ketcher-react 3.4.0-rc.1 → 3.4.0-rc.2

package/dist/cjs/script/ui/views/components/ContextMenu/hooks/useMonomerExpansionHandlers.d.ts

@@ -1,4 +1,6 @@
+import { FunctionalGroup } from 'ketcher-core';
 import { ItemEventParams, MacromoleculeContextMenuProps } from '../contextMenu.types';
 declare type Params = ItemEventParams<MacromoleculeContextMenuProps>;
+export declare const canExpandMonomer: (functionalGroup: FunctionalGroup) => boolean;
 declare const useMonomerExpansionHandlers: () => readonly [({ props }: Params, toExpand: boolean) => void, ({ props }: Params, toExpand: boolean) => boolean];
 export default useMonomerExpansionHandlers;

package/dist/index.js

@@ -3745,7 +3745,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v3.4.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
+  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v3.4.0-rc.2\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -24534,18 +24534,26 @@ var SCALE = provideEditorSettings().microModeScale;
 var HISTORY_SIZE = 32;
 var structObjects = ['atoms', 'bonds', 'frags', 'sgroups', 'sgroupData', 'rgroups', 'rxnArrows', 'rxnPluses', 'enhancedFlags', 'simpleObjects', 'texts', 'rgroupAttachmentPoints', IMAGE_KEY, MULTITAIL_ARROW_KEY];
 var highlightTargets = ['atoms', 'bonds', 'rxnArrows', 'rxnPluses', 'functionalGroups', 'frags', 'merge', 'rgroups', 'rgroupAttachmentPoints', 'sgroups', 'sgroupData', 'enhancedFlags', 'simpleObjects', 'texts', IMAGE_KEY, MULTITAIL_ARROW_KEY];
-function selectStereoFlagsIfNecessary(atoms, expAtoms) {
-  var atomsOfFragments = {};
+function selectStereoFlagsIfNecessary(atoms, explicitlySelectedAtoms) {
+  var fragmentToAtoms = new Map();
   atoms.forEach(function (atom, atomId) {
-    atomsOfFragments[atom.fragment] ? atomsOfFragments[atom.fragment].push(atomId) : atomsOfFragments[atom.fragment] = [atomId];
+    var _fragmentToAtoms$get;
+    var atomFragment = atom.fragment;
+    if (atomFragment === -1) {
+      return;
+    }
+    var currentAtoms = (_fragmentToAtoms$get = fragmentToAtoms.get(atomFragment)) !== null && _fragmentToAtoms$get !== void 0 ? _fragmentToAtoms$get : [];
+    var updatedAtoms = currentAtoms.concat(atomId);
+    fragmentToAtoms.set(atomFragment, updatedAtoms);
   });
   var stereoFlags = [];
-  Object.keys(atomsOfFragments).forEach(function (fragId) {
-    var shouldSelSFlag = true;
-    atomsOfFragments[fragId].forEach(function (atomId) {
-      if (!expAtoms.includes(atomId)) shouldSelSFlag = false;
+  fragmentToAtoms.forEach(function (fragmentAtoms, fragmentId) {
+    var shouldSelectStereoFlag = fragmentAtoms.every(function (atomId) {
+      return explicitlySelectedAtoms.includes(atomId);
     });
-    shouldSelSFlag && stereoFlags.push(Number(fragId));
+    if (shouldSelectStereoFlag) {
+      stereoFlags = stereoFlags.concat(fragmentId);
+    }
   });
   return stereoFlags;
 }
@@ -26495,6 +26503,9 @@ function MultitailArrowMenuItems(props) {
   });
 }
 
+var canExpandMonomer = function canExpandMonomer(functionalGroup) {
+  return functionalGroup.relatedSGroup instanceof MonomerMicromolecule && !(functionalGroup.relatedSGroup.monomer instanceof AmbiguousMonomer) && !(functionalGroup.relatedSGroup.monomer instanceof UnresolvedMonomer);
+};
 var useMonomerExpansionHandlers = function useMonomerExpansionHandlers() {
   var _useAppContext = useAppContext(),
     getKetcherInstance = _useAppContext.getKetcherInstance;
@@ -26505,6 +26516,9 @@ var useMonomerExpansionHandlers = function useMonomerExpansionHandlers() {
     var selectedFunctionalGroups = props === null || props === void 0 ? void 0 : props.functionalGroups;
     var action = new Action();
     selectedFunctionalGroups === null || selectedFunctionalGroups === void 0 || selectedFunctionalGroups.forEach(function (fg) {
+      if (!canExpandMonomer(fg)) {
+        return;
+      }
       action.mergeWith(setExpandMonomerSGroup(molecule, fg.relatedSGroupId, {
         expanded: toExpand
       }));
@@ -26525,12 +26539,15 @@ var useMonomerExpansionHandlers = function useMonomerExpansionHandlers() {
 function ownKeys$J(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$J(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$J(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$J(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MacromoleculeMenuItems = function MacromoleculeMenuItems(props) {
-  var _props$propsFromTrigg;
+  var _props$propsFromTrigg, _props$propsFromTrigg2;
   var _useMonomerExpansionH = useMonomerExpansionHandlers(),
     _useMonomerExpansionH2 = _slicedToArray$1(_useMonomerExpansionH, 2),
     action = _useMonomerExpansionH2[0],
     _hidden = _useMonomerExpansionH2[1];
-  var multipleMonomersSelected = (props === null || props === void 0 || (_props$propsFromTrigg = props.propsFromTrigger) === null || _props$propsFromTrigg === void 0 ? void 0 : _props$propsFromTrigg.functionalGroups) && props.propsFromTrigger.functionalGroups.length > 1;
+  var multipleMonomersSelected = (props === null || props === void 0 || (_props$propsFromTrigg = props.propsFromTrigger) === null || _props$propsFromTrigg === void 0 ? void 0 : _props$propsFromTrigg.functionalGroups) !== undefined && props.propsFromTrigger.functionalGroups.length > 1;
+  var expandingDisabled = ((_props$propsFromTrigg2 = props.propsFromTrigger) === null || _props$propsFromTrigg2 === void 0 ? void 0 : _props$propsFromTrigg2.functionalGroups) !== undefined && props.propsFromTrigger.functionalGroups.every(function (fg) {
+    return !canExpandMonomer(fg);
+  });
   var expandText = multipleMonomersSelected ? 'Expand monomers' : 'Expand monomer';
   var collapseText = multipleMonomersSelected ? 'Collapse monomers' : 'Collapse monomer';
   return jsxs(Fragment, {
@@ -26541,6 +26558,7 @@ var MacromoleculeMenuItems = function MacromoleculeMenuItems(props) {
       onClick: function onClick(params) {
         return action(params, true);
       },
+      disabled: expandingDisabled,
       children: expandText
     })), jsx(Item, _objectSpread$J(_objectSpread$J({}, props), {}, {
       hidden: function hidden(params) {
@@ -35193,8 +35211,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "3.4.0-rc.1" ,
-                  buildDate: "2025-05-01T08:13:25" ,
+                  version: "3.4.0-rc.2" ,
+                  buildDate: "2025-05-09T17:24:54" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);
@@ -35486,7 +35504,7 @@ var ModeControl = function ModeControl(_ref3) {
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MacromoleculesEditor = lazy(function () {
-  return import('./index.modern-ac2ddbd4.js');
+  return import('./index.modern-e737524e.js');
 });
 var Editor = function Editor(props) {
   var _useState = useState(false),