@modusoperandi/licit 0.13.10 → 0.13.18

package/src/client/Licit.js

@@ -51,7 +51,7 @@ export const DataType = Object.freeze({
  */
 class Licit extends React.Component<any, any> {
   _runtime: EditorRuntime;
-  _connector: any;
+  _connector: SimpleConnector;
   _clientID: string;
   _editorView: EditorView; // This will be handy in updating document's content.
   _skipSCU: boolean; // Flag to decide whether to skip shouldComponentUpdate
@@ -107,6 +107,9 @@ class Licit extends React.Component<any, any> {
     // Handle Image Upload from Angular App
     const runtime = props.runtime || null;
     const plugins = props.plugins || null;
+    // This flag decides whether DataType.HTML check is needed when
+    // changing document. If it forcefully done, it is not needed, otherwise needed.
+    this.skipDataTypeCheck = false;
 
     this._defaultEditorSchema = new Schema({
       nodes: EditorNodes,
@@ -135,6 +138,8 @@ class Licit extends React.Component<any, any> {
         )
       : new SimpleConnector(editorState, setState);
 
+    this._connector._dataDefined = !!props.data;
+
     // FS IRAD-989 2020-18-06
     // updating properties should automatically render the changes
 
@@ -152,6 +157,7 @@ class Licit extends React.Component<any, any> {
       disabled,
       embedded,
       runtime,
+      dataType,
     };
 
     // FS IRAD-1040 2020-26-08
@@ -313,13 +319,33 @@ class Licit extends React.Component<any, any> {
     return node.attrs && node.attrs[attrName];
   }
 
-  setContent = (content: any = {}): void => {
+  getDocument(content: any, editorState: EditorState, dataType: DataType) {
+    let document = null;
+    const { schema } = editorState;
+
+    if (DataType.JSON === dataType || this.skipDataTypeCheck) {
+      document = schema.nodeFromJSON(content ? content : EMPTY_DOC_JSON);
+    } else {
+      const tempEState = convertFromHTML(
+        content ? content : '',
+        schema,
+        editorState.plugins
+      );
+      document = tempEState.doc;
+    }
+
+    return document;
+  }
+
+  setContent = (content: any = {}, dataType: DataType): void => {
+    this.skipDataTypeCheck = false;
     // [FS] IRAD-1571 2021-09-27
     // dispatch a transaction that MUST start from the view’s current state;
     const editorState = this._editorView.state;
-    const { doc, schema } = editorState;
+    const { doc } = editorState;
     let { tr } = editorState;
-    const document = schema.nodeFromJSON(content ? content : EMPTY_DOC_JSON);
+    const document = this.getDocument(content, editorState, dataType);
+    this.skipDataTypeCheck = true;
 
     // [FS] IRAD-1593 2021-10-12
     // Reset lastKeyCode since the content is set dynamically and so lastKeyCode is invalid now.
@@ -339,7 +365,7 @@ class Licit extends React.Component<any, any> {
     this._editorView.dispatch(tr);
   };
 
-  hasDataChanged(nextData: any) {
+  hasDataChanged(nextData: any, nextDataType: DataType) {
     let dataChanged = false;
 
     // [FS] IRAD-1571 2021-09-27
@@ -348,21 +374,19 @@ class Licit extends React.Component<any, any> {
     // 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
-      );
+      const nextDoc = this.getDocument(nextData, editorState, nextDataType);
       dataChanged = !nextDoc.eq(editorState.doc);
     }
 
     return dataChanged;
   }
 
-  changeContent(data: any) {
-    if (this.hasDataChanged(data)) {
+  changeContent(data: any, dataType: DataType) {
+    if (this.hasDataChanged(data, dataType)) {
       // 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);
+      setTimeout(this.setContent.bind(this, data, dataType), 1);
     }
   }
 
@@ -371,13 +395,15 @@ class Licit extends React.Component<any, any> {
     if (!this._skipSCU) {
       this._skipSCU = false;
 
-      this.changeContent(nextState.data);
+      this.changeContent(nextState.data, nextState.dataType);
 
       if (this.state.docID !== nextState.docID) {
         setTimeout(this.setDocID.bind(this, nextState), 1);
       }
     }
 
+    this.skipDataTypeCheck = true;
+
     return true;
   }
 
@@ -628,6 +654,7 @@ class Licit extends React.Component<any, any> {
       delete propsCopy.data;
       this.setState(propsCopy);
     }
+    this.skipDataTypeCheck = false;
     // Need to go through shouldComponentUpdate lifecycle here, when updated from outside,
     // so that content is modified gracefully using transaction so that undo/redo works too.
     this._skipSCU = false;

package/src/client/SimpleConnector.js

@@ -14,6 +14,10 @@ export type SetStateCall = (
 class SimpleConnector {
   _setState: SetStateCall;
   _editorState: EditorState;
+  // This flag is used to deteremine if data passed in or not
+  // If not passed in, use the data from collab server when in collab mode.
+  // else use empty content.
+  _dataDefined: boolean;
 
   constructor(editorState: EditorState, setState: SetStateCall) {
     this._editorState = editorState;
@@ -49,6 +53,8 @@ class SimpleConnector {
   // Send the modified schema to server
   updateSchema = (schema: Schema, data: any) => {};
 
+  updateContent = (data: any) => {};
+
   cleanUp = () => {};
 }
 

package/src/convertFromHTML.js

@@ -12,6 +12,18 @@ export default function convertFromHTML(
   plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  root.innerHTML = html;
+  root.innerHTML = unEscape(html ? html : ' ');
   return convertFromDOMElement(root, schema, plugins);
 }
+
+function unEscape(htmlStr) {
+  if (htmlStr) {
+    htmlStr = htmlStr
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/&amp;/g, '&');
+  }
+  return htmlStr;
+}

package/src/ui/czi-link-tooltip.css

@@ -1,4 +1,4 @@
-@import '@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
 @import './czi-vars.css';
 
 .czi-link-tooltip {

package/src/ui/czi-vars.css

@@ -1,2 +1,2 @@
-@import '@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
 

package/utils/build_licit_collab_server.js

@@ -8,7 +8,7 @@ const env = require('./env');
 const path = require('path');
 
 const config = {
-  mode: 'production',//development
+  mode: env.NODE_ENV,
   entry: {// [FS] IRAD-901 2020-07-15 New collab server reusing base PM collab server
     run_licit_collab_server: path.join(__dirname, '../licit', 'server/collab', 'start.js'),
   },

package/webpack.config.js

@@ -20,7 +20,7 @@ var isDev = env.NODE_ENV === 'development' || 0;
 // isDev = false;
 
 var options = {
-  mode: 'production',
+  mode: env.NODE_ENV,
   entry: {
     licit: path.join(__dirname, 'licit', 'client', 'index.js'),
   },