Backmerge: #5809 – Open correct context menu for expanded monomer whi…

…le clicking on bond or atom (#5901)
epam · Nov 4, 2024 · a691731 · a691731
1 parent 909baef
commit a691731
Showing 1 changed file with 44 additions and 20 deletions.
diff --git a/...ages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts b/...ages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts
@@ -54,16 +54,28 @@ export function getMenuPropsForClosestItem(
         true,
       );
 
-      return functionalGroup === null ||
-        functionalGroup?.relatedSGroup.isSuperatomWithoutLabel
-        ? {
-            id: CONTEXT_MENU_ID.FOR_BONDS,
-            bondIds: [closestItem.id],
-          }
-        : {
-            id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-            functionalGroups: [functionalGroup],
-          };
+      const noFunctionalGroup =
+        functionalGroup === null ||
+        functionalGroup?.relatedSGroup.isSuperatomWithoutLabel;
+      const isMonomer =
+        functionalGroup?.relatedSGroup instanceof MonomerMicromolecule;
+
+      if (noFunctionalGroup) {
+        return {
+          id: CONTEXT_MENU_ID.FOR_BONDS,
+          bondIds: [closestItem.id],
+        };
+      } else if (isMonomer) {
+        return {
+          id: CONTEXT_MENU_ID.FOR_MACROMOLECULE,
+          functionalGroups: [functionalGroup],
+        };
+      } else {
+        return {
+          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
+          functionalGroups: [functionalGroup],
+        };
+      }
     }
 
     case 'atoms': {
@@ -73,16 +85,28 @@ export function getMenuPropsForClosestItem(
         true,
       );
 
-      return functionalGroup === null ||
-        functionalGroup?.relatedSGroup.isSuperatomWithoutLabel
-        ? {
-            id: CONTEXT_MENU_ID.FOR_ATOMS,
-            atomIds: [closestItem.id],
-          }
-        : {
-            id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-            functionalGroups: [functionalGroup],
-          };
+      const noFunctionalGroup =
+        functionalGroup === null ||
+        functionalGroup?.relatedSGroup.isSuperatomWithoutLabel;
+      const isMonomer =
+        functionalGroup?.relatedSGroup instanceof MonomerMicromolecule;
+
+      if (noFunctionalGroup) {
+        return {
+          id: CONTEXT_MENU_ID.FOR_ATOMS,
+          atomIds: [closestItem.id],
+        };
+      } else if (isMonomer) {
+        return {
+          id: CONTEXT_MENU_ID.FOR_MACROMOLECULE,
+          functionalGroups: [functionalGroup],
+        };
+      } else {
+        return {
+          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
+          functionalGroups: [functionalGroup],
+        };
+      }
     }
 
     case 'sgroups':