@modusoperandi/licit 0.1.4 → 0.1.8

package/dist/clearMarks.js.flow

@@ -1,132 +1,128 @@
-// @flow
-
-import { Schema } from 'prosemirror-model';
-import { Transform } from 'prosemirror-transform';
-import { HEADING, PARAGRAPH } from './NodeNames';
-import * as MarkNames from './MarkNames';
-import { setTextAlign } from './TextAlignCommand';
-import { setTextLineSpacing } from './TextLineSpacingCommand';
-
-const {
-  MARK_EM,
-  MARK_FONT_SIZE,
-  MARK_FONT_TYPE,
-  MARK_STRIKE,
-  MARK_STRONG,
-  MARK_TEXT_COLOR,
-  MARK_TEXT_HIGHLIGHT,
-  MARK_UNDERLINE,
-  MARK_CUSTOMSTYLES,
-} = MarkNames;
-
-const FORMAT_MARK_NAMES = [
-  MARK_EM,
-  MARK_FONT_SIZE,
-  MARK_FONT_TYPE,
-  MARK_STRIKE,
-  MARK_STRONG,
-  MARK_TEXT_COLOR,
-  MARK_TEXT_HIGHLIGHT,
-  MARK_UNDERLINE,
-  // [FS] IRAD-1042 2020-09-18
-  // Fix: To clear custom style format.
-  MARK_CUSTOMSTYLES,
-];
-
-// [FS] IRAD-1053 2020-11-13
-// Clear format not removes the line spacing
-function removeTextAlignAndLineSpacing(
-  tr: Transform,
-  schema: Schema
-): Transform {
-  // to clear the text align format.
-  tr = setTextAlign(tr, schema, null);
-  // to clear the applied line spacing format.
-  tr = setTextLineSpacing(tr, schema, null);
-  return tr;
-}
-
-export function clearMarks(tr: Transform, schema: Schema): Transform {
-  const { doc, selection } = tr;
-  if (!selection || !doc) {
-    return tr;
-  }
-  const { from, to, empty } = selection;
-  if (empty) {
-    return tr;
-  }
-
-  const markTypesToRemove = new Set(
-    FORMAT_MARK_NAMES.map((n) => schema.marks[n]).filter(Boolean)
-  );
-
-  if (!markTypesToRemove.size) {
-    return tr;
-  }
-
-  const tasks = [];
-  doc.nodesBetween(from, to, (node, pos) => {
-    if (node.marks && node.marks.length) {
-      node.marks.some((mark) => {
-        if (markTypesToRemove.has(mark.type)) {
-          tasks.push({ node, pos, mark });
-        }
-      });
-      return true;
-    }
-    return true;
-  });
-  if (!tasks.length) {
-    // It should clear text alignment and line spacing.
-    tr = removeTextAlignAndLineSpacing(tr, schema);
-    return tr;
-  }
-
-  tasks.forEach((job) => {
-    const { mark } = job;
-    // [FS] IRAD-1043 2020-10-27
-    // Issue fix on when clear the format of a selected word, the entire paragraphs style removed
-    tr = tr.removeMark(from, to, mark.type);
-  });
-
-  // It should clear text alignment and line spacing.
-  tr = removeTextAlignAndLineSpacing(tr, schema);
-  return tr;
-}
-
-// [FS] IRAD-948 2020-05-22
-// Clear Header formatting
-export function clearHeading(tr: Transform, schema: Schema) {
-  const { doc, selection } = tr;
-
-  if (!selection || !doc) {
-    return tr;
-  }
-  const { from, to, empty } = selection;
-  if (empty) {
-    return tr;
-  }
-  const { nodes } = schema;
-
-  const heading = nodes[HEADING];
-  const paragraph = nodes[PARAGRAPH];
-
-  const tasks = [];
-
-  doc.nodesBetween(from, to, (node, pos) => {
-    if (heading === node.type) {
-      tasks.push({ node, pos });
-    }
-    return true;
-  });
-
-  if (!tasks.length) {
-    return tr;
-  }
-
-  tasks.forEach((job) => {
-    const { node, pos } = job;
-    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
-  });
-  return tr;
-}
+// @flow
+
+import { Schema } from 'prosemirror-model';
+import { Transform } from 'prosemirror-transform';
+import { HEADING, PARAGRAPH } from './NodeNames';
+import * as MarkNames from './MarkNames';
+import { setTextAlign } from './TextAlignCommand';
+import { setTextLineSpacing } from './TextLineSpacingCommand';
+
+const {
+  MARK_EM,
+  MARK_FONT_SIZE,
+  MARK_FONT_TYPE,
+  MARK_STRIKE,
+  MARK_STRONG,
+  MARK_TEXT_COLOR,
+  MARK_TEXT_HIGHLIGHT,
+  MARK_UNDERLINE,
+} = MarkNames;
+
+const FORMAT_MARK_NAMES = [
+  MARK_EM,
+  MARK_FONT_SIZE,
+  MARK_FONT_TYPE,
+  MARK_STRIKE,
+  MARK_STRONG,
+  MARK_TEXT_COLOR,
+  MARK_TEXT_HIGHLIGHT,
+  MARK_UNDERLINE,
+];
+
+// [FS] IRAD-1053 2020-11-13
+// Clear format not removes the line spacing
+function removeTextAlignAndLineSpacing(
+  tr: Transform,
+  schema: Schema
+): Transform {
+  // to clear the text align format.
+  tr = setTextAlign(tr, schema, null);
+  // to clear the applied line spacing format.
+  tr = setTextLineSpacing(tr, schema, null);
+  return tr;
+}
+
+export function clearMarks(tr: Transform, schema: Schema): Transform {
+  const { doc, selection } = tr;
+  if (!selection || !doc) {
+    return tr;
+  }
+  const { from, to, empty } = selection;
+  if (empty) {
+    return tr;
+  }
+
+  const markTypesToRemove = new Set(
+    FORMAT_MARK_NAMES.map((n) => schema.marks[n]).filter(Boolean)
+  );
+
+  if (!markTypesToRemove.size) {
+    return tr;
+  }
+
+  const tasks = [];
+  doc.nodesBetween(from, to, (node, pos) => {
+    if (node.marks && node.marks.length) {
+      node.marks.some((mark) => {
+        if (markTypesToRemove.has(mark.type)) {
+          tasks.push({ node, pos, mark });
+        }
+      });
+      return true;
+    }
+    return true;
+  });
+  if (!tasks.length) {
+    // It should clear text alignment and line spacing.
+    tr = removeTextAlignAndLineSpacing(tr, schema);
+    return tr;
+  }
+
+  tasks.forEach((job) => {
+    const { mark } = job;
+    // [FS] IRAD-1043 2020-10-27
+    // Issue fix on when clear the format of a selected word, the entire paragraphs style removed
+    tr = tr.removeMark(from, to, mark.type);
+  });
+
+  // It should clear text alignment and line spacing.
+  tr = removeTextAlignAndLineSpacing(tr, schema);
+  return tr;
+}
+
+// [FS] IRAD-948 2020-05-22
+// Clear Header formatting
+export function clearHeading(tr: Transform, schema: Schema) {
+  const { doc, selection } = tr;
+
+  if (!selection || !doc) {
+    return tr;
+  }
+  const { from, to, empty } = selection;
+  if (empty) {
+    return tr;
+  }
+  const { nodes } = schema;
+
+  const heading = nodes[HEADING];
+  const paragraph = nodes[PARAGRAPH];
+
+  const tasks = [];
+
+  doc.nodesBetween(from, to, (node, pos) => {
+    if (heading === node.type) {
+      tasks.push({ node, pos });
+    }
+    return true;
+  });
+
+  if (!tasks.length) {
+    return tr;
+  }
+
+  tasks.forEach((job) => {
+    const { node, pos } = job;
+    tr = tr.setNodeMarkup(pos, paragraph, node.attrs, node.marks);
+  });
+  return tr;
+}

package/dist/client/CollabConnector.js

@@ -28,7 +28,7 @@ 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; }
 
 class CollabConnector extends _SimpleConnector.default {
-  constructor(editorState, setState, config, _schema, plugins) {
+  constructor(editorState, setState, config, _schema, plugins, onReady) {
     super(editorState, setState);
 
     _defineProperty(this, "_clientID", void 0);
@@ -60,14 +60,14 @@ class CollabConnector extends _SimpleConnector.default {
     });
 
     const {
-      docID
+      docID,
+      collabServiceURL
     } = config;
-    this._docID = docID; // [FS][11-MAR-2020]
-    // Modified the scripts to ensure not to always replace 3001 with 3002 to run both servers together,
-    // instead used running hostname and configured port.
+    this._docID = docID; // [FS] IRAD-1553 2021-08-26
+    // Configurable Collaboration Service URL.
 
-    const url = window.location.protocol + '//' + window.location.hostname + ':3002/docs/' + docID;
-    this._connection = new _EditorConnection.default(setState, new _Reporter.default(), url, plugins, _schema);
+    const url = collabServiceURL + '/docs/' + docID;
+    this._connection = new _EditorConnection.default(onReady, new _Reporter.default(), url, plugins, _schema);
     this._connection.view = {
       updateState: s => {
         setState({

package/dist/client/CollabConnector.js.flow

@@ -1,75 +1,71 @@
-// @flow
-
-import { Transform } from 'prosemirror-transform';
-import { Schema } from 'prosemirror-model';
-import { Plugin, EditorState } from 'prosemirror-state';
-import SimpleConnector from './SimpleConnector';
-import type { SetStateCall } from './SimpleConnector';
-import EditorConnection from './EditorConnection';
-import Reporter from './Reporter';
-import ReactDOM from 'react-dom';
-
-type IdStrict = number;
-
-class CollabConnector extends SimpleConnector {
-  _clientID: string;
-  _connected: boolean;
-  _connection: any;
-  _docID: IdStrict;
-  _stepKeys: Object;
-
-  constructor(
-    editorState: EditorState,
-    setState: SetStateCall,
-    config: {
-      docID: IdStrict,
-    },
-    schema: Schema,
-    plugins: Array<Plugin>
-  ) {
-    super(editorState, setState);
-    const { docID } = config;
-    this._docID = docID;
-
-    // [FS][11-MAR-2020]
-    // Modified the scripts to ensure not to always replace 3001 with 3002 to run both servers together,
-    // instead used running hostname and configured port.
-    const url =
-      window.location.protocol +
-      '//' +
-      window.location.hostname +
-      ':3002/docs/' +
-      docID;
-    this._connection = new EditorConnection(
-      setState,
-      new Reporter(),
-      url,
-      plugins,
-      schema
-    );
-
-    this._connection.view = {
-      updateState: (s) => {
-        setState({ editorState: s }, () => {});
-      },
-    };
-  }
-
-  onEdit = (transaction: Transform): void => {
-    if (!this._connection.ready) {
-      console.warn('not ready');
-      return;
-    }
-    ReactDOM.unstable_batchedUpdates(() => {
-      this._connection.dispatch({ type: 'transaction', transaction });
-    });
-  };
-
-  // FS IRAD-1040 2020-09-02
-  // Send the modified schema to server
-  updateSchema = (schema: Schema) => {
-    this._connection.updateSchema(schema);
-  };
-}
-
-export default CollabConnector;
+// @flow
+
+import { Transform } from 'prosemirror-transform';
+import { Schema } from 'prosemirror-model';
+import { Plugin, EditorState } from 'prosemirror-state';
+import SimpleConnector from './SimpleConnector';
+import type { SetStateCall } from './SimpleConnector';
+import EditorConnection from './EditorConnection';
+import Reporter from './Reporter';
+import ReactDOM from 'react-dom';
+
+type IdStrict = string;
+
+class CollabConnector extends SimpleConnector {
+  _clientID: string;
+  _connected: boolean;
+  _connection: any;
+  _docID: IdStrict;
+  _stepKeys: Object;
+
+  constructor(
+    editorState: EditorState,
+    setState: SetStateCall,
+    config: {
+      docID: IdStrict,
+      collabServiceURL: string,
+    },
+    schema: Schema,
+    plugins: Array<Plugin>,
+    onReady: Function
+  ) {
+    super(editorState, setState);
+    const { docID, collabServiceURL } = config;
+    this._docID = docID;
+
+    // [FS] IRAD-1553 2021-08-26
+    // Configurable Collaboration Service URL.
+    const url = collabServiceURL + '/docs/' + docID;
+    this._connection = new EditorConnection(
+      onReady,
+      new Reporter(),
+      url,
+      plugins,
+      schema
+    );
+
+    this._connection.view = {
+      updateState: (s) => {
+        setState({ editorState: s }, () => {});
+      },
+    };
+  }
+
+  onEdit = (transaction: Transform): void => {
+    if (!this._connection.ready) {
+      console.warn('not ready');
+      return;
+    }
+    ReactDOM.unstable_batchedUpdates(() => {
+      this._connection.dispatch({ type: 'transaction', transaction });
+    });
+  };
+
+  // FS IRAD-1040 2020-09-02
+  // Send the modified schema to server
+  updateSchema = (schema: Schema) => {
+    this._connection.updateSchema(schema);
+  };
+}
+
+export default CollabConnector;