@atlaskit/prosemirror-collab 0.11.0 → 0.11.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/prosemirror-collab
 
+## 0.11.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.11.0
 
 ### Minor Changes

package/dist/cjs/index.js

@@ -13,6 +13,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _uuid = require("uuid");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var Rebaseable = /*#__PURE__*/(0, _createClass2.default)(function Rebaseable(step, inverted, origin) {
   (0, _classCallCheck2.default)(this, Rebaseable);
   this.step = step;
@@ -99,7 +100,11 @@ function collab() {
       apply: function apply(tr, collab) {
         var newState = tr.getMeta(collabKey);
         if (newState) {
-          return newState;
+          if ((0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps')) {
+            return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
+          } else {
+            return newState;
+          }
         }
         if (tr.docChanged) {
           return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
@@ -117,8 +122,6 @@ function collab() {
 /// Create a transaction that represents a set of new steps received from
 /// the authority. Applying this transaction moves the state forward to
 /// adjust to the authority's view of the document.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 function receiveTransaction(state, steps, clientIDs) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   // Pushes a set of steps (received from the central authority) into

package/dist/es2019/index.js

@@ -1,5 +1,6 @@
 import { v4 as uuidv4 } from 'uuid';
 import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 class Rebaseable {
   constructor(step, inverted, origin) {
     this.step = step;
@@ -17,9 +18,9 @@ export function rebaseSteps(steps, over, transform) {
   for (let i = 0; i < over.length; i++) {
     transform.step(over[i]);
   }
-  let result = [];
+  const result = [];
   for (let i = 0, mapFrom = steps.length; i < steps.length; i++) {
-    let mapped = steps[i].step.map(transform.mapping.slice(mapFrom));
+    const mapped = steps[i].step.map(transform.mapping.slice(mapFrom));
     mapFrom--;
     if (mapped && !transform.maybeStep(mapped).failed) {
       // Open ticket for setMirror https://github.com/ProseMirror/prosemirror/issues/869
@@ -51,7 +52,7 @@ class CollabState {
   }
 }
 function unconfirmedFrom(transform) {
-  let result = [];
+  const result = [];
   for (let i = 0; i < transform.steps.length; i++) {
     // Filter out the analytics steps, they don't need to be sent to the collab service
     // Commented out because it broke undo behaviour
@@ -69,7 +70,7 @@ const collabKey = new PluginKey('collab');
 /// for the editor.
 export function collab(config = {}) {
   var _config$transformUnco;
-  let conf = {
+  const conf = {
     version: config.version || 0,
     clientID:
     // eslint-disable-next-line eqeqeq
@@ -83,9 +84,13 @@ export function collab(config = {}) {
     state: {
       init: () => new CollabState(conf.version, []),
       apply(tr, collab) {
-        let newState = tr.getMeta(collabKey);
+        const newState = tr.getMeta(collabKey);
         if (newState) {
-          return newState;
+          if (fg('platform_editor_merge_unconfirmed_steps')) {
+            return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
+          } else {
+            return newState;
+          }
         }
         if (tr.docChanged) {
           return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
@@ -103,19 +108,17 @@ export function collab(config = {}) {
 /// Create a transaction that represents a set of new steps received from
 /// the authority. Applying this transaction moves the state forward to
 /// adjust to the authority's view of the document.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function receiveTransaction(state, steps, clientIDs, options = {}) {
   // Pushes a set of steps (received from the central authority) into
   // the editor state (which should have the collab plugin enabled).
   // Will recognize its own changes, and confirm unconfirmed steps as
   // appropriate. Remaining unconfirmed steps will be rebased over
   // remote steps.
-  let collabState = collabKey.getState(state);
-  let version = ((collabState === null || collabState === void 0 ? void 0 : collabState.version) || 0) + steps.length;
+  const collabState = collabKey.getState(state);
+  const version = ((collabState === null || collabState === void 0 ? void 0 : collabState.version) || 0) + steps.length;
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion,  @typescript-eslint/no-explicit-any
-  let ourID = collabKey.get(state).spec.config.clientID;
+  const ourID = collabKey.get(state).spec.config.clientID;
 
   // Find out which prefix of the steps originated with us
   let ours = 0;
@@ -130,8 +133,8 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
   if (!steps.length) {
     return state.tr.setMeta(collabKey, new CollabState(version, unconfirmed));
   }
-  let nUnconfirmed = unconfirmed.length;
-  let tr = state.tr;
+  const nUnconfirmed = unconfirmed.length;
+  const tr = state.tr;
   if (nUnconfirmed) {
     unconfirmed = rebaseSteps(unconfirmed, steps, tr);
   } else {
@@ -140,7 +143,7 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
     }
     unconfirmed = [];
   }
-  let newCollabState = new CollabState(version, unconfirmed);
+  const newCollabState = new CollabState(version, unconfirmed);
   if (options && options.mapSelectionBackward && state.selection instanceof TextSelection) {
     tr.setSelection(TextSelection.between(tr.doc.resolve(tr.mapping.map(state.selection.anchor, -1)), tr.doc.resolve(tr.mapping.map(state.selection.head, -1)), -1));
     // Ignored via go/ees005
@@ -160,7 +163,7 @@ export function receiveTransaction(state, steps, clientIDs, options = {}) {
 /// rebased, whereas the origin transactions are still the old,
 /// unchanged objects.
 export function sendableSteps(state) {
-  let collabState = collabKey.getState(state);
+  const collabState = collabKey.getState(state);
   if (!collabState) {
     return null;
   }

package/dist/esm/index.js

@@ -2,6 +2,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import { v4 as uuidv4 } from 'uuid';
 import { Plugin, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 var Rebaseable = /*#__PURE__*/_createClass(function Rebaseable(step, inverted, origin) {
   _classCallCheck(this, Rebaseable);
   this.step = step;
@@ -88,7 +89,11 @@ export function collab() {
       apply: function apply(tr, collab) {
         var newState = tr.getMeta(collabKey);
         if (newState) {
-          return newState;
+          if (fg('platform_editor_merge_unconfirmed_steps')) {
+            return new CollabState(newState.version, transformUnconfirmed(newState.unconfirmed));
+          } else {
+            return newState;
+          }
         }
         if (tr.docChanged) {
           return new CollabState(collab.version, transformUnconfirmed(collab.unconfirmed.concat(unconfirmedFrom(tr))));
@@ -106,8 +111,6 @@ export function collab() {
 /// Create a transaction that represents a set of new steps received from
 /// the authority. Applying this transaction moves the state forward to
 /// adjust to the authority's view of the document.
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
 export function receiveTransaction(state, steps, clientIDs) {
   var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   // Pushes a set of steps (received from the central authority) into

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/prosemirror-collab",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"description": "Collaborative editing for ProseMirror - Atlassian Fork",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,6 +31,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/platform-feature-flags": "^1.0.0",
 		"@babel/runtime": "^7.0.0",
 		"uuid": "^3.1.0"
 	},
@@ -52,5 +53,10 @@
 				"emotion"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"platform_editor_merge_unconfirmed_steps": {
+			"type": "boolean"
+		}
 	}
 }