ketcher-react 2.26.0-rc.6 → 2.27.0-rc.1

package/dist/index.js

@@ -3798,7 +3798,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.26.0-rc.6\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("v2.27.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -8315,11 +8315,6 @@ var DetailsContainer = styled__default["default"].div({
   overflowX: 'hidden',
   overflowY: 'auto',
   transition: 'all .3s'
-}, function (_ref) {
-  var expanded = _ref.expanded;
-  return {
-    maxHeight: expanded ? '9999px' : '0'
-  };
 });
 
 var Accordion$1 = function Accordion(_ref) {
@@ -8334,7 +8329,7 @@ var Accordion$1 = function Accordion(_ref) {
     children: [jsxRuntime.jsx(SummaryContainer, {
       onClick: onSummaryClick,
       children: summary
-    }), jsxRuntime.jsx(DetailsContainer, {
+    }), expanded && jsxRuntime.jsx(DetailsContainer, {
       "data-testid": dataTestIdDetails,
       expanded: expanded,
       children: details
@@ -8501,7 +8496,8 @@ var MonomerName = styled__default["default"].div(_templateObject6$2 || (_templat
 
 var AmbiguousMonomerPreview = function AmbiguousMonomerPreview(_ref) {
   var className = _ref.className,
-    preview = _ref.preview;
+    preview = _ref.preview,
+    style = _ref.style;
   var monomer = preview.monomer,
     presetMonomers = preview.presetMonomers;
   var isAlternatives = monomer.subtype === 'alternatives';
@@ -8559,6 +8555,7 @@ var AmbiguousMonomerPreview = function AmbiguousMonomerPreview(_ref) {
     return sortedData.slice(0, 5);
   }, [previewData, isAlternatives]);
   return jsxRuntime.jsxs(Container, {
+    style: style,
     className: className,
     "data-testid": "polymer-library-preview",
     children: [jsxRuntime.jsx(Header$1, {
@@ -14625,7 +14622,7 @@ var groupDescriptors = groups.reduce(function (accum, group, index) {
 var rGroupOptions = makeItems(['rgroup-label', 'rgroup-fragment', 'rgroup-attpoints']);
 var shapeOptions = makeItems(['shape-ellipse', 'shape-rectangle', 'shape-line']);
 var selectOptions$2 = makeItems(['select-rectangle', 'select-lasso', 'select-fragment']);
-var arrowsOptions = makeItems(['reaction-arrow-open-angle', 'reaction-arrow-filled-triangle', 'reaction-arrow-filled-bow', 'reaction-arrow-dashed-open-angle', 'reaction-arrow-failed', 'reaction-arrow-retrosynthetic', 'reaction-arrow-both-ends-filled-triangle', 'reaction-arrow-equilibrium-filled-half-bow', 'reaction-arrow-equilibrium-filled-triangle', 'reaction-arrow-equilibrium-open-angle', 'reaction-arrow-unbalanced-equilibrium-filled-half-bow', 'reaction-arrow-unbalanced-equilibrium-open-half-angle', 'reaction-arrow-unbalanced-equilibrium-large-filled-half-bow', 'reaction-arrow-unbalanced-equilibrium-filled-half-triangle', 'reaction-arrow-elliptical-arc-arrow-open-angle', 'reaction-arrow-elliptical-arc-arrow-filled-triangle', 'reaction-arrow-elliptical-arc-arrow-filled-bow', 'reaction-arrow-elliptical-arc-arrow-open-half-angle', ketcherCore.MULTITAIL_ARROW_TOOL_NAME]);
+var arrowsOptions = makeItems(['reaction-arrow-open-angle', 'reaction-arrow-filled-triangle', 'reaction-arrow-filled-bow', 'reaction-arrow-dashed-open-angle', 'reaction-arrow-failed', 'reaction-arrow-retrosynthetic', 'reaction-arrow-both-ends-filled-triangle', 'reaction-arrow-equilibrium-filled-half-bow', 'reaction-arrow-equilibrium-filled-triangle', 'reaction-arrow-equilibrium-open-angle', 'reaction-arrow-unbalanced-equilibrium-filled-half-bow', 'reaction-arrow-unbalanced-equilibrium-open-half-angle', 'reaction-arrow-unbalanced-equilibrium-large-filled-half-bow', 'reaction-arrow-unbalanced-equilibrium-filled-half-triangle', 'reaction-arrow-elliptical-arc-arrow-filled-bow', 'reaction-arrow-elliptical-arc-arrow-filled-triangle', 'reaction-arrow-elliptical-arc-arrow-open-angle', 'reaction-arrow-elliptical-arc-arrow-open-half-angle', ketcherCore.MULTITAIL_ARROW_TOOL_NAME]);
 var mappingOptions = makeItems(['reaction-map', 'reaction-unmap', 'reaction-automap']);
 
 var classes$M = {"scroll":"ArrowScroll-module_scroll__h9kCx","button":"ArrowScroll-module_button__ygMgL","down":"ArrowScroll-module_down__yDzZX","up":"ArrowScroll-module_up__Q1ubd"};
@@ -15410,14 +15407,16 @@ var UndoRedo = function UndoRedo(_ref) {
       iconName: "undo",
       disabled: disabledButtons.includes('undo'),
       isHidden: hiddenButtons.includes('undo'),
-      shortcut: shortcuts.undo
+      shortcut: shortcuts.undo,
+      testId: "undo"
     }), jsxRuntime.jsx(TopToolbarIconButton, {
       title: "Redo",
       onClick: onRedo,
       iconName: "redo",
       disabled: disabledButtons.includes('redo'),
       isHidden: hiddenButtons.includes('redo'),
-      shortcut: shortcuts.redo
+      shortcut: shortcuts.redo,
+      testId: "redo"
     }), jsxRuntime.jsx(Divider$1, {})]
   });
 };
@@ -16215,22 +16214,34 @@ function getElementsInRectangle(restruct, p0, p1) {
   var bottomLeftPosition = new ketcherCore.Vec2(x0, y1);
   var polygon = [topLeftPosition, topRightPosition, bottomRightPosition, bottomLeftPosition];
   restruct.bonds.forEach(function (bond, bid) {
-    if (struct.isBondFromMacromolecule(bid)) {
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       return;
     }
-    var centre = ketcherCore.Vec2.lc2(
-    restruct.atoms.get(bond.b.begin).a.pp, 0.5,
-    restruct.atoms.get(bond.b.end).a.pp, 0.5);
-    if (centre.x > x0 && centre.x < x1 && centre.y > y0 && centre.y < y1 && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
+    var center;
+    if (bond.b.isExternalBondBetweenMonomers(struct)) {
+      var firstMonomer = struct.getGroupFromAtomId(bond.b.begin);
+      var secondMonomer = struct.getGroupFromAtomId(bond.b.end);
+      assert_1(firstMonomer);
+      assert_1(secondMonomer);
+      center = firstMonomer.pp && secondMonomer.pp ? ketcherCore.Vec2.centre(firstMonomer.pp, secondMonomer.pp) : bond.b.center;
+    } else {
+      center = bond.b.center;
+    }
+    if (center.x > x0 && center.x < x1 && center.y > y0 && center.y < y1) {
       bondList.push(bid);
     }
   });
   restruct.atoms.forEach(function (atom, aid) {
     var relatedFGId = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, aid);
-    var reSGroup = restruct.sgroups.get(relatedFGId);
-    if (atom.a.pp.x > x0 && atom.a.pp.x < x1 && atom.a.pp.y > y0 && atom.a.pp.y < y1 && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) ||
-    aid === reSGroup.item.atoms[0])) {
-      atomList.push(aid);
+    var sGroup = struct.sgroups.get(relatedFGId);
+    if (struct.isAtomFromMacromolecule(aid)) {
+      if (sGroup && sGroup.pp && sGroup.pp.x > x0 && sGroup.pp.x < x1 && sGroup.pp.y > y0 && sGroup.pp.y < y1) {
+        atomList.push(aid);
+      }
+    } else {
+      if (atom.a.pp.x > x0 && atom.a.pp.x < x1 && atom.a.pp.y > y0 && atom.a.pp.y < y1 && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) || aid === (sGroup === null || sGroup === void 0 ? void 0 : sGroup.atoms[0]))) {
+        atomList.push(aid);
+      }
     }
   });
   var rxnArrowsList = [];
@@ -16325,22 +16336,34 @@ function getElementsInPolygon(restruct, rr) {
     r[i] = new ketcherCore.Vec2(rr[i].x, rr[i].y);
   }
   restruct.bonds.forEach(function (bond, bid) {
-    if (struct.isAtomFromMacromolecule(bond.b.begin) || struct.isAtomFromMacromolecule(bond.b.end)) {
+    if (ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
       return;
     }
-    var centre = ketcherCore.Vec2.lc2(
-    restruct.atoms.get(bond.b.begin).a.pp, 0.5,
-    restruct.atoms.get(bond.b.end).a.pp, 0.5);
-    if (isPointInPolygon(r, centre) && !ketcherCore.FunctionalGroup.isBondInContractedFunctionalGroup(bond.b, sGroups, functionalGroups)) {
+    var center;
+    if (bond.b.isExternalBondBetweenMonomers(struct)) {
+      var firstMonomer = struct.getGroupFromAtomId(bond.b.begin);
+      var secondMonomer = struct.getGroupFromAtomId(bond.b.end);
+      assert_1(firstMonomer);
+      assert_1(secondMonomer);
+      center = firstMonomer !== null && firstMonomer !== void 0 && firstMonomer.pp && secondMonomer !== null && secondMonomer !== void 0 && secondMonomer.pp ? ketcherCore.Vec2.centre(firstMonomer.pp, secondMonomer.pp) : bond.b.center;
+    } else {
+      center = bond.b.center;
+    }
+    if (isPointInPolygon(r, center)) {
       bondList.push(bid);
     }
   });
   restruct.atoms.forEach(function (atom, aid) {
     var relatedFGId = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, aid);
-    var reSGroup = restruct.sgroups.get(relatedFGId);
-    if (isPointInPolygon(r, atom.a.pp) && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) ||
-    aid === reSGroup.item.atoms[0])) {
-      atomList.push(aid);
+    var sGroup = struct.sgroups.get(relatedFGId);
+    if (struct.isAtomFromMacromolecule(aid)) {
+      if (sGroup && sGroup.pp && isPointInPolygon(r, sGroup.pp)) {
+        atomList.push(aid);
+      }
+    } else {
+      if (isPointInPolygon(r, atom.a.pp) && (!ketcherCore.FunctionalGroup.isAtomInContractedFunctionalGroup(atom.a, sGroups, functionalGroups, true) || aid === (sGroup === null || sGroup === void 0 ? void 0 : sGroup.atoms[0]))) {
+        atomList.push(aid);
+      }
     }
   });
   var rxnArrowsList = [];
@@ -21527,7 +21550,12 @@ var EnhancedStereoTool = function () {
         }
         var action = stereoAtoms.reduce(function (acc, stereoAtom) {
           var _struct$atoms$get;
-          return acc.mergeWith(ketcherCore.fromStereoFlagUpdate(restruct, (_struct$atoms$get = struct.atoms.get(stereoAtom)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.fragment));
+          var frid = (_struct$atoms$get = struct.atoms.get(stereoAtom)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.fragment;
+          var frag = frid !== undefined ? restruct.molecule.frags.get(frid) : null;
+          if (frag && frag.stereoAtoms) {
+            return acc.mergeWith(ketcherCore.fromStereoFlagUpdate(restruct, frid));
+          }
+          return acc;
         }, ketcherCore.fromAtomsAttrs(restruct, stereoAtoms, {
           stereoLabel: stereoLabel
         }, false));
@@ -23563,23 +23591,26 @@ var Highlighter = function () {
       args.forEach(function (arg) {
         var atoms = arg.atoms,
           bonds = arg.bonds,
+          rgroupAttachmentPoints = arg.rgroupAttachmentPoints,
           color = arg.color;
         if (typeof color !== 'string') {
           return;
         }
-        if (!atoms && !bonds) {
+        if (!atoms && !bonds && !rgroupAttachmentPoints) {
           return;
         }
         var restruct = _this.editor.render.ctab;
-        var _getValidInputOnly = getValidInputOnly(restruct.molecule, atoms, bonds),
+        var _getValidInputOnly = getValidInputOnly(restruct.molecule, atoms, bonds, rgroupAttachmentPoints),
           validAtoms = _getValidInputOnly.validAtoms,
-          validBonds = _getValidInputOnly.validBonds;
-        if (validAtoms.length === 0 && validBonds.length === 0) {
+          validBonds = _getValidInputOnly.validBonds,
+          validRgroupAttachmentPoints = _getValidInputOnly.validRgroupAttachmentPoints;
+        if (validAtoms.length === 0 && validBonds.length === 0 && validRgroupAttachmentPoints.length === 0) {
           return;
         }
         createdHighlights.push({
           atoms: validAtoms,
           bonds: validBonds,
+          rgroupAttachmentPoints: validRgroupAttachmentPoints,
           color: color
         });
       });
@@ -23595,15 +23626,19 @@ var Highlighter = function () {
   }]);
   return Highlighter;
 }();
-function getValidInputOnly(struct, atoms, bonds) {
+function getValidInputOnly(struct, atoms, bonds, rgroupAttachmentPoints) {
   if (!Array.isArray(atoms)) {
     atoms = [];
   }
   if (!Array.isArray(bonds)) {
     bonds = [];
   }
+  if (!Array.isArray(rgroupAttachmentPoints)) {
+    rgroupAttachmentPoints = [];
+  }
   var structAtoms = struct.atoms,
-    structBonds = struct.bonds;
+    structBonds = struct.bonds,
+    structRgroupAttachmentPoints = struct.rgroupAttachmentPoints;
   if (atoms.length > 0) {
     atoms = atoms.filter(function (aid) {
       return structAtoms.has(aid);
@@ -23614,9 +23649,15 @@ function getValidInputOnly(struct, atoms, bonds) {
       return structBonds.has(bid);
     });
   }
+  if (rgroupAttachmentPoints.length > 0) {
+    rgroupAttachmentPoints = rgroupAttachmentPoints.filter(function (rgroupAPId) {
+      return structRgroupAttachmentPoints.has(rgroupAPId);
+    });
+  }
   return {
     validAtoms: atoms,
-    validBonds: bonds
+    validBonds: bonds,
+    validRgroupAttachmentPoints: rgroupAttachmentPoints
   };
 }
 
@@ -24402,7 +24443,7 @@ function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedec
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 var SCALE = ketcherCore.provideEditorSettings().microModeScale;
 var HISTORY_SIZE = 32;
-var structObjects = ['atoms', 'bonds', 'frags', 'sgroups', 'sgroupData', 'rgroups', 'rxnArrows', 'rxnPluses', 'enhancedFlags', 'simpleObjects', 'texts', ketcherCore.IMAGE_KEY, ketcherCore.MULTITAIL_ARROW_KEY];
+var structObjects = ['atoms', 'bonds', 'frags', 'sgroups', 'sgroupData', 'rgroups', 'rxnArrows', 'rxnPluses', 'enhancedFlags', 'simpleObjects', 'texts', 'rgroupAttachmentPoints', ketcherCore.IMAGE_KEY, ketcherCore.MULTITAIL_ARROW_KEY];
 var highlightTargets = ['atoms', 'bonds', 'rxnArrows', 'rxnPluses', 'functionalGroups', 'frags', 'merge', 'rgroups', 'rgroupAttachmentPoints', 'sgroups', 'sgroupData', 'enhancedFlags', 'simpleObjects', 'texts', ketcherCore.IMAGE_KEY, ketcherCore.MULTITAIL_ARROW_KEY];
 function selectStereoFlagsIfNecessary(atoms, expAtoms) {
   var atomsOfFragments = {};
@@ -24646,21 +24687,13 @@ var Editor$3 = function () {
       if (arguments.length === 0) {
         return this._selection;
       }
-      var struct = this.struct();
       var ReStruct = this.render.ctab;
       var selectAll = false;
       this._selection = null;
       if (ci === 'all') {
         selectAll = true;
         ci = structObjects.reduce(function (res, key) {
-          var restructItemsIds = Array.from(ReStruct[key].keys());
-          restructItemsIds = restructItemsIds.filter(function (restructItemId) {
-            return !struct.isTargetFromMacromolecule({
-              map: key,
-              id: restructItemId
-            });
-          });
-          res[key] = restructItemsIds;
+          res[key] = Array.from(ReStruct[key].keys());
           return res;
         }, {});
       }
@@ -25583,15 +25616,20 @@ var AtomMenuItems = function AtomMenuItems(props) {
     var atomIds = ((_props$propsFromTrigg6 = props.propsFromTrigger) === null || _props$propsFromTrigg6 === void 0 ? void 0 : _props$propsFromTrigg6.atomIds) || [];
     editor.highlights.create({
       atoms: atomIds,
+      rgroupAttachmentPoints: [],
       bonds: [],
       color: color === '' ? 'transparent' : color
     });
   };
   if (isAtomSuperatomLeavingGroup && onlyOneAtomSelected) {
-    return jsxRuntime.jsx(reactContexify.Item, _objectSpread$O(_objectSpread$O({}, props), {}, {
-      onClick: handleDelete,
-      children: "Delete"
-    }));
+    return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+      children: [jsxRuntime.jsx(HighlightMenu, {
+        onHighlight: highlightAtomWithColor
+      }), jsxRuntime.jsx(reactContexify.Item, _objectSpread$O(_objectSpread$O({}, props), {}, {
+        onClick: handleDelete,
+        children: "Delete"
+      }))]
+    });
   }
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx(reactContexify.Item, _objectSpread$O(_objectSpread$O({}, props), {}, {
@@ -25705,6 +25743,7 @@ var useBondSGroupAttach = function useBondSGroupAttach() {
     SGroupTool.sgroupDialog(editor, null);
   }, [getKetcherInstance]);
   var hidden = React.useCallback(function (_ref2) {
+    var _struct$sgroups$get;
     var props = _ref2.props;
     var editor = getKetcherInstance().editor;
     var struct = editor.render.ctab;
@@ -25714,6 +25753,12 @@ var useBondSGroupAttach = function useBondSGroupAttach() {
     }
     var bond = struct.bonds.get(bondIds[0]);
     var attachedSGroups = bond.b.getAttachedSGroups(struct.molecule);
+    var _attachedSGroups = _slicedToArray__default["default"](attachedSGroups, 1),
+      sgGroupId = _attachedSGroups[0];
+    var sgroup = (_struct$sgroups$get = struct.sgroups.get(sgGroupId)) === null || _struct$sgroups$get === void 0 ? void 0 : _struct$sgroups$get.item;
+    if (sgroup !== null && sgroup !== void 0 && sgroup.isSuperatomWithoutLabel) {
+      return false;
+    }
     return attachedSGroups.size > 0;
   }, [getKetcherInstance]);
   return [handler, hidden];
@@ -25741,8 +25786,17 @@ var useBondSGroupEdit = function useBondSGroupEdit() {
     return sGroupsRef.current.size > 1;
   }, [getKetcherInstance]);
   var hidden = React.useCallback(function () {
+    var _struct$sgroups$get;
+    var editor = getKetcherInstance().editor;
+    var struct = editor.render.ctab;
+    var _sGroupsRef$current = _slicedToArray__default["default"](sGroupsRef.current, 1),
+      sgGroupId = _sGroupsRef$current[0];
+    var sgroup = (_struct$sgroups$get = struct.sgroups.get(sgGroupId)) === null || _struct$sgroups$get === void 0 ? void 0 : _struct$sgroups$get.item;
+    if (sgroup !== null && sgroup !== void 0 && sgroup.isSuperatomWithoutLabel) {
+      return true;
+    }
     return sGroupsRef.current.size === 0;
-  }, []);
+  }, [getKetcherInstance]);
   return [handler, disabled, hidden];
 };
 
@@ -25858,6 +25912,7 @@ var BondMenuItems = function BondMenuItems(props) {
     editor.highlights.create({
       atoms: [],
       bonds: bondIds,
+      rgroupAttachmentPoints: [],
       color: color === '' ? 'transparent' : color
     });
   };
@@ -26048,12 +26103,14 @@ var SelectionMenuItems = function SelectionMenuItems(props) {
     atomStereoDisabled = _useAtomStereo2[1];
   var handleDelete = useDelete$1();
   var highlightBondWithColor = function highlightBondWithColor(color) {
-    var _props$propsFromTrigg, _props$propsFromTrigg2;
+    var _props$propsFromTrigg, _props$propsFromTrigg2, _props$propsFromTrigg3;
     var bondIds = ((_props$propsFromTrigg = props.propsFromTrigger) === null || _props$propsFromTrigg === void 0 ? void 0 : _props$propsFromTrigg.bondIds) || [];
     var atomIds = ((_props$propsFromTrigg2 = props.propsFromTrigger) === null || _props$propsFromTrigg2 === void 0 ? void 0 : _props$propsFromTrigg2.atomIds) || [];
+    var rgroupAttachmentPoints = ((_props$propsFromTrigg3 = props.propsFromTrigger) === null || _props$propsFromTrigg3 === void 0 ? void 0 : _props$propsFromTrigg3.rgroupAttachmentPoints) || [];
     editor.highlights.create({
       atoms: atomIds,
       bonds: bondIds,
+      rgroupAttachmentPoints: rgroupAttachmentPoints,
       color: color === '' ? 'transparent' : color
     });
   };
@@ -26175,19 +26232,34 @@ var useRGroupAttachmentPointEdit = function useRGroupAttachmentPointEdit() {
 function ownKeys$K(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$K(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$K(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$K(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var RGroupAttachmentPointMenuItems = function RGroupAttachmentPointMenuItems(props) {
+  var _useAppContext = useAppContext(),
+    getKetcherInstance = _useAppContext.getKetcherInstance;
   var handleRemove = useDelete();
   var _useRGroupAttachmentP = useRGroupAttachmentPointEdit(),
     _useRGroupAttachmentP2 = _slicedToArray__default["default"](_useRGroupAttachmentP, 3),
     handleEditRGroupAttachmentPoint = _useRGroupAttachmentP2[0],
     rgroupAttachmentPointDisabled = _useRGroupAttachmentP2[1],
     rgroupAttachmentPointHidden = _useRGroupAttachmentP2[2];
+  var editor = getKetcherInstance().editor;
+  var highlight = function highlight(color) {
+    var _props$propsFromTrigg;
+    var rgroupAttachmentPoints = ((_props$propsFromTrigg = props.propsFromTrigger) === null || _props$propsFromTrigg === void 0 ? void 0 : _props$propsFromTrigg.rgroupAttachmentPoints) || [];
+    editor.highlights.create({
+      rgroupAttachmentPoints: rgroupAttachmentPoints,
+      atoms: [],
+      bonds: [],
+      color: color === '' ? 'transparent' : color
+    });
+  };
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx(reactContexify.Item, _objectSpread$K(_objectSpread$K({}, props), {}, {
       disabled: rgroupAttachmentPointDisabled,
       hidden: rgroupAttachmentPointHidden,
       onClick: handleEditRGroupAttachmentPoint,
       children: "Edit..."
-    })), jsxRuntime.jsx(reactContexify.Item, _objectSpread$K(_objectSpread$K({}, props), {}, {
+    })), jsxRuntime.jsx(HighlightMenu, {
+      onHighlight: highlight
+    }), jsxRuntime.jsx(reactContexify.Item, _objectSpread$K(_objectSpread$K({}, props), {}, {
       onClick: handleRemove,
       children: "Remove"
     }))]
@@ -26291,10 +26363,14 @@ var useMonomerExpansionHandlers = function useMonomerExpansionHandlers() {
 function ownKeys$I(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$I(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$I(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$I(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var MacromoleculeMenuItems = function MacromoleculeMenuItems(props) {
+  var _props$propsFromTrigg;
   var _useMonomerExpansionH = useMonomerExpansionHandlers(),
     _useMonomerExpansionH2 = _slicedToArray__default["default"](_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 expandText = multipleMonomersSelected ? 'Expand monomers' : 'Expand monomer';
+  var collapseText = multipleMonomersSelected ? 'Collapse monomers' : 'Collapse monomer';
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx(reactContexify.Item, _objectSpread$I(_objectSpread$I({}, props), {}, {
       hidden: function hidden(params) {
@@ -26303,7 +26379,7 @@ var MacromoleculeMenuItems = function MacromoleculeMenuItems(props) {
       onClick: function onClick(params) {
         return action(params, true);
       },
-      children: "Expand monomer"
+      children: expandText
     })), jsxRuntime.jsx(reactContexify.Item, _objectSpread$I(_objectSpread$I({}, props), {}, {
       hidden: function hidden(params) {
         return _hidden(params, false);
@@ -26311,7 +26387,7 @@ var MacromoleculeMenuItems = function MacromoleculeMenuItems(props) {
       onClick: function onClick(params) {
         return action(params, false);
       },
-      children: "Collapse monomer"
+      children: collapseText
     }))]
   });
 };
@@ -26474,24 +26550,46 @@ function getMenuPropsForClosestItem(editor, closestItem) {
     case 'bonds':
       {
         var functionalGroup = ketcherCore.FunctionalGroup.findFunctionalGroupByBond(struct, struct.functionalGroups, closestItem.id, true);
-        return functionalGroup === null || functionalGroup !== null && functionalGroup !== void 0 && functionalGroup.relatedSGroup.isSuperatomWithoutLabel ? {
-          id: CONTEXT_MENU_ID.FOR_BONDS,
-          bondIds: [closestItem.id]
-        } : {
-          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-          functionalGroups: [functionalGroup]
-        };
+        var noFunctionalGroup = functionalGroup === null || (functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup.isSuperatomWithoutLabel);
+        var isMonomer = (functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup) instanceof ketcherCore.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':
       {
         var _functionalGroup = ketcherCore.FunctionalGroup.findFunctionalGroupByAtom(struct.functionalGroups, closestItem.id, true);
-        return _functionalGroup === null || _functionalGroup !== null && _functionalGroup !== void 0 && _functionalGroup.relatedSGroup.isSuperatomWithoutLabel ? {
-          id: CONTEXT_MENU_ID.FOR_ATOMS,
-          atomIds: [closestItem.id]
-        } : {
-          id: CONTEXT_MENU_ID.FOR_FUNCTIONAL_GROUPS,
-          functionalGroups: [_functionalGroup]
-        };
+        var _noFunctionalGroup = _functionalGroup === null || (_functionalGroup === null || _functionalGroup === void 0 ? void 0 : _functionalGroup.relatedSGroup.isSuperatomWithoutLabel);
+        var _isMonomer = (_functionalGroup === null || _functionalGroup === void 0 ? void 0 : _functionalGroup.relatedSGroup) instanceof ketcherCore.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':
     case 'functionalGroups':
@@ -26572,7 +26670,8 @@ function getMenuPropsForSelection(selection, selectedFunctionalGroups) {
     return {
       id: CONTEXT_MENU_ID.FOR_SELECTION,
       bondIds: bonds,
-      atomIds: atoms
+      atomIds: atoms,
+      rgroupAttachmentPoints: rgroupAttachmentPoints
     };
   }
 }
@@ -26873,16 +26972,17 @@ var InfoPanel = function InfoPanel(props) {
   return isAmbiguousMonomer ? jsxRuntime.jsx(AmbiguousMonomerPreview, {
     preview: {
       type: exports.PreviewType.AmbiguousMonomer,
-      monomer: sGroup.monomer.variantMonomerItem,
-      style: {
-        left: "".concat(clientX - 50, "px"),
-        top: calculateAmbiguousMonomerPreviewTop(sGroup.monomer.variantMonomerItem)({
-          left: clientX - 50,
-          top: clientY - 65,
-          bottom: clientY - 25
-        }),
-        transform: 'translate(-50%, 0)'
-      }
+      monomer: sGroup.monomer.variantMonomerItem
+    },
+    style: {
+      position: 'absolute',
+      left: "".concat(clientX - 50, "px"),
+      top: calculateAmbiguousMonomerPreviewTop(sGroup.monomer.variantMonomerItem)({
+        left: clientX - 50,
+        top: clientY - 65,
+        bottom: clientY - 25
+      }),
+      transform: 'translate(-50%, 0)'
     }
   }) : showMolecule ? jsxRuntime.jsx("div", {
     style: {
@@ -34849,8 +34949,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.26.0-rc.6" ,
-                  buildDate: "2024-10-25T09:50:21" ,
+                  version: "2.27.0-rc.1" ,
+                  buildDate: "2024-11-05T14:46:09" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);