ketcher-react 2.22.0-rc.6 → 2.23.0-rc.1-dev.1

package/dist/index.modern.js

@@ -24,7 +24,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck$2 from '@babel/runtime/helpers/classCallCheck';
 import _createClass$2 from '@babel/runtime/helpers/createClass';
-import { KetSerializer, MolSerializer, KetcherLogger, Ketcher, defaultBondThickness, FormatterFactory, isClipboardAPIAvailable, notifyCopyCut, notifyRequestCompleted, isControlKey, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, ShowHydrogenLabelNames, SettingsManager, SdfSerializer, KETCHER_SAVED_OPTIONS_KEY, Bond as Bond$2, Elements, AtomList, getAtomType, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup as SGroup$1, Pile, getStereoAtomsMap, identifyStructFormat, SupportedFormat, ChemicalMimeType, RenderStruct, Struct, shortcutStr, MonomerMicromolecule, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, generateMenuShortcuts, Vec2, Scale, fromMultipleMove, FunctionalGroup, fromSgroupDeletion, fromFragmentDeletion, mergeMapOfItemsToSet, vectorUtils, fromBondAddition, Action, fromAtomAddition, fromAtomsAttrs, checkOverlapping, fromSeveralSgroupAddition, expandSGroupWithMultipleAttachmentPoint, SgContexts, fromSgroupAction, fromItemsFuse, ReBond, setExpandSGroup, fromBondsAttrs, OperationType, ReStruct, fromSimpleObjectResizing, fromArrowResizing, getItemsToFuse, getHoverToFuse, fromTextDeletion, fromTextUpdating, CoordinateTransformation, fromTemplateOnCanvas, fromTemplateOnBondAction, fromTemplateOnAtom, BondAttr, AtomAttr, formatProperties, ketcherProvider, runAsyncAction, getStructStringFromClipboardData, getStructure, initHotKeys, keyNorm, Fragment as Fragment$1, fromRGroupAttachmentPointUpdate, fromOneBondDeletion, bondChangingAction, fromChain, fromStereoFlagUpdate, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromRGroupAttachmentPointDeletion, notifyItemsToMergeInitializationComplete, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromSimpleObjectAddition, fromTextCreation, fromHighlightCreate, fromHighlightClear, provideEditorSettings, fromNewCanvas, Render, fromDescriptorsAlign, fromSgroupAddition, SGroupAttachmentPoint, fromSgroupAttachmentPointAddition, atomGetAttr, genericsList, getAtomCustomQuery, getFormatMimeTypeByFileName, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
+import { KetSerializer, MolSerializer, KetcherLogger, Ketcher, defaultBondThickness, FormatterFactory, isClipboardAPIAvailable, notifyCopyCut, notifyRequestCompleted, isControlKey, StereLabelStyleType, StereoColoringType, ShowHydrogenLabels, ShowHydrogenLabelNames, SettingsManager, SdfSerializer, KETCHER_SAVED_OPTIONS_KEY, Bond as Bond$2, Elements, AtomList, getAtomType, StereoLabel, isAttachmentBond, Atom as Atom$2, findStereoAtoms, RxnArrowMode, SimpleObjectMode, SGroup as SGroup$1, Pile, getStereoAtomsMap, identifyStructFormat, SupportedFormat, ChemicalMimeType, RenderStruct, Struct, shortcutStr, MonomerMicromolecule, FunctionalGroupsProvider, SaltsAndSolventsProvider, KetcherAsyncEvents, ElementColor, generateMenuShortcuts, Vec2, Scale, fromMultipleMove, FunctionalGroup, fromSgroupDeletion, fromFragmentDeletion, mergeMapOfItemsToSet, vectorUtils, fromBondAddition, Action, fromAtomAddition, fromAtomsAttrs, checkOverlapping, fromSeveralSgroupAddition, expandSGroupWithMultipleAttachmentPoint, SgContexts, fromSgroupAction, fromItemsFuse, ReBond, setExpandSGroup, fromBondsAttrs, OperationType, ReStruct, fromSimpleObjectResizing, fromArrowResizing, getItemsToFuse, getHoverToFuse, fromTextDeletion, fromTextUpdating, CoordinateTransformation, fromTemplateOnCanvas, fromTemplateOnBondAction, fromTemplateOnAtom, BondAttr, AtomAttr, formatProperties, ketcherProvider, runAsyncAction, getStructStringFromClipboardData, getStructure, initHotKeys, keyNorm, Fragment as Fragment$1, fromRGroupAttachmentPointUpdate, fromOneBondDeletion, bondChangingAction, fromChain, fromStereoFlagUpdate, fromOneAtomDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromRGroupAttachmentPointDeletion, notifyItemsToMergeInitializationComplete, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromSimpleObjectAddition, fromTextCreation, fromHighlightCreate, fromHighlightClear, provideEditorSettings, fromNewCanvas, Render, fromDescriptorsAlign, fromSgroupAttachmentPointAddition, SGroupAttachmentPoint, fromSgroupAddition, atomGetAttr, genericsList, getAtomCustomQuery, getFormatMimeTypeByFileName, getPropertiesByFormat, StereoFlag, getPropertiesByImgFormat, b64toBlob, Generics, TextCommand, DefaultStructServiceOptions } from 'ketcher-core';
 import * as React from 'react';
 import React__default, { createRef, Component, useRef, useEffect, useLayoutEffect, useState, useMemo, createElement, forwardRef, useCallback, Fragment as Fragment$2, PureComponent, lazy, Suspense } from 'react';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
@@ -3595,7 +3595,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.22.0-rc.6\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
+  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.23.0-rc.1-dev.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -23599,6 +23599,12 @@ var Editor$3 = function () {
     value: function clearMacromoleculeConvertionError() {
       this.macromoleculeConvertionError = null;
     }
+  }, {
+    key: "focusCliparea",
+    value: function focusCliparea() {
+      var cliparea = document.querySelector('.cliparea');
+      cliparea === null || cliparea === void 0 || cliparea.focus();
+    }
   }]);
   return Editor;
 }();
@@ -23894,7 +23900,8 @@ var useDelete$1 = function useDelete() {
             action = fromFragmentDeletion(molecule, itemsToDelete);
             editor.update(action);
             editor.selection(null);
-          case 7:
+            editor.focusCliparea();
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -23946,7 +23953,7 @@ var useAddAttachmentPoint = function useAddAttachmentPoint() {
   var handler = useCallback( function () {
     var _ref2 = _asyncToGenerator( _regeneratorRuntime.mark(function _callee(_ref) {
       var _props$atomIds;
-      var props, editor, restruct, struct, atomId, sgroup, bondAdditionResult, action, addedLeavingGroupAtomId, moleculeAtoms, sgroupAttachmentPoints, lastAttachmentPoint;
+      var props, editor, restruct, struct, atomId, sgroup, bondAdditionResult, action, addedLeavingGroupAtomId, moleculeAtoms, sgroupAttachmentPoints, allPointsNumbers, lastMinimalPointNumber, hasFirstNumber, i, prevNumber, currentNumber;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -23969,19 +23976,56 @@ var useAddAttachmentPoint = function useAddAttachmentPoint() {
             });
             action = bondAdditionResult[0];
             addedLeavingGroupAtomId = bondAdditionResult[2];
-            if (!sgroup) {
-              moleculeAtoms = struct.findConnectedComponent(atomId);
-              action.mergeWith(fromSgroupAddition(restruct, SGroup$1.TYPES.SUP, moleculeAtoms, {
-                expanded: true
-              }, restruct.molecule.sgroups.newId(), [new SGroupAttachmentPoint(atomId, addedLeavingGroupAtomId, undefined, 1)]));
-            } else {
-              sgroupAttachmentPoints = (sgroup === null || sgroup === void 0 ? void 0 : sgroup.getAttachmentPoints()) || [];
-              lastAttachmentPoint = sgroupAttachmentPoints[sgroupAttachmentPoints.length - 1];
-              action.mergeWith(fromSgroupAttachmentPointAddition(restruct, sgroup.id, new SGroupAttachmentPoint(atomId, addedLeavingGroupAtomId, undefined, (lastAttachmentPoint.attachmentPointNumber || 0) + 1)));
+            if (sgroup) {
+              _context.next = 16;
+              break;
+            }
+            moleculeAtoms = struct.findConnectedComponent(atomId);
+            action.mergeWith(fromSgroupAddition(restruct, SGroup$1.TYPES.SUP, moleculeAtoms, {
+              expanded: true
+            }, restruct.molecule.sgroups.newId(), [new SGroupAttachmentPoint(atomId, addedLeavingGroupAtomId, undefined, 1)]));
+            _context.next = 35;
+            break;
+          case 16:
+            sgroupAttachmentPoints = (sgroup === null || sgroup === void 0 ? void 0 : sgroup.getAttachmentPoints()) || [];
+            allPointsNumbers = sgroupAttachmentPoints.map(function (point) {
+              return point.attachmentPointNumber || 0;
+            }).sort();
+            lastMinimalPointNumber = allPointsNumbers[allPointsNumbers.length - 1];
+            hasFirstNumber = allPointsNumbers.includes(1);
+            if (hasFirstNumber) {
+              _context.next = 24;
+              break;
             }
+            lastMinimalPointNumber = 0;
+            _context.next = 34;
+            break;
+          case 24:
+            i = 1;
+          case 25:
+            if (!(i < allPointsNumbers.length)) {
+              _context.next = 34;
+              break;
+            }
+            prevNumber = allPointsNumbers[i - 1];
+            currentNumber = allPointsNumbers[i];
+            if (!(currentNumber > prevNumber + 1)) {
+              _context.next = 31;
+              break;
+            }
+            lastMinimalPointNumber = prevNumber;
+            return _context.abrupt("break", 34);
+          case 31:
+            i++;
+            _context.next = 25;
+            break;
+          case 34:
+            action.mergeWith(fromSgroupAttachmentPointAddition(restruct, sgroup.id, new SGroupAttachmentPoint(atomId, addedLeavingGroupAtomId, undefined, lastMinimalPointNumber + 1)));
+          case 35:
             editor.update(action);
             editor.selection(null);
-          case 14:
+            editor.focusCliparea();
+          case 38:
           case "end":
             return _context.stop();
         }
@@ -24027,7 +24071,8 @@ var useRemoveAttachmentPoint = function useRemoveAttachmentPoint() {
             action = fromOneAtomDeletion(restruct, attachmentPointToDelete.leaveAtomId);
             editor.update(action);
             editor.selection(null);
-          case 15:
+            editor.focusCliparea();
+          case 16:
           case "end":
             return _context.stop();
         }
@@ -24168,6 +24213,12 @@ var AtomMenuItems = function AtomMenuItems(props) {
       return bond.endSuperatomAttachmentPointNumber === attachmentPoint.attachmentPointNumber || bond.beginSuperatomAttachmentPointNumber === attachmentPoint.attachmentPointNumber;
     }));
   });
+  if (isAtomSuperatomLeavingGroup && onlyOneAtomSelected) {
+    return jsx(Item, _objectSpread$M(_objectSpread$M({}, props), {}, {
+      onClick: handleDelete,
+      children: "Delete"
+    }));
+  }
   return jsxs(Fragment, {
     children: [jsx(Item, _objectSpread$M(_objectSpread$M({}, props), {}, {
       onClick: handleEdit,
@@ -32937,8 +32988,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.22.0-rc.6" ,
-                  buildDate: "2024-06-13T19:04:58" ,
+                  version: "2.23.0-rc.1-dev.1" ,
+                  buildDate: "2024-06-16T11:41:22" ,
                   buildNumber: ''
                 }, structService, resolve, togglerComponent);
               });