@atlaskit/editor-plugin-collab-edit 2.0.0 → 2.0.2

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

@@ -30,6 +30,9 @@ export class PluginState {
   get sessionId() {
     return this.sid;
   }
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
   constructor(decorations, participants, sessionId, collabInitalised = false, onError) {
     // eslint-disable-next-line no-console
     _defineProperty(this, "onError", error => console.error(error));
@@ -128,6 +131,8 @@ export class PluginState {
                     }
                   },
                   from
+                  // Ignored via go/ees005
+                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } = step;
                 const pos = getValidPos(tr, size ? Math.min(from + size, tr.doc.nodeSize - 3) : Math.max(from, 1));
                 add = add.concat(createTelepointers(pos, pos, sessionId, false, this.getInitial(sessionId)));
@@ -142,10 +147,14 @@ export class PluginState {
       // 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(isReplaceStep).forEach(s => {
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const {
           from,
           to
         } = s;
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         this.decorationSet.find(from, to).forEach(deco => {
           // `type` is private, `from` and `to` are public in latest version
           // `from` != `to` means it's a selection
@@ -158,6 +167,8 @@ export class PluginState {
     const {
       selection
     } = tr;
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     this.decorationSet.find().forEach(deco => {
       if (deco.type.toDOM) {
         const hasTelepointerDimClass = deco.type.toDOM.classList.contains(TELEPOINTER_DIM_CLASS);
@@ -206,6 +217,9 @@ export class PluginState {
   static 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
   static init(config) {
     const {
       doc,

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

@@ -0,0 +1,66 @@
+import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+function isLockable(step) {
+  return (step === null || step === void 0 ? void 0 : step.lockStep) !== undefined;
+}
+const createLockableProseMirrorStep = step => {
+  let stepIsLocked = false;
+  if (isLockable(step)) {
+    return step;
+  }
+  return new Proxy(step, {
+    get(target, prop, receiver) {
+      if (prop === 'lockStep') {
+        return () => {
+          stepIsLocked = true;
+        };
+      } else if (prop === 'isLocked') {
+        return () => {
+          return stepIsLocked;
+        };
+      }
+      return Reflect.get(target, prop, receiver);
+    }
+  });
+};
+
+// Based on: `packages/editor/prosemirror-collab/src/index.ts`
+class LockableRebaseable {
+  constructor(step, inverted, origin) {
+    this.step = step;
+    this.inverted = inverted;
+    this.origin = origin;
+  }
+}
+class LockableProseMirrorStep extends ProseMirrorStep {}
+
+/**
+ * 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
+ */
+export function mergeUnconfirmedSteps(steps) {
+  const mergedSteps = steps.reduce((acc, rebaseable) => {
+    var _lastStep$step$isLock, _lastStep$step, _rebaseable$step$isLo, _rebaseable$step;
+    const 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) {
+      const mergedStep = lastStep.step.merge(rebaseable.step);
+      const 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
+      const 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/es2019/pm-plugins/utils.js

@@ -2,13 +2,15 @@ import { AnalyticsStep, SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { processRawValueWithoutValidation } from '@atlaskit/editor-common/process-raw-value';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
-import { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { avatarColors } from '@atlaskit/editor-shared-styles/consts';
 import { fg } from '@atlaskit/platform-feature-flags';
-export const findPointers = (id, decorations) => decorations.find().reduce((arr, deco) => deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr, []);
+export const findPointers = (id, decorations) => decorations.find()
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+.reduce((arr, deco) => deco.spec.pointer.sessionId === id ? arr.concat(deco) : arr, []);
 function style(options) {
   const color = options && options.color || 'black';
   return `border-right: 2px solid ${color}; margin-right: -2px;`;
@@ -27,13 +29,19 @@ export function getAvatarColor(str) {
     color: avatarColors[index]
   };
 }
-export const createTelepointers = (from, to, sessionId, isSelection, initial) => {
+export const createTelepointers = (from, to, sessionId, isSelection, initial
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   let decorations = [];
   const avatarColor = getAvatarColor(sessionId);
   const color = avatarColor.index.toString();
   if (isSelection) {
     const className = `telepointer color-${color} telepointer-selection`;
-    decorations.push(Decoration.inline(from, to, {
+    decorations.push(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    Decoration.inline(from, to, {
       class: className,
       'data-initial': initial
     }, {
@@ -53,24 +61,36 @@ export const createTelepointers = (from, to, sessionId, isSelection, initial) =>
     color: avatarColor.color
   })};`;
   cursor.setAttribute('data-initial', initial);
-  return decorations.concat(Decoration.widget(to, spaceJoinerAfter, {
+  return decorations.concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  Decoration.widget(to, spaceJoinerAfter, {
     pointer: {
       sessionId
     },
     key: `telepointer-${sessionId}-zero`
-  })).concat(Decoration.widget(to, cursor, {
+  })).concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  Decoration.widget(to, cursor, {
     pointer: {
       sessionId
     },
     key: `telepointer-${sessionId}`
-  })).concat(Decoration.widget(to, spaceJoinerBefore, {
+  })).concat(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  Decoration.widget(to, spaceJoinerBefore, {
     pointer: {
       sessionId
     },
     key: `telepointer-${sessionId}-zero`
   }));
 };
-export const replaceDocument = (doc, state, version, options, reserveCursor, editorAnalyticsAPI) => {
+export const replaceDocument = (doc, state, version, options, reserveCursor, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   const {
     schema,
     tr
@@ -82,11 +102,15 @@ export const replaceDocument = (doc, state, version, options, reserveCursor, edi
     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(child => schema.nodeFromJSON(child));
     hasContent = Array.isArray(content) && !!content.length;
   }
   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);
     const selection = state.selection;
     if (reserveCursor) {
@@ -112,7 +136,10 @@ export const replaceDocument = (doc, state, version, options, reserveCursor, edi
   }
   return tr;
 };
-export const scrollToCollabCursor = (editorView, participants, sessionId, index, editorAnalyticsAPI) => {
+export const scrollToCollabCursor = (editorView, participants, sessionId, index, editorAnalyticsAPI
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) => {
   const selectedUser = participants[index];
   if (selectedUser && selectedUser.cursorPos !== undefined && selectedUser.sessionId !== sessionId) {
     const {
@@ -135,6 +162,8 @@ export const scrollToCollabCursor = (editorView, participants, sessionId, index,
 };
 export const getPositionOfTelepointer = (sessionId, decorationSet) => {
   let scrollPosition;
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   decorationSet.find().forEach(deco => {
     if (deco.type.spec.pointer.sessionId === sessionId) {
       scrollPosition = deco.from;

package/dist/esm/collabEditPlugin.js

@@ -7,11 +7,13 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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';
@@ -144,16 +146,32 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
       },
       getCurrentCollabState: function getCurrentCollabState() {
         var _getCollabState;
+        // Ignored via go/ees005
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         var 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: 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 {
@@ -175,7 +193,8 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         name: 'pmCollab',
         plugin: function plugin() {
           return collab({
-            clientID: userId
+            clientID: userId,
+            transformUnconfirmed: fg('platform_editor_merge_unconfirmed_steps') ? mergeUnconfirmedSteps : undefined
           });
         }
       }, {

package/dist/esm/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 var registerAllCustomSteps = function registerAllCustomSteps() {
   Object.entries(allAtlaskitCustomSteps).forEach(function () {});
   Object.entries(allAdfSchemaSteps).forEach(function () {});
 };
-export var handleInit = function handleInit(initData, view, options, editorAnalyticsApi) {
+export var 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,
@@ -67,7 +74,10 @@ export var applyRemoteData = function applyRemoteData(remoteData, view, options)
     applyRemoteSteps(json, view, userIds, options);
   }
 };
-export var applyRemoteSteps = function applyRemoteSteps(json, view, userIds, options) {
+export var 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/esm/pm-plugins/analytics.js

@@ -1,7 +1,10 @@
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { getDocStructure } from '@atlaskit/editor-common/core-utils';
 import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
-export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi) {
+export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr, featureFlags, editorAnalyticsApi
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   return function (error) {
     var browserExtensions = sniffUserBrowserExtensions({
       extensions: ['grammarly']
@@ -16,6 +19,8 @@ export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(stat
       }
     };
     if (featureFlags.synchronyErrorDocStructure) {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       payload.attributes.docStructure = getDocStructure(state.doc, {
         compact: true
       });

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

@@ -1,5 +1,14 @@
 import { applyRemoteData, handleActivityAck, handleActivityJoin, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
 import { addSynchronyEntityAnalytics, addSynchronyErrorAnalytics } from '../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;
@@ -15,7 +24,10 @@ var effect = function effect(fn, eq) {
     return cleanup;
   };
 };
-export var subscribe = effect(function (view, provider, options, featureFlags, _providerFactory, editorAnalyticsApi) {
+export var 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/esm/pm-plugins/events/initialize.js

@@ -11,7 +11,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/esm/pm-plugins/main/index.js

@@ -1,6 +1,11 @@
 // It is important to get all steps in that package
+
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as adfCustomSteps from '@atlaskit/adf-schema/steps';
 // It is important to get all steps in that package
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
 import * as atlaskKitCustomSteps from '@atlaskit/custom-steps';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, fireAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
@@ -38,14 +43,21 @@ var enforceCustomStepRegisters = function enforceCustomStepRegisters() {
   // @ts-expect-error
   tryToRegisterStep(adfCustomSteps);
 };
-export var createPlugin = function createPlugin(dispatch, providerFactory, providerResolver, collabProviderCallback, options, featureFlags, pluginInjectionApi) {
+export var 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({
     key: pluginKey,
     state: {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       init: function init(config) {
         return 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, pluginState);

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

@@ -23,6 +23,8 @@ export var getValidPos = function getValidPos(tr, pos) {
   return endOfDocPos;
 };
 export var 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;
@@ -151,9 +153,13 @@ export var 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(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
@@ -164,6 +170,8 @@ export var 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(TELEPOINTER_DIM_CLASS);
@@ -212,6 +220,9 @@ export var 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/esm/pm-plugins/mergeUnconfirmed.js

@@ -0,0 +1,78 @@
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
+import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+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__*/_createClass(function LockableRebaseable(step, inverted, origin) {
+  _classCallCheck(this, LockableRebaseable);
+  this.step = step;
+  this.inverted = inverted;
+  this.origin = origin;
+});
+var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
+  function LockableProseMirrorStep() {
+    _classCallCheck(this, LockableProseMirrorStep);
+    return _callSuper(this, LockableProseMirrorStep, arguments);
+  }
+  _inherits(LockableProseMirrorStep, _ProseMirrorStep);
+  return _createClass(LockableProseMirrorStep);
+}(ProseMirrorStep);
+/**
+ * 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
+ */
+export 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;
+}