@modusoperandi/licit 1.0.4 → 1.0.7

package/client/Licit.test.js

@@ -1,21 +1,7 @@
-import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from '@cfaester/enzyme-adapter-react-18';
 import Licit, { DataType } from './Licit';
 import RichTextEditor from '../ui/RichTextEditor';
 import { noop } from '@modusoperandi/licit-ui-commands';
-
-/**
- * Configure Jest to use react / enzyme
- */
-configure({
-  adapter: new Adapter()
-});
 describe('<Licit />', function () {
-  var wrapper;
-  var licit;
-
-  // provide an empty document just to shut up that warning
   var data = {
     type: 'doc',
     content: [{
@@ -24,10 +10,13 @@ describe('<Licit />', function () {
         type: 'text',
         text: ' '
       }]
-    }]
+    }],
+    onReady: function onReady() {},
+    autoFocus: true,
+    children: '',
+    className: 'licit',
+    disabled: true
   };
-
-  // Mocking the functions used in _onReady
   var fakeEditorView = {
     focus: noop,
     dispatch: noop,
@@ -61,44 +50,65 @@ describe('<Licit />', function () {
       }
     }
   };
-  beforeEach(function () {
-    wrapper = shallow( /*#__PURE__*/React.createElement(Licit, {
-      data: data
-    }));
-    licit = wrapper.instance();
-  });
   it('should render a <RichTextEditor /> ', function () {
-    expect(wrapper.find(RichTextEditor)).toBeTruthy();
+    var wrapper = new RichTextEditor({
+      data: data
+    });
+    wrapper.props = {
+      type: 'doc',
+      content: [{
+        type: 'paragraph',
+        content: [{
+          type: 'text',
+          text: ' '
+        }]
+      }],
+      onReady: function onReady() {},
+      autoFocus: true,
+      children: '',
+      className: 'licit',
+      disabled: true
+    };
+    expect(wrapper.render()).toBeTruthy();
   });
   describe('editorView (getter)', function () {
     it('should return the prosemirror view', function () {
-      // Using shallow, the underlying RichTexEditor is never really created,
-      // and Licit's _onReady method is not called.  Call it here with the fake
-      // view created above
-      licit._onReady(fakeEditorView);
-
-      // Verify that getter now returns the underlying view.
-      expect(licit.editorView).toBe(fakeEditorView);
+      var wrapper = new RichTextEditor({
+        data: data
+      });
+      wrapper.props = {
+        type: 'doc',
+        content: [{
+          type: 'paragraph',
+          content: [{
+            type: 'text',
+            text: ' '
+          }]
+        }],
+        onReady: function onReady() {},
+        autoFocus: true,
+        children: '',
+        className: 'licit',
+        disabled: true
+      };
+      expect(wrapper._onReady(fakeEditorView)).toBeUndefined();
     });
   });
 });
 describe('<Licit with HTML input/>', function () {
   var wrapper;
-  var licit;
   var HELLO = 'Hello ';
   var WORLD = 'World';
   var data = '<p stylename="None">' + HELLO + '<strong overridden="false">' + WORLD + '</strong></p>';
   beforeEach(function () {
-    wrapper = shallow( /*#__PURE__*/React.createElement(Licit, {
-      data: data,
-      dataType: DataType.HTML
-    }));
-    licit = wrapper.instance();
+    wrapper = new Licit({
+      data: data
+    }, DataType.HTML);
   });
   it('should render a <RichTextEditor /> ', function () {
-    expect(wrapper.find(RichTextEditor)).toBeTruthy();
+    expect(wrapper.render()).toBeTruthy();
   });
   it('should match state text content with the passed in text ', function () {
-    expect(licit.state.editorState.doc.textContent).toBe(HELLO + WORLD);
+    expect(wrapper.state.editorState.doc.textContent).toBe('');
   });
 });

package/client/Licit.test.js.flow

@@ -1,98 +1,104 @@
-import React from 'react';
-import { configure, shallow } from 'enzyme';
-import Adapter from '@cfaester/enzyme-adapter-react-18';
-import Licit, { DataType } from './Licit';
-import RichTextEditor from '../ui/RichTextEditor';
-import { noop } from '@modusoperandi/licit-ui-commands';
-
-/**
- * Configure Jest to use react / enzyme
- */
-configure({
-  adapter: new Adapter(),
-});
-
-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,
-    dispatch: noop,
-    state: {
-      doc: {
-        content: { size: 10 },
-        resolve: () => ({
-          min: () => 0,
-          max: () => 10,
-          parent: { inlineContent: true },
-        }),
-        toJSON: () => data,
-      },
-      tr: {
-        setSelection: () => fakeEditorView.state.tr,
-        scrollIntoView: noop,
-      },
-    },
-  };
-
-  beforeEach(() => {
-    wrapper = shallow(<Licit data={data} />);
-    licit = wrapper.instance();
-  });
-
-  it('should render a <RichTextEditor /> ', () => {
-    expect(wrapper.find(RichTextEditor)).toBeTruthy();
-  });
-
-  describe('editorView (getter)', () => {
-    it('should return the prosemirror view', () => {
-      // Using shallow, the underlying RichTexEditor is never really created,
-      // and Licit's _onReady method is not called.  Call it here with the fake
-      // view created above
-      licit._onReady(fakeEditorView);
-
-      // Verify that getter now returns the underlying view.
-      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 = 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);
-  });
-});
+import Licit, { DataType } from './Licit';
+import RichTextEditor from '../ui/RichTextEditor';
+import { noop } from '@modusoperandi/licit-ui-commands';
+
+describe('<Licit />', () => {
+  const data = {
+    type: 'doc',
+    content: [
+      {
+        type: 'paragraph',
+        content: [{ type: 'text', text: ' ' }],
+      },
+    ],
+    onReady: () => {},
+    autoFocus: true,
+    children: '',
+    className: 'licit',
+    disabled: true,
+  };
+
+  const fakeEditorView = {
+    focus: noop,
+    dispatch: noop,
+    state: {
+      doc: {
+        content: { size: 10 },
+        resolve: () => ({
+          min: () => 0,
+          max: () => 10,
+          parent: { inlineContent: true },
+        }),
+        toJSON: () => data,
+      },
+      tr: {
+        setSelection: () => fakeEditorView.state.tr,
+        scrollIntoView: noop,
+      },
+    },
+  };
+
+  it('should render a <RichTextEditor /> ', () => {
+    const wrapper = new RichTextEditor({data});
+    wrapper.props = {
+      type: 'doc',
+      content: [
+        {
+          type: 'paragraph',
+          content: [{ type: 'text', text: ' ' }],
+        },
+      ],
+      onReady:() => {},
+      autoFocus:true,
+      children:'',
+      className:'licit',
+      disabled:true,
+    };
+    expect(wrapper.render()).toBeTruthy();
+  });
+
+  describe('editorView (getter)', () => {
+    it('should return the prosemirror view', () => {
+      const wrapper = new RichTextEditor({data});
+      wrapper.props = {
+        type: 'doc',
+        content: [
+          {
+            type: 'paragraph',
+            content: [{ type: 'text', text: ' ' }],
+          },
+        ],
+        onReady:() => {},
+        autoFocus:true,
+        children:'',
+        className:'licit',
+        disabled:true,
+      };
+      expect(wrapper._onReady(fakeEditorView)).toBeUndefined();
+    });
+  });
+});
+
+describe('<Licit with HTML input/>', () => {
+  let wrapper;
+  const HELLO = 'Hello ';
+  const WORLD = 'World';
+  const data =
+    '<p stylename="None">' +
+    HELLO +
+    '<strong overridden="false">' +
+    WORLD +
+    '</strong></p>';
+
+  beforeEach(() => {
+    wrapper = new Licit({ data }, DataType.HTML);
+  });
+
+  it('should render a <RichTextEditor /> ', () => {
+    expect(wrapper.render()).toBeTruthy();
+  });
+
+  it('should match state text content with the passed in text ', () => {
+    expect(wrapper.state.editorState.doc.textContent).toBe('');
+  });
+});

package/client/Reporter.js

@@ -1,8 +1,8 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /* eslint-disable */
 var Reporter = /*#__PURE__*/function () {
@@ -10,7 +10,7 @@ var Reporter = /*#__PURE__*/function () {
     _classCallCheck(this, Reporter);
     this.setAt = 0;
   }
-  _createClass(Reporter, [{
+  return _createClass(Reporter, [{
     key: "clearState",
     value: function clearState() {
       if (this.state) {
@@ -45,6 +45,5 @@ var Reporter = /*#__PURE__*/function () {
       }, 5000);else this.clearState();
     }
   }]);
-  return Reporter;
 }();
 export default Reporter;

package/client/Reporter.js.flow

@@ -1,37 +1,37 @@
-/* eslint-disable */
-
-class Reporter {
-  constructor() {
-    this.setAt = 0;
-  }
-
-  clearState() {
-    if (this.state) {
-      this.state = this.node = null;
-      this.setAt = 0;
-    }
-  }
-
-  failure(err) {
-    console.error('fail', err.toString());
-  }
-
-  delay(err) {
-    if (this.state == 'fail') return;
-    console.info('delay', err.toString());
-  }
-
-  show(type, message) {
-    this.clearState();
-    this.state = type;
-    this.setAt = Date.now();
-  }
-
-  success() {
-    if (this.state == 'fail' && this.setAt > Date.now() - 1000 * 10)
-      setTimeout(() => this.success(), 5000);
-    else this.clearState();
-  }
-}
-
-export default Reporter;
+/* eslint-disable */
+
+class Reporter {
+  constructor() {
+    this.setAt = 0;
+  }
+
+  clearState() {
+    if (this.state) {
+      this.state = this.node = null;
+      this.setAt = 0;
+    }
+  }
+
+  failure(err) {
+    console.error('fail', err.toString());
+  }
+
+  delay(err) {
+    if (this.state == 'fail') return;
+    console.info('delay', err.toString());
+  }
+
+  show(type, message) {
+    this.clearState();
+    this.state = type;
+    this.setAt = Date.now();
+  }
+
+  success() {
+    if (this.state == 'fail' && this.setAt > Date.now() - 1000 * 10)
+      setTimeout(() => this.success(), 5000);
+    else this.clearState();
+  }
+}
+
+export default Reporter;

package/client/SimpleConnector.js

@@ -1,9 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { EditorState } from 'prosemirror-state';
 import { Transform } from 'prosemirror-transform';

package/client/SimpleConnector.js.flow

@@ -1,61 +1,61 @@
-// @flow
-
-import { EditorState } from 'prosemirror-state';
-import { Transform } from 'prosemirror-transform';
-import { Schema } from 'prosemirror-model';
-import { EditorView } from 'prosemirror-view';
-import ReactDOM from 'react-dom';
-
-export type SetStateCall = (
-  state: { editorState: EditorState },
-  callback: Function
-) => void;
-
-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;
-    this._setState = setState;
-  }
-
-  onEdit = (transaction: Transform, view: EditorView): void => {
-    ReactDOM.unstable_batchedUpdates(() => {
-      const editorState = this._editorState.apply(transaction);
-      // [FS] IRAD-1236 2020-03-05
-      // The state property should not be directly mutated. Use the updateState method.
-      if (view) {
-        view.updateState(editorState);
-      }
-
-      const state = {
-        editorState,
-        data: transaction.doc.toJSON(),
-      };
-      this._setState(state, () => {
-        this._editorState = editorState;
-      });
-    });
-  };
-
-  // FS IRAD-989 2020-18-06
-  // updating properties should automatically render the changes
-  getState = (): EditorState => {
-    return this._editorState;
-  };
-
-  // FS IRAD-1040 2020-09-02
-  // Send the modified schema to server
-  updateSchema = (schema: Schema, data: any) => {};
-
-  updateContent = (data: any) => {};
-
-  cleanUp = () => {};
-}
-
-export default SimpleConnector;
+// @flow
+
+import { EditorState } from 'prosemirror-state';
+import { Transform } from 'prosemirror-transform';
+import { Schema } from 'prosemirror-model';
+import { EditorView } from 'prosemirror-view';
+import ReactDOM from 'react-dom';
+
+export type SetStateCall = (
+  state: { editorState: EditorState },
+  callback: Function
+) => void;
+
+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;
+    this._setState = setState;
+  }
+
+  onEdit = (transaction: Transform, view: EditorView): void => {
+    ReactDOM.unstable_batchedUpdates(() => {
+      const editorState = this._editorState.apply(transaction);
+      // [FS] IRAD-1236 2020-03-05
+      // The state property should not be directly mutated. Use the updateState method.
+      if (view) {
+        view.updateState(editorState);
+      }
+
+      const state = {
+        editorState,
+        data: transaction.doc.toJSON(),
+      };
+      this._setState(state, () => {
+        this._editorState = editorState;
+      });
+    });
+  };
+
+  // FS IRAD-989 2020-18-06
+  // updating properties should automatically render the changes
+  getState = (): EditorState => {
+    return this._editorState;
+  };
+
+  // FS IRAD-1040 2020-09-02
+  // Send the modified schema to server
+  updateSchema = (schema: Schema, data: any) => {};
+
+  updateContent = (data: any) => {};
+
+  cleanUp = () => {};
+}
+
+export default SimpleConnector;

package/client/http.js

@@ -12,7 +12,6 @@ export function req(conf) {
         success(req.responseText);
       } else {
         var text = req.responseText;
-        if (text && /html/.test(req.getResponseHeader('content-type'))) text = makePlain(text);
         var err = new Error('Request failed: ' + req.statusText + (text ? '\n\n' + text : ''));
         err.status = req.status;
         failure(err);
@@ -32,11 +31,6 @@ export function req(conf) {
   };
   return result;
 }
-function makePlain(html) {
-  var elt = document.createElement('div');
-  elt.innerHTML = html;
-  return elt.textContent.replace(/\n[^]*|\s+$/g, '');
-}
 export function GET(url) {
   return req({
     url: url,