ketcher-react 2.9.0-rc.5-dev.1 → 2.9.0-rc.6

package/dist/constants.d.ts

@@ -15,3 +15,6 @@
  ***************************************************************************/
 export declare const KETCHER_INIT_EVENT_NAME = "ketcher-init";
 export declare const KETCHER_SAVED_SETTINGS_KEY = "ketcher_editor_saved_settings";
+export declare const MODES: {
+    FG: string;
+};

package/dist/index.js

@@ -2539,6 +2539,9 @@ var tools$1 = typeSchema$1["enum"].reduce(function (res, type, i) {
 
 var KETCHER_INIT_EVENT_NAME = 'ketcher-init';
 var KETCHER_SAVED_SETTINGS_KEY = 'ketcher_editor_saved_settings';
+var MODES = {
+  FG: 'fg'
+};
 
 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__default["default"](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; }
@@ -3073,7 +3076,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.9.0-rc.5-dev.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.9.0-rc.6\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -3098,7 +3101,7 @@ var functionalGroupsLib = {
       }
     },
     selected: function selected(editor) {
-      return editor._tool.mode === 'fg';
+      return editor._tool.mode === MODES.FG;
     },
     disabled: function disabled(_, __, options) {
       return !options.app.functionalGroups;
@@ -8128,7 +8131,7 @@ function _objectSpread$10(target) { for (var i = 1; i < arguments.length; i++) {
 var initialState$1 = {
   lib: [],
   functionalGroupInfo: null,
-  mode: 'fg'
+  mode: MODES.FG
 };
 var functionalGroupsReducer = function functionalGroupsReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState$1;
@@ -8203,7 +8206,7 @@ function ownKeys$$(object, enumerableOnly) { var keys = Object.keys(object); if
 function _objectSpread$$(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$$(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$$(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var initialState = {
   lib: [],
-  mode: 'fg'
+  mode: MODES.FG
 };
 var saltsAndSolventsReducer = function saltsAndSolventsReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
@@ -12289,72 +12292,6 @@ function updateSelectedAtoms(_ref) {
   }
 }
 
-var edgeOffset = 150;
-function isCloseToEdgeOfScreen(event) {
-  var clientX = event.clientX,
-      clientY = event.clientY;
-  var body = document.body;
-  var isCloseToLeftEdgeOfScreen = clientX <= edgeOffset;
-  var isCloseToTopEdgeOfScreen = clientY <= edgeOffset;
-  var isCloseToRightEdgeOfScreen = body.clientWidth - clientX <= edgeOffset;
-  var isCloseToBottomEdgeOfScreen = body.clientHeight - clientY <= edgeOffset;
-  return {
-    isCloseToLeftEdgeOfScreen: isCloseToLeftEdgeOfScreen,
-    isCloseToTopEdgeOfScreen: isCloseToTopEdgeOfScreen,
-    isCloseToRightEdgeOfScreen: isCloseToRightEdgeOfScreen,
-    isCloseToBottomEdgeOfScreen: isCloseToBottomEdgeOfScreen
-  };
-}
-function isCloseToEdgeOfCanvas(event, canvasSize) {
-  var layerX = event.layerX,
-      layerY = event.layerY;
-  var isCloseToLeftEdgeOfCanvas = layerX <= edgeOffset;
-  var isCloseToTopEdgeOfCanvas = layerY <= edgeOffset;
-  var isCloseToRightEdgeOfCanvas = canvasSize.x - layerX <= edgeOffset;
-  var isCloseToBottomEdgeOfCanvas = canvasSize.y - layerY <= edgeOffset;
-  return {
-    isCloseToLeftEdgeOfCanvas: isCloseToLeftEdgeOfCanvas,
-    isCloseToTopEdgeOfCanvas: isCloseToTopEdgeOfCanvas,
-    isCloseToRightEdgeOfCanvas: isCloseToRightEdgeOfCanvas,
-    isCloseToBottomEdgeOfCanvas: isCloseToBottomEdgeOfCanvas
-  };
-}
-function calculateCanvasExtension(clientArea, currentCanvasSize, extensionVector) {
-  var newHorizontalScrollPosition = clientArea.scrollLeft + extensionVector.x;
-  var newVerticalScrollPosition = clientArea.scrollTop + extensionVector.y;
-  var horizontalExtension = 0;
-  var verticalExtension = 0;
-  if (newHorizontalScrollPosition > currentCanvasSize.x) {
-    horizontalExtension = newHorizontalScrollPosition - currentCanvasSize.x;
-  }
-  if (newHorizontalScrollPosition < 0) {
-    horizontalExtension = Math.abs(newHorizontalScrollPosition);
-  }
-  if (newVerticalScrollPosition > currentCanvasSize.y) {
-    verticalExtension = newVerticalScrollPosition - currentCanvasSize.y;
-  }
-  if (newVerticalScrollPosition < 0) {
-    verticalExtension = Math.abs(newVerticalScrollPosition);
-  }
-  return new ketcherCore.Vec2(horizontalExtension, verticalExtension, 0);
-}
-function shiftAndExtendCanvasByVector(vector, render) {
-  var clientArea = render.clientArea;
-  var extensionVector = calculateCanvasExtension(clientArea, render.sz.scaled(render.options.zoom), vector).scaled(1 / render.options.zoom);
-  if (extensionVector.x > 0 || extensionVector.y > 0) {
-    render.setPaperSize(render.sz.add(extensionVector));
-    render.setOffset(render.options.offset.add(vector));
-    render.ctab.translate(vector);
-  }
-  scrollByVector(vector, render);
-  render.update(false);
-}
-function scrollByVector(vector, render) {
-  var clientArea = render.clientArea;
-  clientArea.scrollLeft += vector.x * render.options.scale;
-  clientArea.scrollTop += vector.y * render.options.scale;
-}
-
 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; }
@@ -12495,7 +12432,9 @@ var SelectTool = function () {
         dragCtx.mergeItems = getMergeItems(editor, expSel);
         editor.hover(ketcherCore.getHoverToFuse(dragCtx.mergeItems));
         extendCanvas(rnd, event);
-        editor.update(dragCtx.action, true);
+        editor.update(dragCtx.action, true, {
+          extendCanvas: false
+        });
         return true;
       }
       if (_classPrivateFieldGet__default["default"](this, _lassoHelper).running()) {
@@ -12696,45 +12635,50 @@ var SelectTool = function () {
 }();
 function extendCanvas(render, event) {
   var offset = 1;
-  var _isCloseToEdgeOfCanva = isCloseToEdgeOfCanvas(event, render.sz),
+  var _isCloseToEdgeOfCanva = ketcherCore.isCloseToEdgeOfCanvas(event, render.sz),
       isCloseToLeftEdgeOfCanvas = _isCloseToEdgeOfCanva.isCloseToLeftEdgeOfCanvas,
       isCloseToTopEdgeOfCanvas = _isCloseToEdgeOfCanva.isCloseToTopEdgeOfCanvas,
       isCloseToRightEdgeOfCanvas = _isCloseToEdgeOfCanva.isCloseToRightEdgeOfCanvas,
       isCloseToBottomEdgeOfCanvas = _isCloseToEdgeOfCanva.isCloseToBottomEdgeOfCanvas;
-  var _isCloseToEdgeOfScree = isCloseToEdgeOfScreen(event),
+  var _isCloseToEdgeOfScree = ketcherCore.isCloseToEdgeOfScreen(event),
       isCloseToLeftEdgeOfScreen = _isCloseToEdgeOfScree.isCloseToLeftEdgeOfScreen,
       isCloseToTopEdgeOfScreen = _isCloseToEdgeOfScree.isCloseToTopEdgeOfScreen,
       isCloseToRightEdgeOfScreen = _isCloseToEdgeOfScree.isCloseToRightEdgeOfScreen,
       isCloseToBottomEdgeOfScreen = _isCloseToEdgeOfScree.isCloseToBottomEdgeOfScreen;
-  if (isCloseToLeftEdgeOfCanvas) {
-    shiftAndExtendCanvasByVector(new ketcherCore.Vec2(-offset, 0, 0), render);
+  var _getDirections = ketcherCore.getDirections(event),
+      isMovingLeft = _getDirections.isMovingLeft,
+      isMovingRight = _getDirections.isMovingRight,
+      isMovingTop = _getDirections.isMovingTop,
+      isMovingBottom = _getDirections.isMovingBottom;
+  if (isCloseToLeftEdgeOfCanvas && isMovingLeft) {
+    ketcherCore.shiftAndExtendCanvasByVector(new ketcherCore.Vec2(-offset, 0, 0), render);
   }
-  if (isCloseToTopEdgeOfCanvas) {
-    shiftAndExtendCanvasByVector(new ketcherCore.Vec2(0, -offset, 0), render);
+  if (isCloseToTopEdgeOfCanvas && isMovingTop) {
+    ketcherCore.shiftAndExtendCanvasByVector(new ketcherCore.Vec2(0, -offset, 0), render);
   }
-  if (isCloseToRightEdgeOfCanvas) {
-    shiftAndExtendCanvasByVector(new ketcherCore.Vec2(offset, 0, 0), render);
+  if (isCloseToRightEdgeOfCanvas && isMovingRight) {
+    ketcherCore.shiftAndExtendCanvasByVector(new ketcherCore.Vec2(offset, 0, 0), render);
   }
-  if (isCloseToBottomEdgeOfCanvas) {
-    shiftAndExtendCanvasByVector(new ketcherCore.Vec2(0, offset, 0), render);
+  if (isCloseToBottomEdgeOfCanvas && isMovingBottom) {
+    ketcherCore.shiftAndExtendCanvasByVector(new ketcherCore.Vec2(0, offset, 0), render);
   }
-  var isCloseToSomeEdgeOfCanvas = [isCloseToTopEdgeOfCanvas, isCloseToRightEdgeOfCanvas, isCloseToBottomEdgeOfCanvas, isCloseToLeftEdgeOfCanvas].some(function (isCloseToEdge) {
+  var isCloseToSomeEdgeOfCanvas = [isCloseToTopEdgeOfCanvas && isMovingTop, isCloseToRightEdgeOfCanvas && isMovingRight, isCloseToBottomEdgeOfCanvas && isMovingBottom, isCloseToLeftEdgeOfCanvas && isMovingLeft].some(function (isCloseToEdge) {
     return isCloseToEdge;
   });
   if (isCloseToSomeEdgeOfCanvas) {
     return;
   }
-  if (isCloseToTopEdgeOfScreen) {
-    scrollByVector(new ketcherCore.Vec2(0, -offset), render);
+  if (isCloseToTopEdgeOfScreen && isMovingTop) {
+    ketcherCore.scrollByVector(new ketcherCore.Vec2(0, -offset), render);
   }
-  if (isCloseToBottomEdgeOfScreen) {
-    scrollByVector(new ketcherCore.Vec2(0, offset), render);
+  if (isCloseToBottomEdgeOfScreen && isMovingBottom) {
+    ketcherCore.scrollByVector(new ketcherCore.Vec2(0, offset), render);
   }
-  if (isCloseToLeftEdgeOfScreen) {
-    scrollByVector(new ketcherCore.Vec2(-offset, 0), render);
+  if (isCloseToLeftEdgeOfScreen && isMovingLeft) {
+    ketcherCore.scrollByVector(new ketcherCore.Vec2(-offset, 0), render);
   }
-  if (isCloseToRightEdgeOfScreen) {
-    scrollByVector(new ketcherCore.Vec2(offset, 0), render);
+  if (isCloseToRightEdgeOfScreen && isMovingRight) {
+    ketcherCore.scrollByVector(new ketcherCore.Vec2(offset, 0), render);
   }
 }
 function closestToSel(ci) {
@@ -14158,7 +14102,7 @@ var TemplateTool = function () {
       this.findItems.push('atoms');
     }
     var bond = frag.bonds.get(this.template.bid);
-    if (bond && this.mode !== 'fg') {
+    if (bond && !this.isModeFunctionalGroup) {
       this.template.sign = getSign(frag, bond, this.template.xy0);
       this.findItems.push('bonds');
     }
@@ -14172,73 +14116,119 @@ var TemplateTool = function () {
     editor.hoverIcon.updatePosition();
   }
   _createClass__default["default"](TemplateTool, [{
+    key: "showRemoveAbbreviationPopup",
+    value: function showRemoveAbbreviationPopup() {
+      var _this = this;
+      return this.editor.event.removeFG.dispatch({
+        fgIds: this.targetGroupsIds
+      }).then(function () {
+        _this.targetGroupsIds.length = 0;
+        return Promise.resolve();
+      });
+    }
+  }, {
+    key: "isModeFunctionalGroup",
+    get: function get() {
+      return this.mode === MODES.FG;
+    }
+  }, {
     key: "mousedown",
-    value: function mousedown(event) {
-      var closestItem = this.editor.findItem(event, ['atoms', 'bonds', 'sgroups', 'functionalGroups']);
-      var ctab = this.editor.render.ctab;
-      var struct = ctab.molecule;
-      if (struct.functionalGroups.size) {
-        this.targetGroupsIds = getGroupIdsFromItemArrays(struct, _objectSpread$N(_objectSpread$N({}, (closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'atoms' && {
-          atoms: [closestItem.id]
-        }), (closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'bonds' && {
-          bonds: [closestItem.id]
-        }));
-        if ((closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(closestItem.id, struct.functionalGroups)) {
-          this.targetGroupsIds.push(closestItem.id);
-        }
-      }
-      this.editor.hover(null);
-      this.dragCtx = {
-        xy0: this.editor.render.page2obj(event),
-        item: this.editor.findItem(event, this.findItems)
-      };
-      var dragCtx = this.dragCtx;
-      var ci = dragCtx.item;
-      if (!ci || this.isSaltOrSolvent) {
-        delete dragCtx.item;
-        return;
-      }
-      if (ci.map === 'bonds' && this.mode !== 'fg') {
-        var _struct$atoms$get, _struct$halfBonds$get;
-        var xy0 = new ketcherCore.Vec2();
-        var bond = struct.bonds.get(ci.id);
-        var frid = (_struct$atoms$get = struct.atoms.get(bond === null || bond === void 0 ? void 0 : bond.begin)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.fragment;
-        var frIds = struct.getFragmentIds(frid);
-        var count = 0;
-        var loop = (_struct$halfBonds$get = struct.halfBonds.get(bond === null || bond === void 0 ? void 0 : bond.hb1)) === null || _struct$halfBonds$get === void 0 ? void 0 : _struct$halfBonds$get.loop;
-        if (loop && loop < 0) {
-          var _struct$halfBonds$get2;
-          loop = (_struct$halfBonds$get2 = struct.halfBonds.get(bond === null || bond === void 0 ? void 0 : bond.hb2)) === null || _struct$halfBonds$get2 === void 0 ? void 0 : _struct$halfBonds$get2.loop;
-        }
-        if (loop && loop >= 0) {
-          var _struct$loops$get;
-          var loopHbs = (_struct$loops$get = struct.loops.get(loop)) === null || _struct$loops$get === void 0 ? void 0 : _struct$loops$get.hbs;
-          loopHbs === null || loopHbs === void 0 ? void 0 : loopHbs.forEach(function (hb) {
-            var _struct$halfBonds$get3;
-            var halfBondBegin = (_struct$halfBonds$get3 = struct.halfBonds.get(hb)) === null || _struct$halfBonds$get3 === void 0 ? void 0 : _struct$halfBonds$get3.begin;
-            if (halfBondBegin) {
-              var hbbAtom = struct.atoms.get(halfBondBegin);
-              if (hbbAtom) {
-                xy0.add_(hbbAtom.pp);
-                count++;
-              }
-            }
-          });
-        } else {
-          frIds.forEach(function (id) {
-            var atomById = struct.atoms.get(id);
-            if (atomById) {
-              xy0.add_(atomById.pp);
-              count++;
+    value: function () {
+      var _mousedown = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(event) {
+        var _struct$functionalGro;
+        var closestItem, ctab, struct, isTargetExpanded, isTargetAtomOrBond, dragCtx, ci, _struct$atoms$get, _struct$halfBonds$get, xy0, bond, frid, frIds, count, loop, _struct$halfBonds$get2, _struct$loops$get, loopHbs, sign;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                closestItem = this.editor.findItem(event, ['atoms', 'bonds', 'sgroups', 'functionalGroups']);
+                ctab = this.editor.render.ctab;
+                struct = ctab.molecule;
+                if (struct.functionalGroups.size) {
+                  this.targetGroupsIds = getGroupIdsFromItemArrays(struct, _objectSpread$N(_objectSpread$N({}, (closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'atoms' && {
+                    atoms: [closestItem.id]
+                  }), (closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'bonds' && {
+                    bonds: [closestItem.id]
+                  }));
+                  if (
+                  (closestItem === null || closestItem === void 0 ? void 0 : closestItem.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(closestItem.id, struct.functionalGroups)) {
+                    this.targetGroupsIds.push(closestItem.id);
+                  }
+                }
+                isTargetExpanded = (_struct$functionalGro = struct.functionalGroups.get(this.targetGroupsIds[0])) === null || _struct$functionalGro === void 0 ? void 0 : _struct$functionalGro.isExpanded;
+                isTargetAtomOrBond = this.targetGroupsIds.length && !this.isModeFunctionalGroup;
+                if (!(isTargetAtomOrBond || isTargetExpanded)) {
+                  _context.next = 10;
+                  break;
+                }
+                _context.next = 9;
+                return this.showRemoveAbbreviationPopup();
+              case 9:
+                return _context.abrupt("return");
+              case 10:
+                this.editor.hover(null);
+                this.dragCtx = {
+                  xy0: this.editor.render.page2obj(event),
+                  item: this.editor.findItem(event, this.findItems)
+                };
+                dragCtx = this.dragCtx;
+                ci = dragCtx.item;
+                if (!(!ci || this.isSaltOrSolvent)) {
+                  _context.next = 17;
+                  break;
+                }
+                delete dragCtx.item;
+                return _context.abrupt("return");
+              case 17:
+                if (ci.map === 'bonds' && !this.isModeFunctionalGroup) {
+                  xy0 = new ketcherCore.Vec2();
+                  bond = struct.bonds.get(ci.id);
+                  frid = (_struct$atoms$get = struct.atoms.get(bond === null || bond === void 0 ? void 0 : bond.begin)) === null || _struct$atoms$get === void 0 ? void 0 : _struct$atoms$get.fragment;
+                  frIds = struct.getFragmentIds(frid);
+                  count = 0;
+                  loop = (_struct$halfBonds$get = struct.halfBonds.get(bond === null || bond === void 0 ? void 0 : bond.hb1)) === null || _struct$halfBonds$get === void 0 ? void 0 : _struct$halfBonds$get.loop;
+                  if (loop && loop < 0) {
+                    loop = (_struct$halfBonds$get2 = struct.halfBonds.get(bond === null || bond === void 0 ? void 0 : bond.hb2)) === null || _struct$halfBonds$get2 === void 0 ? void 0 : _struct$halfBonds$get2.loop;
+                  }
+                  if (loop && loop >= 0) {
+                    loopHbs = (_struct$loops$get = struct.loops.get(loop)) === null || _struct$loops$get === void 0 ? void 0 : _struct$loops$get.hbs;
+                    loopHbs === null || loopHbs === void 0 ? void 0 : loopHbs.forEach(function (hb) {
+                      var _struct$halfBonds$get3;
+                      var halfBondBegin = (_struct$halfBonds$get3 = struct.halfBonds.get(hb)) === null || _struct$halfBonds$get3 === void 0 ? void 0 : _struct$halfBonds$get3.begin;
+                      if (halfBondBegin) {
+                        var hbbAtom = struct.atoms.get(halfBondBegin);
+                        if (hbbAtom) {
+                          xy0.add_(hbbAtom.pp);
+                          count++;
+                        }
+                      }
+                    });
+                  } else {
+                    frIds.forEach(function (id) {
+                      var atomById = struct.atoms.get(id);
+                      if (atomById) {
+                        xy0.add_(atomById.pp);
+                        count++;
+                      }
+                    });
+                  }
+                  dragCtx.v0 = xy0.scaled(1 / count);
+                  sign = getSign(struct, bond, dragCtx.v0);
+                  dragCtx.sign1 = sign || 1;
+                  dragCtx.sign2 = this.template.sign;
+                }
+              case 18:
+              case "end":
+                return _context.stop();
             }
-          });
-        }
-        dragCtx.v0 = xy0.scaled(1 / count);
-        var sign = getSign(struct, bond, dragCtx.v0);
-        dragCtx.sign1 = sign || 1;
-        dragCtx.sign2 = this.template.sign;
+          }
+        }, _callee, this);
+      }));
+      function mousedown(_x) {
+        return _mousedown.apply(this, arguments);
       }
-    }
+      return mousedown;
+    }()
   }, {
     key: "mousemove",
     value: function mousemove(event) {
@@ -14253,7 +14243,7 @@ var TemplateTool = function () {
       var targetPos = null;
       var eventPos = this.editor.render.page2obj(event);
       var struct = this.editor.render.ctab.molecule;
-      if (ci && ci.map === 'bonds' && this.mode !== 'fg') {
+      if (ci && ci.map === 'bonds' && !this.isModeFunctionalGroup) {
         var bond = struct.bonds.get(ci.id);
         var sign = getSign(struct, bond, eventPos);
         if (dragCtx.sign1 * this.template.sign > 0) {
@@ -14284,7 +14274,7 @@ var TemplateTool = function () {
           var atom = struct.atoms.get(atomId);
           targetPos = atom === null || atom === void 0 ? void 0 : atom.pp;
           if (targetPos) {
-            extraBond = this.mode === 'fg' ? true : ketcherCore.Vec2.dist(targetPos, eventPos) > 1;
+            extraBond = this.isModeFunctionalGroup ? true : ketcherCore.Vec2.dist(targetPos, eventPos) > 1;
           }
         }
       }
@@ -14330,7 +14320,7 @@ var TemplateTool = function () {
       }
       dragCtx.action = action;
       this.editor.update(dragCtx.action, true);
-      if (this.mode !== 'fg') {
+      if (!this.isModeFunctionalGroup) {
         dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, pasteItems);
         this.editor.hover(ketcherCore.getHoverToFuse(dragCtx.mergeItems));
       }
@@ -14340,15 +14330,9 @@ var TemplateTool = function () {
   }, {
     key: "mouseup",
     value: function mouseup(event) {
-      var _this = this,
+      var _this2 = this,
           _ci;
       var dragCtx = this.dragCtx;
-      if (this.targetGroupsIds.length && this.mode !== 'fg') {
-        this.editor.event.removeFG.dispatch({
-          fgIds: this.targetGroupsIds
-        });
-        return;
-      }
       if (!dragCtx) {
         return true;
       }
@@ -14357,16 +14341,16 @@ var TemplateTool = function () {
       var struct = restruct.molecule;
       var ci = dragCtx.item;
       var functionalGroups = struct.functionalGroups;
-      if (dragCtx.action && ci && ci.map === 'bonds' && this.mode !== 'fg') {
+      if (dragCtx.action && ci && ci.map === 'bonds' && !this.isModeFunctionalGroup) {
         dragCtx.action.perform(restruct);
         var promise = ketcherCore.fromTemplateOnBondAction(restruct, this.template, ci.id, this.editor.event, dragCtx.sign1 * dragCtx.sign2 > 0, true);
         promise.then(function (_ref) {
           var _ref2 = _slicedToArray__default["default"](_ref, 2),
               action = _ref2[0],
               pasteItems = _ref2[1];
-          var mergeItems = ketcherCore.getItemsToFuse(_this.editor, pasteItems);
+          var mergeItems = ketcherCore.getItemsToFuse(_this2.editor, pasteItems);
           action = ketcherCore.fromItemsFuse(restruct, mergeItems).mergeWith(action);
-          _this.editor.update(action);
+          _this2.editor.update(action);
         });
         return true;
       }
@@ -14375,7 +14359,7 @@ var TemplateTool = function () {
       if (this.isSaltOrSolvent) {
         addSaltsAndSolventsOnCanvasWithoutMerge(restruct, this.template, dragCtx, this.editor);
         return true;
-      } else if (((_ci = ci) === null || _ci === void 0 ? void 0 : _ci.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups) && this.mode === 'fg' && this.targetGroupsIds.length) {
+      } else if (((_ci = ci) === null || _ci === void 0 ? void 0 : _ci.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups) && this.isModeFunctionalGroup && this.targetGroupsIds.length) {
         functionalGroupRemoveAction = new ketcherCore.Action();
         var _struct = this.editor.struct();
         var _restruct = this.editor.render.ctab;
@@ -14423,23 +14407,23 @@ var TemplateTool = function () {
             action = functionalGroupRemoveAction.mergeWith(action);
           }
           dragCtx.action = action;
-        } else if (ci.map === 'bonds' && this.mode !== 'fg') {
+        } else if (ci.map === 'bonds' && !this.isModeFunctionalGroup) {
           var _promise = ketcherCore.fromTemplateOnBondAction(restruct, this.template, ci.id, this.editor.event, dragCtx.sign1 * dragCtx.sign2 > 0, true);
           _promise.then(function (_ref3) {
             var _ref4 = _slicedToArray__default["default"](_ref3, 2),
                 action = _ref4[0],
                 pasteItems = _ref4[1];
-            if (_this.mode !== 'fg') {
-              var mergeItems = ketcherCore.getItemsToFuse(_this.editor, pasteItems);
+            if (!_this2.isModeFunctionalGroup) {
+              var mergeItems = ketcherCore.getItemsToFuse(_this2.editor, pasteItems);
               action = ketcherCore.fromItemsFuse(restruct, mergeItems).mergeWith(action);
-              _this.editor.update(action);
+              _this2.editor.update(action);
             }
           });
           return true;
         }
       }
       this.editor.selection(null);
-      if (!dragCtx.mergeItems && pasteItems && this.mode !== 'fg') {
+      if (!dragCtx.mergeItems && pasteItems && !this.isModeFunctionalGroup) {
         dragCtx.mergeItems = ketcherCore.getItemsToFuse(this.editor, pasteItems);
       }
       dragCtx.action = dragCtx.action ? ketcherCore.fromItemsFuse(restruct, dragCtx.mergeItems).mergeWith(dragCtx.action) : ketcherCore.fromItemsFuse(restruct, dragCtx.mergeItems);
@@ -14480,8 +14464,12 @@ function addSaltsAndSolventsOnCanvasWithoutMerge(restruct, template, dragCtx, ed
 }
 function getTemplateMode(tmpl) {
   var _tmpl$props;
-  if (tmpl.mode) return tmpl.mode;
-  if (['Functional Groups', 'Salts and Solvents'].includes((_tmpl$props = tmpl.props) === null || _tmpl$props === void 0 ? void 0 : _tmpl$props.group)) return 'fg';
+  if (tmpl.mode) {
+    return tmpl.mode;
+  }
+  if (['Functional Groups', 'Salts and Solvents'].includes((_tmpl$props = tmpl.props) === null || _tmpl$props === void 0 ? void 0 : _tmpl$props.group)) {
+    return MODES.FG;
+  }
   return null;
 }
 function getSign(molecule, bond, v) {
@@ -16000,7 +15988,7 @@ var HoverIcon = function () {
   }, {
     key: "onMouseLeave",
     value: function onMouseLeave(event) {
-      if (!this.isOverLoader(event)) {
+      if (!this.isOverLoader(event) && this.isShown) {
         this.shouldBeShownWhenMouseBack = true;
         this.hide();
       }
@@ -16025,9 +16013,12 @@ var HoverIcon = function () {
     }
   }, {
     key: "hide",
-    value: function hide() {
+    value: function hide(restShouldBeShownWhenMouseBack) {
       this.element.hide();
       this.isShown = false;
+      if (restShouldBeShownWhenMouseBack) {
+        this.shouldBeShownWhenMouseBack = false;
+      }
     }
   }, {
     key: "initialize",
@@ -16052,9 +16043,8 @@ var HoverIcon = function () {
       this.element = icon.element;
       this._fill = icon.fill;
       this._label = icon.label;
-      this.isShown = true;
       this.shouldBeShownWhenMouseBack = false;
-      this.updatePosition();
+      this.hide();
     }
   }]);
   return HoverIcon;
@@ -16159,7 +16149,7 @@ var Editor$3 = function () {
       var tool = new tools[name](this, opts);
       var isAtomToolChosen = name === 'atom';
       if (!isAtomToolChosen) {
-        this.hoverIcon.hide();
+        this.hoverIcon.hide(true);
       }
       if (!tool || tool.isNotActiveTool) {
         return null;
@@ -16218,7 +16208,7 @@ var Editor$3 = function () {
       this.render = new ketcherCore.Render(this.render.clientArea, Object.assign({
         scale: SCALE
       }, value));
-      this.render.setMolecule(struct);
+      this.struct(struct);
       this.render.setZoom(zoom);
       this.render.update();
       return this.render.options;
@@ -24118,8 +24108,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.9.0-rc.5-dev.1" ,
-                    buildDate: "2023-03-30T12:13:55" ,
+                    version: "2.9.0-rc.6" ,
+                    buildDate: "2023-04-10T13:09:58" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });
@@ -24232,4 +24222,5 @@ function Editor(props) {
 exports.Editor = Editor;
 exports.KETCHER_INIT_EVENT_NAME = KETCHER_INIT_EVENT_NAME;
 exports.KETCHER_SAVED_SETTINGS_KEY = KETCHER_SAVED_SETTINGS_KEY;
+exports.MODES = MODES;
 //# sourceMappingURL=index.js.map