@atlaskit/editor-plugin-collab-edit 2.0.1 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 2.1.0
+
+### Minor Changes
+
+- [#98820](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98820)
+  [`9f7dc3ba5d256`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9f7dc3ba5d256) -
+  [ux] Update the potential list of colors for avatar badges and telepointers within the editor.
+  Also add support for using presenceId over sessionId, when presenceId exists, in order to make the
+  avatar badge and telepointer color selection.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.0.2
+
+### Patch Changes
+
+- [#97210](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97210)
+  [`c1744e14e854d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c1744e14e854d) -
+  Use transformUnconfirmed from collab prosemirror plugin to merge unconfirmed steps while offline
+  to reduce payload.
+- Updated dependencies
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/cjs/collabEditPlugin.js

@@ -12,11 +12,13 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _analytics2 = require("./pm-plugins/analytics");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/main/plugin-key");
+var _mergeUnconfirmed = require("./pm-plugins/mergeUnconfirmed");
 var _nativeCollabProviderPlugin = require("./pm-plugins/native-collab-provider-plugin");
 var _trackAndFilterSpammingSteps = require("./pm-plugins/track-and-filter-spamming-steps");
 var _trackLastOrganicChange = require("./pm-plugins/track-last-organic-change");
@@ -151,16 +153,32 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
       },
       getCurrentCollabState: function getCurrentCollabState() {
         var _getCollabState;
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var adfDocument = new _editorJsonTransformer.JSONTransformer().encode(editorViewRef.current.state.doc);
         return {
           content: adfDocument,
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           version: ((_getCollabState = (0, _prosemirrorCollab.getCollabState)(editorViewRef.current.state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.version) || 0,
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           sendableSteps: (0, _prosemirrorCollab.sendableSteps)(editorViewRef.current.state)
         };
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       validatePMJSONDocument: function validatePMJSONDocument(doc) {
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         var content = (doc.content || []).map(function (child) {
-          return editorViewRef.current.state.schema.nodeFromJSON(child);
+          return (
+            // Ignored via go/ees005
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            // Ignored via go/ees005
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            editorViewRef.current.state.schema.nodeFromJSON(child)
+          );
         });
         return content.every(function (node) {
           try {
@@ -182,7 +200,8 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         name: 'pmCollab',
         plugin: function plugin() {
           return (0, _prosemirrorCollab.collab)({
-            clientID: userId
+            clientID: userId,
+            transformUnconfirmed: (0, _platformFeatureFlags.fg)('platform_editor_merge_unconfirmed_steps') ? _mergeUnconfirmed.mergeUnconfirmedSteps : undefined
           });
         }
       }, {

package/dist/cjs/pm-plugins/actions.js

@@ -13,6 +13,12 @@ var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _utils = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
+
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
+
 /*
  * This is a non-op function to force ProseMirror to load and register all custom steps in the same bundle
  */
@@ -20,7 +26,10 @@ var registerAllCustomSteps = exports.registerAllCustomSteps = function registerA
   Object.entries(allAtlaskitCustomSteps).forEach(function () {});
   Object.entries(allAdfSchemaSteps).forEach(function () {});
 };
-var handleInit = exports.handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
+var handleInit = exports.handleInit = function handleInit(initData, view, options, editorAnalyticsApi
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var doc = initData.doc,
     json = initData.json,
     version = initData.version,
@@ -75,7 +84,10 @@ var applyRemoteData = exports.applyRemoteData = function applyRemoteData(remoteD
     applyRemoteSteps(json, view, userIds, options);
   }
 };
-var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json, view, userIds, options) {
+var applyRemoteSteps = exports.applyRemoteSteps = function applyRemoteSteps(json, view, userIds, options
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   if (!json || !json.length) {
     return;
   }

package/dist/cjs/pm-plugins/analytics.js

@@ -7,7 +7,10 @@ exports.addSynchronyErrorAnalytics = exports.addSynchronyEntityAnalytics = void
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _utils = require("@atlaskit/editor-common/utils");
-var addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
+var addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return function (error) {
     var browserExtensions = (0, _utils.sniffUserBrowserExtensions)({
       extensions: ['grammarly']
@@ -22,6 +25,8 @@ var addSynchronyErrorAnalytics = exports.addSynchronyErrorAnalytics = function a
       }
     };
     if (featureFlags.synchronyErrorDocStructure) {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       payload.attributes.docStructure = (0, _coreUtils.getDocStructure)(state.doc, {
         compact: true
       });

package/dist/cjs/pm-plugins/events/handlers.js

@@ -6,6 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.subscribe = void 0;
 var _actions = require("../actions");
 var _analytics = require("../analytics");
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 var effect = function effect(fn, eq) {
   var previousDeps;
   var cleanup;
@@ -21,7 +29,10 @@ var effect = function effect(fn, eq) {
     return cleanup;
   };
 };
-var subscribe = exports.subscribe = effect(function (view, provider, options, featureFlags, _providerFactory, editorAnalyticsApi) {
+var subscribe = exports.subscribe = effect(
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+function (view, provider, options, featureFlags, _providerFactory, editorAnalyticsApi) {
   var entityRef;
   var entityHandlers = {
     disconnectedHandler: function disconnectedHandler() {

package/dist/cjs/pm-plugins/events/initialize.js

@@ -18,7 +18,10 @@ var initCollab = function initCollab(collabEditProvider, view) {
     });
   }
 };
-var initNewCollab = function initNewCollab(collabEditProvider, view, editorApi, onSyncUpError) {
+var initNewCollab = function initNewCollab(collabEditProvider, view, editorApi, onSyncUpError
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   collabEditProvider.setup({
     getState: function getState() {
       return view.state;

package/dist/cjs/pm-plugins/main/index.js

@@ -18,7 +18,12 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // It is important to get all steps in that package
 
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
+
 // It is important to get all steps in that package
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 
 var enforceCustomStepRegisters = function enforceCustomStepRegisters() {
   var tryToRegisterStep = function tryToRegisterStep(obj) {
@@ -49,14 +54,21 @@ var enforceCustomStepRegisters = function enforceCustomStepRegisters() {
   // @ts-expect-error
   tryToRegisterStep(adfCustomSteps);
 };
-var createPlugin = exports.createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags, pluginInjectionApi) {
+var createPlugin = exports.createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags, pluginInjectionApi
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   enforceCustomStepRegisters();
   return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
     state: {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       init: function init(config) {
         return _pluginState.PluginState.init(config);
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       apply: function apply(transaction, prevPluginState, _oldEditorState, _newEditorState) {
         var pluginState = prevPluginState.apply(transaction);
         dispatch(_pluginKey.pluginKey, pluginState);

package/dist/cjs/pm-plugins/main/plugin-state.js

@@ -29,6 +29,8 @@ var getValidPos = exports.getValidPos = function getValidPos(tr, pos) {
   return endOfDocPos;
 };
 var PluginState = exports.PluginState = /*#__PURE__*/function () {
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
   function PluginState(decorations, participants, sessionId) {
     var collabInitalised = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var onError = arguments.length > 4 ? arguments[4] : undefined;
@@ -64,6 +66,13 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
       var participant = this.participants.get(sessionId);
       return participant ? participant.name.substring(0, 1).toUpperCase() : 'X';
     }
+  }, {
+    key: "getPresenceId",
+    value: function getPresenceId(sessionId) {
+      var _participant$presence;
+      var participant = this.participants.get(sessionId);
+      return (_participant$presence = participant === null || participant === void 0 ? void 0 : participant.presenceId) !== null && _participant$presence !== void 0 ? _participant$presence : sessionId;
+    }
   }, {
     key: "apply",
     value: function apply(tr) {
@@ -104,7 +113,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
       if (telepointerData) {
         var sessionId = telepointerData.sessionId;
         if (participants.get(sessionId) && sessionId !== sid) {
-          var oldPointers = (0, _utils.findPointers)(telepointerData.sessionId, this.decorationSet);
+          var oldPointers = (0, _utils.findPointers)(sessionId, this.decorationSet);
           if (oldPointers) {
             remove = remove.concat(oldPointers);
           }
@@ -128,7 +137,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
           } catch (err) {
             this.onError(err);
           }
-          add = add.concat((0, _utils.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId)));
+          add = add.concat((0, _utils.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId)));
         }
       }
       if (tr.docChanged) {
@@ -140,12 +149,14 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
               if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
                 var step = tr.steps.filter(_utils.isReplaceStep)[0];
                 if (step) {
-                  var _sessionId = spec.pointer.sessionId;
+                  var _spec$pointer = spec.pointer,
+                    _sessionId = _spec$pointer.sessionId,
+                    presenceId = _spec$pointer.presenceId;
                   var _ref = step,
                     size = _ref.slice.content.size,
                     _from = _ref.from;
                   var pos = getValidPos(tr, size ? Math.min(_from + size, tr.doc.nodeSize - 3) : Math.max(_from, 1));
-                  add = add.concat((0, _utils.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId)));
+                  add = add.concat((0, _utils.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId), presenceId));
                 }
               }
             }
@@ -157,9 +168,13 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
         // Remove any selection decoration within the change range,
         // takes care of the issue when after pasting we end up with a dead selection
         tr.steps.filter(_utils.isReplaceStep).forEach(function (s) {
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           var _ref2 = s,
             from = _ref2.from,
             to = _ref2.to;
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           _this.decorationSet.find(from, to).forEach(function (deco) {
             // `type` is private, `from` and `to` are public in latest version
             // `from` != `to` means it's a selection
@@ -170,6 +185,8 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
         });
       }
       var selection = tr.selection;
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       this.decorationSet.find().forEach(function (deco) {
         if (deco.type.toDOM) {
           var hasTelepointerDimClass = deco.type.toDOM.classList.contains(_collab.TELEPOINTER_DIM_CLASS);
@@ -218,6 +235,9 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
     value: function eq(a, b) {
       return a.participants === b.participants && a.sessionId === b.sessionId && a.isReady === b.isReady;
     }
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   }, {
     key: "init",
     value: function init(config) {

package/dist/cjs/pm-plugins/mergeUnconfirmed.js

@@ -0,0 +1,85 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function isLockable(step) {
+  return (step === null || step === void 0 ? void 0 : step.lockStep) !== undefined;
+}
+var createLockableProseMirrorStep = function createLockableProseMirrorStep(step) {
+  var stepIsLocked = false;
+  if (isLockable(step)) {
+    return step;
+  }
+  return new Proxy(step, {
+    get: function get(target, prop, receiver) {
+      if (prop === 'lockStep') {
+        return function () {
+          stepIsLocked = true;
+        };
+      } else if (prop === 'isLocked') {
+        return function () {
+          return stepIsLocked;
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+};
+
+// Based on: `packages/editor/prosemirror-collab/src/index.ts`
+var LockableRebaseable = /*#__PURE__*/(0, _createClass2.default)(function LockableRebaseable(step, inverted, origin) {
+  (0, _classCallCheck2.default)(this, LockableRebaseable);
+  this.step = step;
+  this.inverted = inverted;
+  this.origin = origin;
+});
+var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
+  function LockableProseMirrorStep() {
+    (0, _classCallCheck2.default)(this, LockableProseMirrorStep);
+    return _callSuper(this, LockableProseMirrorStep, arguments);
+  }
+  (0, _inherits2.default)(LockableProseMirrorStep, _ProseMirrorStep);
+  return (0, _createClass2.default)(LockableProseMirrorStep);
+}(_transform.Step);
+/**
+ * Merge a set of steps together to reduce the total number of steps stored in memory.
+ *
+ * All steps passing through here should be "lockable" (ie. can be locked by the document service)
+ * so that it can be indicated they have already been sent (or are about to be sent) to the backend
+ * and cannot be merged.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ */
+function mergeUnconfirmedSteps(steps) {
+  var mergedSteps = steps.reduce(function (acc, rebaseable) {
+    var _lastStep$step$isLock, _lastStep$step, _rebaseable$step$isLo, _rebaseable$step;
+    var lastStep = acc[acc.length - 1];
+    if (lastStep && ((_lastStep$step$isLock = (_lastStep$step = lastStep.step).isLocked) === null || _lastStep$step$isLock === void 0 ? void 0 : _lastStep$step$isLock.call(_lastStep$step)) !== true && ((_rebaseable$step$isLo = (_rebaseable$step = rebaseable.step).isLocked) === null || _rebaseable$step$isLo === void 0 ? void 0 : _rebaseable$step$isLo.call(_rebaseable$step)) !== true) {
+      var mergedStep = lastStep.step.merge(rebaseable.step);
+      var _inverted = rebaseable.inverted.merge(lastStep.inverted);
+      // Always take the origin of the new step.
+      // We use this in packages/editor/collab-provider/src/document/document-service.ts:commitUnconfirmedSteps
+      // to confirm that the last transaction has been sent. Since we're taking the latest this still works as expected
+      // As we want to wait until all the transactions have been pushed through
+      var _origin = lastStep.origin;
+      if (mergedStep && _inverted) {
+        acc[acc.length - 1] = new LockableRebaseable(createLockableProseMirrorStep(mergedStep), _inverted, _origin);
+        return acc;
+      }
+    }
+    return acc.concat(new LockableRebaseable(createLockableProseMirrorStep(rebaseable.step), rebaseable.inverted, rebaseable.origin));
+  }, []);
+  return mergedSteps;
+}

package/dist/cjs/pm-plugins/utils.js

@@ -15,10 +15,13 @@ var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _consts = require("@atlaskit/editor-shared-styles/consts");
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var findPointers = exports.findPointers = function findPointers(id, decorations) {
-  return decorations.find().reduce(function (arr, deco) {
+  return decorations.find()
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  .reduce(function (arr, deco) {
     return deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr;
   }, []);
 };
@@ -27,31 +30,32 @@ function style(options) {
   return "border-right: 2px solid ".concat(color, "; margin-right: -2px;");
 }
 function getAvatarColor(str) {
-  var hash = 0;
-  for (var i = 0; i < str.length; i++) {
-    /* eslint-disable no-bitwise */
-    hash = (hash << 5) - hash + str.charCodeAt(i);
-    hash = hash & hash;
-    /* eslint-enable no-bitwise */
-  }
-  var index = Math.abs(hash) % _consts.avatarColors.length;
+  var participantColor = (0, _editorSharedStyles.getParticipantColor)(str);
   return {
-    index: index,
-    color: _consts.avatarColors[index]
+    index: participantColor.index,
+    backgroundColor: participantColor.color.backgroundColor,
+    textColor: participantColor.color.textColor
   };
 }
-var createTelepointers = exports.createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial) {
+var createTelepointers = exports.createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial, presenceId
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var decorations = [];
-  var avatarColor = getAvatarColor(sessionId);
+  var avatarColor = getAvatarColor(presenceId);
   var color = avatarColor.index.toString();
   if (isSelection) {
     var className = "telepointer color-".concat(color, " telepointer-selection");
-    decorations.push(_view.Decoration.inline(from, to, {
+    decorations.push(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    _view.Decoration.inline(from, to, {
       class: className,
       'data-initial': initial
     }, {
       pointer: {
-        sessionId: sessionId
+        sessionId: sessionId,
+        presenceId: presenceId
       }
     }));
   }
@@ -63,27 +67,42 @@ var createTelepointers = exports.createTelepointers = function createTelepointer
   cursor.textContent = _whitespace.ZERO_WIDTH_JOINER;
   cursor.className = "telepointer color-".concat(color, " telepointer-selection-badge");
   cursor.style.cssText = "".concat(style({
-    color: avatarColor.color
+    color: avatarColor.backgroundColor
   }), ";");
   cursor.setAttribute('data-initial', initial);
-  return decorations.concat(_view.Decoration.widget(to, spaceJoinerAfter, {
+  return decorations.concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  _view.Decoration.widget(to, spaceJoinerAfter, {
     pointer: {
-      sessionId: sessionId
+      sessionId: sessionId,
+      presenceId: presenceId
     },
     key: "telepointer-".concat(sessionId, "-zero")
-  })).concat(_view.Decoration.widget(to, cursor, {
+  })).concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  _view.Decoration.widget(to, cursor, {
     pointer: {
-      sessionId: sessionId
+      sessionId: sessionId,
+      presenceId: presenceId
     },
     key: "telepointer-".concat(sessionId)
-  })).concat(_view.Decoration.widget(to, spaceJoinerBefore, {
+  })).concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  _view.Decoration.widget(to, spaceJoinerBefore, {
     pointer: {
-      sessionId: sessionId
+      sessionId: sessionId,
+      presenceId: presenceId
     },
     key: "telepointer-".concat(sessionId, "-zero")
   }));
 };
-var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI) {
+var replaceDocument = exports.replaceDocument = function replaceDocument(doc, state, version, options, reserveCursor, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var schema = state.schema,
     tr = state.tr;
   var hasContent;
@@ -93,6 +112,8 @@ var replaceDocument = exports.replaceDocument = function replaceDocument(doc, st
     hasContent = !!(parsedDoc !== null && parsedDoc !== void 0 && parsedDoc.childCount);
     content = parsedDoc === null || parsedDoc === void 0 ? void 0 : parsedDoc.content;
   } else {
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     content = (doc.content || []).map(function (child) {
       return schema.nodeFromJSON(child);
     });
@@ -100,6 +121,8 @@ var replaceDocument = exports.replaceDocument = function replaceDocument(doc, st
   }
   if (hasContent) {
     tr.setMeta('addToHistory', false);
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     tr.replaceWith(0, state.doc.nodeSize - 2, content);
     var selection = state.selection;
     if (reserveCursor) {
@@ -125,7 +148,10 @@ var replaceDocument = exports.replaceDocument = function replaceDocument(doc, st
   }
   return tr;
 };
-var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index, editorAnalyticsAPI) {
+var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToCollabCursor(editorView, participants, sessionId, index, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var selectedUser = participants[index];
   if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
     var state = editorView.state;
@@ -146,6 +172,8 @@ var scrollToCollabCursor = exports.scrollToCollabCursor = function scrollToColla
 };
 var getPositionOfTelepointer = exports.getPositionOfTelepointer = function getPositionOfTelepointer(sessionId, decorationSet) {
   var scrollPosition;
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   decorationSet.find().forEach(function (deco) {
     if (deco.type.spec.pointer.sessionId === sessionId) {
       scrollPosition = deco.from;

package/dist/es2019/collabEditPlugin.js

@@ -1,11 +1,13 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { AddMarkStep, AddNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-collab';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey as mainPluginKey } from './pm-plugins/main/plugin-key';
+import { mergeUnconfirmedSteps } from './pm-plugins/mergeUnconfirmed';
 import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-plugin';
 import { sanitizeFilteredStep, createPlugin as trackSpammingStepsPlugin } from './pm-plugins/track-and-filter-spamming-steps';
 import { createPlugin as createLastOrganicChangePlugin, trackLastOrganicChangePluginKey } from './pm-plugins/track-last-organic-change';
@@ -110,15 +112,30 @@ export const collabEditPlugin = ({
       isRemoteReplaceDocumentTransaction: tr => tr.getMeta('isRemote') && tr.getMeta('replaceDocument'),
       getCurrentCollabState: () => {
         var _getCollabState;
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const adfDocument = new JSONTransformer().encode(editorViewRef.current.state.doc);
         return {
           content: adfDocument,
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           version: ((_getCollabState = getCollabState(editorViewRef.current.state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.version) || 0,
+          // Ignored via go/ees005
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           sendableSteps: sendableSteps(editorViewRef.current.state)
         };
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       validatePMJSONDocument: doc => {
-        const content = (doc.content || []).map(child => editorViewRef.current.state.schema.nodeFromJSON(child));
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const content = (doc.content || []).map(child =>
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        editorViewRef.current.state.schema.nodeFromJSON(child));
         return content.every(node => {
           try {
             node.check(); // this will throw an error if the node is invalid
@@ -137,7 +154,8 @@ export const collabEditPlugin = ({
       const plugins = [...(useNativePlugin ? [{
         name: 'pmCollab',
         plugin: () => collab({
-          clientID: userId
+          clientID: userId,
+          transformUnconfirmed: fg('platform_editor_merge_unconfirmed_steps') ? mergeUnconfirmedSteps : undefined
         })
       }, {
         name: 'nativeCollabProviderPlugin',

package/dist/es2019/pm-plugins/actions.js

@@ -1,4 +1,8 @@
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as allAdfSchemaSteps from '@atlaskit/adf-schema/steps';
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as allAtlaskitCustomSteps from '@atlaskit/custom-steps';
 import { AllSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { Step } from '@atlaskit/editor-prosemirror/transform';
@@ -12,7 +16,10 @@ export const registerAllCustomSteps = () => {
   Object.entries(allAtlaskitCustomSteps).forEach(() => {});
   Object.entries(allAdfSchemaSteps).forEach(() => {});
 };
-export const handleInit = (initData, view, options, editorAnalyticsApi) => {
+export const handleInit = (initData, view, options, editorAnalyticsApi
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   const {
     doc,
     json,
@@ -80,7 +87,10 @@ export const applyRemoteData = (remoteData, view, options) => {
     applyRemoteSteps(json, view, userIds, options);
   }
 };
-export const applyRemoteSteps = (json, view, userIds, options) => {
+export const applyRemoteSteps = (json, view, userIds, options
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   if (!json || !json.length) {
     return;
   }