@modusoperandi/licit 1.4.0 → 1.4.2

package/client/Licit.js

@@ -133,9 +133,9 @@ var Licit = /*#__PURE__*/function (_React$Component) {
           // Only need to call if there is any difference in collab mode OR always in non-collab mode.
           _this._connector.onEdit(transaction, _this._editorView);
         }
-        if (transaction.docChanged) {
-          var _docJson$attrs;
-          var docJson = transaction.doc.toJSON();
+        if (transaction.docChanged || !isSameState) {
+          var _this$_editorView, _docJson$attrs;
+          var docJson = (_this$_editorView = _this._editorView) === null || _this$_editorView === void 0 || (_this$_editorView = _this$_editorView.state) === null || _this$_editorView === void 0 || (_this$_editorView = _this$_editorView.doc) === null || _this$_editorView === void 0 ? void 0 : _this$_editorView.toJSON();
           if (!Object.isFrozen(docJson === null || docJson === void 0 || (_docJson$attrs = docJson.attrs) === null || _docJson$attrs === void 0 ? void 0 : _docJson$attrs.objectMetaData)) {
             docJson.attrs.objectMetaData = _objectSpread(_objectSpread({}, docJson.attrs.objectMetaData), {}, {
               lastEditedOn: new Date().toISOString().replace('Z', '+00:00')
@@ -172,7 +172,23 @@ var Licit = /*#__PURE__*/function (_React$Component) {
       _this._editorView = editorView;
       var tr = state.tr;
       dispatch(tr.scrollIntoView());
-
+      if (!_this._editorView.editable) {
+        var _tr = _this._editorView.state.tr;
+        var modified = false;
+        _this._editorView.state.doc.descendants(function (node, pos) {
+          if (node.type.name === 'table') {
+            var _tr2;
+            // Apply setNodeMarkup with same type and attrs to force a refresh
+            _tr = (_tr2 = _tr) === null || _tr2 === void 0 ? void 0 : _tr2.setNodeMarkup(pos, undefined, _objectSpread(_objectSpread({}, node.attrs), {}, {
+              Id: pos
+            }));
+            modified = true;
+          }
+        });
+        if (modified) {
+          _this._editorView.dispatch(_tr);
+        }
+      }
       // [FS] IRAD-1578 2021-09-27
       // In collab mode, fire onRead only after getting the response from collab server.
       if (_this.state.onReadyCB && _this.state.docID === '') {

package/client/Licit.js.flow

@@ -77,7 +77,7 @@ class Licit extends React.Component<any, any> {
     this._editorView = null;
     this._skipSCU = true;
 
-    const noop = function () { };
+    const noop = function () {};
 
     // [FS] IRAD-981 2020-06-10
     // Component's configurations.
@@ -508,14 +508,13 @@ class Licit extends React.Component<any, any> {
         this._connector.onEdit(transaction, this._editorView);
       }
 
-      if (transaction.docChanged) {
-        const docJson = transaction.doc.toJSON();
+      if (transaction.docChanged || !isSameState) {
+        const docJson = this._editorView?.state?.doc?.toJSON();
         if (!Object.isFrozen(docJson?.attrs?.objectMetaData)) {
           docJson.attrs.objectMetaData = {
             ...docJson.attrs.objectMetaData,
-            lastEditedOn: new Date().toISOString().replace('Z', '+00:00')
+            lastEditedOn: new Date().toISOString().replace('Z', '+00:00'),
           };
-
         }
         let isEmpty = false;
         if (docJson.content && docJson.content.length === 1) {
@@ -560,7 +559,20 @@ class Licit extends React.Component<any, any> {
     this._editorView = editorView;
     const tr = state.tr;
     dispatch(tr.scrollIntoView());
-
+    if (!this._editorView.editable) {
+      let _tr = this._editorView.state.tr;
+      let modified = false;
+      this._editorView.state.doc.descendants((node, pos) => {
+        if (node.type.name === 'table') {
+          // Apply setNodeMarkup with same type and attrs to force a refresh
+          _tr = _tr?.setNodeMarkup(pos, undefined, { ...node.attrs, Id: pos });
+          modified = true;
+        }
+      });
+      if (modified) {
+        this._editorView.dispatch(_tr);
+      }
+    }
     // [FS] IRAD-1578 2021-09-27
     // In collab mode, fire onRead only after getting the response from collab server.
     if (this.state.onReadyCB && this.state.docID === '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "license": "MIT",
   "type": "module",
   "subversion": "1",
@@ -71,8 +71,8 @@
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-flow": "^7.10.4",
     "@babel/preset-react": "^7.18.6",
-    "@cyclonedx/cyclonedx-npm": "^3.0.0",
-    "babel-jest": "^29.2.0",
+    "@cyclonedx/cyclonedx-npm": "^4.0.0",
+    "babel-jest": "^30.0.2",
     "babel-loader": "^10.0.0",
     "babel-plugin-flow-react-proptypes": "^26.0.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
@@ -84,13 +84,13 @@
     "css-loader": "^7.1.1",
     "eslint": "^9.20.1",
     "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-jest": "^28.2.0",
+    "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.33.2",
     "exports-loader": "^5.0.0",
     "express": "^5.1.0",
     "file-loader": "^6.2.0",
-    "flow-bin": "^0.272.1",
+    "flow-bin": "^0.276.0",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^4.0.0",
     "flow-webpack-plugin": "^1.2.0",
@@ -102,7 +102,7 @@
     "husky": "^9.0.10",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.2.0",
-    "jest-environment-jsdom": "^29.3.1",
+    "jest-environment-jsdom": "^30.0.0",
     "jest-junit": "^16.0.0",
     "jest-prosemirror": "^3.0.0",
     "jest-sonar-reporter": "^2.0.0",

package/ui/Icon.js

@@ -12,7 +12,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (c = i[4] || 3, u = i[5] === e ? i[3] : i[5], i[4] = 3, i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }

package/ui/LinkURLEditor.js

@@ -103,8 +103,8 @@ var LinkURLEditor = /*#__PURE__*/function (_React$PureComponent) {
           return false;
         }
         return TOCselectedNode_.some(function (item) {
-          var _item$node_;
-          return ((_item$node_ = item.node_) === null || _item$node_ === void 0 || (_item$node_ = _item$node_.content[0]) === null || _item$node_ === void 0 || (_item$node_ = _item$node_.text) === null || _item$node_ === void 0 ? void 0 : _item$node_.trim()) !== '';
+          var _item$content$;
+          return (item === null || item === void 0 || (_item$content$ = item.content[0]) === null || _item$content$ === void 0 || (_item$content$ = _item$content$.text) === null || _item$content$ === void 0 ? void 0 : _item$content$.trim()) !== '';
         });
       };
       var isValid = isTOCValid();
@@ -179,27 +179,27 @@ var LinkURLEditor = /*#__PURE__*/function (_React$PureComponent) {
         action: "#"
       }, /*#__PURE__*/React.createElement("label", null, "Select the Inner Link"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("select", {
         defaultValue: TOCselectedNode_.some(function (res) {
-          var _res$node_;
-          return ((_res$node_ = res.node_) === null || _res$node_ === void 0 || (_res$node_ = _res$node_.content[0]) === null || _res$node_ === void 0 ? void 0 : _res$node_.text) === url;
+          var _res$content$;
+          return (res === null || res === void 0 || (_res$content$ = res.content[0]) === null || _res$content$ === void 0 ? void 0 : _res$content$.text) === url;
         }) ? url : null,
         id: "toc",
         name: "toccontents",
         size: "3"
       }, TOCselectedNode_ === null || TOCselectedNode_ === void 0 ? void 0 : TOCselectedNode_.filter(function (res) {
-        var _res$node_2;
-        return ((_res$node_2 = res.node_) === null || _res$node_2 === void 0 || (_res$node_2 = _res$node_2.content[0]) === null || _res$node_2 === void 0 || (_res$node_2 = _res$node_2.text) === null || _res$node_2 === void 0 ? void 0 : _res$node_2.trim()) !== '';
+        var _res$content$2;
+        return (res === null || res === void 0 || (_res$content$2 = res.content[0]) === null || _res$content$2 === void 0 || (_res$content$2 = _res$content$2.text) === null || _res$content$2 === void 0 ? void 0 : _res$content$2.trim()) !== '';
       }).map(function (res, index) {
-        var _res$node_3, _res$node_6, _res$node_7;
+        var _res$content$3, _res$content$5, _res$content$6;
         return /*#__PURE__*/React.createElement("option", {
-          "data-tooltip-content": (_res$node_3 = res.node_) === null || _res$node_3 === void 0 || (_res$node_3 = _res$node_3.content[0]) === null || _res$node_3 === void 0 ? void 0 : _res$node_3.text,
+          "data-tooltip-content": res === null || res === void 0 || (_res$content$3 = res.content[0]) === null || _res$content$3 === void 0 ? void 0 : _res$content$3.text,
           "data-tooltip-id": "select-toc-tooltip",
           key: index,
           onClick: function onClick() {
-            var _res$node_4, _res$node_5;
-            _this2.handleOptionChange((_res$node_4 = res.node_) === null || _res$node_4 === void 0 || (_res$node_4 = _res$node_4.content[0]) === null || _res$node_4 === void 0 ? void 0 : _res$node_4.text, (_res$node_5 = res.node_) === null || _res$node_5 === void 0 ? void 0 : _res$node_5.attrs.selectionId);
+            var _res$content$4;
+            _this2.handleOptionChange(res === null || res === void 0 || (_res$content$4 = res.content[0]) === null || _res$content$4 === void 0 ? void 0 : _res$content$4.text, res === null || res === void 0 ? void 0 : res.attrs.selectionId);
           },
-          value: (_res$node_6 = res.node_) === null || _res$node_6 === void 0 || (_res$node_6 = _res$node_6.content[0]) === null || _res$node_6 === void 0 ? void 0 : _res$node_6.text
-        }, (_res$node_7 = res.node_) === null || _res$node_7 === void 0 || (_res$node_7 = _res$node_7.content[0]) === null || _res$node_7 === void 0 ? void 0 : _res$node_7.text);
+          value: res === null || res === void 0 || (_res$content$5 = res.content[0]) === null || _res$content$5 === void 0 ? void 0 : _res$content$5.text
+        }, res === null || res === void 0 || (_res$content$6 = res.content[0]) === null || _res$content$6 === void 0 ? void 0 : _res$content$6.text);
       })), /*#__PURE__*/React.createElement(ReactTooltip, {
         effect: "solid",
         id: "select-toc-tooltip",

package/ui/LinkURLEditor.js.flow

@@ -69,7 +69,7 @@ class LinkURLEditor extends React.PureComponent<any, any> {
       }
 
       return TOCselectedNode_.some(
-        (item) => item.node_?.content[0]?.text?.trim() !== ''
+        (item) => item?.content[0]?.text?.trim() !== ''
       );
     };
     const isValid = isTOCValid();
@@ -146,7 +146,7 @@ class LinkURLEditor extends React.PureComponent<any, any> {
                 <select
                   defaultValue={
                     TOCselectedNode_.some(
-                      (res) => res.node_?.content[0]?.text === url
+                      (res) => res?.content[0]?.text === url
                     )
                       ? url
                       : null
@@ -156,21 +156,21 @@ class LinkURLEditor extends React.PureComponent<any, any> {
                   size="3"
                 >
                   {TOCselectedNode_?.filter(
-                    (res) => res.node_?.content[0]?.text?.trim() !== ''
+                    (res) => res?.content[0]?.text?.trim() !== ''
                   ).map((res, index) => (
                     <option
-                      data-tooltip-content={res.node_?.content[0]?.text}
+                      data-tooltip-content={res?.content[0]?.text}
                       data-tooltip-id="select-toc-tooltip"
                       key={index}
                       onClick={() => {
                         this.handleOptionChange(
-                          res.node_?.content[0]?.text,
-                          res.node_?.attrs.selectionId
+                          res?.content[0]?.text,
+                          res?.attrs.selectionId
                         );
                       }}
-                      value={res.node_?.content[0]?.text}
+                      value={res?.content[0]?.text}
                     >
-                      {res.node_?.content[0]?.text}
+                      {res?.content[0]?.text}
                     </option>
                   ))}
                 </select>

package/ui/czi-editor.css

@@ -209,3 +209,8 @@
 .ProseMirror-hideselection *::-moz-selection {
   background-color: transparent;
 }
+
+td[fullsize="1"] .czi-font-size-mark {
+  line-height: unset
+ 
+}

package/ui/czi-table.css

@@ -9,9 +9,10 @@
   height: 12px;
  }
 .ProseMirror table {
+  border: 1px solid var(--czi-table-border-color);
   border-collapse:collapse;
   border-spacing: 0;
-  border: none;
+  border-width: 0 thin thin 0;
   margin: 0;
   overflow: hidden;
   page-break-inside: avoid;
@@ -23,6 +24,7 @@
 .ProseMirror th {
   background-color: #fff;
   border: 1px solid var(--czi-table-border-color);
+  border-width: thin 0 0 thin;
   box-sizing: border-box;
   min-width: 1em;
   padding: 8px;
@@ -79,6 +81,7 @@ Rezie cursor position issue fixed. */
   z-index: 2;
 }
 
+
 @media only print {
   .ProseMirror table {
     width: 100% !important;