@modusoperandi/licit 1.4.9 → 1.5.0

package/client/Licit.js

@@ -1,6 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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; }
@@ -359,7 +363,7 @@ var Licit = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "getEffectivePlugins",
     value: function getEffectivePlugins(schema, defaultPlugins, plugins) {
-      var effectivePlugins = defaultPlugins;
+      var effectivePlugins = _toConsumableArray(defaultPlugins);
       var pasteJSONPlugin = null;
       if (plugins) {
         var _iterator = _createForOfIteratorHelper(plugins),
@@ -373,7 +377,12 @@ var Licit = /*#__PURE__*/function (_React$Component) {
                 schema = p.getEffectiveSchema(schema);
               }
               if (p.initKeyCommands) {
-                effectivePlugins.push(p.initKeyCommands());
+                var keyCommandPlugins = p.initKeyCommands();
+                if (Array.isArray(keyCommandPlugins)) {
+                  effectivePlugins.push.apply(effectivePlugins, _toConsumableArray(keyCommandPlugins));
+                } else if (keyCommandPlugins) {
+                  effectivePlugins.push(keyCommandPlugins);
+                }
               }
               if (p.insert) {
                 pasteJSONPlugin = p;

package/client/Licit.js.flow

@@ -204,35 +204,42 @@ class Licit extends React.Component<any, any> {
     return editorState;
   }
 
-  getEffectivePlugins(
-    schema: Schema,
-    defaultPlugins: Array<Plugin>,
-    plugins: Array<Plugin>
-  ): { plugins: Array<Plugin>, schema: Schema, pasteJSONPlugin: Plugin } {
-    const effectivePlugins = defaultPlugins;
-    let pasteJSONPlugin = null;
-
-    if (plugins) {
-      for (const p of plugins) {
-        if (!effectivePlugins.includes(p)) {
-          effectivePlugins.push(p);
-          if (p.getEffectiveSchema) {
-            schema = p.getEffectiveSchema(schema);
-          }
+getEffectivePlugins(
+  schema: Schema,
+  defaultPlugins: Array<Plugin>,
+  plugins: Array<Plugin>
+): { plugins: Array<Plugin>; schema: Schema; pasteJSONPlugin: Plugin | null } {
+  const effectivePlugins = [...defaultPlugins];
+  let pasteJSONPlugin: Plugin | null = null;
+
+  if (plugins) {
+    for (const p of plugins) {
+      if (!effectivePlugins.includes(p)) {
+        effectivePlugins.push(p);
+
+        if (p.getEffectiveSchema) {
+          schema = p.getEffectiveSchema(schema);
+        }
 
-          if (p.initKeyCommands) {
-            effectivePlugins.push(p.initKeyCommands());
+        if (p.initKeyCommands) {
+          const keyCommandPlugins = p.initKeyCommands();
+          if (Array.isArray(keyCommandPlugins)) {
+            effectivePlugins.push(...keyCommandPlugins);
+          } else if (keyCommandPlugins) {
+            effectivePlugins.push(keyCommandPlugins);
           }
+        }
 
-          if (p.insert) {
-            pasteJSONPlugin = p;
-          }
+        if (p.insert) {
+          pasteJSONPlugin = p;
         }
       }
     }
-    return { plugins: effectivePlugins, schema, pasteJSONPlugin };
   }
 
+  return { plugins: effectivePlugins, schema, pasteJSONPlugin };
+}
+
   // [FS] IRAD-1578 2021-09-27
   onReady(state: EditorState) {
     const collabEditing = this.state.docID !== '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "1.4.9",
+  "version": "1.5.0",
   "license": "MIT",
   "type": "module",
   "subversion": "1",
@@ -76,29 +76,29 @@
     "babel-loader": "^10.0.0",
     "babel-plugin-flow-react-proptypes": "^26.0.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "body-parser": "^2.2.0",
+    "body-parser": "^2.2.1",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^13.0.1",
     "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
     "css-loader": "^7.1.2",
-    "eslint": "^9.38.0",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-jest": "^29.12.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.5",
     "exports-loader": "^5.0.0",
-    "express": "^5.1.0",
+    "express": "^5.2.1",
     "file-loader": "^6.2.0",
-    "flow-bin": "^0.287.0",
+    "flow-bin": "^0.295.0",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^4.1.1",
     "flow-webpack-plugin": "^1.2.0",
     "formidable": "^3.5.4",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "html-loader": "^5.1.0",
     "html-webpack-inline-source-plugin": "1.0.0-beta.2",
-    "html-webpack-plugin": "^5.6.4",
+    "html-webpack-plugin": "^5.6.5",
     "husky": "^9.1.7",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
@@ -106,20 +106,20 @@
     "jest-junit": "^16.0.0",
     "jest-prosemirror": "^3.0.1",
     "jest-sonar-reporter": "^2.0.0",
-    "lint-staged": "^16.2.6",
+    "lint-staged": "^16.2.7",
     "mkdirp": "^3.0.1",
     "mv": "^2.1.1",
-    "prettier": "^3.6.2",
+    "prettier": "^3.7.4",
     "style-loader": "^4.0.0",
-    "stylelint": "^16.25.0",
+    "stylelint": "^16.26.1",
     "stylelint-config-standard": "^39.0.1",
     "stylelint-prettier": "^5.0.3",
-    "terser-webpack-plugin": "^5.3.14",
-    "ts-jest": "^29.4.5",
+    "terser-webpack-plugin": "^5.3.16",
+    "ts-jest": "^29.4.6",
     "ts-loader": "^9.5.4",
     "ts-node": "^10.9.2",
     "typescript": "5.9.3",
-    "webpack": "^5.102.1",
+    "webpack": "^5.104.1",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.2",
     "write-file-webpack-plugin": "^4.5.1"

package/toClosestFontPtSize.js

@@ -6,7 +6,7 @@
 import convertToCSSPTValue from './convertToCSSPTValue.js';
 export function toClosestFontPtSize(styleValue) {
   // duplicated FONT_PT_SIZES(available in ./ui/FontSizeCommandMenuButton)
-  var FONT_PT_SIZES = [8, 9, 10, 11, 12, 14, 18, 24, 30, 36, 48, 60, 72, 90];
+  var FONT_PT_SIZES = [6, 6.5, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 30, 36, 48, 60, 72, 90];
   var originalPTValue = convertToCSSPTValue(styleValue);
   if (FONT_PT_SIZES.includes(originalPTValue)) {
     return originalPTValue;

package/toClosestFontPtSize.js.flow

@@ -7,7 +7,26 @@ import convertToCSSPTValue from './convertToCSSPTValue.js';
 
 export function toClosestFontPtSize(styleValue: string): number {
   // duplicated FONT_PT_SIZES(available in ./ui/FontSizeCommandMenuButton)
-  const FONT_PT_SIZES = [8, 9, 10, 11, 12, 14, 18, 24, 30, 36, 48, 60, 72, 90];
+  const FONT_PT_SIZES = [6,
+    6.5,
+    7,
+    8,
+    9,
+    10,
+    11,
+    12,
+    14,
+    16,
+    18,
+    20,
+    22,
+    24,
+    30,
+    36,
+    48,
+    60,
+    72,
+    90,];
   const originalPTValue = convertToCSSPTValue(styleValue);
 
   if (FONT_PT_SIZES.includes(originalPTValue)) {

package/ui/FontSizeCommandMenuButton.js

@@ -19,7 +19,7 @@ import * as React from 'react';
 import { FontSizeCommand } from '@modusoperandi/licit-ui-commands';
 import CommandMenuButton from './CommandMenuButton.js';
 import findActiveFontSize from './findActiveFontSize.js';
-export var FONT_PT_SIZES = [8, 9, 10, 11, 12, 14, 18, 24, 30, 36, 48, 60, 72, 90];
+export var FONT_PT_SIZES = [6, 6.5, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 30, 36, 48, 60, 72, 90];
 var FONT_PT_SIZE_COMMANDS = FONT_PT_SIZES.reduce(function (memo, size) {
   memo[" ".concat(size, " ")] = new FontSizeCommand(size);
   return memo;

package/ui/FontSizeCommandMenuButton.js.flow

@@ -5,18 +5,24 @@ import { Transform } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
 import * as React from 'react';
 
-import {FontSizeCommand} from '@modusoperandi/licit-ui-commands';
+import { FontSizeCommand } from '@modusoperandi/licit-ui-commands';
 import CommandMenuButton from './CommandMenuButton.js';
 import findActiveFontSize from './findActiveFontSize.js';
 
 export const FONT_PT_SIZES = [
+  6,
+  6.5,
+  7,
   8,
   9,
   10,
   11,
   12,
   14,
+  16,
   18,
+  20,
+  22,
   24,
   30,
   36,

package/ui/TableNodeView.js

@@ -40,7 +40,7 @@ var TableNodeView = /*#__PURE__*/function (_TableView) {
   }, {
     key: "_updateAttrs",
     value: function _updateAttrs(node) {
-      var _node$attrs, _node$attrs2, _node$attrs3;
+      var _node$attrs, _node$attrs2, _node$attrs3, _node$attrs4;
       // Handle marginLeft
       var marginLeft = ((_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.marginLeft) || 0;
       this.table.style.marginLeft = marginLeft ? "".concat(marginLeft, "px") : '';
@@ -56,6 +56,11 @@ var TableNodeView = /*#__PURE__*/function (_TableView) {
       } else {
         this.table.removeAttribute('dirty');
       }
+      if ((_node$attrs4 = node.attrs) !== null && _node$attrs4 !== void 0 && _node$attrs4.coverPage) {
+        this.table.setAttribute('data-cover-page', 'true');
+      } else {
+        this.table.removeAttribute('data-cover-page');
+      }
     }
   }]);
 }(TableView);

package/ui/TableNodeView.js.flow

@@ -32,5 +32,10 @@ export default class TableNodeView extends TableView {
     } else {
       this.table.removeAttribute('dirty');
     }
+    if (node.attrs?.coverPage) {
+      this.table.setAttribute('data-cover-page', 'true');
+    } else {
+      this.table.removeAttribute('data-cover-page');
+    }
   }
 }

package/ui/czi-custom-menu-item.css

@@ -3,10 +3,10 @@
   border-radius: 0;
   display: block;
   margin: 0;
-  padding-bottom: 8px;
+  padding-bottom: 6px;
   padding-left: 20px;
   padding-right: 20px;
-  padding-top: 8px;
+  padding-top: 5px;
 }
 
 .czi-custom-menu-item.czi-custom-button:hover {

package/ui/czi-table.css

@@ -32,6 +32,15 @@
   vertical-align: top;
 }
 
+.ProseMirror table[data-cover-page="true"] td,
+.ProseMirror table[data-cover-page="true"] th {
+  padding: 4px;
+}
+
+table[data-cover-page="true"].molm-czi-image-view.align-center {
+  margin: 0 0 -18px;
+}
+
 .ProseMirror th {
   background-color: var(--czi-table-header-background-color);
   font-weight: bold;