@atlaskit/editor-plugin-collab-edit 3.0.0 → 3.1.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.1.1
+
+### Patch Changes
+
+- [#120905](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120905)
+  [`4194ea903d7d6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4194ea903d7d6) -
+  Refactor step merging while offline.
+
+## 3.1.0
+
+### Minor Changes
+
+- [#117768](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117768)
+  [`d55a8d95dd68a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d55a8d95dd68a) -
+  Add support for presenceActivity changes within collab provider. Remove unused code from original
+  presence experiment.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.0.0
 
 ### Major Changes

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

@@ -4,7 +4,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.registerAllCustomSteps = exports.handleTelePointer = exports.handlePresence = exports.handleInit = exports.handleConnection = exports.handleActivityJoin = exports.handleActivityAck = exports.getSendableSelection = exports.applyRemoteSteps = exports.applyRemoteData = void 0;
+exports.registerAllCustomSteps = exports.handleTelePointer = exports.handlePresence = exports.handleInit = exports.handleConnection = exports.getSendableSelection = exports.applyRemoteSteps = exports.applyRemoteData = void 0;
 var allAdfSchemaSteps = _interopRequireWildcard(require("@atlaskit/adf-schema/steps"));
 var allAtlaskitCustomSteps = _interopRequireWildcard(require("@atlaskit/custom-steps"));
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -48,31 +48,6 @@ var handlePresence = exports.handlePresence = function handlePresence(presenceDa
   var tr = view.state.tr;
   view.dispatch(tr.setMeta('presence', presenceData));
 };
-var ACTIVITY_EDITING = 'EDITING';
-
-/**
- * A Handler for event "activity:ack" forwarded from NCS.
- * This event "activity:ack" is emitted by the existing collaborators in response to a new collaborator
- * joining. It is used to inform the new collaborator about the current actions or states of the existing
- * collaborators, such as viewing or editing.
- */
-var handleActivityAck = exports.handleActivityAck = function handleActivityAck() {};
-
-/**
- * A Handler for event "activity:join" forwarded from NCS.
- * Existing participant respond to the new joiner with their status.
- * This event "activity:join" is emitted when a new collaborator joins the session. The event carries
- * information about the action the new collaborator is currently doing in the session, such as viewing
- * or editing.
- */
-var handleActivityJoin = exports.handleActivityJoin = function handleActivityJoin(provider) {
-  if (provider) {
-    provider.sendMessage({
-      type: 'activity:ack',
-      activity: ACTIVITY_EDITING
-    });
-  }
-};
 var applyRemoteData = exports.applyRemoteData = function applyRemoteData(remoteData, view, options) {
   var json = remoteData.json,
     _remoteData$userIds = remoteData.userIds,

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

@@ -60,12 +60,6 @@ var subscribe = exports.subscribe = effect(function (view, provider, options, fe
     presenceHandler: function presenceHandler(data) {
       return (0, _actions.handlePresence)(data, view);
     },
-    activityAckHandler: function activityAckHandler() {
-      return (0, _actions.handleActivityAck)();
-    },
-    activityJoinHandler: function activityJoinHandler() {
-      return (0, _actions.handleActivityJoin)(provider);
-    },
     telepointerHandler: function telepointerHandler(data) {
       return (0, _actions.handleTelePointer)(data, view);
     },
@@ -94,10 +88,10 @@ var subscribe = exports.subscribe = effect(function (view, provider, options, fe
       view.dispatch(view.state.tr.setMeta(_trackReconnectionConflict.trackLastRemoteConflictPluginKey, data));
     }
   };
-  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('activity:ack', handlers.activityAckHandler).on('activity:join', handlers.activityJoinHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
+  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
   return function () {
     unsubscribeSynchronyEntity();
-    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('activity:ack', handlers.activityAckHandler).off('activity:join', handlers.activityJoinHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
+    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
   };
 }, function (previousDeps, currentDeps) {
   return currentDeps && currentDeps.every(function (dep, i) {

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

@@ -5,38 +5,9 @@ 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);
-    }
-  });
-};
-
+var _state = require("@atlaskit/editor-prosemirror/state");
 // 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);
@@ -44,14 +15,13 @@ var LockableRebaseable = /*#__PURE__*/(0, _createClass2.default)(function Lockab
   this.inverted = inverted;
   this.origin = origin;
 });
-var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
-  function LockableProseMirrorStep() {
-    (0, _classCallCheck2.default)(this, LockableProseMirrorStep);
-    return _callSuper(this, LockableProseMirrorStep, arguments);
+var isLocked = function isLocked(step) {
+  if (step.origin instanceof _state.Transaction) {
+    return step.origin.getMeta('mergeIsLocked');
   }
-  (0, _inherits2.default)(LockableProseMirrorStep, _ProseMirrorStep);
-  return (0, _createClass2.default)(LockableProseMirrorStep);
-}(_transform.Step);
+  return false;
+};
+
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.
  *
@@ -64,9 +34,9 @@ var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
  */
 function mergeUnconfirmedSteps(steps, api) {
   var mergedSteps = steps.reduce(function (acc, rebaseable) {
-    var _api$connectivity, _lastStep$step$isLock, _lastStep$step, _rebaseable$step$isLo, _rebaseable$step;
+    var _api$connectivity;
     var lastStep = acc[acc.length - 1];
-    if ((api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline' && 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) {
+    if ((api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline' && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
       var _inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.
@@ -75,11 +45,11 @@ function mergeUnconfirmedSteps(steps, api) {
       // 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);
+        acc[acc.length - 1] = new LockableRebaseable(mergedStep, _inverted, _origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(createLockableProseMirrorStep(rebaseable.step), rebaseable.inverted, rebaseable.origin));
+    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
   }, []);
   return mergedSteps;
 }

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

@@ -50,31 +50,6 @@ export const handlePresence = (presenceData, view) => {
   } = view;
   view.dispatch(tr.setMeta('presence', presenceData));
 };
-const ACTIVITY_EDITING = 'EDITING';
-
-/**
- * A Handler for event "activity:ack" forwarded from NCS.
- * This event "activity:ack" is emitted by the existing collaborators in response to a new collaborator
- * joining. It is used to inform the new collaborator about the current actions or states of the existing
- * collaborators, such as viewing or editing.
- */
-export const handleActivityAck = () => {};
-
-/**
- * A Handler for event "activity:join" forwarded from NCS.
- * Existing participant respond to the new joiner with their status.
- * This event "activity:join" is emitted when a new collaborator joins the session. The event carries
- * information about the action the new collaborator is currently doing in the session, such as viewing
- * or editing.
- */
-export const handleActivityJoin = provider => {
-  if (provider) {
-    provider.sendMessage({
-      type: 'activity:ack',
-      activity: ACTIVITY_EDITING
-    });
-  }
-};
 export const applyRemoteData = (remoteData, view, options) => {
   const {
     json,

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

@@ -1,4 +1,4 @@
-import { applyRemoteData, handleActivityAck, handleActivityJoin, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
+import { applyRemoteData, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
 import { addSynchronyEntityAnalytics, addSynchronyErrorAnalytics } from '../analytics';
 import { trackLastRemoteConflictPluginKey } from '../track-reconnection-conflict';
 
@@ -46,8 +46,6 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
     connectedHandler: data => handleConnection(data, view),
     dataHandler: data => applyRemoteData(data, view, options),
     presenceHandler: data => handlePresence(data, view),
-    activityAckHandler: () => handleActivityAck(),
-    activityJoinHandler: () => handleActivityJoin(provider),
     telepointerHandler: data => handleTelePointer(data, view),
     localStepsHandler: data => {
       const {
@@ -79,9 +77,9 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
       view.dispatch(view.state.tr.setMeta(trackLastRemoteConflictPluginKey, data));
     }
   };
-  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('activity:ack', handlers.activityAckHandler).on('activity:join', handlers.activityJoinHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
+  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
   return () => {
     unsubscribeSynchronyEntity();
-    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('activity:ack', handlers.activityAckHandler).off('activity:join', handlers.activityJoinHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
+    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
   };
 }, (previousDeps, currentDeps) => currentDeps && currentDeps.every((dep, i) => dep === previousDeps[i]));

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

@@ -1,28 +1,4 @@
-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);
-    }
-  });
-};
-
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 // Based on: `packages/editor/prosemirror-collab/src/index.ts`
 class LockableRebaseable {
   constructor(step, inverted, origin) {
@@ -31,7 +7,12 @@ class LockableRebaseable {
     this.origin = origin;
   }
 }
-class LockableProseMirrorStep extends ProseMirrorStep {}
+const isLocked = step => {
+  if (step.origin instanceof Transaction) {
+    return step.origin.getMeta('mergeIsLocked');
+  }
+  return false;
+};
 
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.
@@ -45,9 +26,9 @@ class LockableProseMirrorStep extends ProseMirrorStep {}
  */
 export function mergeUnconfirmedSteps(steps, api) {
   const mergedSteps = steps.reduce((acc, rebaseable) => {
-    var _api$connectivity, _api$connectivity$sha, _lastStep$step$isLock, _lastStep$step, _rebaseable$step$isLo, _rebaseable$step;
+    var _api$connectivity, _api$connectivity$sha;
     const lastStep = acc[acc.length - 1];
-    if ((api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode) === 'offline' && 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) {
+    if ((api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode) === 'offline' && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       const mergedStep = lastStep.step.merge(rebaseable.step);
       const inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.
@@ -56,11 +37,11 @@ export function mergeUnconfirmedSteps(steps, api) {
       // 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);
+        acc[acc.length - 1] = new LockableRebaseable(mergedStep, inverted, origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(createLockableProseMirrorStep(rebaseable.step), rebaseable.inverted, rebaseable.origin));
+    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
   }, []);
   return mergedSteps;
 }

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

@@ -38,31 +38,6 @@ export var handlePresence = function handlePresence(presenceData, view) {
   var tr = view.state.tr;
   view.dispatch(tr.setMeta('presence', presenceData));
 };
-var ACTIVITY_EDITING = 'EDITING';
-
-/**
- * A Handler for event "activity:ack" forwarded from NCS.
- * This event "activity:ack" is emitted by the existing collaborators in response to a new collaborator
- * joining. It is used to inform the new collaborator about the current actions or states of the existing
- * collaborators, such as viewing or editing.
- */
-export var handleActivityAck = function handleActivityAck() {};
-
-/**
- * A Handler for event "activity:join" forwarded from NCS.
- * Existing participant respond to the new joiner with their status.
- * This event "activity:join" is emitted when a new collaborator joins the session. The event carries
- * information about the action the new collaborator is currently doing in the session, such as viewing
- * or editing.
- */
-export var handleActivityJoin = function handleActivityJoin(provider) {
-  if (provider) {
-    provider.sendMessage({
-      type: 'activity:ack',
-      activity: ACTIVITY_EDITING
-    });
-  }
-};
 export var applyRemoteData = function applyRemoteData(remoteData, view, options) {
   var json = remoteData.json,
     _remoteData$userIds = remoteData.userIds,

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

@@ -1,4 +1,4 @@
-import { applyRemoteData, handleActivityAck, handleActivityJoin, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
+import { applyRemoteData, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
 import { addSynchronyEntityAnalytics, addSynchronyErrorAnalytics } from '../analytics';
 import { trackLastRemoteConflictPluginKey } from '../track-reconnection-conflict';
 
@@ -55,12 +55,6 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
     presenceHandler: function presenceHandler(data) {
       return handlePresence(data, view);
     },
-    activityAckHandler: function activityAckHandler() {
-      return handleActivityAck();
-    },
-    activityJoinHandler: function activityJoinHandler() {
-      return handleActivityJoin(provider);
-    },
     telepointerHandler: function telepointerHandler(data) {
       return handleTelePointer(data, view);
     },
@@ -89,10 +83,10 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
       view.dispatch(view.state.tr.setMeta(trackLastRemoteConflictPluginKey, data));
     }
   };
-  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('activity:ack', handlers.activityAckHandler).on('activity:join', handlers.activityJoinHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
+  provider.on('init', handlers.initHandler).on('connected', handlers.connectedHandler).on('data', handlers.dataHandler).on('presence', handlers.presenceHandler).on('telepointer', handlers.telepointerHandler).on('local-steps', handlers.localStepsHandler).on('error', handlers.errorHandler).on('entity', handlers.entityHandler).on('data:conflict', handlers.dataConflictHandler);
   return function () {
     unsubscribeSynchronyEntity();
-    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('activity:ack', handlers.activityAckHandler).off('activity:join', handlers.activityJoinHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
+    provider.off('init', handlers.initHandler).off('connected', handlers.connectedHandler).off('data', handlers.dataHandler).off('presence', handlers.presenceHandler).off('telepointer', handlers.telepointerHandler).off('local-steps', handlers.localStepsHandler).off('error', handlers.errorHandler).off('entity', handlers.entityHandler).off('data:conflict', handlers.dataConflictHandler);
   };
 }, function (previousDeps, currentDeps) {
   return currentDeps && currentDeps.every(function (dep, i) {

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

@@ -1,35 +1,6 @@
-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);
-    }
-  });
-};
-
+import { Transaction } from '@atlaskit/editor-prosemirror/state';
 // Based on: `packages/editor/prosemirror-collab/src/index.ts`
 var LockableRebaseable = /*#__PURE__*/_createClass(function LockableRebaseable(step, inverted, origin) {
   _classCallCheck(this, LockableRebaseable);
@@ -37,14 +8,13 @@ var LockableRebaseable = /*#__PURE__*/_createClass(function LockableRebaseable(s
   this.inverted = inverted;
   this.origin = origin;
 });
-var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
-  function LockableProseMirrorStep() {
-    _classCallCheck(this, LockableProseMirrorStep);
-    return _callSuper(this, LockableProseMirrorStep, arguments);
+var isLocked = function isLocked(step) {
+  if (step.origin instanceof Transaction) {
+    return step.origin.getMeta('mergeIsLocked');
   }
-  _inherits(LockableProseMirrorStep, _ProseMirrorStep);
-  return _createClass(LockableProseMirrorStep);
-}(ProseMirrorStep);
+  return false;
+};
+
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.
  *
@@ -57,9 +27,9 @@ var LockableProseMirrorStep = /*#__PURE__*/function (_ProseMirrorStep) {
  */
 export function mergeUnconfirmedSteps(steps, api) {
   var mergedSteps = steps.reduce(function (acc, rebaseable) {
-    var _api$connectivity, _lastStep$step$isLock, _lastStep$step, _rebaseable$step$isLo, _rebaseable$step;
+    var _api$connectivity;
     var lastStep = acc[acc.length - 1];
-    if ((api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline' && 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) {
+    if ((api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline' && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
       var _inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.
@@ -68,11 +38,11 @@ export function mergeUnconfirmedSteps(steps, api) {
       // 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);
+        acc[acc.length - 1] = new LockableRebaseable(mergedStep, _inverted, _origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(createLockableProseMirrorStep(rebaseable.step), rebaseable.inverted, rebaseable.origin));
+    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
   }, []);
   return mergedSteps;
 }

package/dist/types/pm-plugins/actions.d.ts

@@ -1,5 +1,5 @@
 import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PrivateCollabEditOptions } from '../types';
@@ -7,21 +7,6 @@ export declare const registerAllCustomSteps: () => void;
 export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
 export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
 export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
-/**
- * A Handler for event "activity:ack" forwarded from NCS.
- * This event "activity:ack" is emitted by the existing collaborators in response to a new collaborator
- * joining. It is used to inform the new collaborator about the current actions or states of the existing
- * collaborators, such as viewing or editing.
- */
-export declare const handleActivityAck: () => void;
-/**
- * A Handler for event "activity:join" forwarded from NCS.
- * Existing participant respond to the new joiner with their status.
- * This event "activity:join" is emitted when a new collaborator joins the session. The event carries
- * information about the action the new collaborator is currently doing in the session, such as viewing
- * or editing.
- */
-export declare const handleActivityJoin: (provider: CollabEditProvider | null) => void;
 export declare const applyRemoteData: (remoteData: CollabEventRemoteData, view: EditorView, options: PrivateCollabEditOptions) => void;
 export declare const applyRemoteSteps: (json: any[], view: EditorView, userIds?: (number | string)[], options?: PrivateCollabEditOptions) => void;
 export declare const handleTelePointer: (telepointerData: CollabTelepointerPayload, view: EditorView) => void;

package/dist/types/pm-plugins/events/handlers.d.ts

@@ -13,8 +13,6 @@ export interface CollabHandlers {
     connectedHandler: (data: CollabEventConnectionData) => void;
     dataHandler: (data: CollabEventRemoteData) => void;
     presenceHandler: (data: CollabEventPresenceData) => void;
-    activityAckHandler: () => void;
-    activityJoinHandler: () => void;
     telepointerHandler: (data: CollabTelepointerPayload) => void;
     localStepsHandler: (data: CollabEventLocalStepData) => void;
     errorHandler: (error: any) => void;

package/dist/types/pm-plugins/mergeUnconfirmed.d.ts

@@ -3,14 +3,10 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import type { Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
 import type { CollabEditPlugin } from '../collabEditPluginType';
 declare class LockableRebaseable {
-    readonly step: LockableProseMirrorStep;
+    readonly step: ProseMirrorStep;
     readonly inverted: ProseMirrorStep;
     readonly origin: ProseMirrorTransform;
-    constructor(step: LockableProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
-}
-declare abstract class LockableProseMirrorStep extends ProseMirrorStep {
-    lockStep?: () => void;
-    isLocked?: () => boolean;
+    constructor(step: ProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
 }
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.

package/dist/types-ts4.5/pm-plugins/actions.d.ts

@@ -1,5 +1,5 @@
 import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEventConnectionData, CollabEventInitData, CollabEventPresenceData, CollabEventRemoteData, CollabSendableSelection, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PrivateCollabEditOptions } from '../types';
@@ -7,21 +7,6 @@ export declare const registerAllCustomSteps: () => void;
 export declare const handleInit: (initData: CollabEventInitData, view: EditorView, options?: PrivateCollabEditOptions, editorAnalyticsApi?: EditorAnalyticsAPI) => void;
 export declare const handleConnection: (connectionData: CollabEventConnectionData, view: EditorView) => void;
 export declare const handlePresence: (presenceData: CollabEventPresenceData, view: EditorView) => void;
-/**
- * A Handler for event "activity:ack" forwarded from NCS.
- * This event "activity:ack" is emitted by the existing collaborators in response to a new collaborator
- * joining. It is used to inform the new collaborator about the current actions or states of the existing
- * collaborators, such as viewing or editing.
- */
-export declare const handleActivityAck: () => void;
-/**
- * A Handler for event "activity:join" forwarded from NCS.
- * Existing participant respond to the new joiner with their status.
- * This event "activity:join" is emitted when a new collaborator joins the session. The event carries
- * information about the action the new collaborator is currently doing in the session, such as viewing
- * or editing.
- */
-export declare const handleActivityJoin: (provider: CollabEditProvider | null) => void;
 export declare const applyRemoteData: (remoteData: CollabEventRemoteData, view: EditorView, options: PrivateCollabEditOptions) => void;
 export declare const applyRemoteSteps: (json: any[], view: EditorView, userIds?: (number | string)[], options?: PrivateCollabEditOptions) => void;
 export declare const handleTelePointer: (telepointerData: CollabTelepointerPayload, view: EditorView) => void;

package/dist/types-ts4.5/pm-plugins/events/handlers.d.ts

@@ -13,8 +13,6 @@ export interface CollabHandlers {
     connectedHandler: (data: CollabEventConnectionData) => void;
     dataHandler: (data: CollabEventRemoteData) => void;
     presenceHandler: (data: CollabEventPresenceData) => void;
-    activityAckHandler: () => void;
-    activityJoinHandler: () => void;
     telepointerHandler: (data: CollabTelepointerPayload) => void;
     localStepsHandler: (data: CollabEventLocalStepData) => void;
     errorHandler: (error: any) => void;

package/dist/types-ts4.5/pm-plugins/mergeUnconfirmed.d.ts

@@ -3,14 +3,10 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import type { Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
 import type { CollabEditPlugin } from '../collabEditPluginType';
 declare class LockableRebaseable {
-    readonly step: LockableProseMirrorStep;
+    readonly step: ProseMirrorStep;
     readonly inverted: ProseMirrorStep;
     readonly origin: ProseMirrorTransform;
-    constructor(step: LockableProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
-}
-declare abstract class LockableProseMirrorStep extends ProseMirrorStep {
-    lockStep?: () => void;
-    isLocked?: () => boolean;
+    constructor(step: ProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
 }
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "3.0.0",
+	"version": "3.1.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,14 +33,14 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.2.1",
 		"@atlaskit/custom-steps": "^0.10.0",
-		"@atlaskit/editor-common": "^100.0.0",
+		"@atlaskit/editor-common": "^100.4.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
 		"@atlaskit/editor-plugin-analytics": "2.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-shared-styles": "^3.3.0",
+		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -53,7 +53,7 @@
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/editor-plugin-mentions": "^3.0.0",
+		"@atlaskit/editor-plugin-mentions": "^4.0.0",
 		"@atlaskit/editor-plugin-text-formatting": "^2.0.0",
 		"@atlaskit/editor-plugin-type-ahead": "^2.0.0",
 		"@atlaskit/editor-plugin-unsupported-content": "^2.0.0",