ketcher-react 2.18.0-rc.3 → 2.18.0-rc.4

package/dist/index.js

@@ -694,8 +694,8 @@ function exec(action) {
   return enabled;
 }
 
-function ownKeys$1n(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1n(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1n(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1n(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1o(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1o(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1o(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1o(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var editor = {
   resetToSelect: {
     title: 'Reset to Select Tool',
@@ -950,7 +950,7 @@ var optionsSchema = {
   title: 'Settings',
   type: 'object',
   required: [],
-  properties: _objectSpread$1n(_objectSpread$1n(_objectSpread$1n(_objectSpread$1n(_objectSpread$1n({}, editor), render), server), debug), miew)
+  properties: _objectSpread$1o(_objectSpread$1o(_objectSpread$1o(_objectSpread$1o(_objectSpread$1o({}, editor), render), server), debug), miew)
 };
 function getDefaultOptions() {
   if (!optionsSchema.properties) return {};
@@ -1133,8 +1133,8 @@ function prefetchRender(tmpls, baseUrl, cacheEl) {
   });
 }
 
-function ownKeys$1m(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1m(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1m(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1m(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1n(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1n(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1n(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1n(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var initOptionsState = {
   app: {
     server: false,
@@ -1232,29 +1232,29 @@ function optionsReducer() {
   var action = arguments.length > 1 ? arguments[1] : undefined;
   var type = action.type,
     data = action.data;
-  if (type === 'APP_OPTIONS') return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
-    app: _objectSpread$1m(_objectSpread$1m({}, state.app), data)
+  if (type === 'APP_OPTIONS') return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
+    app: _objectSpread$1n(_objectSpread$1n({}, state.app), data)
   });
   if (type === 'SAVE_SETTINGS') {
-    return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
-      settings: _objectSpread$1m(_objectSpread$1m({}, state.settings), data)
+    return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
+      settings: _objectSpread$1n(_objectSpread$1n({}, state.settings), data)
     });
   }
-  if (type === 'SAVE_CHECK_OPTS') return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
+  if (type === 'SAVE_CHECK_OPTS') return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
     check: data
   });
-  if (type === 'CHANGE_ANALYSE') return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
-    analyse: _objectSpread$1m(_objectSpread$1m(_objectSpread$1m({}, state.analyse), data), {}, {
+  if (type === 'CHANGE_ANALYSE') return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
+    analyse: _objectSpread$1n(_objectSpread$1n(_objectSpread$1n({}, state.analyse), data), {}, {
       loading: false
     })
   });
-  if (type === 'ANALYSE_LOADING') return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
-    analyse: _objectSpread$1m(_objectSpread$1m({}, state.analyse), {}, {
+  if (type === 'ANALYSE_LOADING') return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
+    analyse: _objectSpread$1n(_objectSpread$1n({}, state.analyse), {}, {
       loading: true
     })
   });
-  if (recognizeActions.includes(type)) return _objectSpread$1m(_objectSpread$1m({}, state), {}, {
-    recognize: _objectSpread$1m(_objectSpread$1m({}, state.recognize), data)
+  if (recognizeActions.includes(type)) return _objectSpread$1n(_objectSpread$1n({}, state), {}, {
+    recognize: _objectSpread$1n(_objectSpread$1n({}, state.recognize), data)
   });
   return state;
 }
@@ -1558,8 +1558,8 @@ function getSdataDefault() {
   return schema[context][fieldName] ? schema[context][fieldName].properties.fieldValue["default"] : '';
 }
 
-function ownKeys$1l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1l(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1m(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1m(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1m(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1m(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var initSdata = function initSdata(schema) {
   var isCustomShema = schema.key === 'Custom';
   var context = isCustomShema ? getSdataDefault(sdataCustomSchema, 'context') : getSdataDefault(sdataSchema);
@@ -1597,7 +1597,7 @@ var onContextChange = function onContextChange(state, payload) {
   var fValue = fieldValue;
   if (fValue === state.result.fieldValue) fValue = getSdataDefault(sdataCustomSchema, 'fieldValue');
   return {
-    result: _objectSpread$1l(_objectSpread$1l({}, payload), {}, {
+    result: _objectSpread$1m(_objectSpread$1m({}, payload), {}, {
       context: context,
       fieldName: fieldName,
       fieldValue: fValue
@@ -1611,7 +1611,7 @@ var onFieldNameChange = function onFieldNameChange(state, payload) {
   if (sdataSchema[context][fieldName]) fieldValue = getSdataDefault(sdataSchema, context, fieldName);
   if (fieldValue === state.result.fieldValue && sdataSchema[context][state.result.fieldName]) fieldValue = '';
   return {
-    result: _objectSpread$1l(_objectSpread$1l({}, payload), {}, {
+    result: _objectSpread$1m(_objectSpread$1m({}, payload), {}, {
       fieldName: fieldName,
       fieldValue: fieldValue
     })
@@ -1619,7 +1619,7 @@ var onFieldNameChange = function onFieldNameChange(state, payload) {
 };
 function sdataReducer(state, action) {
   if (action.data.result.init) {
-    return correctErrors(_objectSpread$1l(_objectSpread$1l({}, state), {}, {
+    return correctErrors(_objectSpread$1m(_objectSpread$1m({}, state), {}, {
       result: Object.assign({}, state.result, action.data.result)
     }), action.data);
   }
@@ -1627,7 +1627,7 @@ function sdataReducer(state, action) {
   var actionFieldName = action.data.result.fieldName;
   var newstate = null;
   if (actionContext !== state.result.context) newstate = onContextChange(state, action.data.result);else if (actionFieldName !== state.result.fieldName) newstate = onFieldNameChange(state, action.data.result);
-  newstate = newstate || _objectSpread$1l(_objectSpread$1l({}, state), {}, {
+  newstate = newstate || _objectSpread$1m(_objectSpread$1m({}, state), {}, {
     result: Object.assign({}, state.result, action.data.result)
   });
   return correctErrors(newstate, action.data);
@@ -1767,8 +1767,8 @@ function formReducer(state, action) {
 var INDIGO_VERIFICATION = 'INDIGO_VERIFICATION';
 var ANALYZING_FILE = 'ANALYZING_FILE';
 
-function ownKeys$1k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1k(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1l(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function indigoVerification(data) {
   return {
     type: INDIGO_VERIFICATION,
@@ -1793,13 +1793,13 @@ function requestReducer () {
   switch (type) {
     case INDIGO_VERIFICATION:
       {
-        return _objectSpread$1k(_objectSpread$1k({}, state), {}, {
+        return _objectSpread$1l(_objectSpread$1l({}, state), {}, {
           indigoVerification: data
         });
       }
     case ANALYZING_FILE:
       {
-        return _objectSpread$1k(_objectSpread$1k({}, state), {}, {
+        return _objectSpread$1l(_objectSpread$1l({}, state), {}, {
           isAnalyzingFile: data
         });
       }
@@ -1817,8 +1817,8 @@ var supportedSGroupTypes = {
   queryComponent: 'queryComponent'
 };
 
-function ownKeys$1j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1j(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1k(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1k(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1k(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1k(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var atom = {
   title: 'Atom',
   type: 'object',
@@ -2050,7 +2050,7 @@ var sgroup = {
   title: 'SGroup',
   type: 'object',
   required: ['type'],
-  oneOf: [_objectSpread$1j({}, sdataCustomSchema), {
+  oneOf: [_objectSpread$1k({}, sdataCustomSchema), {
     key: 'MUL',
     title: 'Multiple group',
     type: 'object',
@@ -2157,12 +2157,12 @@ var attachSchema = {
 
 var _excluded$z = ["aromaticity", "ringMembership", "ringSize", "connectivity", "chirality", "customQuery"],
   _excluded2$7 = ["type", "radiobuttons"];
-function ownKeys$1i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1i(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1j(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1j(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1j(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1j(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var DefaultStereoGroupNumber = 1;
 function fromElement(selem) {
   if (selem.label === 'R#') {
-    return _objectSpread$1i({
+    return _objectSpread$1j({
       type: 'rlabel',
       values: fromRlabel(selem.rglabel)
     }, selem);
@@ -2419,7 +2419,7 @@ function fromBond(sbond) {
 }
 function toBond(bond) {
   var isCustomQuery = bond.customQuery !== '';
-  return _objectSpread$1i({
+  return _objectSpread$1j({
     topology: bond.topology,
     reactingCenterStatus: bond.center,
     customQuery: !isCustomQuery ? null : bond.customQuery
@@ -2515,7 +2515,7 @@ function toSgroup(sgroup) {
   var type = sgroup.type,
     radiobuttons = sgroup.radiobuttons,
     props = _objectWithoutProperties__default["default"](sgroup, _excluded2$7);
-  var attrs = _objectSpread$1i({}, props);
+  var attrs = _objectSpread$1j({}, props);
   var absolute = 'absolute';
   var attached = 'attached';
   switch (radiobuttons) {
@@ -3070,8 +3070,8 @@ var tools = typeSchema$1["enum"].reduce(function (res, type, i) {
 
 var _excluded$y = ["rescale", "fragment"],
   _excluded2$6 = ["isPaste", "method"];
-function ownKeys$1h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1h(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$1i(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1i(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function onAction(action) {
   if (action && action.dialog) {
     return {
@@ -3113,6 +3113,21 @@ function removeStructAction() {
   var savedSelectedTool = ketcherCore.SettingsManager.selectionTool;
   return onAction(savedSelectedTool || tools['select-rectangle'].action);
 }
+var getSelectionFromStruct = function getSelectionFromStruct(struct) {
+  var selection = {};
+  ['atoms', 'bonds', 'enhancedFlags', 'rxnPluses', 'rxnArrows', 'texts', 'rgroupAttachmentPoints'].forEach(function (selectionEntity) {
+    if (struct && struct[selectionEntity]) {
+      var selected = [];
+      struct[selectionEntity].forEach(function (value, key) {
+        if (typeof value.getInitiallySelected === 'function' && value.getInitiallySelected()) {
+          selected.push(key);
+        }
+      });
+      selection[selectionEntity] = selected;
+    }
+  });
+  return selection;
+};
 function load(struct, options) {
   return function () {
     var _ref = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(dispatch, getState) {
@@ -3126,7 +3141,7 @@ function load(struct, options) {
             errorHandler = editor.errorHandler;
             options = options || {};
             _options2 = options, isPaste = _options2.isPaste, method = _options2.method, otherOptions = _objectWithoutProperties__default["default"](_options2, _excluded2$6);
-            otherOptions = _objectSpread$1h(_objectSpread$1h({}, otherOptions), {}, {
+            otherOptions = _objectSpread$1i(_objectSpread$1i({}, otherOptions), {}, {
               'dearomatize-on-load': editor.options()['dearomatize-on-load'],
               ignoreChiralFlag: editor.options().ignoreChiralFlag
             });
@@ -3197,27 +3212,31 @@ function load(struct, options) {
             if (!isPaste && !isIndigoFunctionCalled) {
               editor.centerStruct();
             }
+            if (!fragment) {
+              editor.selection(getSelectionFromStruct(editor.struct()));
+            }
+            editor.struct().disableInitiallySelected();
             dispatch(setAnalyzingFile(false));
             dispatch({
               type: 'MODAL_CLOSE'
             });
-            _context.next = 38;
+            _context.next = 40;
             break;
-          case 33:
-            _context.prev = 33;
+          case 35:
+            _context.prev = 35;
             _context.t0 = _context["catch"](8);
             ketcherCore.KetcherLogger.error('shared.ts::load', _context.t0);
             dispatch(setAnalyzingFile(false));
             _context.t0 && errorHandler && errorHandler(_context.t0.message);
-          case 38:
-            _context.prev = 38;
+          case 40:
+            _context.prev = 40;
             ketcherCore.notifyRequestCompleted();
-            return _context.finish(38);
-          case 41:
+            return _context.finish(40);
+          case 43:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8, 33, 38, 41]]);
+      }, _callee, null, [[8, 35, 40, 43]]);
     }));
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
@@ -3247,6 +3266,8 @@ function openInfoModalWithCustomMessage(message) {
   };
 }
 
+function ownKeys$1h(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1h(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function checkServer() {
   return function (dispatch, getState) {
     var _getState = getState(),
@@ -3370,20 +3391,30 @@ function resetStereoFlagsPosition(struct) {
 function serverCall(editor, server, method, options, struct) {
   var selection = editor.selection();
   var selectedAtoms = [];
+  var selectedBonds = [];
   var aidMap = new Map();
-  var currentStruct = (struct || editor.struct()).clone(null, null, false, aidMap);
+  var bidMap = new Map();
+  var currentStruct = (struct || editor.struct()).clone(null, null, false, aidMap, null, null, null, bidMap);
+  var expSel = editor.explicitSelected();
   if (selection) {
-    selectedAtoms = (selection.atoms ? selection.atoms : editor.explicitSelected().atoms).map(function (aid) {
+    selectedAtoms = (selection.atoms ? selection.atoms : expSel.atoms).map(function (aid) {
       return aidMap.get(aid);
     });
+    selectedBonds = (selection.bonds ? selection.bonds : expSel.bonds).map(function (bid) {
+      return bidMap.get(bid);
+    });
   }
   if (method === 'layout') {
     resetStereoFlagsPosition(currentStruct);
   }
   var ketSerializer = new ketcherCore.KetSerializer();
+  var serializedStruct = ketSerializer.serialize(currentStruct, undefined, _objectSpread$1h(_objectSpread$1h({}, selection), {}, {
+    atoms: selectedAtoms,
+    bonds: selectedBonds
+  }));
   return server.then(function () {
     return server[method](Object.assign({
-      struct: ketSerializer.serialize(currentStruct)
+      struct: serializedStruct
     }, method !== 'calculate' && method !== 'check' ? {
       output_format: ketcherCore.ChemicalMimeType.KET
     } : null, selectedAtoms && selectedAtoms.length > 0 ? {
@@ -3629,7 +3660,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.18.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("v2.18.0-rc.4\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -9219,10 +9250,20 @@ var shams$1 = function hasSymbols() {
 	return true;
 };
 
+/** @type {import('.')} */
 var shams = function hasToStringTagShams() {
 	return shams$1() && !!Symbol.toStringTag;
 };
 
+/** @type {import('./range')} */
+var range = RangeError;
+
+/** @type {import('./syntax')} */
+var syntax = SyntaxError;
+
+/** @type {import('./type')} */
+var type = TypeError;
+
 var origSymbol = typeof Symbol !== 'undefined' && Symbol;
 
 
@@ -9337,11 +9378,19 @@ var $hasOwn = Object.prototype.hasOwnProperty;
 /** @type {(o: {}, p: PropertyKey) => p is keyof o} */
 var hasown = functionBind.call(call, $hasOwn);
 
+var $RangeError = range;
+
+var $SyntaxError$1 = syntax;
+
+var $TypeError$2 = type;
+
 var undefined$1;
 
-var $SyntaxError$1 = SyntaxError;
+
+
+
+
 var $Function = Function;
-var $TypeError$2 = TypeError;
 
 // eslint-disable-next-line consistent-return
 var getEvalledConstructor = function (expressionSyntax) {
@@ -9393,6 +9442,7 @@ var needsEval = {};
 var TypedArray = typeof Uint8Array === 'undefined' || !getProto$1 ? undefined$1 : getProto$1(Uint8Array);
 
 var INTRINSICS = {
+	__proto__: null,
 	'%AggregateError%': typeof AggregateError === 'undefined' ? undefined$1 : AggregateError,
 	'%Array%': Array,
 	'%ArrayBuffer%': typeof ArrayBuffer === 'undefined' ? undefined$1 : ArrayBuffer,
@@ -9437,7 +9487,7 @@ var INTRINSICS = {
 	'%parseInt%': parseInt,
 	'%Promise%': typeof Promise === 'undefined' ? undefined$1 : Promise,
 	'%Proxy%': typeof Proxy === 'undefined' ? undefined$1 : Proxy,
-	'%RangeError%': RangeError,
+	'%RangeError%': $RangeError,
 	'%ReferenceError%': ReferenceError,
 	'%Reflect%': typeof Reflect === 'undefined' ? undefined$1 : Reflect,
 	'%RegExp%': RegExp,
@@ -9497,6 +9547,7 @@ var doEval = function doEval(name) {
 };
 
 var LEGACY_ALIASES = {
+	__proto__: null,
 	'%ArrayBufferPrototype%': ['ArrayBuffer', 'prototype'],
 	'%ArrayPrototype%': ['Array', 'prototype'],
 	'%ArrayProto_entries%': ['Array', 'prototype', 'entries'],
@@ -9687,7 +9738,9 @@ var getIntrinsic = function GetIntrinsic(name, allowMissing) {
 	return value;
 };
 
-var $defineProperty$1 = getIntrinsic('%Object.defineProperty%', true);
+var GetIntrinsic = getIntrinsic;
+
+var $defineProperty$1 = GetIntrinsic('%Object.defineProperty%', true);
 
 var hasPropertyDescriptors$1 = function hasPropertyDescriptors() {
 	if ($defineProperty$1) {
@@ -9717,7 +9770,7 @@ hasPropertyDescriptors$1.hasArrayLengthDefineBug = function hasArrayLengthDefine
 
 var hasPropertyDescriptors_1 = hasPropertyDescriptors$1;
 
-var $gOPD = getIntrinsic('%Object.getOwnPropertyDescriptor%', true);
+var $gOPD = GetIntrinsic('%Object.getOwnPropertyDescriptor%', true);
 
 if ($gOPD) {
 	try {
@@ -9738,7 +9791,7 @@ var hasPropertyDescriptors = require$$0$1();
 
 
 
-var $defineProperty = hasPropertyDescriptors && getIntrinsic('%Object.defineProperty%', true);
+var $defineProperty = hasPropertyDescriptors && GetIntrinsic('%Object.defineProperty%', true);
 if ($defineProperty) {
 	try {
 		$defineProperty({}, 'a', { value: 1 });
@@ -9748,8 +9801,8 @@ if ($defineProperty) {
 	}
 }
 
-var $SyntaxError = getIntrinsic('%SyntaxError%');
-var $TypeError$1 = getIntrinsic('%TypeError%');
+var $SyntaxError = GetIntrinsic('%SyntaxError%');
+var $TypeError$1 = GetIntrinsic('%TypeError%');
 
 
 
@@ -9806,8 +9859,8 @@ var defineDataProperty = defineDataProperty$1;
 var hasDescriptors = require$$0$1();
 
 
-var $TypeError = getIntrinsic('%TypeError%');
-var $floor = getIntrinsic('%Math.floor%');
+var $TypeError = GetIntrinsic('%TypeError%');
+var $floor = GetIntrinsic('%Math.floor%');
 
 /** @typedef {(...args: unknown[]) => unknown} Func */
 
@@ -9852,13 +9905,13 @@ var callBind = createCommonjsModule(function (module) {
 
 
 
-var $TypeError = getIntrinsic('%TypeError%');
-var $apply = getIntrinsic('%Function.prototype.apply%');
-var $call = getIntrinsic('%Function.prototype.call%');
-var $reflectApply = getIntrinsic('%Reflect.apply%', true) || functionBind.call($call, $apply);
+var $TypeError = GetIntrinsic('%TypeError%');
+var $apply = GetIntrinsic('%Function.prototype.apply%');
+var $call = GetIntrinsic('%Function.prototype.call%');
+var $reflectApply = GetIntrinsic('%Reflect.apply%', true) || functionBind.call($call, $apply);
 
-var $defineProperty = getIntrinsic('%Object.defineProperty%', true);
-var $max = getIntrinsic('%Math.max%');
+var $defineProperty = GetIntrinsic('%Object.defineProperty%', true);
+var $max = GetIntrinsic('%Math.max%');
 
 if ($defineProperty) {
 	try {
@@ -9892,10 +9945,10 @@ if ($defineProperty) {
 }
 });
 
-var $indexOf$1 = callBind(getIntrinsic('String.prototype.indexOf'));
+var $indexOf$1 = callBind(GetIntrinsic('String.prototype.indexOf'));
 
 var callBound = function callBoundIntrinsic(name, allowMissing) {
-	var intrinsic = getIntrinsic(name, !!allowMissing);
+	var intrinsic = GetIntrinsic(name, !!allowMissing);
 	if (typeof intrinsic === 'function' && $indexOf$1(name, '.prototype.') > -1) {
 		return callBind(intrinsic);
 	}
@@ -10130,7 +10183,7 @@ var forEach = function forEach(list, iterator, thisArg) {
 
 var forEach_1 = forEach;
 
-var possibleNames = [
+var /** @type {ReturnType<import('.')>} */ possibleNames = [
 	'BigInt64Array',
 	'BigUint64Array',
 	'Float32Array',
@@ -10146,10 +10199,12 @@ var possibleNames = [
 
 var g$1 = typeof globalThis === 'undefined' ? commonjsGlobal : globalThis;
 
+/** @type {import('.')} */
 var availableTypedArrays$1 = function availableTypedArrays() {
-	var out = [];
+	var /** @type {ReturnType<typeof availableTypedArrays>} */ out = [];
 	for (var i = 0; i < possibleNames.length; i++) {
 		if (typeof g$1[possibleNames[i]] === 'function') {
+			// @ts-expect-error
 			out[out.length] = possibleNames[i];
 		}
 	}
@@ -10167,7 +10222,7 @@ var typedArrays = availableTypedArrays();
 var $slice = callBound('String.prototype.slice');
 var getPrototypeOf = Object.getPrototypeOf; // require('getprototypeof');
 
-var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(array, value) {
+var $indexOf = callBound('Array.prototype.indexOf', true) || /** @type {(array: readonly unknown[], value: unknown) => keyof array} */ function indexOf(array, value) {
 	for (var i = 0; i < array.length; i += 1) {
 		if (array[i] === value) {
 			return i;
@@ -10175,17 +10230,24 @@ var $indexOf = callBound('Array.prototype.indexOf', true) || function indexOf(ar
 	}
 	return -1;
 };
+
+/** @typedef {Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array | BigInt64Array | BigUint64Array} TypedArray */
+/** @typedef {'Int8Array' | 'Uint8Array' | 'Uint8ClampedArray' | 'Int16Array' | 'Uint16Array' | 'Int32Array' | 'Uint32Array' | 'Float32Array' | 'Float64Array' | 'BigInt64Array' | 'BigUint64Array'} TypedArrayName */
+/** @type {{ [k in `\$${TypedArrayName}`]?: (receiver: TypedArray) => string | typeof Uint8Array.prototype.slice.call | typeof Uint8Array.prototype.set.call } & { __proto__: null }} */
 var cache = { __proto__: null };
 if (hasToStringTag && gOPD && getPrototypeOf) {
 	forEach_1(typedArrays, function (typedArray) {
 		var arr = new g[typedArray]();
 		if (Symbol.toStringTag in arr) {
 			var proto = getPrototypeOf(arr);
+			// @ts-expect-error TS won't narrow inside a closure
 			var descriptor = gOPD(proto, Symbol.toStringTag);
 			if (!descriptor) {
 				var superProto = getPrototypeOf(proto);
+				// @ts-expect-error TS won't narrow inside a closure
 				descriptor = gOPD(superProto, Symbol.toStringTag);
 			}
+			// @ts-expect-error TODO: fix
 			cache['$' + typedArray] = callBind(descriptor.get);
 		}
 	});
@@ -10194,38 +10256,52 @@ if (hasToStringTag && gOPD && getPrototypeOf) {
 		var arr = new g[typedArray]();
 		var fn = arr.slice || arr.set;
 		if (fn) {
+			// @ts-expect-error TODO: fix
 			cache['$' + typedArray] = callBind(fn);
 		}
 	});
 }
 
+/** @type {import('.')} */
 var tryTypedArrays = function tryAllTypedArrays(value) {
-	var found = false;
-	forEach_1(cache, function (getter, typedArray) {
-		if (!found) {
-			try {
-				if ('$' + getter(value) === typedArray) {
-					found = $slice(typedArray, 1);
-				}
-			} catch (e) { /**/ }
+	/** @type {ReturnType<tryAllTypedArrays>} */ var found = false;
+	forEach_1(
+		// eslint-disable-next-line no-extra-parens
+		/** @type {Record<`\$${TypedArrayName}`, typeof cache>} */ /** @type {any} */ (cache),
+		/** @type {(getter: typeof cache, name: `\$${TypedArrayName}`) => void} */ function (getter, typedArray) {
+			if (!found) {
+				try {
+				// @ts-expect-error TODO: fix
+					if ('$' + getter(value) === typedArray) {
+						found = $slice(typedArray, 1);
+					}
+				} catch (e) { /**/ }
+			}
 		}
-	});
+	);
 	return found;
 };
 
+/** @type {import('.')} */
 var trySlices = function tryAllSlices(value) {
-	var found = false;
-	forEach_1(cache, function (getter, name) {
-		if (!found) {
-			try {
-				getter(value);
-				found = $slice(name, 1);
-			} catch (e) { /**/ }
+	/** @type {ReturnType<tryAllSlices>} */ var found = false;
+	forEach_1(
+		// eslint-disable-next-line no-extra-parens
+		/** @type {any} */ (cache),
+		/** @type {(getter: typeof cache, name: `\$${TypedArrayName}`) => void} */ function (getter, name) {
+			if (!found) {
+				try {
+				// @ts-expect-error TODO: fix
+					getter(value);
+					found = $slice(name, 1);
+				} catch (e) { /**/ }
+			}
 		}
-	});
+	);
 	return found;
 };
 
+/** @type {import('.')} */
 var whichTypedArray$1 = function whichTypedArray(value) {
 	if (!value || typeof value !== 'object') { return false; }
 	if (!hasToStringTag) {
@@ -10245,10 +10321,13 @@ var whichTypedArray$1 = function whichTypedArray(value) {
 
 var whichTypedArray = whichTypedArray$1;
 
-var isTypedArray = function isTypedArray(value) {
+/** @type {import('.')} */
+var isTypedArray$1 = function isTypedArray(value) {
 	return !!whichTypedArray(value);
 };
 
+var isTypedArray = isTypedArray$1;
+
 var types = createCommonjsModule(function (module, exports) {
 
 
@@ -18197,42 +18276,48 @@ function _getStructStringFromClipboardData() {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           clipboardItem = data[0];
-          _context8.next = 3;
+          if (!(clipboardItem instanceof ClipboardItem)) {
+            _context8.next = 23;
+            break;
+          }
+          _context8.next = 4;
           return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.KET));
-        case 3:
+        case 4:
           _context8.t2 = _context8.sent;
           if (_context8.t2) {
-            _context8.next = 8;
+            _context8.next = 9;
             break;
           }
-          _context8.next = 7;
+          _context8.next = 8;
           return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.Mol));
-        case 7:
-          _context8.t2 = _context8.sent;
         case 8:
+          _context8.t2 = _context8.sent;
+        case 9:
           _context8.t1 = _context8.t2;
           if (_context8.t1) {
-            _context8.next = 13;
+            _context8.next = 14;
             break;
           }
-          _context8.next = 12;
+          _context8.next = 13;
           return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.Rxn));
-        case 12:
-          _context8.t1 = _context8.sent;
         case 13:
+          _context8.t1 = _context8.sent;
+        case 14:
           _context8.t0 = _context8.t1;
           if (_context8.t0) {
-            _context8.next = 18;
+            _context8.next = 19;
             break;
           }
-          _context8.next = 17;
+          _context8.next = 18;
           return safelyGetMimeType(clipboardItem, 'text/plain');
-        case 17:
-          _context8.t0 = _context8.sent;
         case 18:
+          _context8.t0 = _context8.sent;
+        case 19:
           structStr = _context8.t0;
           return _context8.abrupt("return", structStr === '' ? '' : structStr.text());
-        case 20:
+        case 23:
+          return _context8.abrupt("return", data[ketcherCore.ChemicalMimeType.KET] || data[ketcherCore.ChemicalMimeType.Mol] || data[ketcherCore.ChemicalMimeType.Rxn] || data['text/plain']);
+        case 24:
         case "end":
           return _context8.stop();
       }
@@ -29297,7 +29382,14 @@ var SaveDialog = function (_Component) {
         var service = factory.create(type, _objectSpread$l(_objectSpread$l({}, options), {}, {
           ignoreChiralFlag: ignoreChiralFlag
         }), queryPropertiesAreUsed);
-        return service.getStructureFromStructAsync(struct).then(function (structStr) {
+        var getStructFromStringByType = function getStructFromStringByType() {
+          if (type === 'ket') {
+            var selection = _this.props.editor.selection();
+            return service.getStructureFromStructAsync(struct, undefined, selection);
+          }
+          return service.getStructureFromStructAsync(struct);
+        };
+        return getStructFromStringByType().then(function (structStr) {
           _this.setState({
             tabIndex: 0,
             structStr: structStr
@@ -29599,7 +29691,8 @@ var mapStateToProps$4 = function mapStateToProps(state) {
     moleculeErrors: state.modal.form.moleculeErrors,
     checkState: state.options.check,
     bondThickness: state.options.settings.bondThickness,
-    ignoreChiralFlag: state.editor.render.options.ignoreChiralFlag
+    ignoreChiralFlag: state.editor.render.options.ignoreChiralFlag,
+    editor: state.editor
   };
 };
 var mapDispatchToProps$6 = function mapDispatchToProps(dispatch) {
@@ -32720,8 +32813,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.18.0-rc.3" ,
-                  buildDate: "2024-01-31T10:46:48" ,
+                  version: "2.18.0-rc.4" ,
+                  buildDate: "2024-02-06T12:50:19" ,
                   buildNumber: ''
                 }, structService, resolve, togglerComponent);
               });