ketcher-react 2.28.0-rc.3 → 3.0.0-rc.1

package/dist/Editor.d.ts

@@ -21,7 +21,7 @@ import 'whatwg-fetch';
 import './index.less';
 import { Config } from './script';
 import { Ketcher } from 'ketcher-core';
-interface EditorProps extends Omit<Config, 'element' | 'appRoot'> {
+export interface EditorProps extends Omit<Config, 'element' | 'appRoot'> {
     onInit?: (ketcher: Ketcher) => void;
 }
 declare function Editor(props: EditorProps): import("react/jsx-runtime").JSX.Element;

package/dist/index.js

@@ -963,6 +963,12 @@ var server = {
     description: 'slider',
     "default": true
   },
+  ignoreChiralFlag: {
+    title: 'Ignore the chiral flag',
+    type: 'boolean',
+    description: 'slider',
+    "default": false
+  },
   'ignore-stereochemistry-errors': {
     title: 'Ignore stereochemistry errors',
     type: 'boolean',
@@ -3802,7 +3808,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.28.0-rc.3\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
+  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v3.0.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -12966,8 +12972,8 @@ assert.strict.strict = assert.strict;
 var calculateMonomerPreviewTop = createCalculatePreviewTopFunction(preview.height);
 var calculateNucleoElementPreviewTop = createCalculatePreviewTopFunction(preview.heightForNucleotide);
 function calculateTop(target, height) {
-  var _ZoomTool$instance$ca;
-  var canvasWrapperBoundingClientRect = (_ZoomTool$instance$ca = ketcherCore.ZoomTool.instance.canvasWrapper.node()) === null || _ZoomTool$instance$ca === void 0 ? void 0 : _ZoomTool$instance$ca.getBoundingClientRect();
+  var _ZoomTool$instance;
+  var canvasWrapperBoundingClientRect = (_ZoomTool$instance = ketcherCore.ZoomTool.instance) === null || _ZoomTool$instance === void 0 || (_ZoomTool$instance = _ZoomTool$instance.canvasWrapper.node()) === null || _ZoomTool$instance === void 0 ? void 0 : _ZoomTool$instance.getBoundingClientRect();
   var canvasWrapperTopOffset = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.top) || 0;
   var canvasWrapperBottom = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.bottom) || 0;
   var canvasWrapperHeight = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.height) || 0;
@@ -12997,21 +13003,21 @@ var calculateAmbiguousMonomerPreviewTop = function calculateAmbiguousMonomerPrev
   return createCalculatePreviewTopFunction(height);
 };
 function calculateAmbiguousMonomerPreviewLeft(initialLeft) {
-  var _ZoomTool$instance$ca2;
-  var canvasWrapperBoundingClientRect = (_ZoomTool$instance$ca2 = ketcherCore.ZoomTool.instance.canvasWrapper.node()) === null || _ZoomTool$instance$ca2 === void 0 ? void 0 : _ZoomTool$instance$ca2.getBoundingClientRect();
+  var _ZoomTool$instance$ca;
+  var canvasWrapperBoundingClientRect = (_ZoomTool$instance$ca = ketcherCore.ZoomTool.instance.canvasWrapper.node()) === null || _ZoomTool$instance$ca === void 0 ? void 0 : _ZoomTool$instance$ca.getBoundingClientRect();
   var PREVIEW_WIDTH = 70;
   var canvasWrapperRight = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.right) || 0;
   var canvasWrapperLeft = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.left) || 0;
   return initialLeft + PREVIEW_WIDTH / 2 > canvasWrapperRight ? canvasWrapperRight - PREVIEW_WIDTH : initialLeft - PREVIEW_WIDTH / 2 < canvasWrapperLeft ? canvasWrapperLeft : initialLeft - PREVIEW_WIDTH / 2;
 }
 var calculateBondPreviewPosition = function calculateBondPreviewPosition(bond, bondCoordinates) {
-  var _firstMonomer$rendere, _secondMonomer$render, _ZoomTool$instance;
+  var _firstMonomer$rendere, _secondMonomer$render, _ZoomTool$instance2;
   var firstMonomer = bond.firstMonomer,
     secondMonomer = bond.secondMonomer;
   assert_1(secondMonomer);
   var firstMonomerCoordinates = (_firstMonomer$rendere = firstMonomer.renderer) === null || _firstMonomer$rendere === void 0 ? void 0 : _firstMonomer$rendere.rootBoundingClientRect;
   var secondMonomerCoordinates = (_secondMonomer$render = secondMonomer.renderer) === null || _secondMonomer$render === void 0 ? void 0 : _secondMonomer$render.rootBoundingClientRect;
-  var canvasWrapperBoundingClientRect = (_ZoomTool$instance = ketcherCore.ZoomTool.instance) === null || _ZoomTool$instance === void 0 || (_ZoomTool$instance = _ZoomTool$instance.canvasWrapper.node()) === null || _ZoomTool$instance === void 0 ? void 0 : _ZoomTool$instance.getBoundingClientRect();
+  var canvasWrapperBoundingClientRect = (_ZoomTool$instance2 = ketcherCore.ZoomTool.instance) === null || _ZoomTool$instance2 === void 0 || (_ZoomTool$instance2 = _ZoomTool$instance2.canvasWrapper.node()) === null || _ZoomTool$instance2 === void 0 ? void 0 : _ZoomTool$instance2.getBoundingClientRect();
   var canvasWrapperBottom = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.bottom) || 0;
   var canvasWrapperTop = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.top) || 0;
   var canvasWrapperRight = (canvasWrapperBoundingClientRect === null || canvasWrapperBoundingClientRect === void 0 ? void 0 : canvasWrapperBoundingClientRect.right) || 0;
@@ -18972,7 +18978,7 @@ var TemplateTool = function () {
     value: function () {
       var _mousedown = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(event) {
         var _this$templatePreview;
-        var target, struct, _this$closestItem2, _this$closestItem3, _this$closestItem4, dragCtx, ci, bond;
+        var target, struct, _this$closestItem2, _this$closestItem3, _this$closestItem4, _this$closestItem5, dragCtx, ci, bond;
         return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -18987,7 +18993,7 @@ var TemplateTool = function () {
                   bonds: [this.closestItem.id]
                 }));
                 if (
-                ((_this$closestItem4 = this.closestItem) === null || _this$closestItem4 === void 0 ? void 0 : _this$closestItem4.map) === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(this.closestItem.id, this.functionalGroups)) {
+                (((_this$closestItem4 = this.closestItem) === null || _this$closestItem4 === void 0 ? void 0 : _this$closestItem4.map) === 'functionalGroups' || ((_this$closestItem5 = this.closestItem) === null || _this$closestItem5 === void 0 ? void 0 : _this$closestItem5.map) === 'sgroups') && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(this.closestItem.id, this.functionalGroups)) {
                   this.targetGroupsIds.push(this.closestItem.id);
                 }
               }
@@ -19723,7 +19729,8 @@ function keyHandle(dispatch, getState, hotKeys, event) {
   var actionTool = actionState.activeTool;
   var key = ketcherCore.keyNorm(event);
   var group = null;
-  if (key && key.length === 1) {
+  var hoveredItem = getHoveredItem(render.ctab);
+  if (key && key.length === 1 && !hoveredItem) {
     var currentlyPressedKeys = selectAbbreviationLookupValue(state);
     var isShortcutKey = shortcutKeys.includes(key === null || key === void 0 ? void 0 : key.toLowerCase());
     var isTheSameKey = key === currentlyPressedKeys;
@@ -19749,7 +19756,6 @@ function keyHandle(dispatch, getState, hotKeys, event) {
       atoms: configWithNonViewOnlyActionsDisabled['atom-props'].action,
       bonds: configWithNonViewOnlyActionsDisabled['bond-props'].action
     };
-    var hoveredItem = getHoveredItem(render.ctab);
     if (!hoveredItem) {
       return;
     }
@@ -20056,7 +20062,7 @@ function _clipData() {
           data = _context7.sent;
           res[ketcherCore.ChemicalMimeType.KET] = ket;
           type = struct.isReaction ? ketcherCore.ChemicalMimeType.Mol : ketcherCore.ChemicalMimeType.Rxn;
-          res['text/plain'] = data;
+          res['text/plain'] = ket;
           res[type] = data;
           return _context7.abrupt("return", res);
         case 19:
@@ -20464,7 +20470,20 @@ function findClosestSGroup(restruct, pos) {
   var ret = null;
   var minDist = SELECTION_DISTANCE_COEFFICIENT;
   restruct.molecule.sgroups.forEach(function (sg, sgid) {
-    if (sg.isContracted() || sg.isSuperatomWithoutLabel) return;
+    if (sg.isSuperatomWithoutLabel) {
+      return;
+    }
+    if (sg.isContracted()) {
+      var sGroupPosition = sg.pp;
+      if (sGroupPosition) {
+        var dist = ketcherCore.Vec2.dist(pos, sGroupPosition);
+        if (dist < minDist) {
+          ret = sgid;
+          minDist = dist;
+        }
+      }
+      return;
+    }
     var d = sg.bracketDirection;
     var n = d.rotateSC(1, 0);
     var pg = new ketcherCore.Vec2(ketcherCore.Vec2.dot(pos, d), ketcherCore.Vec2.dot(pos, n));
@@ -21845,7 +21864,7 @@ var EraserTool = function () {
         this.editor.update(ketcherCore.fromOneAtomDeletion(restruct, ci.id));
       } else if (ci.map === 'bonds') {
         this.editor.update(ketcherCore.fromOneBondDeletion(restruct, ci.id));
-      } else if (ci.map === 'functionalGroups' && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups)) {
+      } else if ((ci.map === 'sgroups' || ci.map === 'functionalGroups') && ketcherCore.FunctionalGroup.isContractedFunctionalGroup(ci.id, functionalGroups)) {
         var _sGroup = sgroups.get(ci.id);
         this.editor.update(ketcherCore.fromFragmentDeletion(rnd.ctab, {
           atoms: _toConsumableArray__default["default"](ketcherCore.SGroup.getAtoms(molecule, _sGroup === null || _sGroup === void 0 ? void 0 : _sGroup.item)),
@@ -26014,7 +26033,7 @@ var useFunctionalGroupEoc = function useFunctionalGroupEoc() {
     var selectedFunctionalGroups = props === null || props === void 0 ? void 0 : props.functionalGroups;
     var action = new ketcherCore.Action();
     selectedFunctionalGroups === null || selectedFunctionalGroups === void 0 || selectedFunctionalGroups.forEach(function (functionalGroup) {
-      action.mergeWith(ketcherCore.setExpandSGroup(molecule, functionalGroup.relatedSGroupId, {
+      action.mergeWith(ketcherCore.setExpandMonomerSGroup(molecule, functionalGroup.relatedSGroupId, {
         expanded: toExpand
       }));
     });
@@ -26032,16 +26051,7 @@ var useFunctionalGroupEoc = function useFunctionalGroupEoc() {
       return toExpand ? functionalGroup.isExpanded : !functionalGroup.isExpanded;
     }));
   }, []);
-  var disabled = React.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 || (_props$functionalGrou2 = props.functionalGroups) === null || _props$functionalGrou2 === void 0 ? void 0 : _props$functionalGrou2.every(function (functionalGroup) {
-      return functionalGroup === null || functionalGroup === void 0 ? void 0 : functionalGroup.relatedSGroup.isNotContractible(molecule);
-    }));
-  }, []);
-  return [handler, hidden, disabled];
+  return [handler, hidden];
 };
 
 var useFunctionalGroupRemove = function useFunctionalGroupRemove() {
@@ -26069,16 +26079,12 @@ function ownKeys$M(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$M(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$M(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$M(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var FunctionalGroupMenuItems = function FunctionalGroupMenuItems(props) {
   var _useFunctionalGroupEo = useFunctionalGroupEoc(),
-    _useFunctionalGroupEo2 = _slicedToArray__default["default"](_useFunctionalGroupEo, 3),
+    _useFunctionalGroupEo2 = _slicedToArray__default["default"](_useFunctionalGroupEo, 2),
     handleExpandOrContract = _useFunctionalGroupEo2[0],
-    ExpandOrContractHidden = _useFunctionalGroupEo2[1],
-    ExpandOrContractDisabled = _useFunctionalGroupEo2[2];
+    ExpandOrContractHidden = _useFunctionalGroupEo2[1];
   var handleRemove = useFunctionalGroupRemove();
   return jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [jsxRuntime.jsx(reactContexify.Item, _objectSpread$M(_objectSpread$M({}, props), {}, {
-      disabled: function disabled(params) {
-        return ExpandOrContractDisabled(params);
-      },
       hidden: function hidden(params) {
         return ExpandOrContractHidden(params, true);
       },
@@ -26087,9 +26093,6 @@ var FunctionalGroupMenuItems = function FunctionalGroupMenuItems(props) {
       },
       children: "Expand Abbreviation"
     })), jsxRuntime.jsx(reactContexify.Item, _objectSpread$M(_objectSpread$M({}, props), {}, {
-      disabled: function disabled(params) {
-        return ExpandOrContractDisabled(params);
-      },
       hidden: function hidden(params) {
         return ExpandOrContractHidden(params, false);
       },
@@ -35029,8 +35032,8 @@ var KetcherBuilder = function () {
                 cleanup = initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.28.0-rc.3" ,
-                  buildDate: "2024-12-11T14:41:49" ,
+                  version: "3.0.0-rc.1" ,
+                  buildDate: "2024-12-31T12:39:38" ,
                   buildNumber: '',
                   customButtons: customButtons || []
                 }, structService, resolve, togglerComponent);