@modusoperandi/licit 0.1.10 → 0.13.1

package/src/client/Licit.js

@@ -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
@@ -265,7 +265,7 @@ 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;
@@ -278,8 +278,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))
@@ -296,7 +296,7 @@ class Licit extends React.Component<any, any> {
       let dataChanged = false;
 
       // [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;
       // [FS] IRAD-1589 2021-10-04
       // Do a proper circular JSON comparison.
       if (stringify(this.state.data) !== stringify(nextState.data)) {
@@ -323,17 +323,17 @@ class Licit extends React.Component<any, any> {
         // 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)
-          )
+              editorState,
+              setState,
+              {
+                docID,
+                collabServiceURL,
+              },
+              this._defaultEditorSchema,
+              this._defaultEditorPlugins,
+              // [FS] IRAD-1578 2021-09-27
+              this.onReady.bind(this)
+            )
           : new SimpleConnector(editorState, setState);
       }
     }
@@ -401,7 +401,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 +430,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,14 +446,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.

package/src/client/Licit.test.js

@@ -16,17 +16,6 @@ describe('<Licit />', () => {
   let wrapper;
   let licit;
 
-  // provide an empty document just to shut up that warning
-  const data = {
-    type: 'doc',
-    content: [
-      {
-        type: 'paragraph',
-        content: [{ type: 'text', text: ' ' }],
-      },
-    ],
-  };
-
   // Mocking the functions used in _onReady
   const fakeEditorView = {
     focus: noop,
@@ -35,7 +24,6 @@ describe('<Licit />', () => {
       doc: {
         content: { size: 10 },
         resolve: () => ({ min: () => 0, max: () => 10 }),
-        toJSON: () => data,
       },
       tr: {
         setSelection: () => fakeEditorView.state.tr,
@@ -45,6 +33,16 @@ describe('<Licit />', () => {
   };
 
   beforeEach(() => {
+    // provide an empty document just to shut up that warning
+    const data = {
+      type: 'doc',
+      content: [
+        {
+          type: 'paragraph',
+          content: [{ type: 'text', text: ' ' }],
+        },
+      ],
+    };
     wrapper = shallow(<Licit data={data} />);
     licit = wrapper.instance();
   });

package/src/createEmptyEditorState.js

@@ -12,8 +12,14 @@ export const EMPTY_DOC_JSON = {
   type: 'doc',
   content: [
     {
-      type: 'paragraph'
-    },// [FS] IRAD-1710 2022-03-04 - No text content needed
+      type: 'paragraph',
+      content: [
+        {
+          type: 'text',
+          text: ' ',
+        },
+      ],
+    },
   ],
 };
 

package/src/ui/Editor.js

@@ -1,7 +1,7 @@
 // @flow
 
 import cx from 'classnames';
-import { Schema } from 'prosemirror-model';
+import { DOMSerializer, Schema } from 'prosemirror-model';
 import { EditorState, Transaction } from 'prosemirror-state';
 import { Transform } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
@@ -158,6 +158,7 @@ class Editor extends React.PureComponent<any, any> {
 
       // Reference: http://prosemirror.net/examples/basic/
       const view = (this._editorView = new CustomEditorView(editorNode, {
+        clipboardSerializer: DOMSerializer.fromSchema(schema),
         dispatchTransaction,
         editable: this._isEditable,
         nodeViews: boundNodeViews,

package/utils/build_customstyle_server.js

@@ -1,7 +1,6 @@
 const webpack = require('webpack');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const FlowWebpackPlugin = require('flow-webpack-plugin');
-const WriteFilePlugin = require('write-file-webpack-plugin');
 const env = require('./env');
 const path = require('path');
 
@@ -53,7 +52,6 @@ const config = {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
     }),
-    new WriteFilePlugin(),
   ],
   // to enable debug
   //devtool: 'source-map'

package/utils/build_image_server.js

@@ -1,7 +1,6 @@
 const webpack = require('webpack');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const FlowWebpackPlugin = require('flow-webpack-plugin');
-const WriteFilePlugin = require('write-file-webpack-plugin');
 const env = require('./env');
 const path = require('path');
 
@@ -53,7 +52,6 @@ const config = {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
     }),
-    new WriteFilePlugin(),
   ],
   // to enable debug
   //devtool: 'source-map'

package/utils/build_licit_collab_server.js

@@ -3,7 +3,6 @@ const webpack = require('webpack');
 // Upgrade outdated packages.
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const FlowWebpackPlugin = require('flow-webpack-plugin');
-const WriteFilePlugin = require('write-file-webpack-plugin');
 const env = require('./env');
 const path = require('path');
 
@@ -56,7 +55,6 @@ const config = {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(env.NODE_ENV)
     }),
-    new WriteFilePlugin(),
   ],
   // to enable debug
   //devtool: 'source-map'

package/webpack.config.js

@@ -3,11 +3,10 @@
 var webpack = require('webpack'),
   CopyWebpackPlugin = require('copy-webpack-plugin'),
   FlowWebpackPlugin = require('flow-webpack-plugin'),
-  HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin'),
   HtmlWebpackPlugin = require('html-webpack-plugin'),
   TerserPlugin = require('terser-webpack-plugin'),
-  
-  WriteFilePlugin = require('write-file-webpack-plugin'),
+ 
+
   env = require('./utils/env'),
   fileSystem = require('fs'),
   path = require('path');
@@ -57,15 +56,8 @@ var options = {
       },
       {
         test: /\.(woff(2)?|ttf|otf|eot|svg)(\?v=\d+\.\d+\.\d+)?$/,
-        use: [
-          {
-            loader: 'file-loader',
-            options: {
-              name: '[name].[ext]',
-              outputPath: 'fonts/'
-            }
-          }
-        ]
+        type: 'asset/resource',
+       
       },
       {
         test: /\.css$/,
@@ -75,8 +67,9 @@ var options = {
         ],
       },
       {
-        test: /\.(jpe?g|png|gif|svg)$/i, 
-        loader: 'file-loader'
+        test: /\.(jpe?g|png|gif|svg)$/i,
+        type: 'asset/resource',
+
       },
       {
         test: /\.html$/,
@@ -86,7 +79,10 @@ var options = {
     ]
   },
   resolve: {
-    alias: {}
+    alias: {},
+    fallback: {
+      url: require.resolve("url/")
+    }
   },
   plugins: [
     new webpack.ProvidePlugin({
@@ -107,8 +103,6 @@ var options = {
       chunks: ['licit'],
       inlineSource: isDev ? '$^' : '.(js|css)$'
     }),
-    new HtmlWebpackInlineSourcePlugin(HtmlWebpackPlugin),
-    new WriteFilePlugin()
   ]
 };