ketcher-react 2.4.1 → 2.4.2

package/dist/index.modern.js

@@ -9,7 +9,7 @@ import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, Bond as Bond$2, Elements, AtomList, StereoLabel, RxnArrowMode, SimpleObjectMode, SGroup, Pile, getStereoAtomsMap, identifyStructFormat, ChemicalMimeType, SdfSerializer, FunctionalGroupsProvider, ElementColor, formatProperties, Vec2, FunctionalGroup, Fragment as Fragment$1, OperationType, fromAtomsAttrs, fracAngle, Atom as Atom$2, fromAtomAddition, Action, fromSgroupDeletion, fromFragmentDeletion, fromBondAddition, fromBondsAttrs, bondChangingAction, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, findStereoAtoms, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, fromOneAtomDeletion, fromOneBondDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTemplateOnAtom, fromTextCreation, Struct, fromNewCanvas, Render, fromDescriptorsAlign, setExpandSGroup, getPropertiesByFormat, StereoFlag, Generics, TextCommand } from 'ketcher-core';
+import { KetSerializer, MolSerializer, Ketcher, FormatterFactory, StereLabelStyleType, StereoColoringType, Bond as Bond$2, Elements, AtomList, StereoLabel, RxnArrowMode, SimpleObjectMode, SGroup, Pile, getStereoAtomsMap, identifyStructFormat, ChemicalMimeType, SdfSerializer, FunctionalGroupsProvider, ElementColor, formatProperties, Vec2, FunctionalGroup, Fragment as Fragment$1, OperationType, fromAtomsAttrs, fracAngle, Atom as Atom$2, fromAtomAddition, Action, fromSgroupDeletion, fromFragmentDeletion, fromBondAddition, fromBondsAttrs, bondChangingAction, fromChain, getItemsToFuse, getHoverToFuse, fromItemsFuse, findStereoAtoms, fromStereoFlagUpdate, Scale, checkOverlapping, fromSeveralSgroupAddition, SgContexts, fromSgroupAction, fromSimpleObjectResizing, fromArrowResizing, fromMultipleMove, fromTextDeletion, fromTextUpdating, fromOneAtomDeletion, fromOneBondDeletion, fromArrowDeletion, fromPlusDeletion, fromSimpleObjectDeletion, fromPaste, RGroup as RGroup$2, fromRGroupFragment, fromUpdateIfThen, fromRGroupAttrs, fromArrowAddition, fromPlusAddition, fromRotate, fromFlip, fromBondAlign, fromSimpleObjectAddition, fromTemplateOnBondAction, fromTemplateOnCanvas, fromTemplateOnAtom, fromTextCreation, fromHighlightCreate, fromHighlightClear, Struct, fromNewCanvas, Render, fromDescriptorsAlign, setExpandSGroup, getPropertiesByFormat, StereoFlag, Generics, TextCommand } from 'ketcher-core';
 import * as React from 'react';
 import React__default, { createRef, Component, useState, useEffect, useRef, useMemo, createElement, forwardRef, useLayoutEffect, useCallback } from 'react';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
@@ -10874,6 +10874,95 @@ var tools = {
   text: TextToolWrapper
 };
 
+var Highlighter = function () {
+  function Highlighter(editor) {
+    _classCallCheck(this, Highlighter);
+    _defineProperty(this, "editor", void 0);
+    this.editor = editor;
+  }
+  _createClass(Highlighter, [{
+    key: "getAll",
+    value: function getAll() {
+      var highlightsMap = this.editor.render.ctab.molecule.highlights;
+      var highlightsArray = _toConsumableArray(highlightsMap).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            id = _ref2[0],
+            highlight = _ref2[1];
+        return {
+          id: id,
+          highlight: highlight
+        };
+      });
+      return highlightsArray;
+    }
+  }, {
+    key: "create",
+    value: function create() {
+      var _this = this;
+      var createdHighlights = [];
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      args.forEach(function (arg) {
+        var atoms = arg.atoms,
+            bonds = arg.bonds,
+            color = arg.color;
+        if (typeof color !== 'string') {
+          return;
+        }
+        if (!atoms && !bonds) {
+          return;
+        }
+        var restruct = _this.editor.render.ctab;
+        var _getValidInputOnly = getValidInputOnly(restruct.molecule, atoms, bonds),
+            validAtoms = _getValidInputOnly.validAtoms,
+            validBonds = _getValidInputOnly.validBonds;
+        if (validAtoms.length === 0 && validBonds.length === 0) {
+          return;
+        }
+        createdHighlights.push({
+          atoms: validAtoms,
+          bonds: validBonds,
+          color: color
+        });
+      });
+      var action = fromHighlightCreate(this.editor.render.ctab, createdHighlights);
+      this.editor.update(action);
+    }
+  }, {
+    key: "clear",
+    value: function clear() {
+      var action = fromHighlightClear(this.editor.render.ctab);
+      this.editor.update(action);
+    }
+  }]);
+  return Highlighter;
+}();
+function getValidInputOnly(struct, atoms, bonds) {
+  if (!Array.isArray(atoms)) {
+    atoms = [];
+  }
+  if (!Array.isArray(bonds)) {
+    bonds = [];
+  }
+  var structAtoms = struct.atoms,
+      structBonds = struct.bonds;
+  if (atoms.length > 0) {
+    atoms = atoms.filter(function (aid) {
+      return structAtoms.has(aid);
+    });
+  }
+  if (bonds.length > 0) {
+    bonds = bonds.filter(function (bid) {
+      return structBonds.has(bid);
+    });
+  }
+  return {
+    validAtoms: atoms,
+    validBonds: bonds
+  };
+}
+
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 var SCALE = 40;
@@ -10909,6 +10998,7 @@ var Editor$2 = function () {
     _defineProperty(this, "historyStack", void 0);
     _defineProperty(this, "historyPtr", void 0);
     _defineProperty(this, "errorHandler", void 0);
+    _defineProperty(this, "highlights", void 0);
     _defineProperty(this, "event", void 0);
     _defineProperty(this, "lastEvent", void 0);
     this.render = new Render(clientArea, Object.assign({
@@ -10919,6 +11009,7 @@ var Editor$2 = function () {
     this.historyStack = [];
     this.historyPtr = 0;
     this.errorHandler = null;
+    this.highlights = new Highlighter(this);
     this.event = {
       message: new Subscription(),
       elementEdit: new PipelineSubscription(),
@@ -11067,48 +11158,10 @@ var Editor$2 = function () {
     value: function hover(ci, newTool) {
       var tool = newTool || this._tool;
       if ('ci' in tool && (!ci || tool.ci.map !== ci.map || tool.ci.id !== ci.id)) {
-        this.highlight(tool.ci, false);
+        setHover(tool.ci, false, this.render);
         delete tool.ci;
       }
-      if (ci && this.highlight(ci, true)) tool.ci = ci;
-    }
-  }, {
-    key: "highlight",
-    value: function highlight(ci, visible) {
-      if (highlightTargets.indexOf(ci.map) === -1) {
-        return false;
-      }
-      var render = this.render;
-      var item = null;
-      if (ci.map === 'merge') {
-        Object.keys(ci.items).forEach(function (mp) {
-          ci.items[mp].forEach(function (dstId) {
-            item = render.ctab[mp].get(dstId);
-            if (item) {
-              item.setHighlight(visible, render);
-            }
-          });
-        });
-        return true;
-      }
-      if (ci.map === 'functionalGroups') ci.map = 'sgroups';
-      item = render.ctab[ci.map].get(ci.id);
-      if (!item) {
-        return true;
-      }
-      if (ci.map === 'sgroups' && item.item.type === 'DAT' || ci.map === 'sgroupData') {
-        var item1 = render.ctab.sgroups.get(ci.id);
-        if (item1) {
-          item1.setHighlight(visible, render);
-        }
-        var item2 = render.ctab.sgroupData.get(ci.id);
-        if (item2) {
-          item2.setHighlight(visible, render);
-        }
-      } else {
-        item.setHighlight(visible, render);
-      }
-      return true;
+      if (ci && setHover(ci, true, this.render)) tool.ci = ci;
     }
   }, {
     key: "update",
@@ -11300,6 +11353,41 @@ function getStructCenter(ReStruct, selection) {
   var bb = ReStruct.getVBoxObj(selection || {});
   return Vec2.lc2(bb.p0, 0.5, bb.p1, 0.5);
 }
+function setHover(ci, visible, render) {
+  if (highlightTargets.indexOf(ci.map) === -1) {
+    return false;
+  }
+  var item = null;
+  if (ci.map === 'merge') {
+    Object.keys(ci.items).forEach(function (mp) {
+      ci.items[mp].forEach(function (dstId) {
+        item = render.ctab[mp].get(dstId);
+        if (item) {
+          item.setHover(visible, render);
+        }
+      });
+    });
+    return true;
+  }
+  if (ci.map === 'functionalGroups') ci.map = 'sgroups';
+  item = render.ctab[ci.map].get(ci.id);
+  if (!item) {
+    return true;
+  }
+  if (ci.map === 'sgroups' && item.item.type === 'DAT' || ci.map === 'sgroupData') {
+    var item1 = render.ctab.sgroups.get(ci.id);
+    if (item1) {
+      item1.setHover(visible, render);
+    }
+    var item2 = render.ctab.sgroupData.get(ci.id);
+    if (item2) {
+      item2.setHover(visible, render);
+    }
+  } else {
+    item.setHover(visible, render);
+  }
+  return true;
+}
 
 var classes$E = {"dialog_body":"StructEditor-module_dialog_body__1WUMs","scrollbar":"StructEditor-module_scrollbar__2RsBC","spinnerOverlay":"StructEditor-module_spinnerOverlay__Q8idX","canvas":"StructEditor-module_canvas__3PrVC","measureLog":"StructEditor-module_measureLog__3FnNR","visible":"StructEditor-module_visible__l4qPY","intermediateCanvas":"StructEditor-module_intermediateCanvas__jP3l0"};
 
@@ -15875,11 +15963,11 @@ var EDITOR_STYLES = {
     fill: '#47b3ec',
     stroke: 'none'
   },
-  highlightStyle: {
+  hoverStyle: {
     stroke: '#1a7090',
     'stroke-width': 1.2
   },
-  highlightStyleSimpleObject: {
+  hoverStyleSimpleObject: {
     'stroke-opacity': 0.3
   }
 };
@@ -16774,8 +16862,8 @@ var KetcherBuilder = function () {
                   initApp(element, staticResourcesUrl, {
                     buttons: buttons || {},
                     errorHandler: errorHandler || null,
-                    version: "2.4.1" ,
-                    buildDate: "2022-01-13T18:04:07" ,
+                    version: "2.4.2" ,
+                    buildDate: "2022-02-21T15:06:53" ,
                     buildNumber: ''
                   }, structService, resolve);
                 });