#4927 - Able to change attachment point label to an atom if it is sel…

…ected first - 2.23 (#4967)
epam · Jul 5, 2024 · 328feb8 · 328feb8
1 parent 43aec07
commit 328feb8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/packages/ketcher-react/src/script/editor/tool/atom.ts b/packages/ketcher-react/src/script/editor/tool/atom.ts
@@ -57,9 +57,13 @@ class AtomTool implements Tool {
           editorSelection &&
           getGroupIdsFromItemArrays(struct.molecule, editorSelection);
         const sgroups = struct.molecule.functionalGroups;
-        const atomsInFunctionalGroup = editorSelection.atoms.map((atom) => {
-          return FunctionalGroup.atomsInFunctionalGroup(sgroups, atom);
-        });
+        const atomsInFunctionalGroup = editorSelection.atoms
+          .filter((atomId) => {
+            return !Atom.isSuperatomLeavingGroupAtom(struct.molecule, atomId);
+          })
+          .map((atom) => {
+            return FunctionalGroup.atomsInFunctionalGroup(sgroups, atom);
+          });
         if (atomsInFunctionalGroup.some((atom) => atom !== null)) {
           editor.event.removeFG.dispatch({ fgIds: [...selectedSGroupsId] });
           this.editor.hoverIcon.hide();

diff --git a/packages/ketcher-react/src/script/editor/tool/helper/getGroupIdsFromItems.ts b/packages/ketcher-react/src/script/editor/tool/helper/getGroupIdsFromItems.ts
@@ -1,4 +1,4 @@
-import { mergeMapOfItemsToSet, Struct } from 'ketcher-core';
+import { Atom, mergeMapOfItemsToSet, Struct } from 'ketcher-core';
 
 type Items = {
   atoms?: number[];
@@ -9,12 +9,16 @@ function getGroupIdsFromItemArrays(struct: Struct, items?: Items): number[] {
   if (!struct.sgroups.size) return [];
 
   const groupsIds = new Set<number>();
-
-  items?.atoms?.forEach((atomId) => {
-    const groupId = struct.getGroupIdFromAtomId(atomId);
-    if (groupId !== null) groupsIds.add(groupId);
-  });
-
+  if (items?.atoms) {
+    items.atoms
+      .filter((atomId) => {
+        return !Atom.isSuperatomLeavingGroupAtom(struct, atomId);
+      })
+      .forEach((atomId) => {
+        const groupId = struct.getGroupIdFromAtomId(atomId);
+        if (groupId !== null) groupsIds.add(groupId);
+      });
+  }
   items?.bonds?.forEach((bondId) => {
     const groupId = struct.getGroupIdFromBondId(bondId);
     if (groupId !== null) groupsIds.add(groupId);