@atlaskit/editor-plugin-collab-edit 2.4.1 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 2.6.0
+
+### Minor Changes
+
+- [#105322](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105322)
+  [`8876083532adc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8876083532adc) -
+  Bumped editor-prosemirror version to 7.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.5.0
+
+### Minor Changes
+
+- [#109636](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109636)
+  [`2eadf04054ac2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2eadf04054ac2) -
+  [ux] Introduces way to retrieve the document from offline if there is a possible conflict event on
+  reconnection.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.4.1
 
 ### Patch Changes

package/dist/cjs/collabEditPlugin.js

@@ -23,6 +23,7 @@ var _nativeCollabProviderPlugin = require("./pm-plugins/native-collab-provider-p
 var _trackAndFilterSpammingSteps = require("./pm-plugins/track-and-filter-spamming-steps");
 var _trackLastOrganicChange = require("./pm-plugins/track-last-organic-change");
 var _trackNcsInitialization = require("./pm-plugins/track-ncs-initialization");
+var _trackReconnectionConflict = require("./pm-plugins/track-reconnection-conflict");
 var _trackSteps = require("./pm-plugins/track-steps");
 var _utils = require("./pm-plugins/utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -124,12 +125,14 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
             lastRemoteOrganicBodyChangeAt: null
           },
           activeParticipants: undefined,
-          sessionId: undefined
+          sessionId: undefined,
+          lastReconnectionConflictMetadata: undefined
         };
       }
       var collabPluginState = _pluginKey.pluginKey.getState(state);
       var metadata = _trackNcsInitialization.trackNCSInitializationPluginKey.getState(state);
       var lastOrganicChangeState = _trackLastOrganicChange.trackLastOrganicChangePluginKey.getState(state);
+      var lastRemoteConflict = _trackReconnectionConflict.trackLastRemoteConflictPluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
@@ -141,7 +144,8 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
           lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null,
           lastLocalOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicBodyChangeAt) || null,
           lastRemoteOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicBodyChangeAt) || null
-        }
+        },
+        lastReconnectionConflictMetadata: lastRemoteConflict
       };
     },
     actions: {
@@ -247,6 +251,12 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: _trackLastOrganicChange.createPlugin
       });
+      if ((0, _platformFeatureFlags.fg)('platform_editor_offline_conflict_resolution')) {
+        plugins.push({
+          name: 'trackLastRemoteConflictPlugin',
+          plugin: _trackReconnectionConflict.createPlugin
+        });
+      }
       return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.subscribe = void 0;
 var _actions = require("../actions");
 var _analytics = require("../analytics");
+var _trackReconnectionConflict = require("../track-reconnection-conflict");
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 
@@ -88,12 +89,15 @@ var subscribe = exports.subscribe = effect(function (view, provider, options, fe
         entity.on('error', entityHandlers.errorHandler);
         entityRef = entity;
       }
+    },
+    dataConflictHandler: function dataConflictHandler(data) {
+      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);
+  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);
   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);
+    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);
   };
 }, function (previousDeps, currentDeps) {
   return currentDeps && currentDeps.every(function (dep, i) {

package/dist/cjs/pm-plugins/track-reconnection-conflict.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.trackLastRemoteConflictPluginKey = exports.createPlugin = void 0;
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var trackLastRemoteConflictPluginKey = exports.trackLastRemoteConflictPluginKey = new _state.PluginKey('trackLastRemoteConflict');
+var createPlugin = exports.createPlugin = function createPlugin() {
+  return new _safePlugin.SafePlugin({
+    key: trackLastRemoteConflictPluginKey,
+    state: {
+      init: function init() {
+        return undefined;
+      },
+      apply: function apply(transaction, prevPluginState) {
+        var metadata = transaction.getMeta(trackLastRemoteConflictPluginKey);
+        if (metadata) {
+          return metadata;
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

package/dist/es2019/collabEditPlugin.js

@@ -12,6 +12,7 @@ import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-
 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';
 import { createPlugin as createTrackNCSInitializationPlugin, trackNCSInitializationPluginKey } from './pm-plugins/track-ncs-initialization';
+import { createPlugin as createTrackReconnectionConflictPlugin, trackLastRemoteConflictPluginKey } from './pm-plugins/track-reconnection-conflict';
 import { track } from './pm-plugins/track-steps';
 import { getAvatarColor } from './pm-plugins/utils';
 const providerBuilder = collabEditProviderPromise => async (codeToExecute, onError) => {
@@ -85,12 +86,14 @@ export const collabEditPlugin = ({
             lastRemoteOrganicBodyChangeAt: null
           },
           activeParticipants: undefined,
-          sessionId: undefined
+          sessionId: undefined,
+          lastReconnectionConflictMetadata: undefined
         };
       }
       const collabPluginState = mainPluginKey.getState(state);
       const metadata = trackNCSInitializationPluginKey.getState(state);
       const lastOrganicChangeState = trackLastOrganicChangePluginKey.getState(state);
+      const lastRemoteConflict = trackLastRemoteConflictPluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
@@ -102,7 +105,8 @@ export const collabEditPlugin = ({
           lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null,
           lastLocalOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicBodyChangeAt) || null,
           lastRemoteOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicBodyChangeAt) || null
-        }
+        },
+        lastReconnectionConflictMetadata: lastRemoteConflict
       };
     },
     actions: {
@@ -193,6 +197,12 @@ export const collabEditPlugin = ({
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
+      if (fg('platform_editor_offline_conflict_resolution')) {
+        plugins.push({
+          name: 'trackLastRemoteConflictPlugin',
+          plugin: createTrackReconnectionConflictPlugin
+        });
+      }
       return plugins;
     },
     onEditorViewStateUpdated(props) {

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

@@ -1,5 +1,6 @@
 import { applyRemoteData, handleActivityAck, handleActivityJoin, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
 import { addSynchronyEntityAnalytics, addSynchronyErrorAnalytics } from '../analytics';
+import { trackLastRemoteConflictPluginKey } from '../track-reconnection-conflict';
 
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -73,11 +74,14 @@ export const subscribe = effect((view, provider, options, featureFlags, _provide
         entity.on('error', entityHandlers.errorHandler);
         entityRef = entity;
       }
+    },
+    dataConflictHandler: data => {
+      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);
+  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);
   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);
+    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);
   };
 }, (previousDeps, currentDeps) => currentDeps && currentDeps.every((dep, i) => dep === previousDeps[i]));

package/dist/es2019/pm-plugins/track-reconnection-conflict.js

@@ -0,0 +1,20 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export const trackLastRemoteConflictPluginKey = new PluginKey('trackLastRemoteConflict');
+export const createPlugin = () => {
+  return new SafePlugin({
+    key: trackLastRemoteConflictPluginKey,
+    state: {
+      init() {
+        return undefined;
+      },
+      apply(transaction, prevPluginState) {
+        const metadata = transaction.getMeta(trackLastRemoteConflictPluginKey);
+        if (metadata) {
+          return metadata;
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

package/dist/esm/collabEditPlugin.js

@@ -18,6 +18,7 @@ import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-
 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';
 import { createPlugin as createTrackNCSInitializationPlugin, trackNCSInitializationPluginKey } from './pm-plugins/track-ncs-initialization';
+import { createPlugin as createTrackReconnectionConflictPlugin, trackLastRemoteConflictPluginKey } from './pm-plugins/track-reconnection-conflict';
 import { track } from './pm-plugins/track-steps';
 import { getAvatarColor } from './pm-plugins/utils';
 var providerBuilder = function providerBuilder(collabEditProviderPromise) {
@@ -117,12 +118,14 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
             lastRemoteOrganicBodyChangeAt: null
           },
           activeParticipants: undefined,
-          sessionId: undefined
+          sessionId: undefined,
+          lastReconnectionConflictMetadata: undefined
         };
       }
       var collabPluginState = mainPluginKey.getState(state);
       var metadata = trackNCSInitializationPluginKey.getState(state);
       var lastOrganicChangeState = trackLastOrganicChangePluginKey.getState(state);
+      var lastRemoteConflict = trackLastRemoteConflictPluginKey.getState(state);
       return {
         activeParticipants: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.activeParticipants,
         sessionId: collabPluginState === null || collabPluginState === void 0 ? void 0 : collabPluginState.sessionId,
@@ -134,7 +137,8 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
           lastRemoteOrganicChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicChangeAt) || null,
           lastLocalOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastLocalOrganicBodyChangeAt) || null,
           lastRemoteOrganicBodyChangeAt: (lastOrganicChangeState === null || lastOrganicChangeState === void 0 ? void 0 : lastOrganicChangeState.lastRemoteOrganicBodyChangeAt) || null
-        }
+        },
+        lastReconnectionConflictMetadata: lastRemoteConflict
       };
     },
     actions: {
@@ -240,6 +244,12 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         name: 'collabTrackLastOrganicChangePlugin',
         plugin: createLastOrganicChangePlugin
       });
+      if (fg('platform_editor_offline_conflict_resolution')) {
+        plugins.push({
+          name: 'trackLastRemoteConflictPlugin',
+          plugin: createTrackReconnectionConflictPlugin
+        });
+      }
       return plugins;
     },
     onEditorViewStateUpdated: function onEditorViewStateUpdated(props) {

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

@@ -1,5 +1,6 @@
 import { applyRemoteData, handleActivityAck, handleActivityJoin, handleConnection, handleInit, handlePresence, handleTelePointer } from '../actions';
 import { addSynchronyEntityAnalytics, addSynchronyErrorAnalytics } from '../analytics';
+import { trackLastRemoteConflictPluginKey } from '../track-reconnection-conflict';
 
 // Ignored via go/ees005
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -83,12 +84,15 @@ export var subscribe = effect(function (view, provider, options, featureFlags, _
         entity.on('error', entityHandlers.errorHandler);
         entityRef = entity;
       }
+    },
+    dataConflictHandler: function dataConflictHandler(data) {
+      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);
+  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);
   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);
+    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);
   };
 }, function (previousDeps, currentDeps) {
   return currentDeps && currentDeps.every(function (dep, i) {

package/dist/esm/pm-plugins/track-reconnection-conflict.js

@@ -0,0 +1,20 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export var trackLastRemoteConflictPluginKey = new PluginKey('trackLastRemoteConflict');
+export var createPlugin = function createPlugin() {
+  return new SafePlugin({
+    key: trackLastRemoteConflictPluginKey,
+    state: {
+      init: function init() {
+        return undefined;
+      },
+      apply: function apply(transaction, prevPluginState) {
+        var metadata = transaction.getMeta(trackLastRemoteConflictPluginKey);
+        if (metadata) {
+          return metadata;
+        }
+        return prevPluginState;
+      }
+    }
+  });
+};

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

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventLocalStepData, CollabEventPresenceData, CollabEventRemoteData, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEventConflictPayload, CollabEventConnectionData, CollabEventInitData, CollabEventLocalStepData, CollabEventPresenceData, CollabEventRemoteData, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -21,6 +21,7 @@ export interface CollabHandlers {
     entityHandler: ({ entity }: {
         entity: SynchronyEntity;
     }) => void;
+    dataConflictHandler: (data: CollabEventConflictPayload) => void;
 }
 export type Cleanup = () => void;
 export declare const subscribe: (currentDeps_0: EditorView, currentDeps_1: CollabEditProvider<import("@atlaskit/editor-common/collab").CollabEvents>, currentDeps_2: PrivateCollabEditOptions, currentDeps_3: FeatureFlags, currentDeps_4?: ProviderFactory | undefined, currentDeps_5?: EditorAnalyticsAPI | undefined) => Cleanup;

package/dist/types/pm-plugins/track-reconnection-conflict.d.ts

@@ -0,0 +1,5 @@
+import type { CollabEventConflictPayload } from '@atlaskit/editor-common/collab';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export declare const trackLastRemoteConflictPluginKey: PluginKey<CollabEventConflictPayload>;
+export declare const createPlugin: () => SafePlugin<CollabEventConflictPayload | undefined>;

package/dist/types/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { CollabEditOptions, CollabEditProvider, CollabParticipant, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
+import type { CollabEditOptions, CollabEditProvider, CollabEventConflictPayload, CollabParticipant, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
 import { type Step } from '@atlaskit/editor-prosemirror/dist/types/transform';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export type PrivateCollabEditOptions = CollabEditOptions & {
@@ -39,4 +39,5 @@ export type CollabEditPluginSharedState = {
     initialised: CollabInitializedMetadata & LastOrganicChangeMetadata;
     activeParticipants: ReadOnlyParticipants | undefined;
     sessionId: string | undefined;
+    lastReconnectionConflictMetadata: CollabEventConflictPayload | undefined;
 };

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

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { CollabEditProvider, CollabEventConnectionData, CollabEventInitData, CollabEventLocalStepData, CollabEventPresenceData, CollabEventRemoteData, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEventConflictPayload, CollabEventConnectionData, CollabEventInitData, CollabEventLocalStepData, CollabEventPresenceData, CollabEventRemoteData, CollabTelepointerPayload } from '@atlaskit/editor-common/collab';
 import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { FeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -21,6 +21,7 @@ export interface CollabHandlers {
     entityHandler: ({ entity }: {
         entity: SynchronyEntity;
     }) => void;
+    dataConflictHandler: (data: CollabEventConflictPayload) => void;
 }
 export type Cleanup = () => void;
 export declare const subscribe: (currentDeps_0: EditorView, currentDeps_1: CollabEditProvider<import("@atlaskit/editor-common/collab").CollabEvents>, currentDeps_2: PrivateCollabEditOptions, currentDeps_3: FeatureFlags, currentDeps_4?: ProviderFactory | undefined, currentDeps_5?: EditorAnalyticsAPI | undefined) => Cleanup;

package/dist/types-ts4.5/pm-plugins/track-reconnection-conflict.d.ts

@@ -0,0 +1,5 @@
+import type { CollabEventConflictPayload } from '@atlaskit/editor-common/collab';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export declare const trackLastRemoteConflictPluginKey: PluginKey<CollabEventConflictPayload>;
+export declare const createPlugin: () => SafePlugin<CollabEventConflictPayload | undefined>;

package/dist/types-ts4.5/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { CollabEditOptions, CollabEditProvider, CollabParticipant, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
+import type { CollabEditOptions, CollabEditProvider, CollabEventConflictPayload, CollabParticipant, SyncUpErrorFunction } from '@atlaskit/editor-common/collab';
 import { type Step } from '@atlaskit/editor-prosemirror/dist/types/transform';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export type PrivateCollabEditOptions = CollabEditOptions & {
@@ -39,4 +39,5 @@ export type CollabEditPluginSharedState = {
     initialised: CollabInitializedMetadata & LastOrganicChangeMetadata;
     activeParticipants: ReadOnlyParticipants | undefined;
     sessionId: string | undefined;
+    lastReconnectionConflictMetadata: CollabEventConflictPayload | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "2.4.1",
+	"version": "2.6.0",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,17 +32,17 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^99.7.0",
-		"@atlaskit/editor-json-transformer": "^8.22.0",
-		"@atlaskit/editor-plugin-analytics": "1.11.0",
-		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
-		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
-		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/custom-steps": "^0.10.0",
+		"@atlaskit/editor-common": "^99.10.0",
+		"@atlaskit/editor-json-transformer": "^8.23.0",
+		"@atlaskit/editor-plugin-analytics": "1.12.0",
+		"@atlaskit/editor-plugin-connectivity": "^1.2.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^2.2.0",
+		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
+		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
-		"@atlaskit/prosemirror-collab": "^0.11.0",
+		"@atlaskit/prosemirror-collab": "^0.12.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
@@ -53,13 +53,13 @@
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/editor-plugin-mentions": "^2.14.0",
-		"@atlaskit/editor-plugin-text-formatting": "^1.17.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.12.0",
-		"@atlaskit/editor-plugin-unsupported-content": "^1.10.0",
-		"@atlaskit/editor-test-helpers": "^21.2.0",
+		"@atlaskit/editor-plugin-mentions": "^2.15.0",
+		"@atlaskit/editor-plugin-text-formatting": "^1.18.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.13.0",
+		"@atlaskit/editor-plugin-unsupported-content": "^1.11.0",
+		"@atlaskit/editor-test-helpers": "^21.3.0",
 		"@atlaskit/ssr": "*",
-		"@atlaskit/synchrony-test-helpers": "^3.0.0",
+		"@atlaskit/synchrony-test-helpers": "^3.1.0",
 		"@atlaskit/util-data-test": "^18.0.0",
 		"@atlaskit/visual-regression": "*",
 		"@testing-library/react": "^13.4.0",
@@ -109,6 +109,9 @@
 		"platform_editor_merge_unconfirmed_steps": {
 			"type": "boolean"
 		},
+		"platform_editor_offline_conflict_resolution": {
+			"type": "boolean"
+		},
 		"platform_editor_selection_without_left_shift": {
 			"type": "boolean"
 		},