@modusoperandi/licit 1.0.3 → 1.0.5

package/ParagraphNodeSpec.js.flow

@@ -1,156 +1,156 @@
-// @flow
-
-import convertToCSSPTValue from './convertToCSSPTValue.js';
-import toCSSLineSpacing from './ui/toCSSLineSpacing.js';
-import { Node } from 'prosemirror-model';
-
-import type { NodeSpec } from './Types.js';
-
-// This assumes that every 36pt maps to one indent level.
-export const INDENT_MARGIN_PT_SIZE = 36;
-export const MIN_INDENT_LEVEL = 0;
-export const MAX_INDENT_LEVEL = 7;
-export const ATTRIBUTE_INDENT = 'data-indent';
-export const ATTRIBUTE_STYLE_LEVEL = 'data-style-level';
-export const RESERVED_STYLE_NONE = 'None';
-export const RESERVED_STYLE_NONE_NUMBERING = RESERVED_STYLE_NONE + '-@#$-';
-const cssVal = new Set(['', '0%', '0pt', '0px']);
-
-export const EMPTY_CSS_VALUE = cssVal;
-
-const ALIGN_PATTERN = /(left|right|center|justify)/;
-
-// https://github.com/ProseMirror/prosemirror-schema-basic/blob/master/src/schema-basic.js
-// :: NodeSpec A plain paragraph textblock. Represented in the DOM
-// as a `<p>` element.
-const ParagraphNodeSpec: NodeSpec = {
-  attrs: {
-    align: {
-      default: null,
-    },
-    color: {
-      default: null,
-    },
-    id: {
-      default: null,
-    },
-    indent: {
-      default: null,
-    },
-    lineSpacing: {
-      default: null,
-    },
-    // TODO: Add UI to let user edit / clear padding.
-    paddingBottom: {
-      default: null,
-    },
-    // TODO: Add UI to let user edit / clear padding.
-    paddingTop: {
-      default: null,
-    },
-  },
-  content: 'inline*',
-  group: 'block',
-  parseDOM: [
-    {
-      tag: 'p',
-      getAttrs,
-    },
-  ],
-  toDOM,
-};
-
-function getAttrs(dom: HTMLElement): Object {
-  const {
-    lineHeight,
-    textAlign,
-    marginLeft,
-    paddingTop,
-    paddingBottom,
-  } = dom.style;
-
-  let align = dom.getAttribute('align') || textAlign || '';
-  align = ALIGN_PATTERN.test(align) ? align : null;
-
-  let indent = parseInt(dom.getAttribute(ATTRIBUTE_INDENT), 10);
-
-  if (!indent && marginLeft) {
-    indent = convertMarginLeftToIndentValue(marginLeft);
-  }
-
-  indent = indent || MIN_INDENT_LEVEL;
-
-  const lineSpacing = lineHeight ? toCSSLineSpacing(lineHeight) : null;
-
-  const id = dom.getAttribute('id') || '';
-  return {
-    align,
-    indent,
-    lineSpacing,
-    paddingTop,
-    paddingBottom,
-    id,
-  };
-}
-
-function getStyle(attrs: Object) {
-  return getStyleEx(
-    attrs.align,
-    attrs.lineSpacing,
-    attrs.paddingTop,
-    attrs.paddingBottom,
-  );
-}
-
-function getStyleEx(align, lineSpacing, paddingTop, paddingBottom) {
-  let style = '';
-  if (align && align !== 'left') {
-    style += `text-align: ${align};`;
-  }
-
-  if (lineSpacing) {
-    const cssLineSpacing = toCSSLineSpacing(lineSpacing);
-    style +=
-      `line-height: ${cssLineSpacing};` +
-      // This creates the local css variable `--czi-content-line-height`
-      // that its children may apply.
-      `--czi-content-line-height: ${cssLineSpacing};`;
-  }
-
-  if (paddingTop && !EMPTY_CSS_VALUE.has(paddingTop)) {
-    style += `padding-top: ${paddingTop};`;
-  }
-  if (paddingBottom && !EMPTY_CSS_VALUE.has(paddingBottom)) {
-    style += `padding-bottom: ${paddingBottom};`;
-  }
-  return { style };
-
-}
-
-function toDOM(node: Node): Array<any> {
-  const { indent, id } = node.attrs;
-  const attrs = {};
-  const { style } = getStyle(node.attrs);
-
-  style && (attrs.style = style);
-
-  if (indent) {
-    attrs[ATTRIBUTE_INDENT] = String(indent);
-  }
-  if (id) {
-    attrs.id = id;
-  }
-
-  return ['p', attrs, 0];
-}
-
-export const toParagraphDOM = toDOM;
-export const getParagraphNodeAttrs = getAttrs;
-export const getParagraphStyle = getStyle;
-
-export function convertMarginLeftToIndentValue(marginLeft: string): number {
-  const ptValue = convertToCSSPTValue(marginLeft);
-  return Math.min(Math.max(Math.floor(ptValue / INDENT_MARGIN_PT_SIZE), MIN_INDENT_LEVEL), MAX_INDENT_LEVEL);
-}
-
-export default ParagraphNodeSpec;
+// @flow
+
+import convertToCSSPTValue from './convertToCSSPTValue.js';
+import toCSSLineSpacing from './ui/toCSSLineSpacing.js';
+import { Node } from 'prosemirror-model';
+
+import type { NodeSpec } from './Types.js';
+
+// This assumes that every 36pt maps to one indent level.
+export const INDENT_MARGIN_PT_SIZE = 36;
+export const MIN_INDENT_LEVEL = 0;
+export const MAX_INDENT_LEVEL = 7;
+export const ATTRIBUTE_INDENT = 'data-indent';
+export const ATTRIBUTE_STYLE_LEVEL = 'data-style-level';
+export const RESERVED_STYLE_NONE = 'None';
+export const RESERVED_STYLE_NONE_NUMBERING = RESERVED_STYLE_NONE + '-@#$-';
+const cssVal = new Set(['', '0%', '0pt', '0px']);
+
+export const EMPTY_CSS_VALUE = cssVal;
+
+const ALIGN_PATTERN = /(left|right|center|justify)/;
+
+// https://github.com/ProseMirror/prosemirror-schema-basic/blob/master/src/schema-basic.js
+// :: NodeSpec A plain paragraph textblock. Represented in the DOM
+// as a `<p>` element.
+const ParagraphNodeSpec: NodeSpec = {
+  attrs: {
+    align: {
+      default: null,
+    },
+    color: {
+      default: null,
+    },
+    id: {
+      default: null,
+    },
+    indent: {
+      default: null,
+    },
+    lineSpacing: {
+      default: null,
+    },
+    // TODO: Add UI to let user edit / clear padding.
+    paddingBottom: {
+      default: null,
+    },
+    // TODO: Add UI to let user edit / clear padding.
+    paddingTop: {
+      default: null,
+    },
+  },
+  content: 'inline*',
+  group: 'block',
+  parseDOM: [
+    {
+      tag: 'p',
+      getAttrs,
+    },
+  ],
+  toDOM,
+};
+
+function getAttrs(dom: HTMLElement): Object {
+  const {
+    lineHeight,
+    textAlign,
+    marginLeft,
+    paddingTop,
+    paddingBottom,
+  } = dom.style;
+
+  let align = dom.getAttribute('align') || textAlign || '';
+  align = ALIGN_PATTERN.test(align) ? align : null;
+
+  let indent = parseInt(dom.getAttribute(ATTRIBUTE_INDENT), 10);
+
+  if (!indent && marginLeft) {
+    indent = convertMarginLeftToIndentValue(marginLeft);
+  }
+
+  indent = indent || MIN_INDENT_LEVEL;
+
+  const lineSpacing = lineHeight ? toCSSLineSpacing(lineHeight) : null;
+
+  const id = dom.getAttribute('id') || '';
+  return {
+    align,
+    indent,
+    lineSpacing,
+    paddingTop,
+    paddingBottom,
+    id,
+  };
+}
+
+function getStyle(attrs: Object) {
+  return getStyleEx(
+    attrs.align,
+    attrs.lineSpacing,
+    attrs.paddingTop,
+    attrs.paddingBottom,
+  );
+}
+
+function getStyleEx(align, lineSpacing, paddingTop, paddingBottom) {
+  let style = '';
+  if (align && align !== 'left') {
+    style += `text-align: ${align};`;
+  }
+
+  if (lineSpacing) {
+    const cssLineSpacing = toCSSLineSpacing(lineSpacing);
+    style +=
+      `line-height: ${cssLineSpacing};` +
+      // This creates the local css variable `--czi-content-line-height`
+      // that its children may apply.
+      `--czi-content-line-height: ${cssLineSpacing};`;
+  }
+
+  if (paddingTop && !EMPTY_CSS_VALUE.has(paddingTop)) {
+    style += `padding-top: ${paddingTop};`;
+  }
+  if (paddingBottom && !EMPTY_CSS_VALUE.has(paddingBottom)) {
+    style += `padding-bottom: ${paddingBottom};`;
+  }
+  return { style };
+
+}
+
+function toDOM(node: Node): Array<any> {
+  const { indent, id } = node.attrs;
+  const attrs = {};
+  const { style } = getStyle(node.attrs);
+
+  style && (attrs.style = style);
+
+  if (indent) {
+    attrs[ATTRIBUTE_INDENT] = String(indent);
+  }
+  if (id) {
+    attrs.id = id;
+  }
+
+  return ['p', attrs, 0];
+}
+
+export const toParagraphDOM = toDOM;
+export const getParagraphNodeAttrs = getAttrs;
+export const getParagraphStyle = getStyle;
+
+export function convertMarginLeftToIndentValue(marginLeft: string): number {
+  const ptValue = convertToCSSPTValue(marginLeft);
+  return Math.min(Math.max(Math.floor(ptValue / INDENT_MARGIN_PT_SIZE), MIN_INDENT_LEVEL), MAX_INDENT_LEVEL);
+}
+
+export default ParagraphNodeSpec;

package/ParagraphSpacingCommand.js

@@ -4,15 +4,15 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 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 _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 _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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 _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 { UICommand } from '@modusoperandi/licit-doc-attrs-step';
 import { AllSelection, TextSelection } from 'prosemirror-state';
@@ -80,14 +80,13 @@ export function setParagraphSpacing(tr, schema, paragraphSpacing, isAfter) {
   return tr;
 }
 var ParagraphSpacingCommand = /*#__PURE__*/function (_UICommand) {
-  _inherits(ParagraphSpacingCommand, _UICommand);
   function ParagraphSpacingCommand(paragraphSpacing, isAfter) {
     var _this;
     _classCallCheck(this, ParagraphSpacingCommand);
     _this = _callSuper(this, ParagraphSpacingCommand);
-    _defineProperty(_assertThisInitialized(_this), "_paragraphSpacing", void 0);
-    _defineProperty(_assertThisInitialized(_this), "_isAfter", void 0);
-    _defineProperty(_assertThisInitialized(_this), "execute", function (state, dispatch, view) {
+    _defineProperty(_this, "_paragraphSpacing", void 0);
+    _defineProperty(_this, "_isAfter", void 0);
+    _defineProperty(_this, "execute", function (state, dispatch, view) {
       var schema = state.schema,
         selection = state.selection;
       var tr = setParagraphSpacing(state.tr.setSelection(selection), schema, _this._paragraphSpacing, _this._isAfter);
@@ -98,22 +97,22 @@ var ParagraphSpacingCommand = /*#__PURE__*/function (_UICommand) {
         return false;
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "waitForUserInput", function (_state, _dispatch, _view, _event) {
+    _defineProperty(_this, "waitForUserInput", function (_state, _dispatch, _view, _event) {
       return Promise.resolve(undefined);
     });
-    _defineProperty(_assertThisInitialized(_this), "executeWithUserInput", function (_state, _dispatch, _view, _inputs) {
+    _defineProperty(_this, "executeWithUserInput", function (_state, _dispatch, _view, _inputs) {
       return false;
     });
     _this._paragraphSpacing = paragraphSpacing;
     _this._isAfter = isAfter;
     return _this;
   }
-  _createClass(ParagraphSpacingCommand, [{
+  _inherits(ParagraphSpacingCommand, _UICommand);
+  return _createClass(ParagraphSpacingCommand, [{
     key: "cancel",
     value: function cancel() {
       return null;
     }
   }]);
-  return ParagraphSpacingCommand;
 }(UICommand);
 export default ParagraphSpacingCommand;

package/ParagraphSpacingCommand.js.flow

@@ -1,144 +1,144 @@
-// @flow
-
-import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
-import { AllSelection, TextSelection } from 'prosemirror-state';
-import { BLOCKQUOTE, HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
-import { EditorState } from 'prosemirror-state';
-import { EditorView } from 'prosemirror-view';
-import { Schema } from 'prosemirror-model';
-import { Transform } from 'prosemirror-transform';
-import * as React from 'react';
-
-export function setParagraphSpacing(
-  tr: Transform,
-  schema: Schema,
-  paragraphSpacing: ?string,
-  isAfter: ?boolean
-): Transform {
-  const { selection, doc } = tr;
-  if (!selection || !doc) {
-    return tr;
-  }
-
-  if (
-    !(selection instanceof TextSelection) &&
-    !(selection instanceof AllSelection)
-  ) {
-    return tr;
-  }
-
-  const { from, to } = selection;
-  const paragraph = schema.nodes[PARAGRAPH];
-  const heading = schema.nodes[HEADING];
-  const listItem = schema.nodes[LIST_ITEM];
-  const blockquote = schema.nodes[BLOCKQUOTE];
-  if (!paragraph && !heading && !listItem && !blockquote) {
-    return tr;
-  }
-
-  const tasks = [];
-  const paragraphSpacingValue = paragraphSpacing || null;
-
-  doc.nodesBetween(from, to, (node, pos, parentNode) => {
-    const nodeType = node.type;
-    if (
-      nodeType === paragraph ||
-      nodeType === heading ||
-      nodeType === listItem ||
-      nodeType === blockquote
-    ) {
-      const paragraphSpacing = node.attrs.paragraphSpacing || null;
-      if (paragraphSpacing !== paragraphSpacingValue) {
-        tasks.push({
-          node,
-          pos,
-          nodeType,
-        });
-      }
-      return nodeType === listItem ? true : false;
-    }
-    return true;
-  });
-
-  if (!tasks.length) {
-    return tr;
-  }
-
-  tasks.forEach((job) => {
-    const { node, pos, nodeType } = job;
-    let { attrs } = node;
-    if (isAfter) {
-      attrs = {
-        ...attrs,
-        paragraphSpacingAfter: paragraphSpacingValue
-          ? paragraphSpacingValue
-          : null,
-      };
-    } else {
-      attrs = {
-        ...attrs,
-        paragraphSpacingBefore: paragraphSpacingValue
-          ? paragraphSpacingValue
-          : null,
-      };
-    }
-    tr = tr.setNodeMarkup(pos, nodeType, attrs, node.marks);
-  });
-
-  return tr;
-}
-
-class ParagraphSpacingCommand extends UICommand {
-  _paragraphSpacing: ?string;
-  _isAfter: ?boolean;
-
-  constructor(paragraphSpacing: ?string, isAfter: ?boolean) {
-    super();
-    this._paragraphSpacing = paragraphSpacing;
-    this._isAfter = isAfter;
-  }
-
-  execute = (
-    state: EditorState,
-    dispatch: ?(tr: Transform) => void,
-    view: ?EditorView
-  ): boolean => {
-    const { schema, selection } = state;
-    const tr = setParagraphSpacing(
-      state.tr.setSelection(selection),
-      schema,
-      this._paragraphSpacing,
-      this._isAfter
-    );
-    if (tr.docChanged) {
-      dispatch && dispatch(tr);
-      return true;
-    } else {
-      return false;
-    }
-  };
-
-  waitForUserInput = (
-    _state: EditorState,
-    _dispatch: ?(tr: Transform) => void,
-    _view: ?EditorView,
-    _event: ?React.SyntheticEvent
-  ): Promise<undefined> => {
-    return Promise.resolve(undefined);
-  };
-
-  executeWithUserInput = (
-    _state: EditorState,
-    _dispatch: ?(tr: Transform) => void,
-    _view: ?EditorView,
-    _inputs: ?string
-  ): boolean => {
-    return false;
-  };
-
-  cancel(): void {
-    return null;
-  }
-}
-
-export default ParagraphSpacingCommand;
+// @flow
+
+import { UICommand } from '@modusoperandi/licit-doc-attrs-step';
+import { AllSelection, TextSelection } from 'prosemirror-state';
+import { BLOCKQUOTE, HEADING, LIST_ITEM, PARAGRAPH } from './NodeNames';
+import { EditorState } from 'prosemirror-state';
+import { EditorView } from 'prosemirror-view';
+import { Schema } from 'prosemirror-model';
+import { Transform } from 'prosemirror-transform';
+import * as React from 'react';
+
+export function setParagraphSpacing(
+  tr: Transform,
+  schema: Schema,
+  paragraphSpacing: ?string,
+  isAfter: ?boolean
+): Transform {
+  const { selection, doc } = tr;
+  if (!selection || !doc) {
+    return tr;
+  }
+
+  if (
+    !(selection instanceof TextSelection) &&
+    !(selection instanceof AllSelection)
+  ) {
+    return tr;
+  }
+
+  const { from, to } = selection;
+  const paragraph = schema.nodes[PARAGRAPH];
+  const heading = schema.nodes[HEADING];
+  const listItem = schema.nodes[LIST_ITEM];
+  const blockquote = schema.nodes[BLOCKQUOTE];
+  if (!paragraph && !heading && !listItem && !blockquote) {
+    return tr;
+  }
+
+  const tasks = [];
+  const paragraphSpacingValue = paragraphSpacing || null;
+
+  doc.nodesBetween(from, to, (node, pos, parentNode) => {
+    const nodeType = node.type;
+    if (
+      nodeType === paragraph ||
+      nodeType === heading ||
+      nodeType === listItem ||
+      nodeType === blockquote
+    ) {
+      const paragraphSpacing = node.attrs.paragraphSpacing || null;
+      if (paragraphSpacing !== paragraphSpacingValue) {
+        tasks.push({
+          node,
+          pos,
+          nodeType,
+        });
+      }
+      return nodeType === listItem ? true : false;
+    }
+    return true;
+  });
+
+  if (!tasks.length) {
+    return tr;
+  }
+
+  tasks.forEach((job) => {
+    const { node, pos, nodeType } = job;
+    let { attrs } = node;
+    if (isAfter) {
+      attrs = {
+        ...attrs,
+        paragraphSpacingAfter: paragraphSpacingValue
+          ? paragraphSpacingValue
+          : null,
+      };
+    } else {
+      attrs = {
+        ...attrs,
+        paragraphSpacingBefore: paragraphSpacingValue
+          ? paragraphSpacingValue
+          : null,
+      };
+    }
+    tr = tr.setNodeMarkup(pos, nodeType, attrs, node.marks);
+  });
+
+  return tr;
+}
+
+class ParagraphSpacingCommand extends UICommand {
+  _paragraphSpacing: ?string;
+  _isAfter: ?boolean;
+
+  constructor(paragraphSpacing: ?string, isAfter: ?boolean) {
+    super();
+    this._paragraphSpacing = paragraphSpacing;
+    this._isAfter = isAfter;
+  }
+
+  execute = (
+    state: EditorState,
+    dispatch: ?(tr: Transform) => void,
+    view: ?EditorView
+  ): boolean => {
+    const { schema, selection } = state;
+    const tr = setParagraphSpacing(
+      state.tr.setSelection(selection),
+      schema,
+      this._paragraphSpacing,
+      this._isAfter
+    );
+    if (tr.docChanged) {
+      dispatch && dispatch(tr);
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  waitForUserInput = (
+    _state: EditorState,
+    _dispatch: ?(tr: Transform) => void,
+    _view: ?EditorView,
+    _event: ?React.SyntheticEvent
+  ): Promise<undefined> => {
+    return Promise.resolve(undefined);
+  };
+
+  executeWithUserInput = (
+    _state: EditorState,
+    _dispatch: ?(tr: Transform) => void,
+    _view: ?EditorView,
+    _inputs: ?string
+  ): boolean => {
+    return false;
+  };
+
+  cancel(): void {
+    return null;
+  }
+}
+
+export default ParagraphSpacingCommand;