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

package/dist/index.modern.js

@@ -24,7 +24,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, Bond as Bond$2, Elements, AtomList, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup as SGroup$1, Pile, getStereoAtomsMap, identifyStructFormat, SupportedFormat, ChemicalMimeType, SdfSerializer, Render, FunctionalGroup, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, fromAtomsAttrs, fracAngle, Vec2, Action, fromSgroupDeletion, fromFragmentDeletion, fromAtomAddition, fromBondAddition, fromOneBondDeletion, bondChangingAction, fromBondsAttrs, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, mergeMapOfItemsToSet, setExpandSGroup, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, isCloseToEdgeOfCanvas, isCloseToEdgeOfScreen, getDirections, shiftAndExtendCanvasByVector, scrollByVector, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, fromTemplateOnAtom, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTextCreation, formatProperties, Fragment as Fragment$1, OperationType, fromHighlightCreate, fromHighlightClear, fromNewCanvas, Struct, fromDescriptorsAlign, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
+import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, Bond as Bond$2, Elements, AtomList, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup as SGroup$1, Pile, getStereoAtomsMap, identifyStructFormat, SupportedFormat, ChemicalMimeType, SdfSerializer, Render, Struct, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, FunctionalGroup, fromAtomsAttrs, fracAngle, Vec2, Action, fromSgroupDeletion, fromFragmentDeletion, fromAtomAddition, fromBondAddition, fromOneBondDeletion, bondChangingAction, fromBondsAttrs, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, mergeMapOfItemsToSet, setExpandSGroup, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, isCloseToEdgeOfCanvas, isCloseToEdgeOfScreen, getDirections, shiftAndExtendCanvasByVector, scrollByVector, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, fromTemplateOnAtom, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTextCreation, formatProperties, Fragment as Fragment$1, OperationType, fromHighlightCreate, fromHighlightClear, fromNewCanvas, fromDescriptorsAlign, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
 import * as React from 'react';
 import React__default, { createRef, Component, useState, useEffect, useRef, useMemo, createElement, forwardRef, useCallback, useLayoutEffect, Fragment as Fragment$2, PureComponent } from 'react';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
@@ -1932,9 +1932,9 @@ function toSgroup(sgroup) {
   };
 }
 
-function _createForOfIteratorHelper$e(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$e(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$e(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$e(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$e(o, minLen); }
-function _arrayLikeToArray$e(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$d(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$d(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$d(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$d(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$d(o, minLen); }
+function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function isFlipDisabled(editor) {
   var selection = editor.selection();
   var restruct = editor.render.ctab;
@@ -1947,13 +1947,13 @@ function isFlipDisabled(editor) {
       atoms = _selection$atoms === void 0 ? [] : _selection$atoms;
   var getBondIdsForAttachmentAtoms = function getBondIdsForAttachmentAtoms() {
     var result = [];
-    var _iterator = _createForOfIteratorHelper$e(atoms),
+    var _iterator = _createForOfIteratorHelper$d(atoms),
         _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var atomId = _step.value;
         var atomBondIds = Atom$2.getConnectedBondIds(restruct.molecule, atomId);
-        var _iterator2 = _createForOfIteratorHelper$e(atomBondIds),
+        var _iterator2 = _createForOfIteratorHelper$d(atomBondIds),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -1979,7 +1979,7 @@ function isFlipDisabled(editor) {
   var getAmountOfAttachmentBonds = function getAmountOfAttachmentBonds() {
     var amountOfAttachmentBonds = 0;
     var totalBondIds = new Set([].concat(_toConsumableArray(bonds), _toConsumableArray(getBondIdsForAttachmentAtoms())));
-    var _iterator3 = _createForOfIteratorHelper$e(totalBondIds),
+    var _iterator3 = _createForOfIteratorHelper$d(totalBondIds),
         _step3;
     try {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -2469,6 +2469,10 @@ var KETCHER_SAVED_SETTINGS_KEY = 'ketcher_editor_saved_settings';
 var MODES = {
   FG: 'fg'
 };
+var STRUCT_TYPE = {
+  atoms: 'atoms',
+  bonds: 'bonds'
+};
 
 function ownKeys$1a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$1a(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$1a(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -2549,10 +2553,14 @@ function parseStruct(struct, server, options) {
     return Promise.resolve(struct);
   }
 }
+function removeStructAction() {
+  var savedSelectedTool = SettingsManager.selectionTool;
+  return onAction(savedSelectedTool || tools$1['select-rectangle'].action);
+}
 function load(struct, options) {
   return function () {
     var _ref = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(dispatch, getState) {
-      var state, editor, server, errorHandler, parsedStruct, _options2, fragment, hasUnsupportedGroups, oldStruct, stereAtomsMap, savedSelectedTool;
+      var state, editor, server, errorHandler, parsedStruct, _options2, fragment, hasUnsupportedGroups, oldStruct, stereAtomsMap;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -2617,11 +2625,7 @@ function load(struct, options) {
               parsedStruct.markFragments();
               if (fragment) {
                 if (parsedStruct.isBlank()) {
-                  savedSelectedTool = SettingsManager.selectionTool;
-                  dispatch({
-                    type: 'ACTION',
-                    action: savedSelectedTool || tools$1['select-rectangle'].action
-                  });
+                  dispatch(removeStructAction());
                 } else {
                   dispatch(onAction({
                     tool: 'paste',
@@ -3003,7 +3007,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.10.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("v2.10.0-rc.2\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -7880,9 +7884,11 @@ var RenderStruct = function () {
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       if (el && struct) {
         var _options$cachePrefix = options.cachePrefix,
-            cachePrefix = _options$cachePrefix === void 0 ? '' : _options$cachePrefix;
+            cachePrefix = _options$cachePrefix === void 0 ? '' : _options$cachePrefix,
+            _options$needCache = options.needCache,
+            needCache = _options$needCache === void 0 ? true : _options$needCache;
         var cacheKey = "".concat(cachePrefix).concat(struct.name);
-        if (renderCache.has(cacheKey)) {
+        if (renderCache.has(cacheKey) && needCache) {
           el.innerHTML = renderCache.get(cacheKey);
           return;
         }
@@ -7896,7 +7902,9 @@ var RenderStruct = function () {
         }, options));
         rnd.setMolecule(preparedStruct);
         rnd.update(true, options.viewSz);
-        renderCache.set(cacheKey, rnd.clientArea.innerHTML);
+        if (needCache) {
+          renderCache.set(cacheKey, rnd.clientArea.innerHTML);
+        }
       }
     }
   }]);
@@ -8023,6 +8031,26 @@ function memoizedDebounce(func) {
 
 var showTooltipTimer = null;
 var TOOLTIP_DELAY = 300;
+function makeStruct(editor, sGroup) {
+  var existingStruct = editor.struct();
+  var struct = new Struct();
+  var atomsIdMapping = new Map();
+  sGroup.atoms.forEach(function (atomId) {
+    var atomIdInTooltip = struct.atoms.add(existingStruct.atoms.get(atomId));
+    atomsIdMapping.set(atomId, atomIdInTooltip);
+  });
+  Array.from(existingStruct.bonds).forEach(function (value) {
+    var _value = _slicedToArray(value, 2);
+        _value[0];
+        var bond = _value[1];
+    var clonedBond = bond.clone(atomsIdMapping);
+    var isInsideSGroup = sGroup.atoms.includes(bond.begin) || sGroup.atoms.includes(bond.end);
+    if (isInsideSGroup) {
+      struct.bonds.add(clonedBond);
+    }
+  });
+  return struct;
+}
 function showTooltip(editor, infoPanelData) {
   editor.event.showInfo.dispatch(null);
   if (showTooltipTimer) {
@@ -8043,7 +8071,8 @@ function showFunctionalGroupsTooltip(editor) {
     var sGroup = (_editor$struct = editor.struct()) === null || _editor$struct === void 0 ? void 0 : _editor$struct.sgroups.get(closestCollapsibleStructures.id);
     if (sGroup && !sGroup.data.expanded && sGroup.hovering) {
       var groupName = sGroup.data.name;
-      var groupStruct = FunctionalGroup.getFunctionalGroupByName(groupName);
+      var groupStruct = makeStruct(editor, sGroup);
+      groupStruct.name = groupName;
       infoPanelData = {
         groupStruct: groupStruct,
         event: event,
@@ -10039,7 +10068,8 @@ var mapDispatchToProps$e = function mapDispatchToProps(dispatch) {
       return dispatchAction('open');
     },
     onSave: function onSave() {
-      return dispatchAction('save');
+      dispatch(removeStructAction());
+      dispatchAction('save');
     },
     onUndo: function onUndo() {
       return dispatchAction('undo');
@@ -10189,9 +10219,9 @@ function lookup(map, event) {
 }
 keyNorm.lookup = lookup;
 
-function _createForOfIteratorHelper$d(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$d(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$d(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$d(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$d(o, minLen); }
-function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$c(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$c(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$c(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$c(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$c(o, minLen); }
+function _arrayLikeToArray$c(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var APointTool = function () {
   function APointTool(editor) {
     _classCallCheck(this, APointTool);
@@ -10227,7 +10257,7 @@ var APointTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$d(atomResult),
+        var _iterator = _createForOfIteratorHelper$c(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -10338,9 +10368,9 @@ var utils = {
   getNonGroupItemsAndAttachmentPoints: getNonGroupItemsAndAttachmentPoints
 };
 
-function _createForOfIteratorHelper$c(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$c(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$c(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$c(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$c(o, minLen); }
-function _arrayLikeToArray$c(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$b(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$b(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$b(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$b(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$b(o, minLen); }
+function _arrayLikeToArray$b(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function _classPrivateFieldInitSpec$2(obj, privateMap, value) { _checkPrivateRedeclaration$2(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration$2(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 var _bondProps = new WeakMap();
@@ -10417,7 +10447,7 @@ var AtomTool = function () {
         if (atomId !== null) atomResult.push(atomId);
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$c(atomResult),
+        var _iterator = _createForOfIteratorHelper$b(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -10489,7 +10519,7 @@ var AtomTool = function () {
         if (atomId !== null) atomResult.push(atomId);
       }
       if (atomResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$c(atomResult),
+        var _iterator2 = _createForOfIteratorHelper$b(atomResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -10558,9 +10588,9 @@ function atomLongtapEvent(tool, render) {
   };
 }
 
-function _createForOfIteratorHelper$b(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$b(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$b(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$b(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$b(o, minLen); }
-function _arrayLikeToArray$b(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$a(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$a(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$a(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$a(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$a(o, minLen); }
+function _arrayLikeToArray$a(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var AttachTool = function () {
   function AttachTool(editor, attachPoints) {
     _classCallCheck(this, AttachTool);
@@ -10613,7 +10643,7 @@ var AttachTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$b(atomResult),
+        var _iterator = _createForOfIteratorHelper$a(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -10633,7 +10663,7 @@ var AttachTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$b(bondResult),
+        var _iterator2 = _createForOfIteratorHelper$a(bondResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -10669,9 +10699,9 @@ var AttachTool = function () {
   return AttachTool;
 }();
 
-function _createForOfIteratorHelper$a(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$a(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$a(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$a(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$a(o, minLen); }
-function _arrayLikeToArray$a(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$9(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$9(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$9(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$9(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$9(o, minLen); }
+function _arrayLikeToArray$9(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var BondTool = function () {
   function BondTool(editor, bondProps) {
     var _editor$selection;
@@ -10708,7 +10738,7 @@ var BondTool = function () {
         if (bondId !== null) bondResult.push(bondId);
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$a(atomResult),
+        var _iterator = _createForOfIteratorHelper$9(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -10728,7 +10758,7 @@ var BondTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$a(bondResult),
+        var _iterator2 = _createForOfIteratorHelper$9(bondResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -10836,7 +10866,7 @@ var BondTool = function () {
               }
             }
             if (atomResult.length > 0) {
-              var _iterator3 = _createForOfIteratorHelper$a(atomResult),
+              var _iterator3 = _createForOfIteratorHelper$9(atomResult),
                   _step3;
               try {
                 for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -10949,7 +10979,7 @@ var BondTool = function () {
   }, {
     key: "getExistingBond",
     value: function getExistingBond(struct, begin, end) {
-      var _iterator4 = _createForOfIteratorHelper$a(struct.bonds.entries()),
+      var _iterator4 = _createForOfIteratorHelper$9(struct.bonds.entries()),
           _step4;
       try {
         for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -10972,9 +11002,9 @@ var BondTool = function () {
   return BondTool;
 }();
 
-function _createForOfIteratorHelper$9(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$9(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$9(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$9(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$9(o, minLen); }
-function _arrayLikeToArray$9(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$8(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$8(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$8(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$8(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$8(o, minLen); }
+function _arrayLikeToArray$8(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var ChainTool = function () {
   function ChainTool(editor) {
     _classCallCheck(this, ChainTool);
@@ -11006,7 +11036,7 @@ var ChainTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$9(atomResult),
+        var _iterator = _createForOfIteratorHelper$8(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -11026,7 +11056,7 @@ var ChainTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$9(bondResult),
+        var _iterator2 = _createForOfIteratorHelper$8(bondResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -11131,7 +11161,7 @@ var ChainTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator3 = _createForOfIteratorHelper$9(atomResult),
+        var _iterator3 = _createForOfIteratorHelper$8(atomResult),
             _step3;
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -11193,9 +11223,9 @@ var ChainTool = function () {
   return ChainTool;
 }();
 
-function _createForOfIteratorHelper$8(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$8(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$8(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$8(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$8(o, minLen); }
-function _arrayLikeToArray$8(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$7(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$7(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$7(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$7(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$7(o, minLen); }
+function _arrayLikeToArray$7(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var ChargeTool = function () {
   function ChargeTool(editor, charge) {
     _classCallCheck(this, ChargeTool);
@@ -11236,7 +11266,7 @@ var ChargeTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$8(atomResult),
+        var _iterator = _createForOfIteratorHelper$7(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -11599,9 +11629,9 @@ var LassoHelper = function () {
   return LassoHelper;
 }();
 
-function _createForOfIteratorHelper$7(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$7(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$7(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$7(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$7(o, minLen); }
-function _arrayLikeToArray$7(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$6(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$6(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$6(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$6(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$6(o, minLen); }
+function _arrayLikeToArray$6(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var searchMaps = ['atoms', 'bonds', 'sgroups', 'functionalGroups', 'sgroupData'];
 var SGroupTool = function () {
   function SGroupTool(editor) {
@@ -11633,7 +11663,7 @@ var SGroupTool = function () {
           return isEqual(sgroup.atoms, selectedAtoms);
         });
         if (selectedAtoms && functionalGroups.size) {
-          var _iterator = _createForOfIteratorHelper$7(selectedAtoms),
+          var _iterator = _createForOfIteratorHelper$6(selectedAtoms),
               _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -11645,7 +11675,7 @@ var SGroupTool = function () {
               }
               var atomFromStruct = atomId !== null && ((_struct$atoms$get = struct.atoms.get(atomId)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.a);
               if (atomFromStruct) {
-                var _iterator2 = _createForOfIteratorHelper$7(atomFromStruct.sgs.values()),
+                var _iterator2 = _createForOfIteratorHelper$6(atomFromStruct.sgs.values()),
                     _step2;
                 try {
                   for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -11678,7 +11708,7 @@ var SGroupTool = function () {
           atomsResult = [];
         }
         if (atomsResult && atomsResult.length > 0) {
-          var _iterator3 = _createForOfIteratorHelper$7(atomsResult),
+          var _iterator3 = _createForOfIteratorHelper$6(atomsResult),
               _step3;
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -11742,7 +11772,7 @@ var SGroupTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator4 = _createForOfIteratorHelper$7(atomResult),
+        var _iterator4 = _createForOfIteratorHelper$6(atomResult),
             _step4;
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -11762,7 +11792,7 @@ var SGroupTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator5 = _createForOfIteratorHelper$7(bondResult),
+        var _iterator5 = _createForOfIteratorHelper$6(bondResult),
             _step5;
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -11824,7 +11854,7 @@ var SGroupTool = function () {
       var result = [];
       if (ci && ci.map === 'functionalGroups' && functionalGroups.size && FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups)) return;
       if (selected && functionalGroups.size && selected.atoms) {
-        var _iterator6 = _createForOfIteratorHelper$7(selected.atoms),
+        var _iterator6 = _createForOfIteratorHelper$6(selected.atoms),
             _step6;
         try {
           for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -11836,7 +11866,7 @@ var SGroupTool = function () {
             }
             var atomFromStruct = atomId !== null && ((_struct$atoms$get3 = struct.atoms.get(atomId)) === null || _struct$atoms$get3 === void 0 ? void 0 : _struct$atoms$get3.a);
             if (atomFromStruct) {
-              var _iterator7 = _createForOfIteratorHelper$7(atomFromStruct.sgs.values()),
+              var _iterator7 = _createForOfIteratorHelper$6(atomFromStruct.sgs.values()),
                   _step7;
               try {
                 for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -11866,7 +11896,7 @@ var SGroupTool = function () {
         }
       }
       if (selected && functionalGroups.size && selected.bonds) {
-        var _iterator8 = _createForOfIteratorHelper$7(selected.bonds),
+        var _iterator8 = _createForOfIteratorHelper$6(selected.bonds),
             _step8;
         try {
           for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
@@ -11908,7 +11938,7 @@ var SGroupTool = function () {
         bondsResult = null;
       }
       if (atomsResult && atomsResult.length > 0) {
-        var _iterator9 = _createForOfIteratorHelper$7(atomsResult),
+        var _iterator9 = _createForOfIteratorHelper$6(atomsResult),
             _step9;
         try {
           for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
@@ -11925,7 +11955,7 @@ var SGroupTool = function () {
         }
       }
       if (bondsResult && bondsResult.length > 0) {
-        var _iterator10 = _createForOfIteratorHelper$7(bondsResult),
+        var _iterator10 = _createForOfIteratorHelper$6(bondsResult),
             _step10;
         try {
           for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
@@ -12078,6 +12108,9 @@ function fromContextType(id, editor, newSg, currSelection) {
   var sg = restruct.molecule.sgroups.get(id);
   var sourceAtoms = sg && sg.atoms || currSelection.atoms || [];
   var context = newSg.attrs.context;
+  if (newSg.type === SGroup$1.TYPES.SUP) {
+    newSg.attrs.expanded = true;
+  }
   var result = fromSgroupAction(context, restruct, newSg, sourceAtoms, currSelection);
   result.selection = result.selection || currSelection;
   if (id !== null && id !== undefined) {
@@ -12138,7 +12171,7 @@ function getGroupIdsFromItemMaps(struct, mergeMaps) {
   });
 }
 
-function dropAndMerge(editor, mergeItems, action) {
+function dropAndMerge(editor, mergeItems, action, resizeCanvas) {
   var _dropItemAction;
   var restruct = editor.render.ctab;
   var isMerging = !!mergeItems;
@@ -12163,7 +12196,7 @@ function dropAndMerge(editor, mergeItems, action) {
   if (isMerging) editor.selection(null);
   if (((_dropItemAction = dropItemAction) === null || _dropItemAction === void 0 ? void 0 : _dropItemAction.operations.length) > 0) {
     editor.update(dropItemAction, false, {
-      resizeCanvas: false
+      resizeCanvas: !!resizeCanvas
     });
   }
   return dropItemAction;
@@ -12188,27 +12221,24 @@ function extractAttachmentAtom(mergeItems, editor) {
     atoms: new Map(mergeItems.atoms),
     bonds: new Map(mergeItems.bonds)
   };
-  var removeNonAttachmentAtoms = new Action();
-  var removeSGroup = new Action();
+  var action = new Action();
   (_mergeItems$atomToFun = mergeItems.atomToFunctionalGroup) === null || _mergeItems$atomToFun === void 0 ? void 0 : _mergeItems$atomToFun.forEach(function (functionalGroupId, srcAtomId) {
     var sGroup = struct.sgroups.get(functionalGroupId);
     var attachmentAtomId = sGroup === null || sGroup === void 0 ? void 0 : sGroup.getAttAtomId(struct);
-    if (attachmentAtomId) {
-      var attachmentAtom = struct.atoms.get(attachmentAtomId);
-      if (SGroup$1.isAtomInContractedSGroup(attachmentAtom, struct.sgroups)) {
-        return;
-      }
-      newMergeItems.atoms.set(srcAtomId, attachmentAtomId);
-      removeNonAttachmentAtoms.mergeWith(fromFragmentDeletion(reStruct, {
-        atoms: _toConsumableArray(SGroup$1.getAtoms(struct, sGroup)).filter(function (atomId) {
-          return atomId !== attachmentAtomId;
-        }),
-        bonds: _toConsumableArray(SGroup$1.getBonds(struct, sGroup))
+    if (attachmentAtomId !== undefined) {
+      var atomsToDelete = _toConsumableArray(SGroup$1.getAtoms(struct, sGroup)).filter(function (atomId) {
+        return atomId !== attachmentAtomId;
+      });
+      var bondsToDelete = _toConsumableArray(SGroup$1.getBonds(struct, sGroup));
+      action.mergeWith(fromSgroupDeletion(reStruct, functionalGroupId));
+      action.mergeWith(fromFragmentDeletion(reStruct, {
+        atoms: atomsToDelete,
+        bonds: bondsToDelete
       }));
-      removeSGroup.mergeWith(fromSgroupDeletion(reStruct, functionalGroupId));
+      newMergeItems.atoms.set(srcAtomId, attachmentAtomId);
     }
   });
-  return [newMergeItems, removeNonAttachmentAtoms];
+  return [newMergeItems, action];
 }
 
 function ownKeys$Q(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -12286,9 +12316,19 @@ function updateSelectedBonds(_ref) {
   }
 }
 
-function _createForOfIteratorHelper$6(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$6(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$6(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$6(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$6(o, minLen); }
-function _arrayLikeToArray$6(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function hasAtomsOutsideCanvas(atoms, render, scale) {
+  return atoms.some(function (atom) {
+    var canvasSize = render.sz;
+    var offset = render.options.offset;
+    var xSize = atom.pp.x * scale;
+    var ySize = atom.pp.y * scale;
+    return xSize > canvasSize.x || xSize + offset.x < 0 || ySize > canvasSize.y || ySize + offset.y < 0;
+  });
+}
+
+function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$5(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$5(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$5(o, minLen); }
+function _arrayLikeToArray$5(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function ownKeys$P(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$P(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$P(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$P(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _classPrivateFieldInitSpec$1(obj, privateMap, value) { _checkPrivateRedeclaration$1(obj, privateMap); privateMap.set(obj, value); }
@@ -12459,7 +12499,9 @@ var SelectTool = function () {
         delete this.dragCtx;
       }
       if ((_this$dragCtx2 = this.dragCtx) !== null && _this$dragCtx2 !== void 0 && _this$dragCtx2.item) {
-        dropAndMerge(editor, this.dragCtx.mergeItems, this.dragCtx.action);
+        var atoms = Array.from(editor.struct().atoms.values());
+        var shouldResizeCanvas = hasAtomsOutsideCanvas(atoms, editor.render, editor.options().scale);
+        dropAndMerge(editor, this.dragCtx.mergeItems, this.dragCtx.action, shouldResizeCanvas);
         delete this.dragCtx;
       } else if (_classPrivateFieldGet(this, _lassoHelper).running()) {
         this.selectElementsOnCanvas(newSelected, editor, event);
@@ -12497,7 +12539,7 @@ var SelectTool = function () {
         bondFromStruct, sgroups, functionalGroups)) bondResult.push(bondId);
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$6(atomResult),
+        var _iterator = _createForOfIteratorHelper$5(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -12517,7 +12559,7 @@ var SelectTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$6(bondResult),
+        var _iterator2 = _createForOfIteratorHelper$5(bondResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -12737,7 +12779,7 @@ function getNewSelectedItems(editor, selectedSgroups) {
     atoms: [],
     bonds: []
   };
-  var _iterator3 = _createForOfIteratorHelper$6(selectedSgroups),
+  var _iterator3 = _createForOfIteratorHelper$5(selectedSgroups),
       _step3;
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -12759,9 +12801,9 @@ function getNewSelectedItems(editor, selectedSgroups) {
   return newSelected;
 }
 
-function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$5(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$5(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$5(o, minLen); }
-function _arrayLikeToArray$5(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$4(o, minLen); }
+function _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var EraserTool = function () {
   function EraserTool(editor, mode) {
     _classCallCheck(this, EraserTool);
@@ -12809,7 +12851,7 @@ var EraserTool = function () {
       var bondsResult = [];
       var preResult = [];
       if (selected && functionalGroups.size && selected.atoms) {
-        var _iterator = _createForOfIteratorHelper$5(selected.atoms),
+        var _iterator = _createForOfIteratorHelper$4(selected.atoms),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -12818,7 +12860,7 @@ var EraserTool = function () {
             var atomId = FunctionalGroup.atomsInFunctionalGroup(functionalGroups, atom);
             var atomFromStruct = atomId !== null && ((_struct$atoms$get = struct.atoms.get(atomId)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.a);
             if (atomFromStruct) {
-              var _iterator2 = _createForOfIteratorHelper$5(atomFromStruct.sgs.values()),
+              var _iterator2 = _createForOfIteratorHelper$4(atomFromStruct.sgs.values()),
                   _step2;
               try {
                 for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -12848,7 +12890,7 @@ var EraserTool = function () {
         }
       }
       if (selected && functionalGroups.size && selected.bonds) {
-        var _iterator3 = _createForOfIteratorHelper$5(selected.bonds),
+        var _iterator3 = _createForOfIteratorHelper$4(selected.bonds),
             _step3;
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -12867,7 +12909,7 @@ var EraserTool = function () {
         }
       }
       if (atomsResult.length > 0) {
-        var _iterator4 = _createForOfIteratorHelper$5(atomsResult),
+        var _iterator4 = _createForOfIteratorHelper$4(atomsResult),
             _step4;
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
@@ -12882,7 +12924,7 @@ var EraserTool = function () {
         }
       }
       if (bondsResult.length > 0) {
-        var _iterator5 = _createForOfIteratorHelper$5(bondsResult),
+        var _iterator5 = _createForOfIteratorHelper$4(bondsResult),
             _step5;
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
@@ -12953,7 +12995,7 @@ var EraserTool = function () {
         }
       }
       if (atomResult.length) {
-        var _iterator6 = _createForOfIteratorHelper$5(atomResult),
+        var _iterator6 = _createForOfIteratorHelper$4(atomResult),
             _step6;
         try {
           for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -12969,7 +13011,7 @@ var EraserTool = function () {
           _iterator6.f();
         }
       } else if (bondResult.length) {
-        var _iterator7 = _createForOfIteratorHelper$5(bondResult),
+        var _iterator7 = _createForOfIteratorHelper$4(bondResult),
             _step7;
         try {
           for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
@@ -13130,7 +13172,8 @@ function ownKeys$O(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$O(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$O(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$O(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var PasteTool = function () {
   function PasteTool(editor, struct) {
-    var _struct$functionalGro;
+    var _struct$functionalGro,
+        _this = this;
     _classCallCheck(this, PasteTool);
     this.editor = editor;
     this.editor.selection(null);
@@ -13150,6 +13193,15 @@ var PasteTool = function () {
         pasteItems = _fromPaste2[1];
     this.action = action;
     this.editor.update(this.action, true);
+    struct.sgroups.forEach(function (sgroup) {
+      var countAttachmentPoint = FunctionalGroup.getAttachmentPointCount(sgroup, _this.editor.render.ctab.molecule);
+      if (countAttachmentPoint > 1) {
+        action.mergeWith(setExpandSGroup(_this.editor.render.ctab, sgroup.id, {
+          expanded: true
+        }));
+      }
+    });
+    this.editor.update(this.action, true);
     this.findItems = ['functionalGroups'];
     this.mergeItems = getItemsToFuse(this.editor, pasteItems);
     this.editor.hover(getHoverToFuse(this.mergeItems), this);
@@ -13183,6 +13235,7 @@ var PasteTool = function () {
   }, {
     key: "mousemove",
     value: function mousemove(event) {
+      var _this2 = this;
       if (this.action) {
         var _this$action2;
         (_this$action2 = this.action) === null || _this$action2 === void 0 ? void 0 : _this$action2.perform(this.editor.render.ctab);
@@ -13213,6 +13266,12 @@ var PasteTool = function () {
         this.dragCtx.action = action;
         this.editor.update(this.dragCtx.action, true);
       } else {
+        this.struct.sgroups.forEach(function (sgroup) {
+          var countAttachmentPoint = FunctionalGroup.getAttachmentPointCount(sgroup, _this2.struct);
+          if (countAttachmentPoint > 1) {
+            sgroup.setAttr('expanded', true);
+          }
+        });
         var _fromPaste5 = fromPaste(this.editor.render.ctab, this.struct, this.editor.render.page2obj(event)),
             _fromPaste6 = _slicedToArray(_fromPaste5, 2),
             _action = _fromPaste6[0],
@@ -13253,7 +13312,7 @@ var PasteTool = function () {
         var action = this.action;
         delete this.action;
         if (!this.isSingleContractedGroup || !this.mergeItems) {
-          this.editor.update(dropAndMerge(this.editor, this.mergeItems, action));
+          this.editor.update(dropAndMerge(this.editor, this.mergeItems, action, true));
         }
       }
     }
@@ -13293,9 +13352,9 @@ function prepareTemplateFromSingleGroup(molecule) {
   return template;
 }
 
-function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$4(o, minLen); }
-function _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
+function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var RGroupAtomTool = function () {
   function RGroupAtomTool(editor) {
     _classCallCheck(this, RGroupAtomTool);
@@ -13331,7 +13390,7 @@ var RGroupAtomTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$4(atomResult),
+        var _iterator = _createForOfIteratorHelper$3(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -13395,9 +13454,9 @@ function propsDialog$1(editor, id, pos) {
   });
 }
 
-function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$3(o, minLen); }
-function _arrayLikeToArray$3(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$2(o, minLen); }
+function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var RGroupFragmentTool = function () {
   function RGroupFragmentTool(editor) {
     _classCallCheck(this, RGroupFragmentTool);
@@ -13434,7 +13493,7 @@ var RGroupFragmentTool = function () {
         }
       }
       if (atomResult.length > 0) {
-        var _iterator = _createForOfIteratorHelper$3(atomResult),
+        var _iterator = _createForOfIteratorHelper$2(atomResult),
             _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -13454,7 +13513,7 @@ var RGroupFragmentTool = function () {
         });
         return;
       } else if (bondResult.length > 0) {
-        var _iterator2 = _createForOfIteratorHelper$3(bondResult),
+        var _iterator2 = _createForOfIteratorHelper$2(bondResult),
             _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -14643,9 +14702,6 @@ var tools = {
   text: TextTool
 };
 
-function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$2(o, minLen); }
-function _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 function ownKeys$M(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$M(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$M(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$M(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function handleHotkeyOverItem(props) {
@@ -14664,18 +14720,44 @@ function handleOtherActions(_ref) {
       newAction = _ref.newAction;
   dispatch(onAction(newAction));
 }
-function handleEraser(_ref2) {
+function eraseItem(_ref2) {
   var editor = _ref2.editor,
-      hoveredItem = _ref2.hoveredItem;
-  var action = fromFragmentDeletion(editor.render.ctab, mapItemsToArrays(hoveredItem));
+      item = _ref2.item;
+  var action = fromFragmentDeletion(editor.render.ctab, item);
   editor.update(action);
   editor.hover(null);
 }
-function handleDialog(_ref3) {
-  var hoveredItem = _ref3.hoveredItem,
+function handleEraser(_ref3) {
+  var editor = _ref3.editor,
+      hoveredItem = _ref3.hoveredItem,
       newAction = _ref3.newAction,
-      editor = _ref3.editor,
       dispatch = _ref3.dispatch;
+  var item = mapItemsToArrays(hoveredItem);
+  var itemType = Object.keys(hoveredItem)[0];
+  if ([STRUCT_TYPE.atoms, STRUCT_TYPE.bonds].includes(itemType)) {
+    isFunctionalGroupChange({
+      editor: editor,
+      hoveredItemId: item[itemType][0],
+      newAction: newAction,
+      dispatch: dispatch
+    }, itemType).then(function (res) {
+      res && eraseItem({
+        editor: editor,
+        item: item
+      });
+    });
+    return;
+  }
+  eraseItem({
+    editor: editor,
+    item: item
+  });
+}
+function handleDialog(_ref4) {
+  var hoveredItem = _ref4.hoveredItem,
+      newAction = _ref4.newAction,
+      editor = _ref4.editor,
+      dispatch = _ref4.dispatch;
   var dialogType = Object.keys(hoveredItem)[0];
   var dialogHandler = getDialogHandler(dialogType);
   var hoveredItemId = hoveredItem[dialogType];
@@ -14701,11 +14783,11 @@ function getDialogHandler(itemType) {
   var dialog = dialogs[itemType];
   return dialog;
 }
-function handleAtomPropsDialog(_ref4) {
-  var hoveredItemId = _ref4.hoveredItemId,
-      newAction = _ref4.newAction,
-      editor = _ref4.editor,
-      dispatch = _ref4.dispatch;
+function handleAtomPropsDialog(_ref5) {
+  var hoveredItemId = _ref5.hoveredItemId,
+      newAction = _ref5.newAction,
+      editor = _ref5.editor,
+      dispatch = _ref5.dispatch;
   var selection = editor.selection();
   var atomsSelected = selection === null || selection === void 0 ? void 0 : selection.atoms;
   var restruct = editor.render.ctab;
@@ -14728,11 +14810,11 @@ function handleAtomPropsDialog(_ref4) {
     });
   }
 }
-function handleBondPropsDialog(_ref5) {
-  var hoveredItemId = _ref5.hoveredItemId,
-      newAction = _ref5.newAction,
-      editor = _ref5.editor,
-      dispatch = _ref5.dispatch;
+function handleBondPropsDialog(_ref6) {
+  var hoveredItemId = _ref6.hoveredItemId,
+      newAction = _ref6.newAction,
+      editor = _ref6.editor,
+      dispatch = _ref6.dispatch;
   var restruct = editor.render.ctab;
   var bondFromStruct = restruct.bonds.get(hoveredItemId);
   var convertedBondForModal = fromBond(bondFromStruct === null || bondFromStruct === void 0 ? void 0 : bondFromStruct.b);
@@ -14743,11 +14825,11 @@ function handleBondPropsDialog(_ref5) {
     return null;
   });
 }
-function handleTool(_ref6) {
-  var hoveredItem = _ref6.hoveredItem,
-      newAction = _ref6.newAction,
-      editor = _ref6.editor,
-      dispatch = _ref6.dispatch;
+function handleTool(_ref7) {
+  var hoveredItem = _ref7.hoveredItem,
+      newAction = _ref7.newAction,
+      editor = _ref7.editor,
+      dispatch = _ref7.dispatch;
   var _loop = function _loop(item) {
     var toolHandler = getToolHandler(item, newAction.tool);
     var isChangeStructureTool = newAction.tool !== 'hand';
@@ -14759,7 +14841,7 @@ function handleTool(_ref6) {
         newAction: newAction,
         dispatch: dispatch
       };
-      isFunctionalGroupChange(props).then(function (result) {
+      isFunctionalGroupChange(props, item).then(function (result) {
         if (!result && isChangeStructureTool) return;
         toolHandler(props);
       });
@@ -14769,17 +14851,17 @@ function handleTool(_ref6) {
     _loop(item);
   }
 }
-function isFunctionalGroupChange(_x) {
+function isFunctionalGroupChange(_x, _x2) {
   return _isFunctionalGroupChange.apply(this, arguments);
 }
 function _isFunctionalGroupChange() {
-  _isFunctionalGroupChange = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(props) {
+  _isFunctionalGroupChange = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(props, type) {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return isChangingFunctionalGroup(props);
+            return isChangingFunctionalGroup(props, type);
           case 2:
             return _context.abrupt("return", _context.sent);
           case 3:
@@ -14807,13 +14889,13 @@ function getToolHandler(itemType) {
       rgroupatom: function rgroupatom(props) {
         return handleRGroupAtomTool(props);
       },
-      sgroup: function sgroup(_ref7) {
-        var editor = _ref7.editor,
-            hoveredItemId = _ref7.hoveredItemId;
+      sgroup: function sgroup(_ref8) {
+        var editor = _ref8.editor,
+            hoveredItemId = _ref8.hoveredItemId;
         tools.sgroup.sgroupDialog(editor, hoveredItemId);
       },
-      hand: function hand(_ref8) {
-        var dispatch = _ref8.dispatch;
+      hand: function hand(_ref9) {
+        var dispatch = _ref9.dispatch;
         return dispatch(onAction({
           tool: 'hand'
         }));
@@ -14827,28 +14909,28 @@ function getToolHandler(itemType) {
   }
   return items._default[toolName];
 }
-function handleAtomTool(_ref9) {
-  var hoveredItemId = _ref9.hoveredItemId,
-      newAction = _ref9.newAction,
-      editor = _ref9.editor;
+function handleAtomTool(_ref10) {
+  var hoveredItemId = _ref10.hoveredItemId,
+      newAction = _ref10.newAction,
+      editor = _ref10.editor;
   var atomProps = _objectSpread$M({}, newAction.opts);
   var updatedAtoms = fromAtomsAttrs(editor.render.ctab, hoveredItemId, atomProps, true);
   editor.update(updatedAtoms);
 }
-function handleBondTool(_ref10) {
-  var hoveredItemId = _ref10.hoveredItemId,
-      newAction = _ref10.newAction,
-      editor = _ref10.editor;
+function handleBondTool(_ref11) {
+  var hoveredItemId = _ref11.hoveredItemId,
+      newAction = _ref11.newAction,
+      editor = _ref11.editor;
   var newBond = fromBondAddition(editor.render.ctab, newAction.opts, hoveredItemId, {
     label: 'C'
   })[0];
   editor.update(newBond);
 }
-function handleChargeTool(_ref11) {
+function handleChargeTool(_ref12) {
   var _editor$render$ctab$a;
-  var hoveredItemId = _ref11.hoveredItemId,
-      newAction = _ref11.newAction,
-      editor = _ref11.editor;
+  var hoveredItemId = _ref12.hoveredItemId,
+      newAction = _ref12.newAction,
+      editor = _ref12.editor;
   var existingAtom = (_editor$render$ctab$a = editor.render.ctab.atoms.get(hoveredItemId)) === null || _editor$render$ctab$a === void 0 ? void 0 : _editor$render$ctab$a.a;
   if (existingAtom) {
     var updatedAtom = fromAtomsAttrs(editor.render.ctab, hoveredItemId, {
@@ -14864,17 +14946,17 @@ function mapItemsToArrays(items) {
   }
   return mappedItems;
 }
-function handleRGroupAtomTool(_x2) {
+function handleRGroupAtomTool(_x3) {
   return _handleRGroupAtomTool.apply(this, arguments);
 }
 function _handleRGroupAtomTool() {
-  _handleRGroupAtomTool = _asyncToGenerator( _regeneratorRuntime.mark(function _callee2(_ref12) {
+  _handleRGroupAtomTool = _asyncToGenerator( _regeneratorRuntime.mark(function _callee2(_ref13) {
     var hoveredItemId, editor, struct, atom, rglabel, label, element;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            hoveredItemId = _ref12.hoveredItemId, editor = _ref12.editor;
+            hoveredItemId = _ref13.hoveredItemId, editor = _ref13.editor;
             struct = editor.render.ctab.molecule;
             atom = hoveredItemId || hoveredItemId === 0 ? struct.atoms.get(hoveredItemId) : null;
             rglabel = atom ? atom.rglabel : 0;
@@ -14911,64 +14993,36 @@ function _handleRGroupAtomTool() {
   }));
   return _handleRGroupAtomTool.apply(this, arguments);
 }
-function isChangingFunctionalGroup(_x3) {
+function getFunctionalGroupIdByItem(editor, hoveredItemId, type) {
+  var molecule = editor.render.ctab.molecule;
+  var functionalGroups = molecule.functionalGroups;
+  return type === 'atoms' ? FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, hoveredItemId) : FunctionalGroup.findFunctionalGroupByBond(molecule, functionalGroups, hoveredItemId);
+}
+function isChangingFunctionalGroup(_x4, _x5) {
   return _isChangingFunctionalGroup.apply(this, arguments);
 }
 function _isChangingFunctionalGroup() {
-  _isChangingFunctionalGroup = _asyncToGenerator( _regeneratorRuntime.mark(function _callee3(_ref13) {
-    var _editor$render$ctab$a2;
-    var hoveredItemId, editor, atomResult, result, atom, molecule, functionalGroups, sgroupsOnCanvas, atomId, isFunctionalGroup, _iterator, _step, id, fgId;
+  _isChangingFunctionalGroup = _asyncToGenerator( _regeneratorRuntime.mark(function _callee3(_ref14, type) {
+    var hoveredItemId, editor, fgId;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            hoveredItemId = _ref13.hoveredItemId, editor = _ref13.editor;
-            atomResult = [];
-            result = [];
-            atom = (_editor$render$ctab$a2 = editor.render.ctab.atoms.get(hoveredItemId)) === null || _editor$render$ctab$a2 === void 0 ? void 0 : _editor$render$ctab$a2.a;
-            molecule = editor.render.ctab.molecule;
-            functionalGroups = molecule.functionalGroups;
-            sgroupsOnCanvas = Array.from(molecule.sgroups.values());
-            if (atom && functionalGroups) {
-              atomId = FunctionalGroup.atomsInFunctionalGroup(functionalGroups, hoveredItemId);
-              if (atomId !== null) {
-                atomResult.push(atomId);
-              }
-            }
-            isFunctionalGroup = atomResult.length > 0;
-            if (!isFunctionalGroup) {
-              _context3.next = 17;
-              break;
-            }
-            if (!SGroup$1.isAtomInSaltOrSolvent(hoveredItemId, sgroupsOnCanvas)) {
-              _context3.next = 12;
+            hoveredItemId = _ref14.hoveredItemId, editor = _ref14.editor;
+            fgId = getFunctionalGroupIdByItem(editor, hoveredItemId, type);
+            if (!(fgId !== null)) {
+              _context3.next = 6;
               break;
             }
-            return _context3.abrupt("return", false);
-          case 12:
-            _iterator = _createForOfIteratorHelper$2(atomResult);
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                id = _step.value;
-                fgId = FunctionalGroup.findFunctionalGroupByAtom(functionalGroups, id);
-                if (fgId !== null && !result.includes(fgId)) {
-                  result.push(fgId);
-                }
-              }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
-            }
-            _context3.next = 16;
+            _context3.next = 5;
             return editor.event.removeFG.dispatch({
-              fgIds: result
+              fgIds: [fgId]
             });
-          case 16:
-            return _context3.abrupt("return", _context3.sent);
-          case 17:
+          case 5:
+            return _context3.abrupt("return", false);
+          case 6:
             return _context3.abrupt("return", true);
-          case 18:
+          case 7:
           case "end":
             return _context3.stop();
         }
@@ -14989,11 +15043,7 @@ function initKeydownListener(element) {
 function removeNotRenderedStruct(actionTool, group, dispatch) {
   var affectedTools = ['paste', 'template'];
   if (affectedTools.includes(actionTool.tool) && group !== null && group !== void 0 && group.includes('save')) {
-    var savedSelectedTool = SettingsManager.selectionTool;
-    dispatch({
-      type: 'ACTION',
-      action: savedSelectedTool || tools$1['select-rectangle'].action
-    });
+    dispatch(removeStructAction());
   }
 }
 function keyHandle(dispatch, state, hotKeys, event) {
@@ -15659,7 +15709,7 @@ function findClosestFG(restruct, pos, skip) {
           reSGroupId = _step$value[0],
           reSGroup = _step$value[1];
       if (reSGroupId === skipId) continue;
-      var _reSGroup$getTextHigh = reSGroup.getTextHighlightDimensions(),
+      var _reSGroup$getTextHigh = reSGroup.getTextHighlightDimensions(0, restruct.render),
           startX = _reSGroup$getTextHigh.startX,
           startY = _reSGroup$getTextHigh.startY,
           width = _reSGroup$getTextHigh.width,
@@ -17131,7 +17181,16 @@ var useFunctionalGroupEoc = function useFunctionalGroupEoc() {
       return toExpand ? functionalGroup.isExpanded : !functionalGroup.isExpanded;
     }));
   }, []);
-  return [handler, hidden];
+  var disabled = useCallback(function (_ref3) {
+    var _props$functionalGrou2;
+    var props = _ref3.props;
+    var editor = getKetcherInstance().editor;
+    var molecule = editor.render.ctab.molecule;
+    return Boolean(props === null || props === void 0 ? void 0 : (_props$functionalGrou2 = props.functionalGroups) === null || _props$functionalGrou2 === void 0 ? void 0 : _props$functionalGrou2.every(function (functionalGroup) {
+      return FunctionalGroup.getAttachmentPointCount(functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup, molecule) > 1;
+    }));
+  }, []);
+  return [handler, hidden, disabled];
 };
 
 var useFunctionalGroupRemove = function useFunctionalGroupRemove() {
@@ -17159,12 +17218,16 @@ function ownKeys$G(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$G(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$G(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$G(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FunctionalGroupMenuItems = function FunctionalGroupMenuItems(props) {
   var _useFunctionalGroupEo = useFunctionalGroupEoc(),
-      _useFunctionalGroupEo2 = _slicedToArray(_useFunctionalGroupEo, 2),
+      _useFunctionalGroupEo2 = _slicedToArray(_useFunctionalGroupEo, 3),
       handleExpandOrContract = _useFunctionalGroupEo2[0],
-      ExpandOrContractHidden = _useFunctionalGroupEo2[1];
+      ExpandOrContractHidden = _useFunctionalGroupEo2[1],
+      ExpandOrContractDisabled = _useFunctionalGroupEo2[2];
   var handleRemove = useFunctionalGroupRemove();
   return jsxs(Fragment, {
     children: [jsx(Item, _objectSpread$G(_objectSpread$G({}, props), {}, {
+      disabled: function disabled(params) {
+        return ExpandOrContractDisabled(params);
+      },
       hidden: function hidden(params) {
         return ExpandOrContractHidden(params, true);
       },
@@ -17173,6 +17236,9 @@ var FunctionalGroupMenuItems = function FunctionalGroupMenuItems(props) {
       },
       children: "Expand Abbreviation"
     })), jsx(Item, _objectSpread$G(_objectSpread$G({}, props), {}, {
+      disabled: function disabled(params) {
+        return ExpandOrContractDisabled(params);
+      },
       hidden: function hidden(params) {
         return ExpandOrContractHidden(params, false);
       },
@@ -17684,6 +17750,7 @@ var InfoPanel = function InfoPanel(props) {
         autoScaleMargin: 0,
         rescaleAmount: 1,
         cachePrefix: 'infoPanel',
+        needCache: false,
         viewSz: new Vec2(width, height),
         width: width,
         height: height
@@ -24243,8 +24310,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.10.0-rc.1" ,
-                    buildDate: "2023-04-21T11:09:47" ,
+                    version: "2.10.0-rc.2" ,
+                    buildDate: "2023-05-03T14:52:11" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });
@@ -24354,5 +24421,5 @@ function Editor(props) {
   });
 }
 
-export { Editor, KETCHER_INIT_EVENT_NAME, KETCHER_SAVED_SETTINGS_KEY, MODES };
+export { Editor, KETCHER_INIT_EVENT_NAME, KETCHER_SAVED_SETTINGS_KEY, MODES, STRUCT_TYPE };
 //# sourceMappingURL=index.modern.js.map