@modusoperandi/licit 0.1.9 → 0.13.2

package/dist/client/CollabConnector.js

@@ -41,6 +41,21 @@ class CollabConnector extends _SimpleConnector.default {
 
     _defineProperty(this, "_stepKeys", void 0);
 
+    _defineProperty(this, "cleanUp", () => {
+      // remove collab plugin
+      if (this._connection) {
+        const cpIdx = this._editorState.plugins.findIndex(plugin => {
+          return 'collab$' === plugin.spec.key.key;
+        });
+
+        if (-1 != cpIdx) {
+          this._editorState.plugins.splice(cpIdx, 1);
+        }
+
+        this._connection.close();
+      }
+    });
+
     _defineProperty(this, "onEdit", transaction => {
       if (!this._connection.ready) {
         console.warn('not ready');
@@ -55,8 +70,8 @@ class CollabConnector extends _SimpleConnector.default {
       });
     });
 
-    _defineProperty(this, "updateSchema", schema => {
-      this._connection.updateSchema(schema);
+    _defineProperty(this, "updateSchema", (schema, data) => {
+      this._connection.updateSchema(schema, data);
     });
 
     const {

package/dist/client/CollabConnector.js.flow

@@ -51,6 +51,21 @@ class CollabConnector extends SimpleConnector {
     };
   }
 
+  cleanUp = () => {
+    // remove collab plugin
+    if (this._connection) {
+      const cpIdx = this._editorState.plugins.findIndex((plugin) => {
+        return 'collab$' === plugin.spec.key.key;
+      });
+
+      if (-1 != cpIdx) {
+        this._editorState.plugins.splice(cpIdx, 1);
+      }
+
+      this._connection.close();
+    }
+  };
+
   onEdit = (transaction: Transform): void => {
     if (!this._connection.ready) {
       console.warn('not ready');
@@ -63,8 +78,8 @@ class CollabConnector extends SimpleConnector {
 
   // FS IRAD-1040 2020-09-02
   // Send the modified schema to server
-  updateSchema = (schema: Schema) => {
-    this._connection.updateSchema(schema);
+  updateSchema = (schema: Schema, data: any) => {
+    this._connection.updateSchema(schema, data);
   };
 }
 

package/dist/client/EditorConnection.js

@@ -102,7 +102,7 @@ class EditorConnection {
       if (newEditState) {
         let sendable;
 
-        if (newEditState.doc.content.size > 40000) {
+        if (newEditState.doc.content.size > 4000000000000) {
           if (this.state.comm !== 'detached') {
             this.report.failure('Document too big. Detached.');
           }
@@ -146,7 +146,18 @@ class EditorConnection {
   } // All state changes go through this
 
 
-  // Load the document from the server and start up
+  dispatchData(data) {
+    this.report.success();
+    this.backOff = 0;
+    this.dispatch({
+      type: 'loaded',
+      doc: this.getEffectiveSchema().nodeFromJSON(data),
+      version: data.version,
+      users: data.users
+    });
+  } // Load the document from the server and start up
+
+
   start() {
     this.run((0, _http.GET)(this.url)).then(data => {
       data = JSON.parse(data);
@@ -255,14 +266,14 @@ class EditorConnection {
   // Send the modified schema to server
 
 
-  updateSchema(schema) {
+  updateSchema(schema, input) {
     // to avoid cyclic reference error, use flatted string.
     const schemaFlatted = (0, _flatted.stringify)(schema);
     this.run((0, _http.POST)(this.url + '/schema/', schemaFlatted, 'text/plain')).then(data => {
       console.log("collab server's schema updated"); // [FS] IRAD-1040 2020-09-08
 
       this.schema = schema;
-      this.start();
+      this.start(input);
     }, err => {
       this.report.failure(err);
     });

package/dist/client/EditorConnection.js.flow

@@ -106,7 +106,7 @@ class EditorConnection {
 
     if (newEditState) {
       let sendable;
-      if (newEditState.doc.content.size > 40000) {
+      if (newEditState.doc.content.size > 4000000000000) {
         if (this.state.comm !== 'detached') {
           this.report.failure('Document too big. Detached.');
         }
@@ -132,6 +132,17 @@ class EditorConnection {
     }
   };
 
+  dispatchData(data: any) {
+    this.report.success();
+    this.backOff = 0;
+    this.dispatch({
+      type: 'loaded',
+      doc: this.getEffectiveSchema().nodeFromJSON(data),
+      version: data.version,
+      users: data.users,
+    });
+  }
+
   // Load the document from the server and start up
   start(): void {
     this.run(GET(this.url)).then(
@@ -242,7 +253,7 @@ class EditorConnection {
 
   // [FS] IRAD-1040 2020-09-02
   // Send the modified schema to server
-  updateSchema(schema: Schema) {
+  updateSchema(schema: Schema, input: any) {
     // to avoid cyclic reference error, use flatted string.
     const schemaFlatted = stringify(schema);
     this.run(POST(this.url + '/schema/', schemaFlatted, 'text/plain')).then(
@@ -250,7 +261,7 @@ class EditorConnection {
         console.log("collab server's schema updated");
         // [FS] IRAD-1040 2020-09-08
         this.schema = schema;
-        this.start();
+        this.start(input);
       },
       (err) => {
         this.report.failure(err);

package/dist/client/Licit.js

@@ -31,9 +31,7 @@ var _CollabConnector = _interopRequireDefault(require("./CollabConnector"));
 
 var _createEmptyEditorState = require("../createEmptyEditorState");
 
-var _createPopUp = _interopRequireDefault(require("../ui/createPopUp"));
-
-var _PopUpPosition = require("../ui/PopUpPosition");
+var _licitUiCommands = require("@modusoperandi/licit-ui-commands");
 
 var _AlertInfo = _interopRequireDefault(require("../ui/AlertInfo"));
 
@@ -117,7 +115,7 @@ class Licit extends React.Component {
     _defineProperty(this, "setContent", function () {
       let content = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // [FS] IRAD-1571 2021-09-27
-      // dispatch a transaction that MUST start from the view�s current state;
+      // dispatch a transaction that MUST start from the view’s current state;
       const editorState = _this._editorView.state;
       const {
         doc,
@@ -126,7 +124,10 @@ class Licit extends React.Component {
       let {
         tr
       } = editorState;
-      const document = schema.nodeFromJSON(content ? content : _createEmptyEditorState.EMPTY_DOC_JSON);
+      const document = schema.nodeFromJSON(content ? content : _createEmptyEditorState.EMPTY_DOC_JSON); // [FS] IRAD-1593 2021-10-12
+      // Reset lastKeyCode since the content is set dynamically and so lastKeyCode is invalid now.
+
+      _this._editorView.lastKeyCode = null;
 
       const selection = _prosemirrorState.TextSelection.create(doc, 0, doc.content.size);
 
@@ -173,7 +174,14 @@ class Licit extends React.Component {
 
         if (transaction.docChanged) {
           const docJson = transaction.doc.toJSON();
-          const isEmpty = this.isDocEmpty(docJson); // setCFlags is/was always the opposite of isEmpty.
+          let isEmpty = false;
+
+          if (docJson.content && docJson.content.length === 1) {
+            if (!docJson.content[0].content || docJson.content[0].content && docJson.content[0].content[0].text && '' === docJson.content[0].content[0].text.trim()) {
+              isEmpty = true;
+            }
+          } // setCFlags is/was always the opposite of isEmpty.
+
 
           if (isEmpty) {
             this.resetCounters(transaction);
@@ -199,15 +207,11 @@ class Licit extends React.Component {
       } = editorView;
       this._editorView = editorView;
       const tr = state.tr;
-      const doc = state.doc; // [FS] IRAD-1710 2022-03-04
-
-      if (!this.isDocEmpty(doc.toJSON())) {
-        const trx = tr.setSelection(_prosemirrorState.TextSelection.create(doc, 0, doc.content.size));
-        dispatch(trx.scrollIntoView());
-      } // [FS] IRAD-1578 2021-09-27
+      const doc = state.doc;
+      const trx = tr.setSelection(_prosemirrorState.TextSelection.create(doc, 0, doc.content.size));
+      dispatch(trx.scrollIntoView()); // [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 === '') {
         editorView.focus();
         this.state.onReadyCB(this);
@@ -322,7 +326,7 @@ class Licit extends React.Component {
 
     if (this._connector.updateSchema) {
       // Use known editorState to update schema.
-      this._connector.updateSchema(editorState.schema);
+      this._connector.updateSchema(editorState.schema, data);
     }
   } // [FS] IRAD-1578 2021-09-27
 
@@ -343,9 +347,9 @@ class Licit extends React.Component {
 
   showAlert() {
     const anchor = null;
-    this._popUp = (0, _createPopUp.default)(_AlertInfo.default, null, {
+    this._popUp = (0, _licitUiCommands.createPopUp)(_AlertInfo.default, null, {
       anchor,
-      position: _PopUpPosition.atViewportCenter,
+      position: _licitUiCommands.atViewportCenter,
       onClose: val => {
         if (this._popUp) {
           this._popUp = null;
@@ -422,45 +426,70 @@ class Licit extends React.Component {
     return node.attrs && node.attrs[attrName];
   }
 
+  hasDataChanged(nextData) {
+    let dataChanged = false; // [FS] IRAD-1571 2021-09-27
+    // dispatch a transaction that MUST start from the view’s current state;
+    // [FS] IRAD-1589 2021-10-04
+    // Do a proper circular JSON comparison.
+
+    if ((0, _flatted.stringify)(this.state.data) !== (0, _flatted.stringify)(nextData)) {
+      const editorState = this._editorView.state;
+      const nextDoc = editorState.schema.nodeFromJSON(nextData ? nextData : _createEmptyEditorState.EMPTY_DOC_JSON);
+      dataChanged = !nextDoc.eq(editorState.doc);
+    }
+
+    return dataChanged;
+  }
+
+  changeContent(data) {
+    if (this.hasDataChanged(data)) {
+      // FS IRAD-1592 2021-11-10
+      // Release here quickly, so that update doesn't care about at this point.
+      // data changed, so update document content
+      setTimeout(this.setContent.bind(this, data), 1);
+    }
+  }
+
   shouldComponentUpdate(nextProps, nextState) {
     // Only interested if properties are set from outside.
     if (!this._skipSCU) {
       this._skipSCU = false;
-      let dataChanged = false; // [FS] IRAD-1571 2021-09-27
-      // dispatch a transaction that MUST start from the view�s current state;
-      // [FS] IRAD-1589 2021-10-04
-      // Do a proper circular JSON comparison.
-
-      if ((0, _flatted.stringify)(this.state.data) !== (0, _flatted.stringify)(nextState.data)) {
-        const editorState = this._editorView.state;
-        const nextDoc = editorState.schema.nodeFromJSON(nextState.data ? nextState.data : _createEmptyEditorState.EMPTY_DOC_JSON);
-        dataChanged = !nextDoc.eq(editorState.doc);
-      }
-
-      if (dataChanged) {
-        // data changed, so update document content
-        this.setContent(nextState.data);
-      }
+      this.changeContent(nextState.data);
 
       if (this.state.docID !== nextState.docID) {
-        // Collaborative mode changed
-        const collabEditing = nextState.docID !== '';
-        const editorState = this._editorView.state;
-        const setState = this.setState.bind(this);
-        const docID = nextState.docID || '';
-        const collabServiceURL = nextState.collabServiceURL || '/collaboration-service'; // create new connector
-
-        this._connector = collabEditing ? new _CollabConnector.default(editorState, setState, {
-          docID,
-          collabServiceURL
-        }, this._defaultEditorSchema, this._defaultEditorPlugins, // [FS] IRAD-1578 2021-09-27
-        this.onReady.bind(this)) : new _SimpleConnector.default(editorState, setState);
+        setTimeout(this.setDocID.bind(this, nextState), 1);
       }
     }
 
     return true;
   }
 
+  setDocID(nextState) {
+    // Collaborative mode changed
+    const collabEditing = nextState.docID !== '';
+    const editorState = this._editorView.state;
+    const setState = this.setState.bind(this);
+    const docID = nextState.docID || '';
+    const collabServiceURL = nextState.collabServiceURL || '/collaboration-service';
+
+    if (this._connector) {
+      this._connector.cleanUp();
+    } // create new connector
+
+
+    this._connector = collabEditing ? new _CollabConnector.default(editorState, setState, {
+      docID,
+      collabServiceURL
+    }, this._defaultEditorSchema, this._defaultEditorPlugins, // [FS] IRAD-1578 2021-09-27
+    this.onReady.bind(this)) : new _SimpleConnector.default(editorState, setState); // FS IRAD-1592 2021-11-10
+    // Notify collab server
+
+    if (this._connector.updateSchema) {
+      // Use known editorState to update schema.
+      this._connector.updateSchema(editorState.schema);
+    }
+  }
+
   render() {
     const {
       editorState,
@@ -487,22 +516,8 @@ class Licit extends React.Component {
     });
   }
 
-  isDocEmpty(docJson) {
-    let isEmpty = false;
-
-    if (docJson.content && docJson.content.length === 1) {
-      if (!docJson.content[0].content || docJson.content[0].content && // [FS] IRAD-1710 2022-03-04
-      // Empty if no content OR when the one & only text content is empty.
-      1 === docJson.content[0].content.length && 'text' === docJson.content[0].content[0].type && docJson.content[0].content[0].text && '' === docJson.content[0].content[0].text) {
-        isEmpty = true;
-      }
-    }
-
-    return isEmpty;
-  } // [FS] IRAD-1173 2021-02-25
+  // [FS] IRAD-1173 2021-02-25
   // Bug fix: Transaction mismatch error when a dialog is opened and keep typing.
-
-
   closeOpenedPopupModels() {
     const element = document.getElementsByClassName('czi-pop-up-element')[0];
 

package/dist/client/Licit.js.flow

@@ -14,8 +14,8 @@ import SimpleConnector from './SimpleConnector';
 import CollabConnector from './CollabConnector';
 import { EMPTY_DOC_JSON } from '../createEmptyEditorState';
 import type { EditorRuntime } from '../Types';
-import createPopUp from '../ui/createPopUp';
-import { atViewportCenter } from '../ui/PopUpPosition';
+import { createPopUp } from '@modusoperandi/licit-ui-commands';
+import { atViewportCenter } from '@modusoperandi/licit-ui-commands';
 import AlertInfo from '../ui/AlertInfo';
 import { SetDocAttrStep } from '@modusoperandi/licit-doc-attrs-step';
 import './licit.css';
@@ -73,7 +73,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.
@@ -132,17 +132,17 @@ class Licit extends React.Component<any, any> {
     const setState = this.setState.bind(this);
     this._connector = collaborative
       ? new CollabConnector(
-        editorState,
-        setState,
-        {
-          docID,
-          collabServiceURL,
-        },
-        this._defaultEditorSchema,
-        this._defaultEditorPlugins,
-        // [FS] IRAD-1578 2021-09-27
-        this.onReady.bind(this)
-      )
+          editorState,
+          setState,
+          {
+            docID,
+            collabServiceURL,
+          },
+          this._defaultEditorSchema,
+          this._defaultEditorPlugins,
+          // [FS] IRAD-1578 2021-09-27
+          this.onReady.bind(this)
+        )
       : new SimpleConnector(editorState, setState);
 
     // FS IRAD-989 2020-18-06
@@ -168,7 +168,7 @@ class Licit extends React.Component<any, any> {
     // Get the modified schema from editorstate and send it to collab server
     if (this._connector.updateSchema) {
       // Use known editorState to update schema.
-      this._connector.updateSchema(editorState.schema);
+      this._connector.updateSchema(editorState.schema, data);
     }
   }
 
@@ -265,12 +265,16 @@ class Licit extends React.Component<any, any> {
 
   setContent = (content: any = {}): void => {
     // [FS] IRAD-1571 2021-09-27
-    // dispatch a transaction that MUST start from the view�s current state;
+    // dispatch a transaction that MUST start from the view’s current state;
     const editorState = this._editorView.state;
     const { doc, schema } = editorState;
     let { tr } = editorState;
     const document = schema.nodeFromJSON(content ? content : EMPTY_DOC_JSON);
 
+    // [FS] IRAD-1593 2021-10-12
+    // Reset lastKeyCode since the content is set dynamically and so lastKeyCode is invalid now.
+    this._editorView.lastKeyCode = null;
+
     const selection = TextSelection.create(doc, 0, doc.content.size);
 
     tr = tr.setSelection(selection).replaceSelectionWith(document, false);
@@ -278,8 +282,8 @@ class Licit extends React.Component<any, any> {
     // set the value for object metadata  and objectId
     tr = this.isNodeHasAttribute(document, ATTR_OBJMETADATA)
       ? tr.step(
-        new SetDocAttrStep(ATTR_OBJMETADATA, document.attrs.objectMetaData)
-      )
+          new SetDocAttrStep(ATTR_OBJMETADATA, document.attrs.objectMetaData)
+        )
       : tr;
     tr = this.isNodeHasAttribute(document, ATTR_OBJID)
       ? tr.step(new SetDocAttrStep(ATTR_OBJID, document.attrs.objectId))
@@ -289,58 +293,84 @@ class Licit extends React.Component<any, any> {
     this._editorView.dispatch(tr);
   };
 
+  hasDataChanged(nextData: any) {
+    let dataChanged = false;
+
+    // [FS] IRAD-1571 2021-09-27
+    // dispatch a transaction that MUST start from the view’s current state;
+    // [FS] IRAD-1589 2021-10-04
+    // Do a proper circular JSON comparison.
+    if (stringify(this.state.data) !== stringify(nextData)) {
+      const editorState = this._editorView.state;
+      const nextDoc = editorState.schema.nodeFromJSON(
+        nextData ? nextData : EMPTY_DOC_JSON
+      );
+      dataChanged = !nextDoc.eq(editorState.doc);
+    }
+
+    return dataChanged;
+  }
+
+  changeContent(data: any) {
+    if (this.hasDataChanged(data)) {
+      // FS IRAD-1592 2021-11-10
+      // Release here quickly, so that update doesn't care about at this point.
+      // data changed, so update document content
+      setTimeout(this.setContent.bind(this, data), 1);
+    }
+  }
+
   shouldComponentUpdate(nextProps: any, nextState: any) {
     // Only interested if properties are set from outside.
     if (!this._skipSCU) {
       this._skipSCU = false;
-      let dataChanged = false;
-
-      // [FS] IRAD-1571 2021-09-27
-      // dispatch a transaction that MUST start from the view�s current state;
-      // [FS] IRAD-1589 2021-10-04
-      // Do a proper circular JSON comparison.
-      if (stringify(this.state.data) !== stringify(nextState.data)) {
-        const editorState = this._editorView.state;
-        const nextDoc = editorState.schema.nodeFromJSON(
-          nextState.data ? nextState.data : EMPTY_DOC_JSON
-        );
-        dataChanged = !nextDoc.eq(editorState.doc);
-      }
 
-      if (dataChanged) {
-        // data changed, so update document content
-        this.setContent(nextState.data);
-      }
+      this.changeContent(nextState.data);
 
       if (this.state.docID !== nextState.docID) {
-        // Collaborative mode changed
-        const collabEditing = nextState.docID !== '';
-        const editorState = this._editorView.state;
-        const setState = this.setState.bind(this);
-        const docID = nextState.docID || '';
-        const collabServiceURL =
-          nextState.collabServiceURL || '/collaboration-service';
-        // create new connector
-        this._connector = collabEditing
-          ? new CollabConnector(
-            editorState,
-            setState,
-            {
-              docID,
-              collabServiceURL,
-            },
-            this._defaultEditorSchema,
-            this._defaultEditorPlugins,
-            // [FS] IRAD-1578 2021-09-27
-            this.onReady.bind(this)
-          )
-          : new SimpleConnector(editorState, setState);
+        setTimeout(this.setDocID.bind(this, nextState), 1);
       }
     }
 
     return true;
   }
 
+  setDocID(nextState: any) {
+    // Collaborative mode changed
+    const collabEditing = nextState.docID !== '';
+    const editorState = this._editorView.state;
+    const setState = this.setState.bind(this);
+    const docID = nextState.docID || '';
+    const collabServiceURL =
+      nextState.collabServiceURL || '/collaboration-service';
+
+    if (this._connector) {
+      this._connector.cleanUp();
+    }
+    // create new connector
+    this._connector = collabEditing
+      ? new CollabConnector(
+          editorState,
+          setState,
+          {
+            docID,
+            collabServiceURL,
+          },
+          this._defaultEditorSchema,
+          this._defaultEditorPlugins,
+          // [FS] IRAD-1578 2021-09-27
+          this.onReady.bind(this)
+        )
+      : new SimpleConnector(editorState, setState);
+
+    // FS IRAD-1592 2021-11-10
+    // Notify collab server
+    if (this._connector.updateSchema) {
+      // Use known editorState to update schema.
+      this._connector.updateSchema(editorState.schema);
+    }
+  }
+
   render(): React.Element<any> {
     const {
       editorState,
@@ -401,7 +431,18 @@ class Licit extends React.Component<any, any> {
 
       if (transaction.docChanged) {
         const docJson = transaction.doc.toJSON();
-        const isEmpty = this.isDocEmpty(docJson);
+        let isEmpty = false;
+
+        if (docJson.content && docJson.content.length === 1) {
+          if (
+            !docJson.content[0].content ||
+            (docJson.content[0].content &&
+              docJson.content[0].content[0].text &&
+              '' === docJson.content[0].content[0].text.trim())
+          ) {
+            isEmpty = true;
+          }
+        }
 
         // setCFlags is/was always the opposite of isEmpty.
         if (isEmpty) {
@@ -419,27 +460,6 @@ class Licit extends React.Component<any, any> {
       }
     }
   };
-
-  isDocEmpty(docJson: Object) {
-    let isEmpty = false;
-
-    if (docJson.content && docJson.content.length === 1) {
-      if (
-        !docJson.content[0].content ||
-        (docJson.content[0].content &&
-          // [FS] IRAD-1710 2022-03-04
-          // Empty if no content OR when the one & only text content is empty.
-          1 === docJson.content[0].content.length &&
-          'text' === docJson.content[0].content[0].type &&
-          docJson.content[0].content[0].text &&
-          '' === docJson.content[0].content[0].text)
-      ) {
-        isEmpty = true;
-      }
-    }
-    return isEmpty;
-  }
-
   // [FS] IRAD-1173 2021-02-25
   // Bug fix: Transaction mismatch error when a dialog is opened and keep typing.
   closeOpenedPopupModels() {
@@ -456,12 +476,8 @@ class Licit extends React.Component<any, any> {
     this._editorView = editorView;
     const tr = state.tr;
     const doc = state.doc;
-
-    // [FS] IRAD-1710 2022-03-04
-    if (!this.isDocEmpty(doc.toJSON())) {
-      const trx = tr.setSelection(TextSelection.create(doc, 0, doc.content.size));
-      dispatch(trx.scrollIntoView());
-    }
+    const trx = tr.setSelection(TextSelection.create(doc, 0, doc.content.size));
+    dispatch(trx.scrollIntoView());
 
     // [FS] IRAD-1578 2021-09-27
     // In collab mode, fire onRead only after getting the response from collab server.