Backmerge: #6185 – Make SGroups expandable while placed within a chain (

#6218)
epam · Dec 30, 2024 · abc694a · abc694a
1 parent 377d79d
commit abc694a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 19 deletions.
diff --git a/...onal-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png b/...onal-Group-Tools2-Contract-Functional-Group-on-a-structure-1-chromium-linux.png
diff --git a/...tional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png b/...tional-Group-Tools2-Expand-Functional-Group-on-a-structure-1-chromium-linux.png
diff --git a/...-to-a--13afb--an-expanded-functional-group-and-contract-it-1-chromium-linux.png b/...-to-a--13afb--an-expanded-functional-group-and-contract-it-1-chromium-linux.png
diff --git a/...eck-that-expanded-Functional-Groups-not-overlap-each-other-1-chromium-linux.png b/...eck-that-expanded-Functional-Groups-not-overlap-each-other-1-chromium-linux.png
diff --git a/...s/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useFunctionalGroupEoc.ts b/...s/ketcher-react/src/script/ui/views/components/ContextMenu/hooks/useFunctionalGroupEoc.ts
@@ -1,4 +1,4 @@
-import { Action, setExpandSGroup } from 'ketcher-core';
+import { Action, setExpandMonomerSGroup } from 'ketcher-core';
 import { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import { useAppContext } from 'src/hooks';
@@ -27,7 +27,7 @@ const useFunctionalGroupEoc = () => {
 
       selectedFunctionalGroups?.forEach((functionalGroup) => {
         action.mergeWith(
-          setExpandSGroup(molecule, functionalGroup.relatedSGroupId, {
+          setExpandMonomerSGroup(molecule, functionalGroup.relatedSGroupId, {
             expanded: toExpand,
           }),
         );
@@ -47,17 +47,8 @@ const useFunctionalGroupEoc = () => {
       ),
     );
   }, []);
-  const disabled = useCallback(({ props }: Params) => {
-    const editor = getKetcherInstance().editor as Editor;
-    const molecule = editor.render.ctab.molecule;
-    return Boolean(
-      props?.functionalGroups?.every((functionalGroup) =>
-        functionalGroup?.relatedSGroup.isNotContractible(molecule),
-      ),
-    );
-  }, []);
 
-  return [handler, hidden, disabled] as const;
+  return [handler, hidden] as const;
 };
 
 export default useFunctionalGroupEoc;
diff --git a/...r-react/src/script/ui/views/components/ContextMenu/menuItems/FunctionalGroupMenuItems.tsx b/...r-react/src/script/ui/views/components/ContextMenu/menuItems/FunctionalGroupMenuItems.tsx
@@ -10,26 +10,21 @@ import {
 const FunctionalGroupMenuItems: FC<
   MenuItemsProps<FunctionalGroupsContextMenuProps>
 > = (props) => {
-  const [
-    handleExpandOrContract,
-    ExpandOrContractHidden,
-    ExpandOrContractDisabled,
-  ] = useFunctionalGroupEoc();
+  const [handleExpandOrContract, ExpandOrContractHidden] =
+    useFunctionalGroupEoc();
   const handleRemove = useFunctionalGroupRemove();
 
   return (
     <>
       <Item
         {...props}
-        disabled={(params) => ExpandOrContractDisabled(params)}
         hidden={(params) => ExpandOrContractHidden(params, true)}
         onClick={(params) => handleExpandOrContract(params, true)}
       >
         Expand Abbreviation
       </Item>
       <Item
         {...props}
-        disabled={(params) => ExpandOrContractDisabled(params)}
         hidden={(params) => ExpandOrContractHidden(params, false)}
         onClick={(params) => handleExpandOrContract(params, false)}
       >