@modusoperandi/licit 0.1.4 → 0.1.8

package/src/EditorPageLayoutPlugin.js

@@ -1,67 +1,67 @@
-// @flow
-
-import { EditorState, Plugin, PluginKey } from 'prosemirror-state';
-
-import { ATTRIBUTE_LAYOUT, LAYOUT } from './DocNodeSpec';
-
-const SPEC = {
-  // [FS] IRAD-1005 2020-07-07
-  // Upgrade outdated packages.
-  key: new PluginKey('EditorPageLayoutPlugin'),
-  props: {
-    attributes: renderAttributes,
-  },
-};
-
-function renderAttributes(editorState: EditorState): Object {
-  const { doc } = editorState;
-  const attrs: Object = {
-    class: 'czi-prosemirror-editor',
-  };
-
-  const { width, padding, layout } = doc.attrs;
-
-  let style = '';
-  let computedLayout;
-  if (width) {
-    const inWidth = width / 72;
-    const cmWidth = inWidth * 2.54;
-    if (!computedLayout && inWidth >= 10.9 && inWidth <= 11.1) {
-      // Round up to letter size.
-      computedLayout = LAYOUT.US_LETTER_LANDSCAPE;
-    } else if (!computedLayout && inWidth >= 8.4 && inWidth <= 8.6) {
-      // Round up to letter size.
-      computedLayout = LAYOUT.US_LETTER_PORTRAIT;
-    } else if (!computedLayout && cmWidth >= 29.5 && cmWidth <= 30.1) {
-      // Round up to letter size.
-      computedLayout = LAYOUT.A4_LANDSCAPE;
-    } else if (!computedLayout && cmWidth >= 20.5 && cmWidth <= 21.5) {
-      // Round up to letter size.
-      computedLayout = LAYOUT.A4_PORTRAIT;
-    } else {
-      // Use custom width (e.g. imported from google doc).
-      style += `width: ${width}pt;`;
-    }
-    if (padding) {
-      style += `padding-left: ${padding}pt;`;
-      style += `padding-right: ${padding}pt;`;
-    }
-    attrs.style = style;
-  } else {
-    computedLayout = layout;
-  }
-  if (computedLayout) {
-    attrs[ATTRIBUTE_LAYOUT] = computedLayout;
-  }
-  return attrs;
-}
-
-// Unfortunately the root node `doc` does not supoort `toDOM`, thus
-// we'd have to assign its `attributes` manually.
-class EditorPageLayoutPlugin extends Plugin {
-  constructor() {
-    super(SPEC);
-  }
-}
-
-export default EditorPageLayoutPlugin;
+// @flow
+
+import { EditorState, Plugin, PluginKey } from 'prosemirror-state';
+
+import { ATTRIBUTE_LAYOUT, LAYOUT } from './DocNodeSpec';
+
+const SPEC = {
+  // [FS] IRAD-1005 2020-07-07
+  // Upgrade outdated packages.
+  key: new PluginKey('EditorPageLayoutPlugin'),
+  props: {
+    attributes: renderAttributes,
+  },
+};
+
+function renderAttributes(editorState: EditorState): Object {
+  const { doc } = editorState;
+  const attrs: Object = {
+    class: 'czi-prosemirror-editor',
+  };
+
+  const { width, padding, layout } = doc.attrs;
+
+  let style = '';
+  let computedLayout;
+  if (width) {
+    const inWidth = width / 72;
+    const cmWidth = inWidth * 2.54;
+    if (!computedLayout && inWidth >= 10.9 && inWidth <= 11.1) {
+      // Round up to letter size.
+      computedLayout = LAYOUT.US_LETTER_LANDSCAPE;
+    } else if (!computedLayout && inWidth >= 8.4 && inWidth <= 8.6) {
+      // Round up to letter size.
+      computedLayout = LAYOUT.US_LETTER_PORTRAIT;
+    } else if (!computedLayout && cmWidth >= 29.5 && cmWidth <= 30.1) {
+      // Round up to letter size.
+      computedLayout = LAYOUT.A4_LANDSCAPE;
+    } else if (!computedLayout && cmWidth >= 20.5 && cmWidth <= 21.5) {
+      // Round up to letter size.
+      computedLayout = LAYOUT.A4_PORTRAIT;
+    } else {
+      // Use custom width (e.g. imported from google doc).
+      style += `width: ${width}pt;`;
+    }
+    if (padding) {
+      style += `padding-left: ${padding}pt;`;
+      style += `padding-right: ${padding}pt;`;
+    }
+    attrs.style = style;
+  } else {
+    computedLayout = layout;
+  }
+  if (computedLayout) {
+    attrs[ATTRIBUTE_LAYOUT] = computedLayout;
+  }
+  return attrs;
+}
+
+// Unfortunately the root node `doc` does not supoort `toDOM`, thus
+// we'd have to assign its `attributes` manually.
+class EditorPageLayoutPlugin extends Plugin {
+  constructor() {
+    super(SPEC);
+  }
+}
+
+export default EditorPageLayoutPlugin;

package/src/EditorPlugins.js

@@ -1,8 +1,8 @@
-// @flow
-
-import EditorSchema from './EditorSchema';
-import DefaultEditorPlugins from './buildEditorPlugins';
-
-// Plugin
-const EditorPlugins = new DefaultEditorPlugins(EditorSchema);
-export default EditorPlugins;
+// @flow
+
+import EditorSchema from './EditorSchema';
+import DefaultEditorPlugins from './buildEditorPlugins';
+
+// Plugin
+const EditorPlugins = new DefaultEditorPlugins(EditorSchema);
+export default EditorPlugins;

package/src/EditorSchema.js

@@ -1,12 +1,12 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-
-import EditorMarks from './EditorMarks';
-import EditorNodes from './EditorNodes';
-
-const EditorSchema = new Schema({
-  nodes: EditorNodes,
-  marks: EditorMarks,
-});
-export default EditorSchema;
+// @flow
+
+import { Schema } from 'prosemirror-model';
+
+import EditorMarks from './EditorMarks';
+import EditorNodes from './EditorNodes';
+
+const EditorSchema = new Schema({
+  nodes: EditorNodes,
+  marks: EditorMarks,
+});
+export default EditorSchema;

package/src/EditorState.js

@@ -1,7 +1,7 @@
-// @flow
-
-import { EditorState } from 'prosemirror-state';
-
-const ProseMirrorEditorState = EditorState;
-
-export default ProseMirrorEditorState;
+// @flow
+
+import { EditorState } from 'prosemirror-state';
+
+const ProseMirrorEditorState = EditorState;
+
+export default ProseMirrorEditorState;

package/src/FontSizeCommand.js

@@ -1,73 +1,57 @@
-// @flow
-
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import applyMark from './applyMark';
-import isTextStyleMarkCommandEnabled from './isTextStyleMarkCommandEnabled';
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-import { MARK_FONT_SIZE } from './MarkNames';
-import { Schema } from 'prosemirror-model';
-import { Transform } from 'prosemirror-transform';
-
-function setFontSize(tr: Transform, schema: Schema, pt: number): Transform {
-  const markType = schema.marks[MARK_FONT_SIZE];
-  if (!markType) {
-    return tr;
-  }
-  const attrs = pt ? { pt } : null;
-  tr = applyMark(tr, schema, markType, attrs);
-  return tr;
-}
-
-class FontSizeCommand extends UICommand {
-  _popUp = null;
-  _pt = 0;
-
-  constructor(pt: number) {
-    super();
-    this._pt = pt;
-  }
-
-  isEnabled = (state: EditorState): boolean => {
-    return isTextStyleMarkCommandEnabled(state, MARK_FONT_SIZE);
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { schema } = state;
-    // commnted selection because selection removes the storedMarks;
-    // {selection}
-    // const tr = setFontSize(state.tr.setSelection(selection), schema, this._pt);
-    const tr = setFontSize(state.tr, schema, this._pt);
-    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 && dispatch(tr);
-      return true;
-    }
-    return false;
-  };
-
-  // [FS] IRAD-1087 2020-10-01
-  // Method to execute custom styling implementation of font size
-  executeCustom = (
-    state: EditorState,
-    tr: Transform,
-    from: number,
-    to: number
-  ): Transform => {
-    const { schema } = state;
-    tr = setFontSize(
-      tr.setSelection(TextSelection.create(tr.doc, from, to)),
-      schema,
-      this._pt
-    );
-    return tr;
-  };
-}
-
-export default FontSizeCommand;
+// @flow
+
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import applyMark from './applyMark';
+import isTextStyleMarkCommandEnabled from './isTextStyleMarkCommandEnabled';
+import { EditorState } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
+import { MARK_FONT_SIZE } from './MarkNames';
+import { Schema } from 'prosemirror-model';
+import { Transform } from 'prosemirror-transform';
+
+function setFontSize(tr: Transform, schema: Schema, pt: number): Transform {
+  const markType = schema.marks[MARK_FONT_SIZE];
+  if (!markType) {
+    return tr;
+  }
+  const attrs = pt ? { pt } : null;
+  tr = applyMark(tr, schema, markType, attrs);
+  return tr;
+}
+
+class FontSizeCommand extends UICommand {
+  _popUp = null;
+  _pt = 0;
+
+  constructor(pt: number) {
+    super();
+    this._pt = pt;
+  }
+
+  isEnabled = (state: EditorState): boolean => {
+    return isTextStyleMarkCommandEnabled(state, MARK_FONT_SIZE);
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { schema } = state;
+    // commnted selection because selection removes the storedMarks;
+    // {selection}
+    // const tr = setFontSize(state.tr.setSelection(selection), schema, this._pt);
+    const tr = setFontSize(state.tr, schema, this._pt);
+    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 && dispatch(tr);
+      return true;
+    }
+    return false;
+  };
+
+}
+
+export default FontSizeCommand;

package/src/FontSizeMarkSpec.js

@@ -1,49 +1,49 @@
-// @flow
-
-import { Node } from 'prosemirror-model';
-
-import { toClosestFontPtSize } from './toClosestFontPtSize';
-
-import type { MarkSpec } from './Types';
-
-const FontSizeMarkSpec: MarkSpec = {
-  attrs: {
-    pt: { default: null },
-  },
-  inline: true,
-  group: 'inline',
-  parseDOM: [
-    {
-      style: 'font-size',
-      getAttrs: getAttrs,
-    },
-  ],
-  toDOM(node: Node) {
-    const { pt } = node.attrs;
-    const domAttrs = pt
-      ? {
-          style: `font-size: ${pt}pt;`,
-          class: 'czi-font-size-mark',
-        }
-      : null;
-
-    return ['span', domAttrs, 0];
-  },
-};
-
-function getAttrs(fontSize: string): Object {
-  const attrs = {};
-  if (!fontSize) {
-    return attrs;
-  }
-
-  const ptValue = toClosestFontPtSize(fontSize);
-  if (!ptValue) {
-    return attrs;
-  }
-  return {
-    pt: ptValue,
-  };
-}
-
-export default FontSizeMarkSpec;
+// @flow
+
+import { Node } from 'prosemirror-model';
+
+import { toClosestFontPtSize } from './toClosestFontPtSize';
+
+import type { MarkSpec } from './Types';
+
+const FontSizeMarkSpec: MarkSpec = {
+  attrs: {
+    pt: { default: null },
+  },
+  inline: true,
+  group: 'inline',
+  parseDOM: [
+    {
+      style: 'font-size',
+      getAttrs: getAttrs,
+    },
+  ],
+  toDOM(node: Node) {
+    const { pt } = node.attrs;
+    const domAttrs = pt
+      ? {
+          style: `font-size: ${pt}pt;`,
+          class: 'czi-font-size-mark',
+        }
+      : null;
+
+    return ['span', domAttrs, 0];
+  },
+};
+
+function getAttrs(fontSize: string): Object {
+  const attrs = {};
+  if (!fontSize) {
+    return attrs;
+  }
+
+  const ptValue = toClosestFontPtSize(fontSize);
+  if (!ptValue) {
+    return attrs;
+  }
+  return {
+    pt: ptValue,
+  };
+}
+
+export default FontSizeMarkSpec;

package/src/FontTypeCommand.js

@@ -1,116 +1,100 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { EditorState } from 'prosemirror-state';
-import { AllSelection, TextSelection } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { EditorView } from 'prosemirror-view';
-import * as React from 'react';
-
-import { MARK_FONT_TYPE } from './MarkNames';
-import applyMark from './applyMark';
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-
-function setFontType(tr: Transform, schema: Schema, name: string): Transform {
-  const markType = schema.marks[MARK_FONT_TYPE];
-  if (!markType) {
-    return tr;
-  }
-  const { selection } = tr;
-  if (
-    !(selection instanceof TextSelection || selection instanceof AllSelection)
-  ) {
-    return tr;
-  }
-  const attrs = name ? { name } : null;
-  tr = applyMark(tr, schema, markType, attrs);
-  return tr;
-}
-
-class FontTypeCommand extends UICommand {
-  _label = null;
-  _name = '';
-  _popUp = null;
-
-  constructor(name: string) {
-    super();
-    this._name = name;
-    this._label = name ? (
-      <span style={{ fontFamily: name }}>{name}</span>
-    ) : null;
-  }
-
-  renderLabel = (state: EditorState): any => {
-    return this._label;
-  };
-
-  isEnabled = (state: EditorState): boolean => {
-    const { schema, selection, tr } = state;
-    if (
-      !(selection instanceof TextSelection || selection instanceof AllSelection)
-    ) {
-      return false;
-    }
-    const markType = schema.marks[MARK_FONT_TYPE];
-    if (!markType) {
-      return false;
-    }
-
-    const { from, to } = selection;
-    if (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 true;
-  };
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { schema } = state;
-    // commnted selection because selection removes the storedMarks;
-    // {selection}
-
-    // const tr = setFontType(
-    //   state.tr.setSelection(selection),
-    //   schema,
-    //   this._name
-    // );
-
-    const tr = setFontType(state.tr, schema, this._name);
-    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 && dispatch(tr);
-      return true;
-    }
-    return false;
-  };
-
-  // [FS] IRAD-1087 2020-10-01
-  // Method to execute custom styling implementation of font type
-  executeCustom = (
-    state: EditorState,
-    tr: Transform,
-    from: number,
-    to: number
-  ): Transform => {
-    const { schema } = state;
-    tr = setFontType(
-      tr.setSelection(TextSelection.create(tr.doc, from, to)),
-      schema,
-      this._name
-    );
-
-    return tr;
-  };
-}
-
-export default FontTypeCommand;
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { EditorState } from 'prosemirror-state';
+import { AllSelection, TextSelection } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { EditorView } from 'prosemirror-view';
+import * as React from 'react';
+
+import { MARK_FONT_TYPE } from './MarkNames';
+import applyMark from './applyMark';
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+
+function setFontType(tr: Transform, schema: Schema, name: string): Transform {
+  const markType = schema.marks[MARK_FONT_TYPE];
+  if (!markType) {
+    return tr;
+  }
+  const { selection } = tr;
+  if (
+    !(selection instanceof TextSelection || selection instanceof AllSelection)
+  ) {
+    return tr;
+  }
+  const attrs = name ? { name } : null;
+  tr = applyMark(tr, schema, markType, attrs);
+  return tr;
+}
+
+class FontTypeCommand extends UICommand {
+  _label = null;
+  _name = '';
+  _popUp = null;
+
+  constructor(name: string) {
+    super();
+    this._name = name;
+    this._label = name ? (
+      <span style={{ fontFamily: name }}>{name}</span>
+    ) : null;
+  }
+
+  renderLabel = (state: EditorState): any => {
+    return this._label;
+  };
+
+  isEnabled = (state: EditorState): boolean => {
+    const { schema, selection, tr } = state;
+    if (
+      !(selection instanceof TextSelection || selection instanceof AllSelection)
+    ) {
+      return false;
+    }
+    const markType = schema.marks[MARK_FONT_TYPE];
+    if (!markType) {
+      return false;
+    }
+
+    const { from, to } = selection;
+    if (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 true;
+  };
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { schema } = state;
+    // commnted selection because selection removes the storedMarks;
+    // {selection}
+
+    // const tr = setFontType(
+    //   state.tr.setSelection(selection),
+    //   schema,
+    //   this._name
+    // );
+
+    const tr = setFontType(state.tr, schema, this._name);
+    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 && dispatch(tr);
+      return true;
+    }
+    return false;
+  };
+
+
+}
+
+export default FontTypeCommand;