@modusoperandi/licit 0.1.4 → 0.1.8

package/dist/TextHighlightCommand.js.flow

@@ -1,110 +1,91 @@
-// @flow
-
-import ColorEditor from './ui/ColorEditor';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import applyMark from './applyMark';
-import createPopUp from './ui/createPopUp';
-import findNodesWithSameMark from './findNodesWithSameMark';
-import isTextStyleMarkCommandEnabled from './isTextStyleMarkCommandEnabled';
-import nullthrows from 'nullthrows';
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-import { MARK_TEXT_HIGHLIGHT } from './MarkNames';
-import { Transform } from 'prosemirror-transform';
-
-class TextHighlightCommand extends UICommand {
-  _popUp = null;
-  _color = '';
-
-  constructor(color: ?string) {
-    super();
-    this._color = color;
-  }
-  isEnabled = (state: EditorState): boolean => {
-    return isTextStyleMarkCommandEnabled(state, MARK_TEXT_HIGHLIGHT);
-  };
-
-  waitForUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): Promise<any> => {
-    if (this._popUp) {
-      return Promise.resolve(undefined);
-    }
-    const target = nullthrows(event).currentTarget;
-    if (!(target instanceof HTMLElement)) {
-      return Promise.resolve(undefined);
-    }
-
-    const { doc, selection, schema } = state;
-    const markType = schema.marks[MARK_TEXT_HIGHLIGHT];
-    const { from, to } = selection;
-    const result = findNodesWithSameMark(doc, from, to, markType);
-    const hex = result ? result.mark.attrs.highlightColor : null;
-    const anchor = event ? event.currentTarget : null;
-    return new Promise((resolve) => {
-      this._popUp = createPopUp(
-        ColorEditor,
-        { hex },
-        {
-          anchor,
-          onClose: (val) => {
-            if (this._popUp) {
-              this._popUp = null;
-              resolve(val);
-            }
-          },
-        }
-      );
-    });
-  };
-
-  executeWithUserInput = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    color: ?string
-  ): boolean => {
-    if (dispatch && color !== undefined) {
-      const { schema } = state;
-      let { tr } = state;
-      const markType = schema.marks[MARK_TEXT_HIGHLIGHT];
-      const attrs = color ? { highlightColor: color } : null;
-      // tr = applyMark(tr.setSelection(state.selection), schema, markType, attrs);
-      tr = applyMark(tr, schema, markType, attrs);
-      if (tr.docChanged || tr.storedMarksSet) {
-        // If selection is empty, the color is added to `storedMarks`, which
-        // works like `toggleMark`
-        // (see https://prosemirror.net/docs/ref/#commands.toggleMark).
-        dispatch(tr);
-        return true;
-      }
-    }
-    return false;
-  };
-
-  // [FS] IRAD-1087 2020-09-30
-  // Method to execute custom styling implementation of Text Highlight
-  executeCustom = (
-    state: EditorState,
-    tr: Transform,
-    from: number,
-    to: number
-  ): Transform => {
-    const { schema } = state;
-    const markType = schema.marks[MARK_TEXT_HIGHLIGHT];
-    const attrs = { highlightColor: this._color };
-    tr = applyMark(
-      tr.setSelection(TextSelection.create(tr.doc, from, to)),
-      schema,
-      markType,
-      attrs
-    );
-
-    return tr;
-  };
-}
-
-export default TextHighlightCommand;
+// @flow
+
+import ColorEditor from './ui/ColorEditor';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import applyMark from './applyMark';
+import createPopUp from './ui/createPopUp';
+import findNodesWithSameMark from './findNodesWithSameMark';
+import isTextStyleMarkCommandEnabled from './isTextStyleMarkCommandEnabled';
+import nullthrows from 'nullthrows';
+import { EditorState } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
+import { MARK_TEXT_HIGHLIGHT } from './MarkNames';
+import { Transform } from 'prosemirror-transform';
+
+class TextHighlightCommand extends UICommand {
+  _popUp = null;
+  _color = '';
+
+  constructor(color: ?string) {
+    super();
+    this._color = color;
+  }
+  isEnabled = (state: EditorState): boolean => {
+    return isTextStyleMarkCommandEnabled(state, MARK_TEXT_HIGHLIGHT);
+  };
+
+  waitForUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): Promise<any> => {
+    if (this._popUp) {
+      return Promise.resolve(undefined);
+    }
+    const target = nullthrows(event).currentTarget;
+    if (!(target instanceof HTMLElement)) {
+      return Promise.resolve(undefined);
+    }
+
+    const { doc, selection, schema } = state;
+    const markType = schema.marks[MARK_TEXT_HIGHLIGHT];
+    const { from, to } = selection;
+    const result = findNodesWithSameMark(doc, from, to, markType);
+    const hex = result ? result.mark.attrs.highlightColor : null;
+    const anchor = event ? event.currentTarget : null;
+    return new Promise((resolve) => {
+      this._popUp = createPopUp(
+        ColorEditor,
+        { hex },
+        {
+          anchor,
+          onClose: (val) => {
+            if (this._popUp) {
+              this._popUp = null;
+              resolve(val);
+            }
+          },
+        }
+      );
+    });
+  };
+
+  executeWithUserInput = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    color: ?string
+  ): boolean => {
+    if (dispatch && color !== undefined) {
+      const { schema } = state;
+      let { tr } = state;
+      const markType = schema.marks[MARK_TEXT_HIGHLIGHT];
+      const attrs = color ? { highlightColor: color } : null;
+      // tr = applyMark(tr.setSelection(state.selection), schema, markType, attrs);
+      tr = applyMark(tr, schema, markType, attrs);
+      if (tr.docChanged || tr.storedMarksSet) {
+        // If selection is empty, the color is added to `storedMarks`, which
+        // works like `toggleMark`
+        // (see https://prosemirror.net/docs/ref/#commands.toggleMark).
+        dispatch(tr);
+        return true;
+      }
+    }
+    return false;
+  };
+
+
+}
+
+export default TextHighlightCommand;

package/dist/TextHighlightMarkSpec.js.flow

@@ -1,38 +1,38 @@
-// @flow
-
-import { Node } from 'prosemirror-model';
-
-import { isTransparent, toCSSColor } from './ui/toCSSColor';
-
-import type { MarkSpec } from './Types';
-
-const TextHighlightMarkSpec: MarkSpec = {
-  attrs: {
-    highlightColor: '',
-  },
-  inline: true,
-  group: 'inline',
-  parseDOM: [
-    {
-      tag: 'span[style*=background-color]',
-      getAttrs: (dom: HTMLElement) => {
-        const {backgroundColor} = dom.style;
-        const color = toCSSColor(backgroundColor);
-        return {
-          highlightColor: isTransparent(color) ? '' : color,
-        };
-      },
-    },
-  ],
-
-  toDOM(node: Node) {
-    const {highlightColor} = node.attrs;
-    let style = '';
-    if (highlightColor) {
-      style += `background-color: ${highlightColor};`;
-    }
-    return ['span', {style}, 0];
-  },
-};
-
-export default TextHighlightMarkSpec;
+// @flow
+
+import { Node } from 'prosemirror-model';
+
+import { isTransparent, toCSSColor } from './ui/toCSSColor';
+
+import type { MarkSpec } from './Types';
+
+const TextHighlightMarkSpec: MarkSpec = {
+  attrs: {
+    highlightColor: '',
+  },
+  inline: true,
+  group: 'inline',
+  parseDOM: [
+    {
+      tag: 'span[style*=background-color]',
+      getAttrs: (dom: HTMLElement) => {
+        const {backgroundColor} = dom.style;
+        const color = toCSSColor(backgroundColor);
+        return {
+          highlightColor: isTransparent(color) ? '' : color,
+        };
+      },
+    },
+  ],
+
+  toDOM(node: Node) {
+    const {highlightColor} = node.attrs;
+    let style = '';
+    if (highlightColor) {
+      style += `background-color: ${highlightColor};`;
+    }
+    return ['span', {style}, 0];
+  },
+};
+
+export default TextHighlightMarkSpec;

package/dist/TextInsertTabSpaceCommand.js

@@ -25,8 +25,6 @@ var _applyMark = _interopRequireDefault(require("./applyMark"));
 
 var _licitDocAttrsStep = require("@modusoperandi/licit-doc-attrs-step");
 
-var _CustomStyleCommand = require("./CustomStyleCommand");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -59,15 +57,14 @@ function insertTabSpace(state, tr, schema) {
     from,
     to
   } = selection;
-  const styleLevel = (0, _CustomStyleCommand.getStyleLevel)(found.node.attrs.styleName);
 
-  if (found.node.type === listItem && found.pos === from - 2 && !styleLevel) {
+  if (found.node.type === listItem && found.pos === from - 2) {
     // Cursur is at the begin of the list-item, let the default indentation
     // behavior happen.
     return tr;
   }
 
-  if (found.node.type === paragraph && found.pos === from - 1 && styleLevel) {
+  if (found.node.type === paragraph && found.pos === from - 1) {
     return tr;
   }
 

package/dist/TextInsertTabSpaceCommand.js.flow

@@ -1,85 +1,83 @@
-// @flow
-
-import { Fragment, Schema } from 'prosemirror-model';
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { findParentNodeOfType } from 'prosemirror-utils';
-import { EditorView } from 'prosemirror-view';
-import { MARK_SPACER } from './MarkNames';
-import { HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
-import { HAIR_SPACE_CHAR, SPACER_SIZE_TAB } from './SpacerMarkSpec';
-import applyMark from './applyMark';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { getStyleLevel } from './CustomStyleCommand';
-
-function insertTabSpace(
-  state: EditorState,
-  tr: Transform,
-  schema: Schema
-): Transform {
-  const { selection } = tr;
-  if (!selection.empty || !(selection instanceof TextSelection)) {
-    return tr;
-  }
-
-  const markType = schema.marks[MARK_SPACER];
-  if (!markType) {
-    return tr;
-  }
-  const paragraph = schema.nodes[PARAGRAPH];
-  const heading = schema.nodes[HEADING];
-  const listItem = schema.nodes[LIST_ITEM];
-
-  const found =
-    (listItem && findParentNodeOfType(listItem)(selection)) ||
-    (paragraph && findParentNodeOfType(paragraph)(selection)) ||
-    (heading && findParentNodeOfType(heading)(selection));
-
-  if (!found) {
-    return tr;
-  }
-
-  const { from, to } = selection;
-  const styleLevel = getStyleLevel(found.node.attrs.styleName);
-  if (found.node.type === listItem && found.pos === from - 2 && !styleLevel) {
-    // Cursur is at the begin of the list-item, let the default indentation
-    // behavior happen.
-    return tr;
-  }
-
-  if (found.node.type === paragraph && found.pos === from - 1 && styleLevel) {
-    return tr;
-  }
-  const textNode = schema.text(HAIR_SPACE_CHAR);
-  tr = tr.insert(to, Fragment.from(textNode));
-  const attrs = {
-    size: SPACER_SIZE_TAB,
-  };
-
-  tr = tr.setSelection(TextSelection.create(tr.doc, to, to + 1));
-
-  tr = applyMark(tr, schema, markType, attrs);
-
-  tr = tr.setSelection(TextSelection.create(tr.doc, to + 1, to + 1));
-
-  return tr;
-}
-
-class TextInsertTabSpaceCommand extends UICommand {
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView,
-    event: ?SyntheticEvent<>
-  ): boolean => {
-    const { schema, tr } = state;
-    const trNext = insertTabSpace(state, tr, schema);
-    if (trNext.docChanged) {
-      dispatch && dispatch(trNext);
-      return true;
-    }
-    return false;
-  };
-}
-
-export default TextInsertTabSpaceCommand;
+// @flow
+
+import { Fragment, Schema } from 'prosemirror-model';
+import { EditorState, TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { findParentNodeOfType } from 'prosemirror-utils';
+import { EditorView } from 'prosemirror-view';
+import { MARK_SPACER } from './MarkNames';
+import { HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
+import { HAIR_SPACE_CHAR, SPACER_SIZE_TAB } from './SpacerMarkSpec';
+import applyMark from './applyMark';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+function insertTabSpace(
+  state: EditorState,
+  tr: Transform,
+  schema: Schema
+): Transform {
+  const { selection } = tr;
+  if (!selection.empty || !(selection instanceof TextSelection)) {
+    return tr;
+  }
+
+  const markType = schema.marks[MARK_SPACER];
+  if (!markType) {
+    return tr;
+  }
+  const paragraph = schema.nodes[PARAGRAPH];
+  const heading = schema.nodes[HEADING];
+  const listItem = schema.nodes[LIST_ITEM];
+
+  const found =
+    (listItem && findParentNodeOfType(listItem)(selection)) ||
+    (paragraph && findParentNodeOfType(paragraph)(selection)) ||
+    (heading && findParentNodeOfType(heading)(selection));
+
+  if (!found) {
+    return tr;
+  }
+
+  const { from, to } = selection;
+  if (found.node.type === listItem && found.pos === from - 2) {
+    // Cursur is at the begin of the list-item, let the default indentation
+    // behavior happen.
+    return tr;
+  }
+
+  if (found.node.type === paragraph && found.pos === from - 1) {
+    return tr;
+  }
+  const textNode = schema.text(HAIR_SPACE_CHAR);
+  tr = tr.insert(to, Fragment.from(textNode));
+  const attrs = {
+    size: SPACER_SIZE_TAB,
+  };
+
+  tr = tr.setSelection(TextSelection.create(tr.doc, to, to + 1));
+
+  tr = applyMark(tr, schema, markType, attrs);
+
+  tr = tr.setSelection(TextSelection.create(tr.doc, to + 1, to + 1));
+
+  return tr;
+}
+
+class TextInsertTabSpaceCommand extends UICommand {
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView,
+    event: ?SyntheticEvent<>
+  ): boolean => {
+    const { schema, tr } = state;
+    const trNext = insertTabSpace(state, tr, schema);
+    if (trNext.docChanged) {
+      dispatch && dispatch(trNext);
+      return true;
+    }
+    return false;
+  };
+}
+
+export default TextInsertTabSpaceCommand;