Backmerge: #5886 - Loading a KET file in macro mode, bond connections are preserved but microstructures are shifted

packages/ketcher-core/src/application/editor/modes/BaseMode.ts

@@ -265,7 +265,7 @@ export abstract class BaseMode {
       return;
     }
 
-    this.updateMonomersPosition(drawingEntitiesManager);
+    this.updateEntitiesPosition(drawingEntitiesManager);
     const { command: modelChanges, mergedDrawingEntities } =
       drawingEntitiesManager.mergeInto(editor.drawingEntitiesManager);
 
@@ -303,24 +303,19 @@ export abstract class BaseMode {
     }
   }
 
-  private updateMonomersPosition(
+  private updateEntitiesPosition(
     drawingEntitiesManager: DrawingEntitiesManager,
   ) {
-    let offset: Vec2;
-    let index = 0;
     const newNodePosition = this.getNewNodePosition();
-    drawingEntitiesManager.monomers.forEach((monomer) => {
-      let position;
-      if (index === 0) {
-        offset = Vec2.diff(newNodePosition, new Vec2(monomer.position));
-        position = newNodePosition;
-      } else {
-        position = offset
-          ? new Vec2(monomer.position).add(offset)
-          : new Vec2(monomer.position);
-      }
-      drawingEntitiesManager.moveMonomer(monomer, position);
-      index++;
+    const firstEntityPosition =
+      drawingEntitiesManager.allEntities[0]?.[1].position;
+    const offset = Vec2.diff(newNodePosition, new Vec2(firstEntityPosition));
+
+    drawingEntitiesManager.allEntities.forEach(([, drawindEntity]) => {
+      drawingEntitiesManager.moveDrawingEntityModelChange(
+        drawindEntity,
+        offset,
+      );
     });
   }
 

packages/ketcher-core/src/application/editor/modes/FlexMode.ts

@@ -25,6 +25,7 @@ export class FlexMode extends BaseMode {
 
   getNewNodePosition() {
     const editor = CoreEditor.provideEditorInstance();
+
     return Coordinates.canvasToModel(editor.lastCursorPositionOfCanvas);
   }
 

packages/ketcher-core/src/domain/entities/DrawingEntitiesManager.ts

@@ -168,8 +168,8 @@ export class DrawingEntitiesManager {
 
   public get allBondsToMonomers() {
     return [
-      ...(this.polymerBonds as Map<number, DrawingEntity>),
-      ...(this.monomerToAtomBonds as Map<number, DrawingEntity>),
+      ...(this.polymerBonds as Map<number, PolymerBond>),
+      ...(this.monomerToAtomBonds as Map<number, MonomerToAtomBond>),
     ];
   }
 
@@ -1808,14 +1808,9 @@ export class DrawingEntitiesManager {
     );
     const structCenter = this.getMacroStructureCenter();
     const offset = Vec2.diff(centerPointOfModel, structCenter);
-    this.monomers.forEach((monomer: BaseMonomer) => {
-      this.moveMonomer(monomer, new Vec2(monomer.position).add(offset));
-    });
-    this.polymerBonds.forEach((bond: PolymerBond) => {
-      const { x: startX, y: startY } = new Vec2(bond.position).add(offset);
-      bond.moveBondStartAbsolute(startX, startY);
-      const { x: endX, y: endY } = new Vec2(bond.endPosition).add(offset);
-      bond.moveBondEndAbsolute(endX, endY);
+
+    this.allEntities.forEach(([, entity]) => {
+      this.moveDrawingEntityModelChange(entity, offset);
     });
   }