@modusoperandi/licit 0.1.4 → 0.1.8

package/src/ListToggleCommand.js

@@ -1,117 +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, PARAGRAPH, IMAGE } from './NodeNames';
-import noop from './noop';
-import toggleList from './toggleList';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { getCustomStyleByName } from './customStyle';
-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 = hasCustomNumberedList(state) || 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-1087 2020-11-11
-  // New method to execute new styling implementation for List
-  //only x.x.x is handled here need to handle indent
-  executeCustom = (
-    state: EditorState,
-    tr: Transform,
-    from: number,
-    to: number
-  ): boolean => {
-    const { schema } = state;
-    const nodeType = schema.nodes[this._ordered ? ORDERED_LIST : BULLET_LIST];
-    if (!nodeType) {
-      return tr;
-    }
-    // tr = tr.setSelection(TextSelection.create(tr.doc, from, to));
-    tr = toggleList(tr, schema, nodeType, this._orderedListType);
-    return tr;
-  };
-}
-
-// [FS] IRAD-1216 2020-02-24
-// Disable the List when menu when the cursor is in custom numbered style
-export function hasCustomNumberedList(state: EditorState) {
-  let isNumberedList = false;
-  const { selection, schema } = state;
-  const text = schema.nodes[PARAGRAPH];
-  const result = findParentNodeOfType(text)(selection);
-  if (result && result.node.attrs) {
-    if (result.node.attrs.styleName && 'None' !== result.node.attrs.styleName) {
-      const style = getCustomStyleByName(result.node.attrs.styleName);
-      if (
-        style &&
-        style.styles &&
-        style.styles.styleLevel &&
-        style.styles.hasNumbering
-      )
-        isNumberedList = true;
-    }
-  }
-  return isNumberedList;
-}
-
-// [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,19 +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';
-export const MARK_CUSTOMSTYLES = 'custom-styles';
+// @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,168 +1,66 @@
-// @flow
-
-import { toggleMark } from 'prosemirror-commands';
-// import { Schema } from 'prosemirror-model';
-// import applyMark from './applyMark';
-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 } = state;
-    const { 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);
-    // tr = setMark(tr, schema, markType);
-    // if (tr.docChanged || tr.storedMarksSet) {
-    //   dispatch && dispatch(tr);
-    // }
-  };
-
-  // [FS] IRAD-1087 2020-09-30
-  // Method to execute strike, em, strong, underline,superscrpt for custom styling implementation.
-  executeCustom = (
-    state: EditorState,
-    tr: Transform,
-    posfrom: number,
-    posto: number
-  ) => {
-    const { schema, selection } = 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;
-      }
-    }
-
-    return toggleCustomStyle(markType, null, state, tr, posfrom, posto);
-  };
-}
-
-// [FS] IRAD-1042 2020-09-30
-// Fix: overrided the toggleMarks for custom style implementation
-// Return Transform object
-function toggleCustomStyle(
-  markType,
-  attrs,
-  state,
-  tr,
-  posfrom: number,
-  posto: number
-) {
-  const ref = state.selection;
-  const empty = ref.empty;
-  const $cursor = ref.$cursor;
-  const ranges = ref.ranges;
-  if ((empty && !$cursor) || !markApplies(state.doc, ranges, markType)) {
-    return tr;
-  }
-  if ($cursor && $cursor.parentOffset === 0 && posfrom === posto) {
-    if (markType.isInSet(state.storedMarks || $cursor.marks())) {
-      tr = state.tr.removeStoredMark(markType);
-    } else {
-      tr = state.tr.addStoredMark(markType.create(attrs));
-    }
-  } else {
-    // [FS] IRAD-1043 2020-10-27
-    // No need to remove the applied custom style, if user select the same style multiple times.
-    tr.addMark(posfrom, posto, markType.create(attrs));
-  }
-  return tr;
-}
-//overrided method from prosemirror Transform
-function markApplies(doc, ranges, type) {
-  let returned = false;
-  const loop = function (i) {
-    const ref = ranges[i];
-    const $from = ref.$from;
-    const $to = ref.$to;
-    let can = $from.depth == 0 ? doc.type.allowsMarkType(type) : false;
-    let bOk = false;
-
-    doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (can) {
-        return false;
-      }
-      can = node.inlineContent && node.type.allowsMarkType(type);
-      return true;
-    });
-    if (can) {
-      bOk = true;
-    }
-    return bOk;
-  };
-
-  for (let i = 0; i < ranges.length; i++) {
-    returned = loop(i);
-    if (returned) {
-      return returned;
-    }
-  }
-  return returned;
-}
-
-// function setMark(tr: Transform, schema: Schema, markType): Transform {
-//   // const markType = schema.marks[MARK_FONT_SIZE];
-//   if (!markType) {
-//     return tr;
-//   }
-//   const attrs = null;
-//   tr = applyMark(tr, schema, markType, attrs);
-//   return tr;
-// }
-
-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,55 +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';
-import { getNode, getMarkByStyleName } from './CustomStyleCommand';
-
-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
-    // Issue fix: after apply clear format on custom style applied paragraph, the custom style is not continuing
-    const startPos = state.selection.$from.before(1);
-    const endPos = state.selection.$to.after(1);
-    const node = getNode(state, startPos, endPos, state.tr);
-    let styleName = '';
-    if (node && node.attrs) {
-      styleName = node.attrs.styleName;
-    }
-    const storedmarks = getMarkByStyleName(styleName, state.schema);
-
-    // [FS] IRAD-948 2021-02-22
-    // Clear Header formatting
-    tr = clearHeading(tr, state.schema);
-    // [FS] IRAD-948 2020-05-22
-    // Issue fix: after apply clear format on custom style applied paragraph, the custom style is not continuing
-    tr.storedMarks = storedmarks;
-    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;