@modusoperandi/licit 1.0.4 → 1.0.7

package/ui/CustomNodeView.js.flow

@@ -1,200 +1,207 @@
-// @xflow
-
-import { Node } from 'prosemirror-model';
-import { Decoration, EditorView } from 'prosemirror-view';
-import * as React from 'react';
-import ReactDOM from 'react-dom';
-
-import SelectionObserver from './SelectionObserver.js';
-
-export type NodeViewProps = {
-  editorView: EditorView,
-  getPos: () => number,
-  node: Node,
-  selected: boolean,
-  focused: boolean,
-};
-
-// Standard className for selected node.
-const SELECTED_NODE_CLASS_NAME = 'ProseMirror-selectednode';
-
-const mountedViews = new Set();
-const pendingViews = new Set();
-
-function onMutation(mutations: any, observer: MutationObserver): void {
-  const root = document.body;
-  if (!root) {
-    return;
-  }
-
-  const mountingViews = [];
-  for (const view of pendingViews) {
-    const el = view.dom;
-    if (root.contains(el)) {
-      pendingViews.delete(view);
-      mountingViews.push(view);
-      view.__renderReactComponent();
-    }
-  }
-
-  for (const view of mountedViews) {
-    const el = view.dom;
-    if (!root.contains(el)) {
-      mountedViews.delete(el);
-      ReactDOM.unmountComponentAtNode(el);
-    }
-  }
-
-  mountingViews.forEach((view) => mountedViews.add(view));
-
-  if (mountedViews.size === 0) {
-    observer.disconnect();
-  }
-}
-
-// Workaround to get in-selection views selected.
-// See https://discuss.prosemirror.net/t/copy-selection-issue-with-the-image-node/1673/2;
-function onSelection(entries: Array<any>, observer: SelectionObserver): void {
-  if (!window.getSelection) {
-    console.warn('window.getSelection() is not supported');
-    observer.disconnect();
-    return;
-  }
-
-  const selection = window.getSelection();
-  if (!selection.containsNode) {
-    console.warn('selection.containsNode() is not supported');
-    observer.disconnect();
-    return;
-  }
-
-  for (const view of mountedViews) {
-    const el = view.dom;
-    if (selection.containsNode(el)) {
-      view.selectNode();
-    } else {
-      view.deselectNode();
-    }
-  }
-
-  if (mountedViews.size === 0) {
-    observer.disconnect();
-  }
-}
-
-const selectionObserver = new SelectionObserver(onSelection);
-const mutationObserver = new MutationObserver(onMutation);
-
-// This implements the `NodeView` interface and renders a Node with a react
-// Component.
-// https://prosemirror.net/docs/ref/#view.NodeView
-// https://github.com/ProseMirror/prosemirror-view/blob/master/src/viewdesc.js#L429
-class CustomNodeView {
-  dom: HTMLElement;
-
-  props: NodeViewProps;
-
-  _selected: null;
-
-  constructor(
-    node: Node,
-    editorView: EditorView,
-    getPos: () => number,
-    decorations: Array<Decoration>
-  ) {
-    this.props = {
-      decorations,
-      editorView,
-      getPos,
-      node,
-      selected: false,
-      focused: false,
-    };
-
-    pendingViews.add(this);
-
-    // The editor will use this as the node's DOM representation
-    const dom = this.createDOMElement();
-    this.dom = dom;
-    dom.onClick = this._onClick;
-
-    if (pendingViews.size === 1) {
-      // [FS] IRAD-1060 2020-09-10
-      // Observe the editorview's dom insteadof root document so that
-      // if multiple instances of editor in a page shouldn't cross-talk
-      mutationObserver.observe(/*document*/ editorView.dom, {
-        childList: true,
-        subtree: true,
-      });
-      selectionObserver.observe(/*document*/ editorView.dom);
-    }
-  }
-
-  update(node: Node, decorations: Array<Decoration>): boolean {
-    this.props = {
-      ...this.props,
-      node,
-    };
-    this.__renderReactComponent();
-    return true;
-  }
-
-  stopEvent(): boolean {
-    return false;
-  }
-
-  // Mark this node as being the selected node.
-  selectNode() {
-    this._selected = true;
-    this.dom.classList.add(SELECTED_NODE_CLASS_NAME);
-    this.__renderReactComponent();
-  }
-
-  // Remove selected node marking from this node.
-  deselectNode() {
-    this._selected = false;
-    this.dom.classList.remove(SELECTED_NODE_CLASS_NAME);
-    this.__renderReactComponent();
-  }
-
-  // This should be overwrite by subclass.
-  createDOMElement(): HTMLElement {
-    // The editor will use this as the node's DOM representation.
-    // return document.createElement('span');
-    throw new Error('not implemented');
-  }
-
-  // This should be overwrite by subclass.
-  renderReactComponent(): React.Element<any> {
-    // return <CustomNodeViewComponent {...this.props} />;
-    throw new Error('not implemented');
-  }
-
-  destroy(): void {
-    // Called when the node view is removed from the editor or the whole
-    // editor is destroyed.
-    // sub-class may override this method.
-    // [FS] IRAD-1555 2021-09-13
-    // When destroying the node view, remove from the set.
-    // FIX: This solves the image missing issue.
-    pendingViews.delete(this);
-  }
-
-  __renderReactComponent(): void {
-    const { editorView, getPos } = this.props;
-
-    if (editorView.state && editorView.state.selection) {
-      const { from } = editorView.state.selection;
-      const pos = getPos();
-      this.props.selected = this._selected;
-      this.props.focused = editorView.focused && pos === from;
-    } else {
-      this.props.selected = false;
-      this.props.focused = false;
-    }
-
-    ReactDOM.render(this.renderReactComponent(), this.dom);
-  }
-}
-
-export default CustomNodeView;
+import { Node } from 'prosemirror-model';
+import { Decoration, EditorView } from 'prosemirror-view';
+import * as React from 'react';
+import ReactDOM from 'react-dom/client';
+
+import SelectionObserver from './SelectionObserver.js';
+
+export type NodeViewProps = {
+  editorView: EditorView,
+  getPos: () => number,
+  node: Node,
+  selected: boolean,
+  focused: boolean,
+};
+
+// Standard className for selected node.
+const SELECTED_NODE_CLASS_NAME = 'ProseMirror-selectednode';
+
+const mountedViews = new Set();
+const pendingViews = new Set();
+
+function onMutation(mutations: any, observer: MutationObserver): void {
+  const root = document.body;
+  if (!root) {
+    return;
+  }
+
+  const mountingViews = [];
+  for (const view of pendingViews) {
+    const el = view.dom;
+    if (root.contains(el)) {
+      pendingViews.delete(view);
+      mountingViews.push(view);
+      view.__renderReactComponent();
+    }
+  }
+
+  for (const view of mountedViews) {
+    const el = view.dom;
+    if (!root.contains(el)) {
+      mountedViews.delete(el);
+      view.unmountReactComponent();
+    }
+  }
+
+  mountingViews.forEach((view) => mountedViews.add(view));
+
+  if (mountedViews.size === 0) {
+    observer.disconnect();
+  }
+}
+
+// Workaround to get in-selection views selected.
+// See https://discuss.prosemirror.net/t/copy-selection-issue-with-the-image-node/1673/2;
+function onSelection(entries: Array<any>, observer: SelectionObserver): void {
+  if (!window.getSelection) {
+    console.warn('window.getSelection() is not supported');
+    observer.disconnect();
+    return;
+  }
+
+  const selection = window.getSelection();
+  if (!selection.containsNode) {
+    console.warn('selection.containsNode() is not supported');
+    observer.disconnect();
+    return;
+  }
+
+  for (const view of mountedViews) {
+    const el = view.dom;
+    if (selection.containsNode(el)) {
+      view.selectNode();
+    } else {
+      view.deselectNode();
+    }
+  }
+
+  if (mountedViews.size === 0) {
+    observer.disconnect();
+  }
+}
+
+const selectionObserver = new SelectionObserver(onSelection);
+const mutationObserver = new MutationObserver(onMutation);
+
+// This implements the `NodeView` interface and renders a Node with a react
+// Component.
+// https://prosemirror.net/docs/ref/#view.NodeView
+// https://github.com/ProseMirror/prosemirror-view/blob/master/src/viewdesc.js#L429
+class CustomNodeView {
+  dom: HTMLElement;
+  props: NodeViewProps;
+  reactRoot: ReactDOM.Root | null = null;
+  _selected: null;
+
+  constructor(
+    node: Node,
+    editorView: EditorView,
+    getPos: () => number,
+    decorations: Array<Decoration>
+  ) {
+    this.props = {
+      decorations,
+      editorView,
+      getPos,
+      node,
+      selected: false,
+      focused: false,
+    };
+
+    pendingViews.add(this);
+
+    // The editor will use this as the node's DOM representation
+    const dom = this.createDOMElement();
+    this.dom = dom;
+    dom.onClick = this._onClick;
+
+    if (pendingViews.size === 1) {
+      // [FS] IRAD-1060 2020-09-10
+      // Observe the editorview's dom insteadof root document so that
+      // if multiple instances of editor in a page shouldn't cross-talk
+      mutationObserver.observe(/*document*/ editorView.dom, {
+        childList: true,
+        subtree: true,
+      });
+      selectionObserver.observe(/*document*/ editorView.dom);
+    }
+  }
+
+  update(node: Node, decorations: Array<Decoration>): boolean {
+    this.props = {
+      ...this.props,
+      node,
+    };
+    this.__renderReactComponent();
+    return true;
+  }
+
+  stopEvent(): boolean {
+    return false;
+  }
+
+  // Mark this node as being the selected node.
+  selectNode() {
+    this._selected = true;
+    this.dom.classList.add(SELECTED_NODE_CLASS_NAME);
+    this.__renderReactComponent();
+  }
+
+  // Remove selected node marking from this node.
+  deselectNode() {
+    this._selected = false;
+    this.dom.classList.remove(SELECTED_NODE_CLASS_NAME);
+    this.__renderReactComponent();
+  }
+
+  // This should be overwrite by subclass.
+  createDOMElement(): HTMLElement {
+    // The editor will use this as the node's DOM representation.
+    // return document.createElement('span');
+    throw new Error('not implemented');
+  }
+
+  // This should be overwrite by subclass.
+  renderReactComponent(): React.Element<any> {
+    throw new Error('not implemented');
+  }
+
+  destroy(): void {
+    // Called when the node view is removed from the editor or the whole
+    // editor is destroyed.
+    // sub-class may override this method.
+    // [FS] IRAD-1555 2021-09-13
+    // When destroying the node view, remove from the set.
+    // FIX: This solves the image missing issue.
+    pendingViews.delete(this);
+    this.unmountReactComponent();
+  }
+
+  __renderReactComponent(): void {
+    const { editorView, getPos } = this.props;
+
+    if (editorView.state?.selection) {
+      const { from } = editorView.state.selection;
+      const pos = getPos();
+      this.props.selected = this._selected;
+      this.props.focused = editorView.focused && pos === from;
+    } else {
+      this.props.selected = false;
+      this.props.focused = false;
+    }
+
+    if (!this.reactRoot) {
+      this.reactRoot = ReactDOM.createRoot(this.dom);
+    }
+    this.reactRoot.render(this.renderReactComponent());
+  }
+
+  unmountReactComponent(): void {
+    if (this.reactRoot) {
+      this.reactRoot.unmount();
+      this.reactRoot = null;
+    }
+  }
+}
+
+export default CustomNodeView;

package/ui/CustomRadioButton.js

@@ -1,30 +1,27 @@
 var _excluded = ["title", "className", "checked", "label", "inline", "name", "onSelect", "disabled"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import './czi-custom-radio-button.css';
-import { PointerSurface } from '@modusoperandi/licit-ui-commands';
+import { PointerSurface, preventEventDefault } from '@modusoperandi/licit-ui-commands';
 import * as React from 'react';
 import cx from 'classnames';
 import uuid from './uuid.js';
-import { preventEventDefault } from '@modusoperandi/licit-ui-commands';
-;
 var CustomRadioButton = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(CustomRadioButton, _React$PureComponent);
   function CustomRadioButton() {
     var _this;
     _classCallCheck(this, CustomRadioButton);
@@ -32,11 +29,12 @@ var CustomRadioButton = /*#__PURE__*/function (_React$PureComponent) {
       args[_key] = arguments[_key];
     }
     _this = _callSuper(this, CustomRadioButton, [].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "props", void 0);
-    _defineProperty(_assertThisInitialized(_this), "_name", uuid());
+    _defineProperty(_this, "props", void 0);
+    _defineProperty(_this, "_name", uuid());
     return _this;
   }
-  _createClass(CustomRadioButton, [{
+  _inherits(CustomRadioButton, _React$PureComponent);
+  return _createClass(CustomRadioButton, [{
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -73,6 +71,5 @@ var CustomRadioButton = /*#__PURE__*/function (_React$PureComponent) {
       }, label));
     }
   }]);
-  return CustomRadioButton;
 }(React.PureComponent);
 export default CustomRadioButton;

package/ui/CustomRadioButton.js.flow

@@ -1,65 +1,64 @@
-// @flow
-
-import './czi-custom-radio-button.css';
-import { PointerSurface } from '@modusoperandi/licit-ui-commands';
-import * as React from 'react';
-import cx from 'classnames';
-import uuid from './uuid.js';
-import { preventEventDefault } from '@modusoperandi/licit-ui-commands';
-
-import type { PointerSurfaceProps } from '@modusoperandi/licit-ui-commands';;
-
-class CustomRadioButton extends React.PureComponent<any, any> {
-  props: PointerSurfaceProps & {
-    checked?: ?boolean,
-    inline?: ?boolean,
-    label?: string | React.Element<any> | null,
-    name?: ?string,
-    onSelect?: ?(val: any, e: SyntheticEvent<>) => void,
-  };
-
-  _name = uuid();
-
-  render(): React.Element<any> {
-    const {
-      title,
-      className,
-      checked,
-      label,
-      inline,
-      name,
-      onSelect,
-      disabled,
-      ...pointerProps
-    } = this.props;
-
-    const klass = cx(className, 'czi-custom-radio-button', {
-      checked: checked,
-      inline: inline,
-    });
-
-    return (
-      <PointerSurface
-        {...pointerProps}
-        className={klass}
-        disabled={disabled}
-        onClick={onSelect}
-        title={title || label}
-      >
-        <input
-          checked={checked}
-          className="czi-custom-radio-button-input"
-          disabled={disabled}
-          name={name || this._name}
-          onChange={preventEventDefault}
-          tabIndex={disabled ? null : 0}
-          type="radio"
-        />
-        <span className="czi-custom-radio-button-icon" />
-        <span className="czi-custom-radio-button-label">{label}</span>
-      </PointerSurface>
-    );
-  }
-}
-
-export default CustomRadioButton;
+// @flow
+
+import './czi-custom-radio-button.css';
+import { PointerSurface, preventEventDefault } from '@modusoperandi/licit-ui-commands';
+import * as React from 'react';
+import cx from 'classnames';
+import uuid from './uuid.js';
+
+import type { PointerSurfaceProps } from '@modusoperandi/licit-ui-commands';
+
+class CustomRadioButton extends React.PureComponent<any, any> {
+  props: PointerSurfaceProps & {
+    checked?: ?boolean,
+    inline?: ?boolean,
+    label?: string | React.Element<any> | null,
+    name?: ?string,
+    onSelect?: ?(val: any, e: SyntheticEvent<>) => void,
+  };
+
+  _name = uuid();
+
+  render(): React.Element<any> {
+    const {
+      title,
+      className,
+      checked,
+      label,
+      inline,
+      name,
+      onSelect,
+      disabled,
+      ...pointerProps
+    } = this.props;
+
+    const klass = cx(className, 'czi-custom-radio-button', {
+      checked: checked,
+      inline: inline,
+    });
+
+    return (
+      <PointerSurface
+        {...pointerProps}
+        className={klass}
+        disabled={disabled}
+        onClick={onSelect}
+        title={title || label}
+      >
+        <input
+          checked={checked}
+          className="czi-custom-radio-button-input"
+          disabled={disabled}
+          name={name || this._name}
+          onChange={preventEventDefault}
+          tabIndex={disabled ? null : 0}
+          type="radio"
+        />
+        <span className="czi-custom-radio-button-icon" />
+        <span className="czi-custom-radio-button-label">{label}</span>
+      </PointerSurface>
+    );
+  }
+}
+
+export default CustomRadioButton;