#3728 - Add group selection for macromolecules (#3924)

epam · Jan 18, 2024 · 15d93cf · 15d93cf
1 parent 8e28981
commit 15d93cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/packages/ketcher-core/src/application/editor/tools/SelectRectangle.ts b/packages/ketcher-core/src/application/editor/tools/SelectRectangle.ts
@@ -115,7 +115,7 @@ class SelectRectangle implements BaseTool {
     } else if (renderer instanceof BaseRenderer && event.shiftKey) {
       const drawingEntity = renderer.drawingEntity;
       modelChanges =
-        this.editor.drawingEntitiesManager.selectCurrentDrawingEntities(
+        this.editor.drawingEntitiesManager.addDrawingEntityToSelection(
           drawingEntity,
         );
     } else {

diff --git a/packages/ketcher-core/src/domain/entities/DrawingEntitiesManager.ts b/packages/ketcher-core/src/domain/entities/DrawingEntitiesManager.ts
@@ -175,29 +175,15 @@ export class DrawingEntitiesManager {
     return command;
   }
 
-  private addOperationToCommand(
-    command: Command,
-    drawingEntity: DrawingEntity,
-  ) {
-    const operation = new DrawingEntitySelectOperation(drawingEntity);
-    command.addOperation(operation);
-  }
-
-  public selectCurrentDrawingEntities(drawingEntity: DrawingEntity) {
+  public addDrawingEntityToSelection(drawingEntity: DrawingEntity) {
     const command = new Command();
 
-    this.allEntities.forEach(([, drawingEntity]) => {
-      if (drawingEntity.selected) {
-        this.addOperationToCommand(command, drawingEntity);
-      }
-    });
-
     if (drawingEntity.selected) {
       drawingEntity.turnOffSelection();
     } else {
       drawingEntity.turnOnSelection();
     }
-    this.addOperationToCommand(command, drawingEntity);
+    command.addOperation(new DrawingEntitySelectOperation(drawingEntity));
 
     return command;
   }