@modusoperandi/licit 0.13.3 → 0.13.10

package/dist/client/EditorConnection.js

@@ -158,8 +158,8 @@ class EditorConnection {
   } // Load the document from the server and start up
 
 
-  start() {
-    this.run((0, _http.GET)(this.url)).then(data => {
+  start(input) {
+    this.run((0, _http.PUT)(this.url, JSON.stringify(input), 'application/json')).then(data => {
       data = JSON.parse(data);
       this.report.success();
       this.backOff = 0;

package/dist/client/EditorConnection.js.flow

@@ -10,7 +10,7 @@ import { Plugin, EditorState } from 'prosemirror-state';
 import { Step } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
 import uuid from '../uuid';
-import { GET, POST } from './http';
+import { GET, POST, PUT } from './http';
 // [FS] IRAD-1040 2020-09-02
 import { Schema } from 'prosemirror-model';
 import { stringify } from 'flatted';
@@ -144,8 +144,8 @@ class EditorConnection {
   }
 
   // Load the document from the server and start up
-  start(): void {
-    this.run(GET(this.url)).then(
+  start(input: any): void {
+    this.run(PUT(this.url, JSON.stringify(input), 'application/json')).then(
       (data) => {
         data = JSON.parse(data);
         this.report.success();

package/dist/client/Licit.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.DataType = void 0;
 
 var _prosemirrorState = require("prosemirror-state");
 
@@ -45,6 +45,8 @@ var _EditorMarks = _interopRequireDefault(require("../EditorMarks"));
 
 var _EditorNodes = _interopRequireDefault(require("../EditorNodes"));
 
+var _convertFromHTML = _interopRequireDefault(require("../convertFromHTML"));
+
 var _Types = require("../Types");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -55,8 +57,10 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const ATTR_OBJID = 'objectId';
-const ATTR_OBJMETADATA = 'objectMetaData';
+const DataType = Object.freeze({
+  JSON: Symbol('json'),
+  HTML: Symbol('html')
+});
 /**
  * LICIT properties:
  *  docID {string} [] Collaborative Doument ID
@@ -69,12 +73,15 @@ const ATTR_OBJMETADATA = 'objectMetaData';
  *      @param data {JSON} Modified document data.
  *  onReady {@callback} [null] Fires when the editor is fully ready.
  *      @param ref {LICIT} Rerefence of the editor.
- *  data {JSON} [null] Document data to be loaded into the editor.
+ *  data {JSON|HTML} [null] Document data to be loaded into the editor.
+ *  dataType {JSON|HTML} [JSON] Document data to be loaded into the editor.
  *  disabled {boolean} [false] Disable the editor.
  *  embedded {boolean} [false] Disable/Enable inline behaviour.
  *  plugins [plugins] External Plugins into the editor.
  */
 
+exports.DataType = DataType;
+
 class Licit extends React.Component {
   // This will be handy in updating document's content.
   // Flag to decide whether to skip shouldComponentUpdate
@@ -133,9 +140,11 @@ class Licit extends React.Component {
 
       tr = tr.setSelection(selection).replaceSelectionWith(document, false); // [FS] IRAD-1092 2020-12-03
       // set the value for object metadata  and objectId
+      // Should update all document attributes.
 
-      tr = _this.isNodeHasAttribute(document, ATTR_OBJMETADATA) ? tr.step(new _licitDocAttrsStep.SetDocAttrStep(ATTR_OBJMETADATA, document.attrs.objectMetaData)) : tr;
-      tr = _this.isNodeHasAttribute(document, ATTR_OBJID) ? tr.step(new _licitDocAttrsStep.SetDocAttrStep(ATTR_OBJID, document.attrs.objectId)) : tr;
+      Object.keys(document.attrs).forEach(attr => {
+        tr = tr.step(new _licitDocAttrsStep.SetDocAttrStep(attr, document.attrs[attr]));
+      });
       _this._skipSCU = true;
 
       _this._editorView.dispatch(tr);
@@ -278,7 +287,8 @@ class Licit extends React.Component {
     const onChangeCB = typeof props.onChange === 'function' ? props.onChange : noop;
     const onReadyCB = typeof props.onReady === 'function' ? props.onReady : noop;
     const readOnly = props.readOnly || false;
-    const data = props.data || null;
+    let data = props.data || null;
+    const dataType = props.dataType || DataType.JSON;
     const disabled = props.disabled || false;
     const embedded = props.embedded || false; // [FS] IRAD-996 2020-06-30
     // [FS] 2020-07-03
@@ -291,14 +301,8 @@ class Licit extends React.Component {
       marks: _EditorMarks.default
     });
     this._defaultEditorPlugins = new _buildEditorPlugins.default(this._defaultEditorSchema).get();
-    let editorState = (0, _convertFromJSON.default)(data, null, this._defaultEditorSchema, plugins, this._defaultEditorPlugins); // [FS] IRAD-1067 2020-09-19
-    // The editorState will return null if the doc Json is mal-formed
-
-    if (null === editorState) {
-      editorState = (0, _convertFromJSON.default)(_createEmptyEditorState.EMPTY_DOC_JSON, null, this._defaultEditorSchema, plugins, this._defaultEditorPlugins);
-      this.showAlert();
-    }
-
+    const editorState = this.initEditorState(plugins, dataType, data);
+    data = editorState.doc;
     const setState = this.setState.bind(this);
     this._connector = collaborative ? new _CollabConnector.default(editorState, setState, {
       docID,
@@ -328,6 +332,50 @@ class Licit extends React.Component {
       // Use known editorState to update schema.
       this._connector.updateSchema(editorState.schema, data);
     }
+  }
+
+  initEditorState(plugins, dataType, data) {
+    let editorState = null;
+    const effectivePlugins = this.getEffectivePlugins(this._defaultEditorSchema, this._defaultEditorPlugins, plugins);
+
+    if (DataType.JSON === dataType) {
+      editorState = (0, _convertFromJSON.default)(data, null, effectivePlugins.schema, effectivePlugins.plugins); // [FS] IRAD-1067 2020-09-19
+      // The editorState will return null if the doc Json is mal-formed
+
+      if (null === editorState) {
+        editorState = (0, _convertFromJSON.default)(_createEmptyEditorState.EMPTY_DOC_JSON, null, effectivePlugins.schema, effectivePlugins.plugins);
+        this.showAlert();
+      }
+    } else {
+      editorState = (0, _convertFromHTML.default)(data, effectivePlugins.schema, effectivePlugins.plugins);
+    }
+
+    return editorState;
+  }
+
+  getEffectivePlugins(schema, defaultPlugins, plugins) {
+    const effectivePlugins = defaultPlugins;
+
+    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());
+          }
+        }
+      }
+    }
+
+    return {
+      plugins: effectivePlugins,
+      schema
+    };
   } // [FS] IRAD-1578 2021-09-27
 
 

package/dist/client/Licit.js.flow

@@ -1,6 +1,6 @@
 // @flow
 import { EditorState, TextSelection, Plugin } from 'prosemirror-state';
-import { Node } from 'prosemirror-model';
+import { Node, Schema } from 'prosemirror-model';
 import { Transform } from 'prosemirror-transform';
 import { EditorView } from 'prosemirror-view';
 import * as React from 'react';
@@ -14,18 +14,23 @@ import SimpleConnector from './SimpleConnector';
 import CollabConnector from './CollabConnector';
 import { EMPTY_DOC_JSON } from '../createEmptyEditorState';
 import type { EditorRuntime } from '../Types';
-import { createPopUp } from '@modusoperandi/licit-ui-commands';
-import { atViewportCenter } from '@modusoperandi/licit-ui-commands';
+import {
+  createPopUp,
+  atViewportCenter,
+} from '@modusoperandi/licit-ui-commands';
 import AlertInfo from '../ui/AlertInfo';
 import { SetDocAttrStep } from '@modusoperandi/licit-doc-attrs-step';
 import './licit.css';
 import DefaultEditorPlugins from '../buildEditorPlugins';
-import { Schema } from 'prosemirror-model';
 import EditorMarks from '../EditorMarks';
 import EditorNodes from '../EditorNodes';
+import convertFromHTML from '../convertFromHTML';
+
+export const DataType = Object.freeze({
+  JSON: Symbol('json'),
+  HTML: Symbol('html'),
+});
 
-const ATTR_OBJID = 'objectId';
-const ATTR_OBJMETADATA = 'objectMetaData';
 /**
  * LICIT properties:
  *  docID {string} [] Collaborative Doument ID
@@ -38,7 +43,8 @@ const ATTR_OBJMETADATA = 'objectMetaData';
  *      @param data {JSON} Modified document data.
  *  onReady {@callback} [null] Fires when the editor is fully ready.
  *      @param ref {LICIT} Rerefence of the editor.
- *  data {JSON} [null] Document data to be loaded into the editor.
+ *  data {JSON|HTML} [null] Document data to be loaded into the editor.
+ *  dataType {JSON|HTML} [JSON] Document data to be loaded into the editor.
  *  disabled {boolean} [false] Disable the editor.
  *  embedded {boolean} [false] Disable/Enable inline behaviour.
  *  plugins [plugins] External Plugins into the editor.
@@ -93,7 +99,8 @@ class Licit extends React.Component<any, any> {
     const onReadyCB =
       typeof props.onReady === 'function' ? props.onReady : noop;
     const readOnly = props.readOnly || false;
-    const data = props.data || null;
+    let data = props.data || null;
+    const dataType = props.dataType || DataType.JSON;
     const disabled = props.disabled || false;
     const embedded = props.embedded || false; // [FS] IRAD-996 2020-06-30
     // [FS] 2020-07-03
@@ -109,25 +116,8 @@ class Licit extends React.Component<any, any> {
       this._defaultEditorSchema
     ).get();
 
-    let editorState = convertFromJSON(
-      data,
-      null,
-      this._defaultEditorSchema,
-      plugins,
-      this._defaultEditorPlugins
-    );
-    // [FS] IRAD-1067 2020-09-19
-    // The editorState will return null if the doc Json is mal-formed
-    if (null === editorState) {
-      editorState = convertFromJSON(
-        EMPTY_DOC_JSON,
-        null,
-        this._defaultEditorSchema,
-        plugins,
-        this._defaultEditorPlugins
-      );
-      this.showAlert();
-    }
+    const editorState = this.initEditorState(plugins, dataType, data);
+    data = editorState.doc;
 
     const setState = this.setState.bind(this);
     this._connector = collaborative
@@ -172,6 +162,66 @@ class Licit extends React.Component<any, any> {
     }
   }
 
+  initEditorState(plugins: Array<Plugin>, dataType: DataType, data: any) {
+    let editorState = null;
+    const effectivePlugins = this.getEffectivePlugins(
+      this._defaultEditorSchema,
+      this._defaultEditorPlugins,
+      plugins
+    );
+    if (DataType.JSON === dataType) {
+      editorState = convertFromJSON(
+        data,
+        null,
+        effectivePlugins.schema,
+        effectivePlugins.plugins
+      );
+      // [FS] IRAD-1067 2020-09-19
+      // The editorState will return null if the doc Json is mal-formed
+      if (null === editorState) {
+        editorState = convertFromJSON(
+          EMPTY_DOC_JSON,
+          null,
+          effectivePlugins.schema,
+          effectivePlugins.plugins
+        );
+        this.showAlert();
+      }
+    } else {
+      editorState = convertFromHTML(
+        data,
+        effectivePlugins.schema,
+        effectivePlugins.plugins
+      );
+    }
+
+    return editorState;
+  }
+
+  getEffectivePlugins(
+    schema: Schema,
+    defaultPlugins: Array<Plugin>,
+    plugins: Array<Plugin>
+  ): { plugins: Array<Plugin>, schema: Schema } {
+    const effectivePlugins = defaultPlugins;
+
+    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());
+          }
+        }
+      }
+    }
+    return { plugins: effectivePlugins, schema };
+  }
+
   // [FS] IRAD-1578 2021-09-27
   onReady(state: EditorState) {
     const collabEditing = this.state.docID !== '';
@@ -280,14 +330,10 @@ class Licit extends React.Component<any, any> {
     tr = tr.setSelection(selection).replaceSelectionWith(document, false);
     // [FS] IRAD-1092 2020-12-03
     // set the value for object metadata  and objectId
-    tr = this.isNodeHasAttribute(document, ATTR_OBJMETADATA)
-      ? tr.step(
-          new SetDocAttrStep(ATTR_OBJMETADATA, document.attrs.objectMetaData)
-        )
-      : tr;
-    tr = this.isNodeHasAttribute(document, ATTR_OBJID)
-      ? tr.step(new SetDocAttrStep(ATTR_OBJID, document.attrs.objectId))
-      : tr;
+    // Should update all document attributes.
+    Object.keys(document.attrs).forEach((attr) => {
+      tr = tr.step(new SetDocAttrStep(attr, document.attrs[attr]));
+    });
 
     this._skipSCU = true;
     this._editorView.dispatch(tr);

package/dist/client/Licit.test.js

@@ -6,12 +6,16 @@ var _enzyme = require("enzyme");
 
 var _enzymeAdapterReact = _interopRequireDefault(require("@wojtekmaj/enzyme-adapter-react-17"));
 
-var _Licit = _interopRequireDefault(require("./Licit"));
+var _Licit = _interopRequireWildcard(require("./Licit"));
 
 var _RichTextEditor = _interopRequireDefault(require("../ui/RichTextEditor"));
 
 var _licitUiCommands = require("@modusoperandi/licit-ui-commands");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -45,7 +49,10 @@ describe('<Licit />', () => {
         },
         resolve: () => ({
           min: () => 0,
-          max: () => 10
+          max: () => 10,
+          parent: {
+            inlineContent: true
+          }
         }),
         toJSON: () => data
       },
@@ -75,4 +82,24 @@ describe('<Licit />', () => {
       expect(licit.editorView).toBe(fakeEditorView);
     });
   });
+});
+describe('<Licit with HTML input/>', () => {
+  let wrapper;
+  let licit;
+  const HELLO = 'Hello ';
+  const WORLD = 'World';
+  const data = '<p stylename="None">' + HELLO + '<strong overridden="false">' + WORLD + '</strong></p>';
+  beforeEach(() => {
+    wrapper = (0, _enzyme.shallow)( /*#__PURE__*/_react.default.createElement(_Licit.default, {
+      data: data,
+      dataType: _Licit.DataType.HTML
+    }));
+    licit = wrapper.instance();
+  });
+  it('should render a <RichTextEditor /> ', () => {
+    expect(wrapper.find(_RichTextEditor.default)).toBeTruthy();
+  });
+  it('should match state text content with the passed in text ', () => {
+    expect(licit.state.editorState.doc.textContent).toBe(HELLO + WORLD);
+  });
 });

package/dist/client/Licit.test.js.flow

@@ -1,7 +1,7 @@
 import React from 'react';
 import { configure, shallow } from 'enzyme';
 import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
-import Licit from './Licit';
+import Licit, { DataType } from './Licit';
 import RichTextEditor from '../ui/RichTextEditor';
 import { noop } from '@modusoperandi/licit-ui-commands';
 
@@ -34,7 +34,11 @@ describe('<Licit />', () => {
     state: {
       doc: {
         content: { size: 10 },
-        resolve: () => ({ min: () => 0, max: () => 10 }),
+        resolve: () => ({
+          min: () => 0,
+          max: () => 10,
+          parent: { inlineContent: true },
+        }),
         toJSON: () => data,
       },
       tr: {
@@ -65,3 +69,30 @@ describe('<Licit />', () => {
     });
   });
 });
+
+describe('<Licit with HTML input/>', () => {
+  let wrapper;
+  let licit;
+
+  const HELLO = 'Hello ';
+  const WORLD = 'World';
+  const data =
+    '<p stylename="None">' +
+    HELLO +
+    '<strong overridden="false">' +
+    WORLD +
+    '</strong></p>';
+
+  beforeEach(() => {
+    wrapper = shallow(<Licit data={data} dataType={DataType.HTML} />);
+    licit = wrapper.instance();
+  });
+
+  it('should render a <RichTextEditor /> ', () => {
+    expect(wrapper.find(RichTextEditor)).toBeTruthy();
+  });
+
+  it('should match state text content with the passed in text ', () => {
+    expect(licit.state.editorState.doc.textContent).toBe(HELLO + WORLD);
+  });
+});

package/dist/client/http.js

@@ -7,6 +7,7 @@ exports.DELETE = DELETE;
 exports.GET = GET;
 exports.PATCH = PATCH;
 exports.POST = POST;
+exports.PUT = PUT;
 exports.req = req;
 
 /* eslint-disable */
@@ -68,6 +69,17 @@ function POST(url, body, type) {
       'Content-Type': type
     }
   });
+}
+
+function PUT(url, body, type) {
+  return req({
+    url,
+    method: 'PUT',
+    body,
+    headers: {
+      'Content-Type': type
+    }
+  });
 } // [FS] IRAD-1128 2021-02-03
 // http DELETE request overrided
 

package/dist/client/http.js.flow

@@ -53,6 +53,10 @@ export function POST(url, body, type) {
   return req({ url, method: 'POST', body, headers: { 'Content-Type': type } });
 }
 
+export function PUT(url, body, type) {
+  return req({ url, method: 'PUT', body, headers: { 'Content-Type': type } });
+}
+
 // [FS] IRAD-1128 2021-02-03
 // http DELETE request overrided
 export function DELETE(url, type) {

package/dist/convertFromDOMElement.js.flow

@@ -11,8 +11,8 @@ import EditorSchema from './EditorSchema';
 
 export default function convertFromDOMElement(
   el: HTMLElement,
-  schema: ?Schema,
-  plugins: ?Array<Plugin>
+  schema: Schema,
+  plugins: Array<Plugin>
 ): EditorState {
   const effectiveSchema = schema || EditorSchema;
   const effectivePlugins = plugins || EditorPlugins;

package/dist/convertFromHTML.js

@@ -11,13 +11,10 @@ var _prosemirrorState = require("prosemirror-state");
 
 var _convertFromDOMElement = _interopRequireDefault(require("./convertFromDOMElement"));
 
-var _normalizeHTML = _interopRequireDefault(require("./normalizeHTML"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function convertFromHTML(html, schema, plugins) {
   const root = document.createElement('html');
-  const newHTML = (0, _normalizeHTML.default)(html);
-  root.innerHTML = newHTML;
+  root.innerHTML = html;
   return (0, _convertFromDOMElement.default)(root, schema, plugins);
 }

package/dist/convertFromHTML.js.flow

@@ -5,15 +5,13 @@ import { EditorState } from 'prosemirror-state';
 import { Plugin } from 'prosemirror-state';
 
 import convertFromDOMElement from './convertFromDOMElement';
-import normalizeHTML from './normalizeHTML';
 
 export default function convertFromHTML(
   html: string,
-  schema: ?Schema,
-  plugins: ?Array<Plugin>
+  schema: Schema,
+  plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  const newHTML = normalizeHTML(html);
-  root.innerHTML = newHTML;
+  root.innerHTML = html;
   return convertFromDOMElement(root, schema, plugins);
 }

package/dist/convertFromJSON.js

@@ -13,44 +13,28 @@ var _createEmptyEditorState = _interopRequireDefault(require("./createEmptyEdito
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function convertFromJSON(json, schema, defaultSchema, plugins, defaultPlugins) {
-  let editorSchema = schema || defaultSchema; // [FS][IRAD-???? 2020-08-17]
-  // Loads plugins and its corresponding schema in editor
-
-  const effectivePlugins = defaultPlugins;
-
-  if (plugins) {
-    for (const p of plugins) {
-      if (!effectivePlugins.includes(p)) {
-        effectivePlugins.push(p);
-
-        if (p.getEffectiveSchema) {
-          editorSchema = p.getEffectiveSchema(editorSchema);
-        }
-
-        if (p.initKeyCommands) {
-          effectivePlugins.push(p.initKeyCommands());
-        }
-      }
-    }
-  }
+function convertFromJSON(json, schema, defaultSchema, effectivePlugins) {
+  const editorSchema = schema || defaultSchema;
+  let error = false;
 
   if (typeof json === 'string') {
     try {
       json = JSON.parse(json);
     } catch (ex) {
-      console.error('convertFromJSON:', ex); // [FS] IRAD-1455 2021-06-16
-      // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
-
-      return (0, _createEmptyEditorState.default)(schema, defaultSchema, plugins, defaultPlugins);
+      console.error('convertFromJSON:', ex);
+      error = true;
     }
   }
 
   if (!json || typeof json !== 'object') {
-    console.error('convertFromJSON: invalid object', json); // [FS] IRAD-1455 2021-06-16
-    // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
+    console.error('convertFromJSON: invalid object', json);
+    error = true;
+  }
 
-    return (0, _createEmptyEditorState.default)(schema, defaultSchema, plugins, defaultPlugins);
+  if (error) {
+    // [FS] IRAD-1455 2021-06-16
+    // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
+    return (0, _createEmptyEditorState.default)(schema, defaultSchema, effectivePlugins);
   } // [FS] IRAD-1067 2020-09-19
   // Handle gracefully when error thrown on invalid json
 

package/dist/convertFromJSON.js.flow

@@ -9,54 +9,32 @@ export default function convertFromJSON(
   json: Object | string,
   schema: ?Schema,
   defaultSchema: Schema,
-  plugins: ?Array<Plugin>,
-  defaultPlugins: Array<Plugin>
+  effectivePlugins: Array<Plugin>
 ): EditorState {
-  let editorSchema = schema || defaultSchema;
+  const editorSchema = schema || defaultSchema;
+  let error = false;
 
-  // [FS][IRAD-???? 2020-08-17]
-  // Loads plugins and its corresponding schema in editor
-  const effectivePlugins = defaultPlugins;
-
-  if (plugins) {
-    for (const p of plugins) {
-      if (!effectivePlugins.includes(p)) {
-        effectivePlugins.push(p);
-        if (p.getEffectiveSchema) {
-          editorSchema = p.getEffectiveSchema(editorSchema);
-        }
-
-        if (p.initKeyCommands) {
-          effectivePlugins.push(p.initKeyCommands());
-        }
-      }
-    }
-  }
   if (typeof json === 'string') {
     try {
       json = JSON.parse(json);
     } catch (ex) {
       console.error('convertFromJSON:', ex);
-      // [FS] IRAD-1455 2021-06-16
-      // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
-      return createEmptyEditorState(
-        schema,
-        defaultSchema,
-        plugins,
-        defaultPlugins
-      );
+      error = true;
     }
   }
 
   if (!json || typeof json !== 'object') {
     console.error('convertFromJSON: invalid object', json);
+    error = true;
+  }
+
+  if(error) {
     // [FS] IRAD-1455 2021-06-16
     // Use the effectivePlugins, editor hangs, b'coz of missing default core plugins
     return createEmptyEditorState(
       schema,
       defaultSchema,
-      plugins,
-      defaultPlugins
+      effectivePlugins
     );
   }
 

package/dist/createEmptyEditorState.js

@@ -10,8 +10,6 @@ var _prosemirrorModel = require("prosemirror-model");
 
 var _prosemirrorState = require("prosemirror-state");
 
-var _buildEditorPlugins = _interopRequireDefault(require("./buildEditorPlugins"));
-
 var _convertFromJSON = _interopRequireDefault(require("./convertFromJSON"));
 
 var _EditorSchema = _interopRequireDefault(require("./EditorSchema"));
@@ -27,8 +25,7 @@ const EMPTY_DOC_JSON = {
 };
 exports.EMPTY_DOC_JSON = EMPTY_DOC_JSON;
 
-function createEmptyEditorState(schema, defaultSchema, plugins, defaultPlugins) {
-  const newSchema = schema || (defaultSchema ? defaultSchema : _EditorSchema.default); // TODO: Check if schema support doc and paragraph nodes.
-
-  return (0, _convertFromJSON.default)(EMPTY_DOC_JSON, schema, defaultSchema ? defaultSchema : _EditorSchema.default, plugins, defaultPlugins ? defaultPlugins : new _buildEditorPlugins.default(newSchema).get());
+function createEmptyEditorState(schema, defaultSchema, plugins) {
+  // TODO: Check if schema support doc and paragraph nodes.
+  return (0, _convertFromJSON.default)(EMPTY_DOC_JSON, schema, defaultSchema ? defaultSchema : _EditorSchema.default, plugins);
 }