ketcher-react 2.15.0-rc.1 → 2.15.0-rc.3

package/dist/index.js

@@ -360,20 +360,76 @@ var ClipArea = function (_Component) {
         mousedown: function mousedown(event) {
           if (event.shiftKey && !isActiveElement(event.target)) event.preventDefault();
         },
-        copy: function copy(event) {
-          if (_this2.props.focused() && _this2.props.onCopy) {
-            var data = _this2.props.onCopy();
-            if (data) _copy(event.clipboardData, data);
-            event.preventDefault();
+        copy: function () {
+          var _copy2 = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(event) {
+            var data;
+            return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    if (!(_this2.props.focused() && _this2.props.onCopy)) {
+                      _context.next = 8;
+                      break;
+                    }
+                    _context.next = 3;
+                    return _this2.props.onCopy();
+                  case 3:
+                    data = _context.sent;
+                    if (!data) {
+                      _context.next = 7;
+                      break;
+                    }
+                    _context.next = 7;
+                    return _copy(data);
+                  case 7:
+                    event.preventDefault();
+                  case 8:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+          function copy(_x) {
+            return _copy2.apply(this, arguments);
           }
-        },
-        cut: function cut(event) {
-          if (_this2.props.focused() && _this2.props.onCut) {
-            var data = _this2.props.onCut();
-            if (data) _copy(event.clipboardData, data);
-            event.preventDefault();
+          return copy;
+        }(),
+        cut: function () {
+          var _cut = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee2(event) {
+            var data;
+            return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+              while (1) {
+                switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (!(_this2.props.focused() && _this2.props.onCut)) {
+                      _context2.next = 8;
+                      break;
+                    }
+                    _context2.next = 3;
+                    return _this2.props.onCut();
+                  case 3:
+                    data = _context2.sent;
+                    if (!data) {
+                      _context2.next = 7;
+                      break;
+                    }
+                    _context2.next = 7;
+                    return _copy(data);
+                  case 7:
+                    event.preventDefault();
+                  case 8:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
+          function cut(_x2) {
+            return _cut.apply(this, arguments);
           }
-        },
+          return cut;
+        }(),
         paste: function paste(event) {
           if (_this2.props.focused() && _this2.props.onPaste) {
             var data = _paste(event.clipboardData, _this2.props.formats);
@@ -422,20 +478,32 @@ function autoselect(cliparea) {
   cliparea.value = ' ';
   cliparea.select();
 }
-function _copy(cb, data) {
-  if (!cb && ieCb) {
-    ieCb.setData('text', data['text/plain']);
-  } else {
-    var curFmt = null;
-    cb.setData('text/plain', data['text/plain']);
-    try {
-      Object.keys(data).forEach(function (fmt) {
-        curFmt = fmt;
-        cb.setData(fmt, data[fmt]);
-      });
-    } catch (ex) {
-    }
-  }
+function _copy(_x3) {
+  return _copy3.apply(this, arguments);
+}
+function _copy3() {
+  _copy3 = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee3(data) {
+    return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.prev = 0;
+            _context3.next = 3;
+            return navigator.clipboard.writeText(data['text/plain']);
+          case 3:
+            _context3.next = 8;
+            break;
+          case 5:
+            _context3.prev = 5;
+            _context3.t0 = _context3["catch"](0);
+          case 8:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3, null, [[0, 5]]);
+  }));
+  return _copy3.apply(this, arguments);
 }
 function _paste(cb, formats) {
   var data = {};
@@ -3264,7 +3332,7 @@ var zoom = {
 
 var openHelpLink = function openHelpLink() {
   var _window$open;
-  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.15.0-rc.1\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
+  return (_window$open = window.open("https://github.com/epam/ketcher/blob/".concat("v2.15.0-rc.2\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -17055,21 +17123,53 @@ function initClipboard(dispatch) {
       return !state.modal;
     },
     onCut: function onCut() {
-      var state = global.currentState;
-      var editor = state.editor;
-      var data = clipData(editor);
-      if (data) debAction({
-        tool: 'eraser',
-        opts: 1
-      });else editor.selection(null);
-      return data;
+      return _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee() {
+        var state, editor, data;
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                state = global.currentState;
+                editor = state.editor;
+                _context.next = 4;
+                return clipData(editor);
+              case 4:
+                data = _context.sent;
+                if (data) debAction({
+                  tool: 'eraser',
+                  opts: 1
+                });else editor.selection(null);
+                return _context.abrupt("return", data);
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
     },
     onCopy: function onCopy() {
-      var state = global.currentState;
-      var editor = state.editor;
-      var data = clipData(editor);
-      editor.selection(null);
-      return data;
+      return _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee2() {
+        var state, editor, data;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                state = global.currentState;
+                editor = state.editor;
+                _context2.next = 4;
+                return clipData(editor);
+              case 4:
+                data = _context2.sent;
+                editor.selection(null);
+                return _context2.abrupt("return", data);
+              case 7:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
     },
     onPaste: function onPaste(data) {
       var structStr = data[ketcherCore.ChemicalMimeType.KET] || data[ketcherCore.ChemicalMimeType.Mol] || data[ketcherCore.ChemicalMimeType.Rxn] || data['text/plain'];
@@ -17080,30 +17180,61 @@ function initClipboard(dispatch) {
     }
   };
 }
-function clipData(editor) {
-  var res = {};
-  var struct = editor.structSelected();
-  var errorHandler = editor.errorHandler;
-  if (struct.isBlank()) return null;
-  var simpleObjectOrText = Boolean(struct.simpleObjects.size || struct.texts.size);
-  if (simpleObjectOrText && reactDeviceDetect.isIE) {
-    errorHandler('The structure you are trying to copy contains Simple object or/and Text object.' + 'To copy Simple object or Text object in Internet Explorer try "Copy as KET" button');
-    return null;
-  }
-  var molSerializer = new ketcherCore.MolSerializer();
-  try {
-    var serializer = new ketcherCore.KetSerializer();
-    var ket = serializer.serialize(struct);
-    res[ketcherCore.ChemicalMimeType.KET] = ket;
-    var type = struct.isReaction ? ketcherCore.ChemicalMimeType.Mol : ketcherCore.ChemicalMimeType.Rxn;
-    var data = molSerializer.serialize(struct);
-    res['text/plain'] = data;
-    res[type] = data;
-    return res;
-  } catch (e) {
-    errorHandler(e.message);
-  }
-  return null;
+function clipData(_x) {
+  return _clipData.apply(this, arguments);
+}
+function _clipData() {
+  _clipData = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee3(editor) {
+    var res, struct, errorHandler, simpleObjectOrText, serializer, ket, ketcherInstance, data, type;
+    return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            res = {};
+            struct = editor.structSelected();
+            errorHandler = editor.errorHandler;
+            if (!struct.isBlank()) {
+              _context3.next = 5;
+              break;
+            }
+            return _context3.abrupt("return", null);
+          case 5:
+            simpleObjectOrText = Boolean(struct.simpleObjects.size || struct.texts.size);
+            if (!(simpleObjectOrText && reactDeviceDetect.isIE && errorHandler)) {
+              _context3.next = 9;
+              break;
+            }
+            errorHandler('The structure you are trying to copy contains Simple object or/and Text object.' + 'To copy Simple object or Text object in Internet Explorer try "Copy as KET" button');
+            return _context3.abrupt("return", null);
+          case 9:
+            _context3.prev = 9;
+            serializer = new ketcherCore.KetSerializer();
+            ket = serializer.serialize(struct);
+            ketcherInstance = ketcherCore.ketcherProvider.getKetcher();
+            _context3.next = 15;
+            return ketcherCore.getStructure(ketcherCore.SupportedFormat.molAuto,
+            ketcherInstance.formatterFactory, struct);
+          case 15:
+            data = _context3.sent;
+            res[ketcherCore.ChemicalMimeType.KET] = ket;
+            type = struct.isReaction ? ketcherCore.ChemicalMimeType.Mol : ketcherCore.ChemicalMimeType.Rxn;
+            res['text/plain'] = data;
+            res[type] = data;
+            return _context3.abrupt("return", res);
+          case 23:
+            _context3.prev = 23;
+            _context3.t0 = _context3["catch"](9);
+            errorHandler && errorHandler(_context3.t0.message);
+          case 26:
+            return _context3.abrupt("return", null);
+          case 27:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3, null, [[9, 23]]);
+  }));
+  return _clipData.apply(this, arguments);
 }
 
 var AppClipArea = reactRedux.connect(null, function (dispatch) {
@@ -22590,35 +22721,45 @@ var useDelete$1 = function useDelete() {
   return handler;
 };
 
+var getAtomIdByProps = function getAtomIdByProps(props, ketcher) {
+  var _props$atomIds, _props$rgroupAttachme;
+  var editor = ketcher.editor;
+  var restruct = editor.render.ctab;
+  var atomId = props === null || props === void 0 ? void 0 : (_props$atomIds = props.atomIds) === null || _props$atomIds === void 0 ? void 0 : _props$atomIds[0];
+  if (atomId != null) {
+    return atomId;
+  }
+  var attachmentPointId = props === null || props === void 0 ? void 0 : (_props$rgroupAttachme = props.rgroupAttachmentPoints) === null || _props$rgroupAttachme === void 0 ? void 0 : _props$rgroupAttachme[0];
+  assert_1(attachmentPointId != null);
+  var attachmentPoint = restruct.molecule.rgroupAttachmentPoints.get(attachmentPointId);
+  assert_1(attachmentPoint != null);
+  return attachmentPoint.atomId;
+};
 var useRGroupAttachmentPointEdit = function useRGroupAttachmentPointEdit() {
   var _useAppContext = useAppContext(),
     getKetcherInstance = _useAppContext.getKetcherInstance;
   var handler = React.useCallback(function (_ref) {
-    var _props$atomIds;
     var props = _ref.props;
-    var editor = getKetcherInstance().editor;
-    var restruct = editor.render.ctab;
-    var atomId = props === null || props === void 0 ? void 0 : (_props$atomIds = props.atomIds) === null || _props$atomIds === void 0 ? void 0 : _props$atomIds[0];
-    assert_1(atomId != null);
+    var ketcher = getKetcherInstance();
+    var restruct = ketcher.editor.render.ctab;
+    var atomId = getAtomIdByProps(props, ketcher);
     var atom = restruct.molecule.atoms.get(atomId);
     assert_1(atom != null);
-    editRGroupAttachmentPoint(editor, atom, atomId);
+    editRGroupAttachmentPoint(ketcher.editor, atom, atomId);
   }, [getKetcherInstance]);
   var disabled = React.useCallback(function (_ref2) {
-    var _props$atomIds2;
     var props = _ref2.props;
-    var editor = getKetcherInstance().editor;
-    var restruct = editor.render.ctab;
-    var atomId = props === null || props === void 0 ? void 0 : (_props$atomIds2 = props.atomIds) === null || _props$atomIds2 === void 0 ? void 0 : _props$atomIds2[0];
-    assert_1(atomId != null);
+    var ketcher = getKetcherInstance();
+    var restruct = ketcher.editor.render.ctab;
+    var atomId = getAtomIdByProps(props, ketcher);
     var atom = restruct.molecule.atoms.get(atomId);
     assert_1(atom != null);
     return atom.isRGroupAttachmentPointEditDisabled;
   }, [getKetcherInstance]);
   var hidden = React.useCallback(function (_ref3) {
-    var _props$atomIds3;
+    var _props$atomIds2;
     var props = _ref3.props;
-    var atomLength = (props === null || props === void 0 ? void 0 : (_props$atomIds3 = props.atomIds) === null || _props$atomIds3 === void 0 ? void 0 : _props$atomIds3.length) || 0;
+    var atomLength = (props === null || props === void 0 ? void 0 : (_props$atomIds2 = props.atomIds) === null || _props$atomIds2 === void 0 ? void 0 : _props$atomIds2.length) || 0;
     return atomLength > 1;
   }, []);
   return [handler, disabled, hidden];
@@ -30687,8 +30828,8 @@ var KetcherBuilder = function () {
                   initApp(element, appRoot, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.15.0-rc.1" ,
-                    buildDate: "2023-09-04T11:49:56" ,
+                    version: "2.15.0-rc.3" ,
+                    buildDate: "2023-10-06T10:46:54" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });
@@ -30729,6 +30870,7 @@ var KetcherBuilder = function () {
       if (initialMol) {
         ketcher.setMolecule(initialMol);
       }
+      ketcherCore.ketcherProvider.setKetcherInstance(ketcher);
       return ketcher;
     }
   }]);