@modusoperandi/licit 1.0.4 → 1.0.7

package/ui/findActiveFontSize.js.flow

@@ -1,58 +1,55 @@
-// @flow
-
-import { EditorState } from 'prosemirror-state';
-import { findParentNodeOfType } from 'prosemirror-utils';
-
-import { MARK_FONT_SIZE } from '../MarkNames.js';
-import { HEADING } from '../NodeNames.js';
-import findActiveMark from '../findActiveMark.js';
-
-// This should map to `--czi-content-font-size` at `czi-editor.css`.
-const FONT_PT_SIZE_DEFAULT = 11;
-
-// This should map to `czi-heading.css`.
-const MAP_HEADING_LEVEL_TO_FONT_PT_SIZE = {
-  '1': 20,
-  '2': 18,
-  '3': 16,
-  '4': 14,
-  '5': 11,
-  '6': 11,
-};
-
-export default function findActiveFontSize(state: EditorState): string {
-  const { schema, doc, selection, tr } = state;
-  const markType = schema.marks[MARK_FONT_SIZE];
-  const heading = schema.nodes[HEADING];
-  const defaultSize = String(FONT_PT_SIZE_DEFAULT);
-  if (!markType) {
-    return defaultSize;
-  }
-
-  const { from, to, empty } = selection;
-  if (empty) {
-    const storedMarks =
-      tr.storedMarks ||
-      state.storedMarks ||
-      (selection.$cursor &&
-        selection.$cursor.marks &&
-        selection.$cursor.marks()) ||
-      [];
-    const sm = storedMarks.find((m) => m.type === markType);
-    return sm ? String(sm.attrs.pt || defaultSize) : defaultSize;
-  }
-
-  const mark = findActiveMark(doc, from, to, markType);
-  if (mark) {
-    return String(mark.attrs.pt);
-  }
-  if (!heading) {
-    return defaultSize;
-  }
-  const result = findParentNodeOfType(heading)(state.selection);
-  if (!result) {
-    return defaultSize;
-  }
-  const level = String(result.node.attrs.level);
-  return MAP_HEADING_LEVEL_TO_FONT_PT_SIZE[level] || defaultSize;
-}
+// @flow
+
+import { EditorState } from 'prosemirror-state';
+import { findParentNodeOfType } from 'prosemirror-utils';
+
+import { MARK_FONT_SIZE } from '../MarkNames.js';
+import { HEADING } from '../NodeNames.js';
+import findActiveMark from '../findActiveMark.js';
+
+// This should map to `--czi-content-font-size` at `czi-editor.css`.
+const FONT_PT_SIZE_DEFAULT = 11;
+
+// This should map to `czi-heading.css`.
+const MAP_HEADING_LEVEL_TO_FONT_PT_SIZE = {
+  '1': 20,
+  '2': 18,
+  '3': 16,
+  '4': 14,
+  '5': 11,
+  '6': 11,
+};
+
+export default function findActiveFontSize(state: EditorState): string {
+  const { schema, doc, selection, tr } = state;
+  const markType = schema.marks[MARK_FONT_SIZE];
+  const heading = schema.nodes[HEADING];
+  const defaultSize = String(FONT_PT_SIZE_DEFAULT);
+  if (!markType) {
+    return defaultSize;
+  }
+
+  const { from, to, empty } = selection;
+  if (empty) {
+    const storedMarks =
+      tr.storedMarks ||
+      state.storedMarks ||
+      selection.$cursor?.marks?.() || [];
+    const sm = storedMarks.find((m) => m.type === markType);
+    return sm ? String(sm.attrs.pt || defaultSize) : defaultSize;
+  }
+
+  const mark = findActiveMark(doc, from, to, markType);
+  if (mark) {
+    return String(mark.attrs.pt);
+  }
+  if (!heading) {
+    return defaultSize;
+  }
+  const result = findParentNodeOfType(heading)(state.selection);
+  if (!result) {
+    return defaultSize;
+  }
+  const level = String(result.node.attrs.level);
+  return MAP_HEADING_LEVEL_TO_FONT_PT_SIZE[level] || defaultSize;
+}

package/ui/findActiveFontType.js

@@ -17,14 +17,15 @@ export default function findActiveFontType(state) {
     to = selection.to,
     empty = selection.empty;
   if (empty) {
-    var storedMarks = tr.storedMarks || state.storedMarks || selection.$cursor && selection.$cursor.marks && selection.$cursor.marks() || [];
+    var _selection$$cursor, _selection$$cursor$ma;
+    var storedMarks = tr.storedMarks || state.storedMarks || ((_selection$$cursor = selection.$cursor) === null || _selection$$cursor === void 0 || (_selection$$cursor$ma = _selection$$cursor.marks) === null || _selection$$cursor$ma === void 0 ? void 0 : _selection$$cursor$ma.call(_selection$$cursor)) || [];
     var sm = storedMarks.find(function (m) {
       return m.type === markType;
     });
-    return sm && sm.attrs.name || FONT_TYPE_NAME_DEFAULT;
+    return (sm === null || sm === void 0 ? void 0 : sm.attrs.name) || FONT_TYPE_NAME_DEFAULT;
   }
   var mark = findActiveMark(doc, from, to, markType);
-  var fontName = mark && mark.attrs.name;
+  var fontName = mark === null || mark === void 0 ? void 0 : mark.attrs.name;
   if (!fontName) {
     return FONT_TYPE_NAME_DEFAULT;
   }

package/ui/findActiveFontType.js.flow

@@ -1,38 +1,35 @@
-// @flow
-
-import { EditorState } from 'prosemirror-state';
-
-import { MARK_FONT_TYPE } from '../MarkNames.js';
-import findActiveMark from '../findActiveMark.js';
-
-// This should map to `--czi-content-font-size` at `czi-editor.css`.
-export const FONT_TYPE_NAME_DEFAULT = 'Arial';
-
-export default function findActiveFontType(state: EditorState): string {
-  const { schema, doc, selection, tr } = state;
-  const markType = schema.marks[MARK_FONT_TYPE];
-  if (!markType) {
-    return FONT_TYPE_NAME_DEFAULT;
-  }
-  const { from, to, empty } = selection;
-
-  if (empty) {
-    const storedMarks =
-      tr.storedMarks ||
-      state.storedMarks ||
-      (selection.$cursor &&
-        selection.$cursor.marks &&
-        selection.$cursor.marks()) ||
-      [];
-    const sm = storedMarks.find((m) => m.type === markType);
-    return (sm && sm.attrs.name) || FONT_TYPE_NAME_DEFAULT;
-  }
-
-  const mark = findActiveMark(doc, from, to, markType);
-  const fontName = mark && mark.attrs.name;
-  if (!fontName) {
-    return FONT_TYPE_NAME_DEFAULT;
-  }
-
-  return fontName;
-}
+// @flow
+
+import { EditorState } from 'prosemirror-state';
+
+import { MARK_FONT_TYPE } from '../MarkNames.js';
+import findActiveMark from '../findActiveMark.js';
+
+// This should map to `--czi-content-font-size` at `czi-editor.css`.
+export const FONT_TYPE_NAME_DEFAULT = 'Arial';
+
+export default function findActiveFontType(state: EditorState): string {
+  const { schema, doc, selection, tr } = state;
+  const markType = schema.marks[MARK_FONT_TYPE];
+  if (!markType) {
+    return FONT_TYPE_NAME_DEFAULT;
+  }
+  const { from, to, empty } = selection;
+
+  if (empty) {
+    const storedMarks =
+      tr.storedMarks ||
+      state.storedMarks ||
+      selection.$cursor?.marks?.() || [];
+    const sm = storedMarks.find((m) => m.type === markType);
+    return (sm?.attrs.name) || FONT_TYPE_NAME_DEFAULT;
+  }
+
+  const mark = findActiveMark(doc, from, to, markType);
+  const fontName = mark?.attrs.name;
+  if (!fontName) {
+    return FONT_TYPE_NAME_DEFAULT;
+  }
+
+  return fontName;
+}