ketcher-react 2.15.0-rc.5 → 2.15.0-rc.6

package/dist/index.js

@@ -331,6 +331,15 @@ var debugObj = {
 
 var classes$R = {"cliparea":"cliparea-module_cliparea__GdPrN"};
 
+function isClipboardAPIAvailable() {
+  var _navigator;
+  return typeof ((_navigator = navigator) === null || _navigator === void 0 || (_navigator = _navigator.clipboard) === null || _navigator === void 0 ? void 0 : _navigator.writeText) === 'function';
+}
+function notifyCopyCut() {
+  var event = new Event('copyOrCutComplete');
+  window.dispatchEvent(event);
+}
+
 function _createSuper$d(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$d(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
 function _isNativeReflectConstruct$d() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var ieCb = window.clipboardData;
@@ -360,76 +369,87 @@ var ClipArea = function (_Component) {
         mousedown: function mousedown(event) {
           if (event.shiftKey && !isActiveElement(event.target)) event.preventDefault();
         },
-        copy: function () {
-          var _copy2 = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee(event) {
+        copy: function copy(event) {
+          if (!_this2.props.focused()) {
+            return;
+          }
+          if (isClipboardAPIAvailable()) {
+            _this2.props.onCopy().then(function (data) {
+              if (!data) {
+                return;
+              }
+              _copy(data).then(function () {
+                event.preventDefault();
+                notifyCopyCut();
+              });
+            });
+          } else {
+            var data = _this2.props.onLegacyCopy();
+            if (data) {
+              legacyCopy(event.clipboardData, data);
+            }
+            event.preventDefault();
+          }
+        },
+        cut: function () {
+          var _cut = _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;
+                  if (_this2.props.focused()) {
+                    _context.next = 2;
                     break;
                   }
-                  _context.next = 3;
-                  return _this2.props.onCopy();
-                case 3:
-                  data = _context.sent;
-                  if (!data) {
-                    _context.next = 7;
-                    break;
+                  return _context.abrupt("return");
+                case 2:
+                  if (isClipboardAPIAvailable()) {
+                    _this2.props.onCut().then(function (data) {
+                      if (!data) {
+                        return;
+                      }
+                      _copy(data).then(function () {
+                        event.preventDefault();
+                        notifyCopyCut();
+                      });
+                    });
+                  } else {
+                    data = _this2.props.onLegacyCut();
+                    if (data) {
+                      legacyCopy(event.clipboardData, data);
+                    }
+                    event.preventDefault();
                   }
-                  _context.next = 7;
-                  return _copy(data);
-                case 7:
-                  event.preventDefault();
-                case 8:
+                case 3:
                 case "end":
                   return _context.stop();
               }
             }, _callee);
           }));
-          function copy(_x) {
-            return _copy2.apply(this, arguments);
-          }
-          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) {
+          function cut(_x) {
             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);
-            if (data) _this2.props.onPaste(data);
+          if (!_this2.props.focused()) {
+            return;
+          }
+          if (isClipboardAPIAvailable()) {
+            navigator.clipboard.read().then(function (data) {
+              if (!data) {
+                return;
+              }
+              _this2.props.onPaste(data).then(function () {
+                event.preventDefault();
+                notifyCopyCut();
+              });
+            });
+          } else {
+            var data = legacyPaste(event.clipboardData, _this2.props.formats);
+            if (data) {
+              _this2.props.onLegacyPaste(data);
+            }
             event.preventDefault();
           }
         }
@@ -474,32 +494,55 @@ function autoselect(cliparea) {
   cliparea.value = ' ';
   cliparea.select();
 }
-function _copy(_x3) {
-  return _copy3.apply(this, arguments);
+function _copy(_x2) {
+  return _copy2.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) {
+function _copy2() {
+  _copy2 = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee2(data) {
+    var clipboardItemData;
+    return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context3.prev = 0;
-          _context3.next = 3;
-          return navigator.clipboard.writeText(data['text/plain']);
-        case 3:
-          _context3.next = 8;
-          break;
+          _context2.prev = 0;
+          clipboardItemData = {};
+          Object.keys(data).forEach(function (mimeType) {
+            var mimeTypeToSet = mimeType === 'text/plain' ? mimeType : "web ".concat(mimeType);
+            clipboardItemData[mimeTypeToSet] = Promise.resolve(new Blob([data[mimeType]], {
+              type: mimeTypeToSet
+            }));
+          });
+          _context2.next = 5;
+          return navigator.clipboard.write([new ClipboardItem(clipboardItemData)]);
         case 5:
-          _context3.prev = 5;
-          _context3.t0 = _context3["catch"](0);
-        case 8:
+          _context2.next = 10;
+          break;
+        case 7:
+          _context2.prev = 7;
+          _context2.t0 = _context2["catch"](0);
+        case 10:
         case "end":
-          return _context3.stop();
+          return _context2.stop();
       }
-    }, _callee3, null, [[0, 5]]);
+    }, _callee2, null, [[0, 7]]);
   }));
-  return _copy3.apply(this, arguments);
+  return _copy2.apply(this, arguments);
 }
-function _paste(cb, formats) {
+function legacyCopy(clipboardData, data) {
+  if (!clipboardData && ieCb) {
+    ieCb.setData('text', data['text/plain']);
+  } else {
+    var curFmt = null;
+    clipboardData.setData('text/plain', data['text/plain']);
+    try {
+      Object.keys(data).forEach(function (fmt) {
+        curFmt = fmt;
+        clipboardData.setData(fmt, data[fmt]);
+      });
+    } catch (e) {
+    }
+  }
+}
+function legacyPaste(cb, formats) {
   var data = {};
   if (!cb && ieCb) {
     data['text/plain'] = ieCb.getData('text');
@@ -3322,7 +3365,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.5\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.6\n", "/documentation/help.md#ketcher-overview"))) === null || _window$open === void 0 ? void 0 : _window$open.focus();
 };
 var help = {
   help: {
@@ -17237,114 +17280,310 @@ function initClipboard(dispatch) {
       var state = global.currentState;
       return !state.modal;
     },
+    onLegacyCut: function onLegacyCut() {
+      var state = global.currentState;
+      var editor = state.editor;
+      var data = legacyClipData(editor);
+      if (data) debAction({
+        tool: 'eraser',
+        opts: 1
+      });else editor.selection(null);
+      return data;
+    },
     onCut: function onCut() {
-      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) {
+      return _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee2() {
+        var ketcherInstance, result;
+        return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.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:
+              ketcherInstance = ketcherCore.ketcherProvider.getKetcher();
+              _context2.next = 3;
+              return ketcherCore.runAsyncAction( _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);
+              })), ketcherInstance.eventBus);
+            case 3:
+              result = _context2.sent;
+              return _context2.abrupt("return", result);
+            case 5:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }))();
     },
+    onLegacyCopy: function onLegacyCopy() {
+      var state = global.currentState;
+      var editor = state.editor;
+      var data = legacyClipData(editor);
+      editor.selection(null);
+      return data;
+    },
     onCopy: function onCopy() {
-      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) {
+      return _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee4() {
+        var ketcherInstance, result;
+        return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.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:
+              ketcherInstance = ketcherCore.ketcherProvider.getKetcher();
+              _context4.next = 3;
+              return ketcherCore.runAsyncAction( _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee3() {
+                var state, editor, data;
+                return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
+                    case 0:
+                      state = global.currentState;
+                      editor = state.editor;
+                      _context3.next = 4;
+                      return clipData(editor);
+                    case 4:
+                      data = _context3.sent;
+                      editor.selection(null);
+                      return _context3.abrupt("return", data);
+                    case 7:
+                    case "end":
+                      return _context3.stop();
+                  }
+                }, _callee3);
+              })), ketcherInstance.eventBus);
+            case 3:
+              result = _context4.sent;
+              return _context4.abrupt("return", result);
+            case 5:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2);
+        }, _callee4);
       }))();
     },
     onPaste: function onPaste(data) {
+      return _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee6() {
+        var ketcherInstance, result;
+        return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              ketcherInstance = ketcherCore.ketcherProvider.getKetcher();
+              _context6.next = 3;
+              return ketcherCore.runAsyncAction( _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee5() {
+                var structStr;
+                return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context5) {
+                  while (1) switch (_context5.prev = _context5.next) {
+                    case 0:
+                      _context5.next = 2;
+                      return getStructStringFromClipboardData(data);
+                    case 2:
+                      structStr = _context5.sent;
+                      if (structStr || !rxnTextPlain.test(data['text/plain'])) {
+                        loadStruct(structStr, {
+                          fragment: true,
+                          isPaste: true
+                        });
+                      }
+                    case 4:
+                    case "end":
+                      return _context5.stop();
+                  }
+                }, _callee5);
+              })), ketcherInstance.eventBus);
+            case 3:
+              result = _context6.sent;
+              return _context6.abrupt("return", result);
+            case 5:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6);
+      }))();
+    },
+    onLegacyPaste: function onLegacyPaste(data) {
       var structStr = data[ketcherCore.ChemicalMimeType.KET] || data[ketcherCore.ChemicalMimeType.Mol] || data[ketcherCore.ChemicalMimeType.Rxn] || data['text/plain'];
-      if (structStr || !rxnTextPlain.test(data['text/plain'])) loadStruct(structStr, {
-        fragment: true,
-        isPaste: true
-      });
+      if (structStr || !rxnTextPlain.test(data['text/plain'])) {
+        loadStruct(structStr, {
+          fragment: true,
+          isPaste: true
+        });
+      }
     }
   };
 }
-function clipData(_x) {
+function safelyGetMimeType(_x, _x2) {
+  return _safelyGetMimeType.apply(this, arguments);
+}
+function _safelyGetMimeType() {
+  _safelyGetMimeType = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee7(clipboardItem, mimeType) {
+    var result;
+    return _regeneratorRuntime__default["default"].wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.prev = 0;
+          _context7.next = 3;
+          return clipboardItem.getType(mimeType);
+        case 3:
+          result = _context7.sent;
+          return _context7.abrupt("return", result);
+        case 7:
+          _context7.prev = 7;
+          _context7.t0 = _context7["catch"](0);
+          return _context7.abrupt("return", '');
+        case 10:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7, null, [[0, 7]]);
+  }));
+  return _safelyGetMimeType.apply(this, arguments);
+}
+function getStructStringFromClipboardData(_x3) {
+  return _getStructStringFromClipboardData.apply(this, arguments);
+}
+function _getStructStringFromClipboardData() {
+  _getStructStringFromClipboardData = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee8(data) {
+    var clipboardItem, structStr;
+    return _regeneratorRuntime__default["default"].wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          clipboardItem = data[0];
+          _context8.next = 3;
+          return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.KET));
+        case 3:
+          _context8.t2 = _context8.sent;
+          if (_context8.t2) {
+            _context8.next = 8;
+            break;
+          }
+          _context8.next = 7;
+          return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.Mol));
+        case 7:
+          _context8.t2 = _context8.sent;
+        case 8:
+          _context8.t1 = _context8.t2;
+          if (_context8.t1) {
+            _context8.next = 13;
+            break;
+          }
+          _context8.next = 12;
+          return safelyGetMimeType(clipboardItem, "web ".concat(ketcherCore.ChemicalMimeType.Rxn));
+        case 12:
+          _context8.t1 = _context8.sent;
+        case 13:
+          _context8.t0 = _context8.t1;
+          if (_context8.t0) {
+            _context8.next = 18;
+            break;
+          }
+          _context8.next = 17;
+          return safelyGetMimeType(clipboardItem, 'text/plain');
+        case 17:
+          _context8.t0 = _context8.sent;
+        case 18:
+          structStr = _context8.t0;
+          return _context8.abrupt("return", structStr === '' ? '' : structStr.text());
+        case 20:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  }));
+  return _getStructStringFromClipboardData.apply(this, arguments);
+}
+function isAbleToCopy(editor) {
+  var struct = editor.structSelected();
+  var errorHandler = editor.errorHandler;
+  if (struct.isBlank()) {
+    return false;
+  }
+  var simpleObjectOrText = Boolean(struct.simpleObjects.size || struct.texts.size);
+  if (simpleObjectOrText && reactDeviceDetect.isIE && errorHandler) {
+    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 false;
+  }
+  return true;
+}
+function clipData(_x4) {
   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) {
+  _clipData = _asyncToGenerator__default["default"]( _regeneratorRuntime__default["default"].mark(function _callee9(editor) {
+    var res, struct, errorHandler, serializer, ket, ketcherInstance, data, type;
+    return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
+          if (isAbleToCopy(editor)) {
+            _context9.next = 2;
+            break;
+          }
+          return _context9.abrupt("return", null);
+        case 2:
           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;
+          _context9.prev = 5;
           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;
+          _context9.next = 11;
+          return ketcherCore.getStructure(ketcherCore.SupportedFormat.molAuto, ketcherInstance.formatterFactory, struct);
+        case 11:
+          data = _context9.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);
+          return _context9.abrupt("return", res);
+        case 19:
+          _context9.prev = 19;
+          _context9.t0 = _context9["catch"](5);
+          errorHandler && errorHandler(_context9.t0.message);
+        case 22:
+          return _context9.abrupt("return", null);
         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();
+          return _context9.stop();
       }
-    }, _callee3, null, [[9, 23]]);
+    }, _callee9, null, [[5, 19]]);
   }));
   return _clipData.apply(this, arguments);
 }
+function legacyClipData(editor) {
+  if (!isAbleToCopy(editor)) {
+    return null;
+  }
+  var res = {};
+  var struct = editor.structSelected();
+  var errorHandler = editor.errorHandler;
+  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 && errorHandler(e.message);
+  }
+  return null;
+}
 
 var AppClipArea = reactRedux.connect(null, function (dispatch) {
   return dispatch(initClipboard);
@@ -30940,8 +31179,8 @@ var KetcherBuilder = function () {
                 initApp(element, appRoot, staticResourcesUrl, {
                   buttons: buttons || {},
                   errorHandler: errorHandler || null,
-                  version: "2.15.0-rc.5" ,
-                  buildDate: "2023-10-24T11:53:09" ,
+                  version: "2.15.0-rc.6" ,
+                  buildDate: "2023-10-27T14:41:31" ,
                   buildNumber: ''
                 }, structService, resolve);
               });