@modusoperandi/licit 0.1.7 → 0.1.10

package/src/ListToggleCommand.js

@@ -1,77 +1,77 @@
-// @flow
-
-import { EditorState } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { findParentNodeOfType } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-
-import { BULLET_LIST, ORDERED_LIST, IMAGE } from './NodeNames';
-import noop from './noop';
-import toggleList from './toggleList';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import isNodeSelectionForNodeType from './isNodeSelectionForNodeType';
-
-export class ListToggleCommand extends UICommand {
-  _ordered: boolean;
-  _orderedListType: string;
-
-  constructor(ordered: boolean, type: string) {
-    super();
-    this._ordered = ordered;
-    this._orderedListType = type;
-  }
-
-  isActive = (state: EditorState): boolean => {
-    let bOK = false;
-    if (this._ordered) {
-      bOK = !!this._findList(state, ORDERED_LIST);
-    } else {
-      bOK = !!this._findList(state, BULLET_LIST);
-    }
-    return bOK;
-  };
-
-  isEnabled = (state: EditorState, view: ?EditorView): boolean => {
-    let bOK = false;
-    bOK = hasImageNode(state);
-    return !bOK;
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { selection, schema } = state;
-    const nodeType = schema.nodes[this._ordered ? ORDERED_LIST : BULLET_LIST];
-    let { tr } = state;
-    tr = tr.setSelection(selection);
-    if (!nodeType) {
-      return tr;
-    }
-    tr = toggleList(tr, schema, nodeType, this._orderedListType);
-    if (tr.docChanged) {
-      dispatch && dispatch(tr);
-      return true;
-    } else {
-      return false;
-    }
-  };
-
-  _findList(state: EditorState, type: string): ?Object {
-    const { nodes } = state.schema;
-    const list = nodes[type];
-    const findList = list ? findParentNodeOfType(list) : noop;
-    return findList(state.selection);
-  }
-
-
-}
-
-// [FS] IRAD-1317 2021-05-06
-// To disable the list menu in toolbar when select an image
-export function hasImageNode(state: EditorState) {
-  const { selection, schema } = state;
-  const imageNodeType = schema.nodes[IMAGE];
-  return imageNodeType && isNodeSelectionForNodeType(selection, imageNodeType);
-}
+// @flow
+
+import { EditorState } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { findParentNodeOfType } from 'prosemirror-utils';
+import { EditorView } from 'prosemirror-view';
+
+import { BULLET_LIST, ORDERED_LIST, IMAGE } from './NodeNames';
+import noop from './noop';
+import toggleList from './toggleList';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import isNodeSelectionForNodeType from './isNodeSelectionForNodeType';
+
+export class ListToggleCommand extends UICommand {
+  _ordered: boolean;
+  _orderedListType: string;
+
+  constructor(ordered: boolean, type: string) {
+    super();
+    this._ordered = ordered;
+    this._orderedListType = type;
+  }
+
+  isActive = (state: EditorState): boolean => {
+    let bOK = false;
+    if (this._ordered) {
+      bOK = !!this._findList(state, ORDERED_LIST);
+    } else {
+      bOK = !!this._findList(state, BULLET_LIST);
+    }
+    return bOK;
+  };
+
+  isEnabled = (state: EditorState, view: ?EditorView): boolean => {
+    let bOK = false;
+    bOK = hasImageNode(state);
+    return !bOK;
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { selection, schema } = state;
+    const nodeType = schema.nodes[this._ordered ? ORDERED_LIST : BULLET_LIST];
+    let { tr } = state;
+    tr = tr.setSelection(selection);
+    if (!nodeType) {
+      return tr;
+    }
+    tr = toggleList(tr, schema, nodeType, this._orderedListType);
+    if (tr.docChanged) {
+      dispatch && dispatch(tr);
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  _findList(state: EditorState, type: string): ?Object {
+    const { nodes } = state.schema;
+    const list = nodes[type];
+    const findList = list ? findParentNodeOfType(list) : noop;
+    return findList(state.selection);
+  }
+
+
+}
+
+// [FS] IRAD-1317 2021-05-06
+// To disable the list menu in toolbar when select an image
+export function hasImageNode(state: EditorState) {
+  const { selection, schema } = state;
+  const imageNodeType = schema.nodes[IMAGE];
+  return imageNodeType && isNodeSelectionForNodeType(selection, imageNodeType);
+}

package/src/MarkNames.js

@@ -1,18 +1,18 @@
-// @flow
-
-// https://github.com/ProseMirror/prosemirror-schema-basic/blob/master/src/schema-basic.js
-export const MARK_CODE = 'code';
-export const MARK_EM = 'em';
-export const MARK_FONT_SIZE = 'mark-font-size';
-export const MARK_FONT_TYPE = 'mark-font-type';
-export const MARK_LINK = 'link';
-export const MARK_NO_BREAK = 'mark-no-break';
-export const MARK_STRIKE = 'strike';
-export const MARK_STRONG = 'strong';
-export const MARK_SUPER = 'super';
-export const MARK_SUB = 'sub';
-export const MARK_TEXT_COLOR = 'mark-text-color';
-export const MARK_TEXT_HIGHLIGHT = 'mark-text-highlight';
-export const MARK_TEXT_SELECTION = 'mark-text-selection';
-export const MARK_UNDERLINE = 'underline';
-export const MARK_SPACER = 'spacer';
+// @flow
+
+// https://github.com/ProseMirror/prosemirror-schema-basic/blob/master/src/schema-basic.js
+export const MARK_CODE = 'code';
+export const MARK_EM = 'em';
+export const MARK_FONT_SIZE = 'mark-font-size';
+export const MARK_FONT_TYPE = 'mark-font-type';
+export const MARK_LINK = 'link';
+export const MARK_NO_BREAK = 'mark-no-break';
+export const MARK_STRIKE = 'strike';
+export const MARK_STRONG = 'strong';
+export const MARK_SUPER = 'super';
+export const MARK_SUB = 'sub';
+export const MARK_TEXT_COLOR = 'mark-text-color';
+export const MARK_TEXT_HIGHLIGHT = 'mark-text-highlight';
+export const MARK_TEXT_SELECTION = 'mark-text-selection';
+export const MARK_UNDERLINE = 'underline';
+export const MARK_SPACER = 'spacer';

package/src/MarkToggleCommand.js

@@ -1,66 +1,66 @@
-// @flow
-
-import { toggleMark } from 'prosemirror-commands';
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-import findNodesWithSameMark from './findNodesWithSameMark';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-class MarkToggleCommand extends UICommand {
-  _markName: string;
-
-  constructor(markName: string) {
-    super();
-    this._markName = markName;
-  }
-
-  isActive = (state: EditorState): boolean => {
-    const { schema, doc, selection } = state;
-    const { from, to } = selection;
-    const markType = schema.marks[this._markName];
-    if (markType && from < to) {
-      return !!findNodesWithSameMark(doc, from, to - 1, markType);
-    }
-    return false;
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { schema, selection, tr } = state;
-    const markType = schema.marks[this._markName];
-    if (!markType) {
-      return false;
-    }
-
-    if (selection.empty && !(selection instanceof TextSelection)) {
-      return false;
-    }
-
-    const { from, to } = selection;
-    if (tr && to === from + 1) {
-      const node = tr.doc.nodeAt(from);
-      if (node.isAtom && !node.isText && node.isLeaf) {
-        // An atomic node (e.g. Image) is selected.
-        return false;
-      }
-    }
-
-    // TODO: Replace `toggleMark` with transform that does not change scroll
-    // position.
-    return toggleMark(markType)(state, dispatch, view);
-  };
-
-
-
-
-}
-
-
-
-
-
-export default MarkToggleCommand;
+// @flow
+
+import { toggleMark } from 'prosemirror-commands';
+import { EditorState, TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import findNodesWithSameMark from './findNodesWithSameMark';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+class MarkToggleCommand extends UICommand {
+  _markName: string;
+
+  constructor(markName: string) {
+    super();
+    this._markName = markName;
+  }
+
+  isActive = (state: EditorState): boolean => {
+    const { schema, doc, selection } = state;
+    const { from, to } = selection;
+    const markType = schema.marks[this._markName];
+    if (markType && from < to) {
+      return !!findNodesWithSameMark(doc, from, to - 1, markType);
+    }
+    return false;
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { schema, selection, tr } = state;
+    const markType = schema.marks[this._markName];
+    if (!markType) {
+      return false;
+    }
+
+    if (selection.empty && !(selection instanceof TextSelection)) {
+      return false;
+    }
+
+    const { from, to } = selection;
+    if (tr && to === from + 1) {
+      const node = tr.doc.nodeAt(from);
+      if (node.isAtom && !node.isText && node.isLeaf) {
+        // An atomic node (e.g. Image) is selected.
+        return false;
+      }
+    }
+
+    // TODO: Replace `toggleMark` with transform that does not change scroll
+    // position.
+    return toggleMark(markType)(state, dispatch, view);
+  };
+
+
+
+
+}
+
+
+
+
+
+export default MarkToggleCommand;

package/src/MarksClearCommand.js

@@ -1,42 +1,42 @@
-// @flow
-
-import { EditorState, AllSelection, TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-
-import { clearMarks, clearHeading } from './clearMarks';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-class MarksClearCommand extends UICommand {
-  isActive = (state: EditorState): boolean => {
-    return false;
-  };
-
-  isEnabled = (state: EditorState) => {
-    const { selection } = state;
-    return (
-      !selection.empty &&
-      (selection instanceof TextSelection || selection instanceof AllSelection)
-    );
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    let tr = clearMarks(state.tr.setSelection(state.selection), state.schema);
-    // [FS] IRAD-948 2021-02-22
-
-    // Clear Header formatting
-    tr = clearHeading(tr, state.schema);
-
-    if (dispatch && tr.docChanged) {
-      dispatch(tr);
-      return true;
-    }
-    return false;
-  };
-}
-
-export default MarksClearCommand;
+// @flow
+
+import { EditorState, AllSelection, TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+
+import { clearMarks, clearHeading } from './clearMarks';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+class MarksClearCommand extends UICommand {
+  isActive = (state: EditorState): boolean => {
+    return false;
+  };
+
+  isEnabled = (state: EditorState) => {
+    const { selection } = state;
+    return (
+      !selection.empty &&
+      (selection instanceof TextSelection || selection instanceof AllSelection)
+    );
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    let tr = clearMarks(state.tr.setSelection(state.selection), state.schema);
+    // [FS] IRAD-948 2021-02-22
+
+    // Clear Header formatting
+    tr = clearHeading(tr, state.schema);
+
+    if (dispatch && tr.docChanged) {
+      dispatch(tr);
+      return true;
+    }
+    return false;
+  };
+}
+
+export default MarksClearCommand;

package/src/MathEditCommand.js

@@ -1,110 +1,110 @@
-// @flow
-
-import { Fragment, Schema } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-// eslint-disable-next-line no-unused-vars
-import * as React from 'react';
-
-import {
-  hideCursorPlaceholder,
-  showCursorPlaceholder,
-} from './CursorPlaceholderPlugin';
-import { MATH } from './NodeNames';
-import MathEditor from './ui/MathEditor';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import createPopUp from './ui/createPopUp';
-
-function insertMath(tr: Transform, schema: Schema, latex: ?string): Transform {
-  const { selection } = tr;
-  if (!selection) {
-    return tr;
-  }
-  const { from, to } = selection;
-  if (from !== to) {
-    return tr;
-  }
-
-  const image = schema.nodes[MATH];
-  if (!image) {
-    return tr;
-  }
-
-  const attrs = {
-    latex,
-  };
-
-  const node = image.create(attrs, null, null);
-  const frag = Fragment.from(node);
-  tr = tr.insert(from, frag);
-  return tr;
-}
-
-class MathEditCommand extends UICommand {
-  _popUp = null;
-
-  isEnabled = (state: EditorState, view: ?EditorView): boolean => {
-    const tr = state;
-    const { selection } = tr;
-    if (selection instanceof TextSelection) {
-      return selection.from === selection.to;
-    }
-    return false;
-  };
-
-  waitForUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (this._popUp) {
-      return Promise.resolve(undefined);
-    }
-
-    if (dispatch) {
-      dispatch(showCursorPlaceholder(state));
-    }
-
-    return new Promise((resolve) => {
-      const props = {
-        runtime: view ? view.runtime : null,
-        initialValue: null,
-      };
-      this._popUp = createPopUp(MathEditor, props, {
-        modal: true,
-        onClose: (val) => {
-          if (this._popUp) {
-            this._popUp = null;
-            resolve(val);
-          }
-        },
-      });
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    latex: ?string
-  ): boolean => {
-    if (dispatch) {
-      const { selection, schema } = state;
-      let { tr } = state;
-      tr = view ? hideCursorPlaceholder(view.state) : tr;
-      tr = tr.setSelection(selection);
-      if (latex) {
-        tr = insertMath(tr, schema, latex);
-      }
-      dispatch(tr);
-      view && view.focus();
-    }
-
-    return false;
-  };
-}
-
-export default MathEditCommand;
+// @flow
+
+import { Fragment, Schema } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+import { TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+// eslint-disable-next-line no-unused-vars
+import * as React from 'react';
+
+import {
+  hideCursorPlaceholder,
+  showCursorPlaceholder,
+} from './CursorPlaceholderPlugin';
+import { MATH } from './NodeNames';
+import MathEditor from './ui/MathEditor';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import createPopUp from './ui/createPopUp';
+
+function insertMath(tr: Transform, schema: Schema, latex: ?string): Transform {
+  const { selection } = tr;
+  if (!selection) {
+    return tr;
+  }
+  const { from, to } = selection;
+  if (from !== to) {
+    return tr;
+  }
+
+  const image = schema.nodes[MATH];
+  if (!image) {
+    return tr;
+  }
+
+  const attrs = {
+    latex,
+  };
+
+  const node = image.create(attrs, null, null);
+  const frag = Fragment.from(node);
+  tr = tr.insert(from, frag);
+  return tr;
+}
+
+class MathEditCommand extends UICommand {
+  _popUp = null;
+
+  isEnabled = (state: EditorState, view: ?EditorView): boolean => {
+    const tr = state;
+    const { selection } = tr;
+    if (selection instanceof TextSelection) {
+      return selection.from === selection.to;
+    }
+    return false;
+  };
+
+  waitForUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (this._popUp) {
+      return Promise.resolve(undefined);
+    }
+
+    if (dispatch) {
+      dispatch(showCursorPlaceholder(state));
+    }
+
+    return new Promise((resolve) => {
+      const props = {
+        runtime: view ? view.runtime : null,
+        initialValue: null,
+      };
+      this._popUp = createPopUp(MathEditor, props, {
+        modal: true,
+        onClose: (val) => {
+          if (this._popUp) {
+            this._popUp = null;
+            resolve(val);
+          }
+        },
+      });
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    latex: ?string
+  ): boolean => {
+    if (dispatch) {
+      const { selection, schema } = state;
+      let { tr } = state;
+      tr = view ? hideCursorPlaceholder(view.state) : tr;
+      tr = tr.setSelection(selection);
+      if (latex) {
+        tr = insertMath(tr, schema, latex);
+      }
+      dispatch(tr);
+      view && view.focus();
+    }
+
+    return false;
+  };
+}
+
+export default MathEditCommand;