@modusoperandi/licit 1.4.3 → 1.4.7

package/LinkSetURLCommand.js.flow

@@ -1,129 +1,129 @@
-// @flow
-
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-
-import { MARK_LINK } from './MarkNames.js';
-import {
-  hideSelectionPlaceholder,
-  showSelectionPlaceholder,
-} from './SelectionPlaceholderPlugin.js';
-import {
-  applyMark,
-  findNodesWithSameMark,
-  createPopUp,
-} from '@modusoperandi/licit-ui-commands';
-import LinkURLEditor from './ui/LinkURLEditor.js';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { INNER_LINK } from './Types.js';
-
-class LinkSetURLCommand extends UICommand {
-  _popUp = null;
-
-  isEnabled = (state: EditorState): boolean => {
-    if (!(state.selection instanceof TextSelection)) {
-      // Could be a NodeSelection or CellSelection.
-      return false;
-    }
-
-    const markType = state.schema.marks[MARK_LINK];
-    if (!markType) {
-      return false;
-    }
-    const { from, to } = state.selection;
-    return from < to;
-  };
-
-  showTocList = async (view) => {
-
-    const stylePromise = view.runtime;
-
-    if (stylePromise === null || undefined) {
-      return [];
-    }
-    const styles = await stylePromise.fetchStyles();
-
-    const storeTOCvalue = styles
-      .filter(
-        (
-          style // Added TOT/TOF selected styles to be listed as well
-        ) =>
-          style?.styles?.toc === true ||
-          style?.styles?.tot === true ||
-          style?.styles?.tof === true
-      )
-      .map((style) => style?.styleName);
-    return stylePromise.fetchInnerLinkSelectionIds(storeTOCvalue); // Fetching the selection IDs for the TOC items from MSD
-  };
-
-  waitForUserInput = async (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (dispatch) {
-      dispatch(showSelectionPlaceholder(state));
-    }
-
-    const { doc, schema, selection } = state;
-    const markType = schema.marks[MARK_LINK];
-    if (!markType) {
-      return Promise.resolve(undefined);
-    }
-    const { from, to } = selection;
-    const result = findNodesWithSameMark(doc, from, to - 1, markType);
-    const href = result ? result.mark.attrs.href : null;
-    const tocItemsNode = await this.showTocList(view);
-    const viewPops = {
-      href_: href,
-      TOCselectedNode_: tocItemsNode
-    };
-
-    return new Promise((resolve) => {
-      this._popUp = createPopUp(LinkURLEditor, viewPops, {
-        modal: true,
-        onClose: (val) => {
-          if (this._popUp) {
-            resolve(val);
-            this._popUp = null;
-          }
-        },
-      });
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    url: ?string
-  ): boolean => {
-    if (dispatch) {
-      const { selection, schema } = view.state;
-      let { tr } = view.state;
-      tr = view ? hideSelectionPlaceholder(view.state) : tr;
-      tr = tr.setSelection(selection);
-      if (url !== undefined) {
-        let selectionId;
-        let href;
-        if (url.includes(INNER_LINK)) {
-          selectionId = url.split(INNER_LINK)[0];
-          href = url.split(INNER_LINK)[1];
-        } else {
-          selectionId = null;
-          href = url;
-        }
-        const markType = schema.marks[MARK_LINK];
-        const attrs = url ? { href, selectionId } : null;
-        tr = applyMark(tr.setSelection(selection), schema, markType, attrs);
-      }
-      dispatch(tr);
-    }
-    view && view.focus();
-    return true;
-  };
-}
-
-export default LinkSetURLCommand;
+// @flow
+
+import { EditorState, TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+
+import { MARK_LINK } from './MarkNames.js';
+import {
+  hideSelectionPlaceholder,
+  showSelectionPlaceholder,
+} from './SelectionPlaceholderPlugin.js';
+import {
+  applyMark,
+  findNodesWithSameMark,
+  createPopUp,
+} from '@modusoperandi/licit-ui-commands';
+import LinkURLEditor from './ui/LinkURLEditor.js';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import { INNER_LINK } from './Types.js';
+
+class LinkSetURLCommand extends UICommand {
+  _popUp = null;
+
+  isEnabled = (state: EditorState): boolean => {
+    if (!(state.selection instanceof TextSelection)) {
+      // Could be a NodeSelection or CellSelection.
+      return false;
+    }
+
+    const markType = state.schema.marks[MARK_LINK];
+    if (!markType) {
+      return false;
+    }
+    const { from, to } = state.selection;
+    return from < to;
+  };
+
+  showTocList = async (view) => {
+
+    const stylePromise = view.runtime;
+
+    if (stylePromise === null || undefined) {
+      return [];
+    }
+    const styles = await stylePromise.fetchStyles();
+
+    const storeTOCvalue = styles
+      .filter(
+        (
+          style // Added TOT/TOF selected styles to be listed as well
+        ) =>
+          style?.styles?.toc === true ||
+          style?.styles?.tot === true ||
+          style?.styles?.tof === true
+      )
+      .map((style) => style?.styleName);
+    return stylePromise.fetchInnerLinkSelectionIds(storeTOCvalue); // Fetching the selection IDs for the TOC items from MSD
+  };
+
+  waitForUserInput = async (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (dispatch) {
+      dispatch(showSelectionPlaceholder(state));
+    }
+
+    const { doc, schema, selection } = state;
+    const markType = schema.marks[MARK_LINK];
+    if (!markType) {
+      return Promise.resolve(undefined);
+    }
+    const { from, to } = selection;
+    const result = findNodesWithSameMark(doc, from, to - 1, markType);
+    const href = result ? result.mark.attrs.href : null;
+    const tocItemsNode = await this.showTocList(view);
+    const viewPops = {
+      href_: href,
+      TOCselectedNode_: tocItemsNode
+    };
+
+    return new Promise((resolve) => {
+      this._popUp = createPopUp(LinkURLEditor, viewPops, {
+        modal: true,
+        onClose: (val) => {
+          if (this._popUp) {
+            resolve(val);
+            this._popUp = null;
+          }
+        },
+      });
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    url: ?string
+  ): boolean => {
+    if (dispatch) {
+      const { selection, schema } = view.state;
+      let { tr } = view.state;
+      tr = view ? hideSelectionPlaceholder(view.state) : tr;
+      tr = tr.setSelection(selection);
+      if (url !== undefined) {
+        let selectionId;
+        let href;
+        if (url.includes(INNER_LINK)) {
+          selectionId = url.split(INNER_LINK)[0];
+          href = url.split(INNER_LINK)[1];
+        } else {
+          selectionId = null;
+          href = url;
+        }
+        const markType = schema.marks[MARK_LINK];
+        const attrs = url ? { href, selectionId } : null;
+        tr = applyMark(tr.setSelection(selection), schema, markType, attrs);
+      }
+      dispatch(tr);
+    }
+    view && view.focus();
+    return true;
+  };
+}
+
+export default LinkSetURLCommand;

package/LinkTooltipPlugin.js

@@ -19,8 +19,7 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 import { Plugin, PluginKey, TextSelection } from 'prosemirror-state';
 import { EditorView } from 'prosemirror-view';
 import { MARK_LINK } from './MarkNames.js';
-import { atAnchorTopCenter, createPopUp, findNodesWithSameMark } from '@modusoperandi/licit-ui-commands';
-import lookUpElement from './lookUpElement.js';
+import { atAnchorTopCenter, createPopUp } from '@modusoperandi/licit-ui-commands';
 import LinkTooltip from './ui/LinkTooltip.js';
 import scrollIntoView from 'smooth-scroll-into-view-if-needed';
 import sanitizeURL from './sanitizeURL.js';
@@ -36,11 +35,27 @@ var SPEC = {
       mouseout: function mouseout(view, event) {
         var pluginView = view.dom._linkTooltipView;
         return pluginView === null || pluginView === void 0 ? void 0 : pluginView._handleMouseOut.call(view, event);
-      },
-      click: function click(view, event) {
-        var pluginView = view.dom._linkTooltipView;
-        return pluginView === null || pluginView === void 0 ? void 0 : pluginView._handleClick.call(view, event);
       }
+    },
+    // https://prosemirror.net/docs/ref/#view.EditorProps.handleClickOn
+    handleClickOn: function handleClickOn(view, pos, node, nodePos, event, direct) {
+      var _node$marks;
+      if (!direct) {
+        return false;
+      }
+      node = view.state.doc.nodeAt(pos);
+      if (!node) {
+        return false;
+      }
+      var linkMark = (_node$marks = node.marks) === null || _node$marks === void 0 ? void 0 : _node$marks.find(function (m) {
+        var _m$type;
+        return (m === null || m === void 0 || (_m$type = m.type) === null || _m$type === void 0 ? void 0 : _m$type.name) === MARK_LINK;
+      });
+      if (!linkMark) {
+        return false;
+      }
+      var pluginView = view.dom._linkTooltipView;
+      return pluginView === null || pluginView === void 0 ? void 0 : pluginView._handleClick(view, linkMark);
     }
   },
   view: function view(editorView) {
@@ -131,7 +146,7 @@ var LinkTooltipView = /*#__PURE__*/function () {
         if ((_this$_view2 = _this._view) !== null && _this$_view2 !== void 0 && (_this$_view2 = _this$_view2.runtime) !== null && _this$_view2 !== void 0 && _this$_view2.openLinkDialog && urlObj.hostname !== window.location.hostname) {
           _this._view.runtime.openLinkDialog(url, popupString);
         } else {
-          window.open(url);
+          window.open(url, '_blank', 'noopener,noreferrer');
         }
       }
     });
@@ -181,37 +196,19 @@ var LinkTooltipView = /*#__PURE__*/function () {
     }
   }, {
     key: "_handleClick",
-    value: function _handleClick(event) {
-      var state = this.dom._linkTooltipView._view.state;
-      var doc = state.doc,
-        selection = state.selection,
-        schema = state.schema;
-      var from = selection.from,
-        to = selection.to;
-      var markType = schema.marks[MARK_LINK];
-      var result = findNodesWithSameMark(doc, from, to, markType);
-      if (!result) {
-        return false;
-      }
-      var domFound = this.dom._linkTooltipView._view.domAtPos(from);
-      if (!domFound) {
-        return false;
-      }
-      var anchor = lookUpElement(domFound.node, function (el) {
-        return el.nodeName === 'A';
-      });
-      if (!anchor) {
-        return false;
-      }
-      var href = anchor.getAttribute('href');
-      var selectionId = anchor.getAttribute('selectionid');
-      var tocItemPos = this.dom._linkTooltipView.getInnerlinkSelected_position(this.dom._linkTooltipView._view, result.mark.attrs.selectionId);
-      if (null === tocItemPos) {
-        this.dom._linkTooltipView.openSelectedSection(selectionId);
-        event.preventDefault(); // prevent default browser navigation
-        return true;
+    value: function _handleClick(view, mark) {
+      var href = mark.attrs['href'];
+      var selectionId = mark.attrs['selectionId'];
+      var tocItemPos = null;
+      if (selectionId) {
+        tocItemPos = this.getInnerlinkSelected_position(view, mark.attrs.selectionId);
+        if (null === tocItemPos) {
+          this.openSelectedSection(selectionId);
+          event.preventDefault(); // prevent default browser navigation
+          return true;
+        }
       }
-      this.dom._linkTooltipView.jumpLink(this.dom._linkTooltipView._view, tocItemPos, href, selectionId);
+      this.jumpLink(view, tocItemPos, href, selectionId);
       event.preventDefault(); // prevent default browser navigation
       return true;
     }