@atlaskit/collab-provider 9.46.0 → 10.1.0

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @atlaskit/collab-provider
 
+## 10.1.0
+
+### Minor Changes
+
+- [#167312](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167312)
+  [`4fe6eb3b36fc3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4fe6eb3b36fc3) -
+  Add support for optional properties, presenceId and presenceActivity, within collab-provider
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.0.0
+
+### Major Changes
+
+- [#165049](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165049)
+  [`febce5463e07f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/febce5463e07f) -
+  Enable no-re-export rule for a subset of editor packages
+
+  ### Major
+
+  #### @atlaskit/collab-provider
+
+  @atlaskit/collab-provider doesn't export following types anymore:
+
+  ```
+  CollabParticipant,
+  CollabEventInitData,
+  CollabEventRemoteData,
+  CollabEventConnectionData,
+  CollabEventConnectingData,
+  CollabEventPresenceData,
+  ResolvedEditorState,
+  CollabConnectedPayload,
+  CollabConnectingPayload,
+  CollabDisconnectedPayload,
+  CollabInitPayload,
+  CollabDataPayload,
+  CollabTelepointerPayload,
+  CollabPresencePayload,
+  CollabMetadataPayload,
+  CollabLocalStepsPayload,
+  CollabCommitStatusEventPayload,
+  CollabPermissionEventPayload,
+  UserPermitType,
+  CollabEvents,
+  Metadata,
+  StepJson,
+  CollabEventTelepointerData,
+  CollabSendableSelection,
+  CollabEditProvider,
+  NewCollabSyncUpErrorAttributes,
+  SyncUpErrorFunction,
+  CollabEventLocalStepData,
+  ```
+
+  Import them from `@atlaskit/editor-common/collab`.
+
+  #### @atlaskit/editor-common
+
+  `@atlaskit/editor-common/provider-factory` doesn't export following types anymore:
+
+  ```
+  CardAdf,
+  DatasourceAdf,
+  ```
+
+  Import them from `@atlaskit/smart-card`.
+
+### Patch Changes
+
+- [#166394](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166394)
+  [`ec83c51a9acba`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ec83c51a9acba) -
+  Add analytics on reconnection events
+- Updated dependencies
+
 ## 9.46.0
 
 ### Minor Changes

package/dist/cjs/helpers/const.js

@@ -22,6 +22,7 @@ var EVENT_ACTION = exports.EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   EVENT_ACTION["WEBSOCKET_MESSAGE_VOLUME_METRIC"] = "websocketMessageVolumeMetric";
   EVENT_ACTION["PROVIDER_INITIALIZED"] = "providerInitialized";
+  EVENT_ACTION["RECONNECTION"] = "providerReconnection";
   EVENT_ACTION["PROVIDER_SETUP"] = "providerSetup";
   EVENT_ACTION["HAS_UNCONFIRMED_STEPS"] = "hasUnconfirmedSteps";
   return EVENT_ACTION;

package/dist/cjs/participants/participants-helper.js

@@ -13,11 +13,11 @@ var PARTICIPANT_UPDATE_INTERVAL = exports.PARTICIPANT_UPDATE_INTERVAL = 300 * 10
 
 var createParticipantFromPayload = exports.createParticipantFromPayload = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(payload, getUser) {
-    var sessionId, timestamp, clientId, userId, permit, user, participant;
+    var sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit;
+          sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
           _context.next = 3;
           return getUser === null || getUser === void 0 ? void 0 : getUser(userId);
         case 3:
@@ -31,7 +31,9 @@ var createParticipantFromPayload = exports.createParticipantFromPayload = /*#__P
             userId: userId,
             clientId: clientId,
             permit: permit,
-            isGuest: user === null || user === void 0 ? void 0 : user.isGuest
+            isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
+            presenceId: presenceId,
+            presenceActivity: presenceActivity
           };
           return _context.abrupt("return", participant);
         case 6:

package/dist/cjs/provider/index.js

@@ -136,6 +136,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         if (initialized && _this.disconnectedAt &&
         // Offline longer than `OUT_OF_SYNC_PERIOD`
         Date.now() - _this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
+          var _this$analyticsHelper2;
+          (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(_const.EVENT_ACTION.RECONNECTION, _const.EVENT_STATUS.INFO, {
+            disconnectionPeriodSeconds: Math.floor((Date.now() - _this.disconnectedAt) / 1000)
+          });
           _this.documentService.throttledCatchupv2(_const.CatchupEventReason.RECONNECTED);
         }
         _this.participantsService.startInactiveRemover(_this.sessionId);
@@ -165,7 +169,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         sessionId: _this.sessionId,
         userId: _this.userId,
         clientId: _this.clientId,
-        permit: _this.permit
+        permit: _this.permit,
+        presenceId: _this.presenceId,
+        presenceActivity: _this.presenceActivity
       };
     });
     /**
@@ -179,13 +185,13 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === _ncsErrors.NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === _ncsErrors.NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         _this.documentService.onStepRejectedError();
       } else {
-        var _this$analyticsHelper2;
-        (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');
+        var _this$analyticsHelper3;
+        (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendErrorEvent(error, 'Error handled');
         var mappedError = (0, _errorCodeMapper.errorCodeMapper)(error);
         // Only emit errors to Confluence very intentionally because they will disconnect the collab provider
         if (mappedError) {
-          var _this$analyticsHelper3;
-          (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendProviderErrorEvent(mappedError);
+          var _this$analyticsHelper4;
+          (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendProviderErrorEvent(mappedError);
           _this.emit('error', mappedError);
         }
       }
@@ -208,7 +214,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * @throws {GetCurrentStateError} Something went wrong while returning the current state
      */
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _this$analyticsHelper4;
+      var _this$analyticsHelper5;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -220,7 +226,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context.prev = 6;
             _context.t0 = _context["catch"](0);
-            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
+            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
             throw new _customErrors.GetCurrentStateError('Error while returning the current state of the draft document', _context.t0);
           case 10:
           case "end":
@@ -234,7 +240,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * @throws {GetFinalAcknowledgedStateError} Something went wrong while returning the acknowledged state
      */
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var _this$analyticsHelper5;
+      var _this$analyticsHelper6;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -246,7 +252,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context2.prev = 6;
             _context2.t0 = _context2["catch"](0);
-            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
+            (_this$analyticsHelper6 = _this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
             throw new _customErrors.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
           case 10:
           case "end":
@@ -294,6 +300,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     _this.participantsService = new _participantsService.ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined, _this.getPresenceData, _this.setUserId);
     _this.metadataService = new _metadataService.MetadataService(_this.emitCallback, _this.channel.sendMetadata);
     _this.namespaceService = new _namespaceService.NamespaceService();
+    _this.presenceId = _this.config.presenceId;
     if (config.isPresenceOnly) {
       // this check is specifically for the presence only
       // This presence feature is only for the confluence view page & jira presence which do not need the document service or api
@@ -363,7 +370,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           clientId: this.clientId
         });
         if (this.isBufferingEnabled && this.initialDraft && !this.isProviderInitialized) {
-          var _this$analyticsHelper6;
+          var _this$analyticsHelper7;
           var _this$initialDraft2 = this.initialDraft,
             document = _this$initialDraft2.document,
             version = _this$initialDraft2.version,
@@ -373,7 +380,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
             version: version,
             metadata: metadata
           });
-          (_this$analyticsHelper6 = this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendActionEvent(_const.EVENT_ACTION.PROVIDER_INITIALIZED, _const.EVENT_STATUS.INFO, {
+          (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendActionEvent(_const.EVENT_ACTION.PROVIDER_INITIALIZED, _const.EVENT_STATUS.INFO, {
             isBuffered: true
           });
         }
@@ -382,8 +389,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper7;
-        (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper8;
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -393,8 +400,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     // Only used for the presence - opts out of the document service and api service
   }, {
     key: "setupForPresenceOnly",
-    value: function setupForPresenceOnly(clientId) {
+    value: function setupForPresenceOnly(clientId, presenceActivity) {
       this.clientId = clientId;
+      this.presenceActivity = presenceActivity;
       this.checkForCookies();
       try {
         if (!this.isChannelInitialized) {
@@ -402,8 +410,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper8;
-        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper9;
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -413,9 +421,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     key: "checkForCookies",
     value: function checkForCookies() {
       if (!global.navigator.cookieEnabled) {
-        var _this$analyticsHelper9;
+        var _this$analyticsHelper10;
         var initError = new _customErrors.ProviderInitialisationError('Cookies are not enabled. Please enable cookies to use collaborative editing.');
-        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
         throw new _customErrors.ProviderInitialisationError('Provider initialisation error - cookies disabled', initError);
       }
     }
@@ -432,14 +440,14 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     value: function send(_tr, _oldState, newState) {
       try {
         if (this.isViewOnly()) {
-          var _this$analyticsHelper10;
+          var _this$analyticsHelper11;
           var error = {
             message: 'Attempted to send steps in view only mode',
             data: {
               code: _internalErrors.INTERNAL_ERROR_CODE.VIEW_ONLY_STEPS_ERROR
             }
           };
-          (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, error.message);
           return;
         }
         // Don't send steps while the document is locked (eg. when restoring the document)
@@ -449,8 +457,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.documentService.send(_tr, _oldState, newState);
       } catch (error) {
-        var _this$analyticsHelper11;
-        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while sending steps for a transaction');
+        var _this$analyticsHelper12;
+        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending steps for a transaction');
         throw new _customErrors.SendTransactionError('Error while sending steps for a transaction', error);
       }
     }
@@ -495,9 +503,9 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.participantsService.sendAIProviderChanged(_objectSpread(_objectSpread({}, basePayload), data));
         }
       } catch (error) {
-        var _this$analyticsHelper12;
+        var _this$analyticsHelper13;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending message - telepointer');
+        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while sending message - telepointer');
       }
     }
   }, {
@@ -540,8 +548,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
           this.sendStepsTimer = undefined;
         }
       } catch (error) {
-        var _this$analyticsHelper13;
-        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while shutting down the collab provider');
+        var _this$analyticsHelper14;
+        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while shutting down the collab provider');
         throw new _customErrors.DestroyError('Error while shutting down the collab provider', error);
       }
       this.clearTimers();
@@ -564,8 +572,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setTitle(title, broadcast);
       } catch (error) {
-        var _this$analyticsHelper14;
-        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while setting title');
+        var _this$analyticsHelper15;
+        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting title');
         throw new _customErrors.SetTitleError('Error while setting title', error);
       }
     }
@@ -583,8 +591,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       try {
         this.metadataService.setEditorWidth(editorWidth, broadcast);
       } catch (error) {
-        var _this$analyticsHelper15;
-        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting editor width');
+        var _this$analyticsHelper16;
+        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting editor width');
         throw new _customErrors.SetEditorWidthError('Error while setting editor width', error);
       }
     }
@@ -603,8 +611,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setMetadata(metadata);
       } catch (error) {
-        var _this$analyticsHelper16;
-        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting metadata');
+        var _this$analyticsHelper17;
+        (_this$analyticsHelper17 = this.analyticsHelper) === null || _this$analyticsHelper17 === void 0 || _this$analyticsHelper17.sendErrorEvent(error, 'Error while setting metadata');
         throw new _customErrors.SetMetadataError('Error while setting metadata', error);
       }
     }

package/dist/cjs/types.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AcknowledgementResponseTypes = void 0;
-// Re-export values for the /types entry point to this package
 // types from editor common end
 // Initial draft
 // Channel

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "9.46.0";
+var version = exports.version = "10.1.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/helpers/const.js

@@ -16,6 +16,7 @@ export let EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   EVENT_ACTION["WEBSOCKET_MESSAGE_VOLUME_METRIC"] = "websocketMessageVolumeMetric";
   EVENT_ACTION["PROVIDER_INITIALIZED"] = "providerInitialized";
+  EVENT_ACTION["RECONNECTION"] = "providerReconnection";
   EVENT_ACTION["PROVIDER_SETUP"] = "providerSetup";
   EVENT_ACTION["HAS_UNCONFIRMED_STEPS"] = "hasUnconfirmedSteps";
   return EVENT_ACTION;

package/dist/es2019/index.js

@@ -1,2 +1,5 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { Provider } from './provider';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/es2019/participants/participants-helper.js

@@ -8,7 +8,9 @@ export const createParticipantFromPayload = async (payload, getUser) => {
     timestamp,
     clientId,
     userId,
-    permit
+    permit,
+    presenceId,
+    presenceActivity
   } = payload;
   const user = await (getUser === null || getUser === void 0 ? void 0 : getUser(userId));
   const participant = {
@@ -20,7 +22,9 @@ export const createParticipantFromPayload = async (payload, getUser) => {
     userId,
     clientId,
     permit,
-    isGuest: user === null || user === void 0 ? void 0 : user.isGuest
+    isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
+    presenceId: presenceId,
+    presenceActivity: presenceActivity
   };
   return participant;
 };

package/dist/es2019/provider/index.js

@@ -113,6 +113,10 @@ export class Provider extends Emitter {
         if (initialized && this.disconnectedAt &&
         // Offline longer than `OUT_OF_SYNC_PERIOD`
         Date.now() - this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
+          var _this$analyticsHelper2;
+          (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.RECONNECTION, EVENT_STATUS.INFO, {
+            disconnectionPeriodSeconds: Math.floor((Date.now() - this.disconnectedAt) / 1000)
+          });
           this.documentService.throttledCatchupv2(CatchupEventReason.RECONNECTED);
         }
         this.participantsService.startInactiveRemover(this.sessionId);
@@ -141,7 +145,9 @@ export class Provider extends Emitter {
         sessionId: this.sessionId,
         userId: this.userId,
         clientId: this.clientId,
-        permit: this.permit
+        permit: this.permit,
+        presenceId: this.presenceId,
+        presenceActivity: this.presenceActivity
       };
     });
     /**
@@ -155,13 +161,13 @@ export class Provider extends Emitter {
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         this.documentService.onStepRejectedError();
       } else {
-        var _this$analyticsHelper2;
-        (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');
+        var _this$analyticsHelper3;
+        (_this$analyticsHelper3 = this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 ? void 0 : _this$analyticsHelper3.sendErrorEvent(error, 'Error handled');
         const mappedError = errorCodeMapper(error);
         // Only emit errors to Confluence very intentionally because they will disconnect the collab provider
         if (mappedError) {
-          var _this$analyticsHelper3;
-          (_this$analyticsHelper3 = this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 ? void 0 : _this$analyticsHelper3.sendProviderErrorEvent(mappedError);
+          var _this$analyticsHelper4;
+          (_this$analyticsHelper4 = this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendProviderErrorEvent(mappedError);
           this.emit('error', mappedError);
         }
       }
@@ -188,8 +194,8 @@ export class Provider extends Emitter {
       try {
         return await this.documentService.getCurrentState();
       } catch (error) {
-        var _this$analyticsHelper4;
-        (_this$analyticsHelper4 = this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 ? void 0 : _this$analyticsHelper4.sendErrorEvent(error, 'Error while returning ADF version of current draft document');
+        var _this$analyticsHelper5;
+        (_this$analyticsHelper5 = this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendErrorEvent(error, 'Error while returning ADF version of current draft document');
         throw new GetCurrentStateError('Error while returning the current state of the draft document', error); // Reject the promise so the consumer can react to it failing
       }
     });
@@ -202,8 +208,8 @@ export class Provider extends Emitter {
       try {
         return await this.documentService.getFinalAcknowledgedState();
       } catch (error) {
-        var _this$analyticsHelper5;
-        (_this$analyticsHelper5 = this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 ? void 0 : _this$analyticsHelper5.sendErrorEvent(error, 'Error while returning ADF version of the final draft document');
+        var _this$analyticsHelper6;
+        (_this$analyticsHelper6 = this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 ? void 0 : _this$analyticsHelper6.sendErrorEvent(error, 'Error while returning ADF version of the final draft document');
         throw new GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', error); // Reject the promise so the consumer can react to it failing
       }
     });
@@ -247,6 +253,7 @@ export class Provider extends Emitter {
     this.participantsService = new ParticipantsService(this.analyticsHelper, undefined, this.emitCallback, this.config.getUser, this.channel.broadcast, this.channel.sendPresenceJoined, this.getPresenceData, this.setUserId);
     this.metadataService = new MetadataService(this.emitCallback, this.channel.sendMetadata);
     this.namespaceService = new NamespaceService();
+    this.presenceId = this.config.presenceId;
     if (config.isPresenceOnly) {
       // this check is specifically for the presence only
       // This presence feature is only for the confluence view page & jira presence which do not need the document service or api
@@ -307,7 +314,7 @@ export class Provider extends Emitter {
         clientId: this.clientId
       });
       if (this.isBufferingEnabled && this.initialDraft && !this.isProviderInitialized) {
-        var _this$analyticsHelper6;
+        var _this$analyticsHelper7;
         const {
           document,
           version,
@@ -318,7 +325,7 @@ export class Provider extends Emitter {
           version,
           metadata
         });
-        (_this$analyticsHelper6 = this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 ? void 0 : _this$analyticsHelper6.sendActionEvent(EVENT_ACTION.PROVIDER_INITIALIZED, EVENT_STATUS.INFO, {
+        (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendActionEvent(EVENT_ACTION.PROVIDER_INITIALIZED, EVENT_STATUS.INFO, {
           isBuffered: true
         });
       }
@@ -327,8 +334,8 @@ export class Provider extends Emitter {
         this.isChannelInitialized = true;
       }
     } catch (initError) {
-      var _this$analyticsHelper7;
-      (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(initError, 'Error while initialising the provider');
+      var _this$analyticsHelper8;
+      (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
       // Throw error so consumers are aware the initialisation failed when initialising themselves
       throw new ProviderInitialisationError('Provider initialisation error', initError);
     }
@@ -336,8 +343,9 @@ export class Provider extends Emitter {
   }
 
   // Only used for the presence - opts out of the document service and api service
-  setupForPresenceOnly(clientId) {
+  setupForPresenceOnly(clientId, presenceActivity) {
     this.clientId = clientId;
+    this.presenceActivity = presenceActivity;
     this.checkForCookies();
     try {
       if (!this.isChannelInitialized) {
@@ -345,8 +353,8 @@ export class Provider extends Emitter {
         this.isChannelInitialized = true;
       }
     } catch (initError) {
-      var _this$analyticsHelper8;
-      (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
+      var _this$analyticsHelper9;
+      (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider');
       // Throw error so consumers are aware the initialisation failed when initialising themselves
       throw new ProviderInitialisationError('Provider initialisation error', initError);
     }
@@ -354,9 +362,9 @@ export class Provider extends Emitter {
   }
   checkForCookies() {
     if (!global.navigator.cookieEnabled) {
-      var _this$analyticsHelper9;
+      var _this$analyticsHelper10;
       const initError = new ProviderInitialisationError('Cookies are not enabled. Please enable cookies to use collaborative editing.');
-      (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
+      (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
       throw new ProviderInitialisationError('Provider initialisation error - cookies disabled', initError);
     }
   }
@@ -371,14 +379,14 @@ export class Provider extends Emitter {
   send(_tr, _oldState, newState) {
     try {
       if (this.isViewOnly()) {
-        var _this$analyticsHelper10;
+        var _this$analyticsHelper11;
         const error = {
           message: 'Attempted to send steps in view only mode',
           data: {
             code: INTERNAL_ERROR_CODE.VIEW_ONLY_STEPS_ERROR
           }
         };
-        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(error, error.message);
+        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, error.message);
         return;
       }
       // Don't send steps while the document is locked (eg. when restoring the document)
@@ -388,8 +396,8 @@ export class Provider extends Emitter {
       }
       this.documentService.send(_tr, _oldState, newState);
     } catch (error) {
-      var _this$analyticsHelper11;
-      (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, 'Error while sending steps for a transaction');
+      var _this$analyticsHelper12;
+      (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 ? void 0 : _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending steps for a transaction');
       throw new SendTransactionError('Error while sending steps for a transaction', error);
     }
   }
@@ -435,9 +443,9 @@ export class Provider extends Emitter {
         });
       }
     } catch (error) {
-      var _this$analyticsHelper12;
+      var _this$analyticsHelper13;
       // We don't want to throw errors for Presence features as they tend to self-restore
-      (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 ? void 0 : _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending message - telepointer');
+      (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendErrorEvent(error, 'Error while sending message - telepointer');
     }
   }
   /**
@@ -473,8 +481,8 @@ export class Provider extends Emitter {
         this.sendStepsTimer = undefined;
       }
     } catch (error) {
-      var _this$analyticsHelper13;
-      (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 ? void 0 : _this$analyticsHelper13.sendErrorEvent(error, 'Error while shutting down the collab provider');
+      var _this$analyticsHelper14;
+      (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(error, 'Error while shutting down the collab provider');
       throw new DestroyError('Error while shutting down the collab provider', error);
     }
     this.clearTimers();
@@ -495,8 +503,8 @@ export class Provider extends Emitter {
       }
       this.metadataService.setTitle(title, broadcast);
     } catch (error) {
-      var _this$analyticsHelper14;
-      (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 ? void 0 : _this$analyticsHelper14.sendErrorEvent(error, 'Error while setting title');
+      var _this$analyticsHelper15;
+      (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting title');
       throw new SetTitleError('Error while setting title', error);
     }
   }
@@ -512,8 +520,8 @@ export class Provider extends Emitter {
     try {
       this.metadataService.setEditorWidth(editorWidth, broadcast);
     } catch (error) {
-      var _this$analyticsHelper15;
-      (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 ? void 0 : _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting editor width');
+      var _this$analyticsHelper16;
+      (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 ? void 0 : _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting editor width');
       throw new SetEditorWidthError('Error while setting editor width', error);
     }
   }
@@ -530,8 +538,8 @@ export class Provider extends Emitter {
       }
       this.metadataService.setMetadata(metadata);
     } catch (error) {
-      var _this$analyticsHelper16;
-      (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 ? void 0 : _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting metadata');
+      var _this$analyticsHelper17;
+      (_this$analyticsHelper17 = this.analyticsHelper) === null || _this$analyticsHelper17 === void 0 ? void 0 : _this$analyticsHelper17.sendErrorEvent(error, 'Error while setting metadata');
       throw new SetMetadataError('Error while setting metadata', error);
     }
   }

package/dist/es2019/types.js

@@ -1,5 +1,3 @@
-// Re-export values for the /types entry point to this package
-
 // types from editor common end
 
 // Initial draft

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "9.46.0";
+export const version = "10.1.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/helpers/const.js

@@ -16,6 +16,7 @@ export var EVENT_ACTION = /*#__PURE__*/function (EVENT_ACTION) {
   EVENT_ACTION["DROPPED_STEPS"] = "droppedStepInCatchup";
   EVENT_ACTION["WEBSOCKET_MESSAGE_VOLUME_METRIC"] = "websocketMessageVolumeMetric";
   EVENT_ACTION["PROVIDER_INITIALIZED"] = "providerInitialized";
+  EVENT_ACTION["RECONNECTION"] = "providerReconnection";
   EVENT_ACTION["PROVIDER_SETUP"] = "providerSetup";
   EVENT_ACTION["HAS_UNCONFIRMED_STEPS"] = "hasUnconfirmedSteps";
   return EVENT_ACTION;

package/dist/esm/index.js

@@ -1,2 +1,5 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { Provider } from './provider';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/esm/participants/participants-helper.js

@@ -6,11 +6,11 @@ export var PARTICIPANT_UPDATE_INTERVAL = 300 * 1000; // 300 seconds
 
 export var createParticipantFromPayload = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(payload, getUser) {
-    var sessionId, timestamp, clientId, userId, permit, user, participant;
+    var sessionId, timestamp, clientId, userId, permit, presenceId, presenceActivity, user, participant;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit;
+          sessionId = payload.sessionId, timestamp = payload.timestamp, clientId = payload.clientId, userId = payload.userId, permit = payload.permit, presenceId = payload.presenceId, presenceActivity = payload.presenceActivity;
           _context.next = 3;
           return getUser === null || getUser === void 0 ? void 0 : getUser(userId);
         case 3:
@@ -24,7 +24,9 @@ export var createParticipantFromPayload = /*#__PURE__*/function () {
             userId: userId,
             clientId: clientId,
             permit: permit,
-            isGuest: user === null || user === void 0 ? void 0 : user.isGuest
+            isGuest: user === null || user === void 0 ? void 0 : user.isGuest,
+            presenceId: presenceId,
+            presenceActivity: presenceActivity
           };
           return _context.abrupt("return", participant);
         case 6:

package/dist/esm/provider/index.js

@@ -129,6 +129,10 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         if (initialized && _this.disconnectedAt &&
         // Offline longer than `OUT_OF_SYNC_PERIOD`
         Date.now() - _this.disconnectedAt >= OUT_OF_SYNC_PERIOD) {
+          var _this$analyticsHelper2;
+          (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.RECONNECTION, EVENT_STATUS.INFO, {
+            disconnectionPeriodSeconds: Math.floor((Date.now() - _this.disconnectedAt) / 1000)
+          });
           _this.documentService.throttledCatchupv2(CatchupEventReason.RECONNECTED);
         }
         _this.participantsService.startInactiveRemover(_this.sessionId);
@@ -158,7 +162,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         sessionId: _this.sessionId,
         userId: _this.userId,
         clientId: _this.clientId,
-        permit: _this.permit
+        permit: _this.permit,
+        presenceId: _this.presenceId,
+        presenceActivity: _this.presenceActivity
       };
     });
     /**
@@ -172,13 +178,13 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       if (((_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.code) === NCS_ERROR_CODE.HEAD_VERSION_UPDATE_FAILED || ((_error$data2 = error.data) === null || _error$data2 === void 0 ? void 0 : _error$data2.code) === NCS_ERROR_CODE.VERSION_NUMBER_ALREADY_EXISTS) {
         _this.documentService.onStepRejectedError();
       } else {
-        var _this$analyticsHelper2;
-        (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendErrorEvent(error, 'Error handled');
+        var _this$analyticsHelper3;
+        (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendErrorEvent(error, 'Error handled');
         var mappedError = errorCodeMapper(error);
         // Only emit errors to Confluence very intentionally because they will disconnect the collab provider
         if (mappedError) {
-          var _this$analyticsHelper3;
-          (_this$analyticsHelper3 = _this.analyticsHelper) === null || _this$analyticsHelper3 === void 0 || _this$analyticsHelper3.sendProviderErrorEvent(mappedError);
+          var _this$analyticsHelper4;
+          (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendProviderErrorEvent(mappedError);
           _this.emit('error', mappedError);
         }
       }
@@ -201,7 +207,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
      * @throws {GetCurrentStateError} Something went wrong while returning the current state
      */
     _defineProperty(_assertThisInitialized(_this), "getCurrentState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this$analyticsHelper4;
+      var _this$analyticsHelper5;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -213,7 +219,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context.prev = 6;
             _context.t0 = _context["catch"](0);
-            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
+            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
             throw new GetCurrentStateError('Error while returning the current state of the draft document', _context.t0);
           case 10:
           case "end":
@@ -227,7 +233,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
      * @throws {GetFinalAcknowledgedStateError} Something went wrong while returning the acknowledged state
      */
     _defineProperty(_assertThisInitialized(_this), "getFinalAcknowledgedState", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _this$analyticsHelper5;
+      var _this$analyticsHelper6;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -239,7 +245,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           case 6:
             _context2.prev = 6;
             _context2.t0 = _context2["catch"](0);
-            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
+            (_this$analyticsHelper6 = _this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
             throw new GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
           case 10:
           case "end":
@@ -287,6 +293,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     _this.participantsService = new ParticipantsService(_this.analyticsHelper, undefined, _this.emitCallback, _this.config.getUser, _this.channel.broadcast, _this.channel.sendPresenceJoined, _this.getPresenceData, _this.setUserId);
     _this.metadataService = new MetadataService(_this.emitCallback, _this.channel.sendMetadata);
     _this.namespaceService = new NamespaceService();
+    _this.presenceId = _this.config.presenceId;
     if (config.isPresenceOnly) {
       // this check is specifically for the presence only
       // This presence feature is only for the confluence view page & jira presence which do not need the document service or api
@@ -356,7 +363,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           clientId: this.clientId
         });
         if (this.isBufferingEnabled && this.initialDraft && !this.isProviderInitialized) {
-          var _this$analyticsHelper6;
+          var _this$analyticsHelper7;
           var _this$initialDraft2 = this.initialDraft,
             document = _this$initialDraft2.document,
             version = _this$initialDraft2.version,
@@ -366,7 +373,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
             version: version,
             metadata: metadata
           });
-          (_this$analyticsHelper6 = this.analyticsHelper) === null || _this$analyticsHelper6 === void 0 || _this$analyticsHelper6.sendActionEvent(EVENT_ACTION.PROVIDER_INITIALIZED, EVENT_STATUS.INFO, {
+          (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendActionEvent(EVENT_ACTION.PROVIDER_INITIALIZED, EVENT_STATUS.INFO, {
             isBuffered: true
           });
         }
@@ -375,8 +382,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper7;
-        (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper8;
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -386,8 +393,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     // Only used for the presence - opts out of the document service and api service
   }, {
     key: "setupForPresenceOnly",
-    value: function setupForPresenceOnly(clientId) {
+    value: function setupForPresenceOnly(clientId, presenceActivity) {
       this.clientId = clientId;
+      this.presenceActivity = presenceActivity;
       this.checkForCookies();
       try {
         if (!this.isChannelInitialized) {
@@ -395,8 +403,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           this.isChannelInitialized = true;
         }
       } catch (initError) {
-        var _this$analyticsHelper8;
-        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(initError, 'Error while initialising the provider');
+        var _this$analyticsHelper9;
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider');
         // Throw error so consumers are aware the initialisation failed when initialising themselves
         throw new ProviderInitialisationError('Provider initialisation error', initError);
       }
@@ -406,9 +414,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     key: "checkForCookies",
     value: function checkForCookies() {
       if (!global.navigator.cookieEnabled) {
-        var _this$analyticsHelper9;
+        var _this$analyticsHelper10;
         var initError = new ProviderInitialisationError('Cookies are not enabled. Please enable cookies to use collaborative editing.');
-        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(initError, 'Error while initialising the provider - cookies disabled');
         throw new ProviderInitialisationError('Provider initialisation error - cookies disabled', initError);
       }
     }
@@ -425,14 +433,14 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     value: function send(_tr, _oldState, newState) {
       try {
         if (this.isViewOnly()) {
-          var _this$analyticsHelper10;
+          var _this$analyticsHelper11;
           var error = {
             message: 'Attempted to send steps in view only mode',
             data: {
               code: INTERNAL_ERROR_CODE.VIEW_ONLY_STEPS_ERROR
             }
           };
-          (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, error.message);
           return;
         }
         // Don't send steps while the document is locked (eg. when restoring the document)
@@ -442,8 +450,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.documentService.send(_tr, _oldState, newState);
       } catch (error) {
-        var _this$analyticsHelper11;
-        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while sending steps for a transaction');
+        var _this$analyticsHelper12;
+        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending steps for a transaction');
         throw new SendTransactionError('Error while sending steps for a transaction', error);
       }
     }
@@ -488,9 +496,9 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           this.participantsService.sendAIProviderChanged(_objectSpread(_objectSpread({}, basePayload), data));
         }
       } catch (error) {
-        var _this$analyticsHelper12;
+        var _this$analyticsHelper13;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper12 = this.analyticsHelper) === null || _this$analyticsHelper12 === void 0 || _this$analyticsHelper12.sendErrorEvent(error, 'Error while sending message - telepointer');
+        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while sending message - telepointer');
       }
     }
   }, {
@@ -533,8 +541,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
           this.sendStepsTimer = undefined;
         }
       } catch (error) {
-        var _this$analyticsHelper13;
-        (_this$analyticsHelper13 = this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendErrorEvent(error, 'Error while shutting down the collab provider');
+        var _this$analyticsHelper14;
+        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while shutting down the collab provider');
         throw new DestroyError('Error while shutting down the collab provider', error);
       }
       this.clearTimers();
@@ -557,8 +565,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setTitle(title, broadcast);
       } catch (error) {
-        var _this$analyticsHelper14;
-        (_this$analyticsHelper14 = this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(error, 'Error while setting title');
+        var _this$analyticsHelper15;
+        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting title');
         throw new SetTitleError('Error while setting title', error);
       }
     }
@@ -576,8 +584,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
       try {
         this.metadataService.setEditorWidth(editorWidth, broadcast);
       } catch (error) {
-        var _this$analyticsHelper15;
-        (_this$analyticsHelper15 = this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendErrorEvent(error, 'Error while setting editor width');
+        var _this$analyticsHelper16;
+        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting editor width');
         throw new SetEditorWidthError('Error while setting editor width', error);
       }
     }
@@ -596,8 +604,8 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         }
         this.metadataService.setMetadata(metadata);
       } catch (error) {
-        var _this$analyticsHelper16;
-        (_this$analyticsHelper16 = this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendErrorEvent(error, 'Error while setting metadata');
+        var _this$analyticsHelper17;
+        (_this$analyticsHelper17 = this.analyticsHelper) === null || _this$analyticsHelper17 === void 0 || _this$analyticsHelper17.sendErrorEvent(error, 'Error while setting metadata');
         throw new SetMetadataError('Error while setting metadata', error);
       }
     }

package/dist/esm/types.js

@@ -1,5 +1,3 @@
-// Re-export values for the /types entry point to this package
-
 // types from editor common end
 
 // Initial draft

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "9.46.0";
+export var version = "10.1.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/helpers/const.d.ts

@@ -17,6 +17,7 @@ export declare enum EVENT_ACTION {
     DROPPED_STEPS = "droppedStepInCatchup",// https://data-portal.internal.atlassian.com/analytics/registry/53724
     WEBSOCKET_MESSAGE_VOLUME_METRIC = "websocketMessageVolumeMetric",// https://data-portal.internal.atlassian.com/analytics/registry/53596
     PROVIDER_INITIALIZED = "providerInitialized",// https://data-portal.internal.atlassian.com/analytics/registry/54714
+    RECONNECTION = "providerReconnection",// https://data-portal.internal.atlassian.com/analytics/registry/73992
     PROVIDER_SETUP = "providerSetup",// https://data-portal.internal.atlassian.com/analytics/registry/54715
     HAS_UNCONFIRMED_STEPS = "hasUnconfirmedSteps"
 }
@@ -253,7 +254,14 @@ type UpdateDocumentAnalyticsEvent = {
         isDocContentValid: boolean;
     } & BaseActionAnalyticsEventAttributes;
 };
-export type ActionAnalyticsEvent = AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent | ReInitDocFailAnalyticsEvent | ReInitDocSuccessAnalyticsEvent | ConnectionSuccessAnalyticsEvent | ConnectionFailureAnalyticsEvent | CatchUpSuccessAnalyticsEvent | CatchUpFailureAnalyticsEvent | DocumentInitSuccessAnalyticsEvent | UpdateParticipantsSuccessAnalyticsEvent | CommitUnconfirmedStepsSuccessAnalyticsEvent | CommitUnconfirmedStepsFailureAnalyticsEvent | PublishPageSuccessAnalyticsEvent | PublishPageFailureAnalyticsEvent | GetCurrentStateSuccessAnalyticsEvent | GetCurrentStateFailureAnalyticsEvent | InvalidateTokenAnalyticsEvent | SendStepsRetryAnalyticsEvent | CatchupAfterMaxSendStepsRetryAnalyticsEvent | CatchUpDroppedStepsEvent | WebsocketMessageVolumeMetricEvent | ProviderInitializedAnalyticsEvent | ProviderSetupAnalyticsEvent | ProviderHasUnconfirmedStepsAnalyticsEvent | UpdateDocumentAnalyticsEvent;
+type ReconnectionAnalyticsEvent = {
+    eventAction: EVENT_ACTION.RECONNECTION;
+    attributes: {
+        eventStatus: EVENT_STATUS.SUCCESS;
+        disconnectionPeriodSeconds: number;
+    } & BaseActionAnalyticsEventAttributes;
+};
+export type ActionAnalyticsEvent = AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent | ReInitDocFailAnalyticsEvent | ReInitDocSuccessAnalyticsEvent | ConnectionSuccessAnalyticsEvent | ConnectionFailureAnalyticsEvent | CatchUpSuccessAnalyticsEvent | CatchUpFailureAnalyticsEvent | DocumentInitSuccessAnalyticsEvent | UpdateParticipantsSuccessAnalyticsEvent | CommitUnconfirmedStepsSuccessAnalyticsEvent | CommitUnconfirmedStepsFailureAnalyticsEvent | PublishPageSuccessAnalyticsEvent | PublishPageFailureAnalyticsEvent | GetCurrentStateSuccessAnalyticsEvent | GetCurrentStateFailureAnalyticsEvent | InvalidateTokenAnalyticsEvent | SendStepsRetryAnalyticsEvent | CatchupAfterMaxSendStepsRetryAnalyticsEvent | CatchUpDroppedStepsEvent | WebsocketMessageVolumeMetricEvent | ProviderInitializedAnalyticsEvent | ProviderSetupAnalyticsEvent | ProviderHasUnconfirmedStepsAnalyticsEvent | UpdateDocumentAnalyticsEvent | ReconnectionAnalyticsEvent;
 export declare const ACK_MAX_TRY = 60;
 export declare const CONFLUENCE = "confluence";
 /** Enumerable for attaching a reason to catchup (v2) call(s) */

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

@@ -2,7 +2,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { Emitter } from '../emitter';
 import type { Config } from '../types';
-import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 import { NullApi } from '../api/null-api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
@@ -22,6 +22,8 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
     private sessionId?;
     private clientId?;
     private userId?;
+    private presenceId?;
+    private presenceActivity?;
     private presenceUpdateTimeout?;
     private disconnectedAt?;
     private sendStepsTimer?;
@@ -66,7 +68,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
         editorApi?: any;
         onSyncUpError?: SyncUpErrorFunction;
     }): this;
-    setupForPresenceOnly(clientId: string): this;
+    setupForPresenceOnly(clientId: string, presenceActivity?: PresenceActivity): this;
     private checkForCookies;
     /**
      * Send steps from transaction to NCS (and as a consequence to other participants), called from the collab-edit plugin in the editor

package/dist/types/types.d.ts

@@ -5,9 +5,8 @@ import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
 import type AnalyticsHelper from './analytics/analytics-helper';
-import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity } from '@atlaskit/editor-common/collab';
+import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { type CatchupEventReason } from './helpers/const';
-export type { CollabParticipant, CollabEventInitData, CollabEventRemoteData, CollabEventConnectionData, CollabEventConnectingData, CollabEventPresenceData, ResolvedEditorState, CollabConnectedPayload, CollabConnectingPayload, CollabDisconnectedPayload, CollabInitPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabMetadataPayload, CollabLocalStepsPayload, CollabCommitStatusEventPayload, CollabPermissionEventPayload, UserPermitType, CollabEvents, Metadata, StepJson, CollabEventTelepointerData, CollabSendableSelection, CollabEditProvider, NewCollabSyncUpErrorAttributes, SyncUpErrorFunction, CollabEventLocalStepData, } from '@atlaskit/editor-common/collab';
 export interface CollabEventDisconnectedData {
     sid: string;
     reason: 'CLIENT_DISCONNECT' | 'SERVER_DISCONNECT' | 'SOCKET_CLOSED' | 'SOCKET_ERROR' | 'SOCKET_TIMEOUT' | 'UNKNOWN_DISCONNECT';
@@ -80,6 +79,12 @@ export interface Config {
      * @default false
      */
     __livePage?: boolean;
+    /**
+     * Configure the provider to pass along a persistent presenceId during presence events. This presenceId will be used
+     * to calculate the colors of the presence avatars as well as the editors telepointers. Since these two features are split across
+     * multiple websocket connections, the presenceId is used to correlate the two.
+     */
+    presenceId?: string;
 }
 export interface InitAndAuthData {
     initialized: boolean;
@@ -125,6 +130,8 @@ export type PresenceData = {
     userId: string | undefined;
     clientId: number | string;
     permit?: UserPermitType;
+    presenceId?: string;
+    presenceActivity?: PresenceActivity;
 };
 export type PresencePayload = PresenceData & {
     timestamp: number;
@@ -215,3 +222,4 @@ export type ProductInformation = {
     product: string;
     subProduct?: string;
 };
+export {};

package/dist/types-ts4.5/helpers/const.d.ts

@@ -17,6 +17,7 @@ export declare enum EVENT_ACTION {
     DROPPED_STEPS = "droppedStepInCatchup",// https://data-portal.internal.atlassian.com/analytics/registry/53724
     WEBSOCKET_MESSAGE_VOLUME_METRIC = "websocketMessageVolumeMetric",// https://data-portal.internal.atlassian.com/analytics/registry/53596
     PROVIDER_INITIALIZED = "providerInitialized",// https://data-portal.internal.atlassian.com/analytics/registry/54714
+    RECONNECTION = "providerReconnection",// https://data-portal.internal.atlassian.com/analytics/registry/73992
     PROVIDER_SETUP = "providerSetup",// https://data-portal.internal.atlassian.com/analytics/registry/54715
     HAS_UNCONFIRMED_STEPS = "hasUnconfirmedSteps"
 }
@@ -253,7 +254,14 @@ type UpdateDocumentAnalyticsEvent = {
         isDocContentValid: boolean;
     } & BaseActionAnalyticsEventAttributes;
 };
-export type ActionAnalyticsEvent = AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent | ReInitDocFailAnalyticsEvent | ReInitDocSuccessAnalyticsEvent | ConnectionSuccessAnalyticsEvent | ConnectionFailureAnalyticsEvent | CatchUpSuccessAnalyticsEvent | CatchUpFailureAnalyticsEvent | DocumentInitSuccessAnalyticsEvent | UpdateParticipantsSuccessAnalyticsEvent | CommitUnconfirmedStepsSuccessAnalyticsEvent | CommitUnconfirmedStepsFailureAnalyticsEvent | PublishPageSuccessAnalyticsEvent | PublishPageFailureAnalyticsEvent | GetCurrentStateSuccessAnalyticsEvent | GetCurrentStateFailureAnalyticsEvent | InvalidateTokenAnalyticsEvent | SendStepsRetryAnalyticsEvent | CatchupAfterMaxSendStepsRetryAnalyticsEvent | CatchUpDroppedStepsEvent | WebsocketMessageVolumeMetricEvent | ProviderInitializedAnalyticsEvent | ProviderSetupAnalyticsEvent | ProviderHasUnconfirmedStepsAnalyticsEvent | UpdateDocumentAnalyticsEvent;
+type ReconnectionAnalyticsEvent = {
+    eventAction: EVENT_ACTION.RECONNECTION;
+    attributes: {
+        eventStatus: EVENT_STATUS.SUCCESS;
+        disconnectionPeriodSeconds: number;
+    } & BaseActionAnalyticsEventAttributes;
+};
+export type ActionAnalyticsEvent = AddStepsSuccessAnalyticsEvent | AddStepsFailureAnalyticsEvent | ReInitDocFailAnalyticsEvent | ReInitDocSuccessAnalyticsEvent | ConnectionSuccessAnalyticsEvent | ConnectionFailureAnalyticsEvent | CatchUpSuccessAnalyticsEvent | CatchUpFailureAnalyticsEvent | DocumentInitSuccessAnalyticsEvent | UpdateParticipantsSuccessAnalyticsEvent | CommitUnconfirmedStepsSuccessAnalyticsEvent | CommitUnconfirmedStepsFailureAnalyticsEvent | PublishPageSuccessAnalyticsEvent | PublishPageFailureAnalyticsEvent | GetCurrentStateSuccessAnalyticsEvent | GetCurrentStateFailureAnalyticsEvent | InvalidateTokenAnalyticsEvent | SendStepsRetryAnalyticsEvent | CatchupAfterMaxSendStepsRetryAnalyticsEvent | CatchUpDroppedStepsEvent | WebsocketMessageVolumeMetricEvent | ProviderInitializedAnalyticsEvent | ProviderSetupAnalyticsEvent | ProviderHasUnconfirmedStepsAnalyticsEvent | UpdateDocumentAnalyticsEvent | ReconnectionAnalyticsEvent;
 export declare const ACK_MAX_TRY = 60;
 export declare const CONFLUENCE = "confluence";
 /** Enumerable for attaching a reason to catchup (v2) call(s) */

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

@@ -2,7 +2,7 @@ import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/stat
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { Emitter } from '../emitter';
 import type { Config } from '../types';
-import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload, CollabActivityAIProviderChangedPayload, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 import { NullApi } from '../api/null-api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
@@ -22,6 +22,8 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
     private sessionId?;
     private clientId?;
     private userId?;
+    private presenceId?;
+    private presenceActivity?;
     private presenceUpdateTimeout?;
     private disconnectedAt?;
     private sendStepsTimer?;
@@ -66,7 +68,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
         editorApi?: any;
         onSyncUpError?: SyncUpErrorFunction;
     }): this;
-    setupForPresenceOnly(clientId: string): this;
+    setupForPresenceOnly(clientId: string, presenceActivity?: PresenceActivity): this;
     private checkForCookies;
     /**
      * Send steps from transaction to NCS (and as a consequence to other participants), called from the collab-edit plugin in the editor

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

@@ -5,9 +5,8 @@ import type { InternalError } from './errors/internal-errors';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
 import type { GetUserType } from './participants/participants-helper';
 import type AnalyticsHelper from './analytics/analytics-helper';
-import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity } from '@atlaskit/editor-common/collab';
+import type { StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity, PresenceActivity } from '@atlaskit/editor-common/collab';
 import { type CatchupEventReason } from './helpers/const';
-export type { CollabParticipant, CollabEventInitData, CollabEventRemoteData, CollabEventConnectionData, CollabEventConnectingData, CollabEventPresenceData, ResolvedEditorState, CollabConnectedPayload, CollabConnectingPayload, CollabDisconnectedPayload, CollabInitPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabMetadataPayload, CollabLocalStepsPayload, CollabCommitStatusEventPayload, CollabPermissionEventPayload, UserPermitType, CollabEvents, Metadata, StepJson, CollabEventTelepointerData, CollabSendableSelection, CollabEditProvider, NewCollabSyncUpErrorAttributes, SyncUpErrorFunction, CollabEventLocalStepData, } from '@atlaskit/editor-common/collab';
 export interface CollabEventDisconnectedData {
     sid: string;
     reason: 'CLIENT_DISCONNECT' | 'SERVER_DISCONNECT' | 'SOCKET_CLOSED' | 'SOCKET_ERROR' | 'SOCKET_TIMEOUT' | 'UNKNOWN_DISCONNECT';
@@ -80,6 +79,12 @@ export interface Config {
      * @default false
      */
     __livePage?: boolean;
+    /**
+     * Configure the provider to pass along a persistent presenceId during presence events. This presenceId will be used
+     * to calculate the colors of the presence avatars as well as the editors telepointers. Since these two features are split across
+     * multiple websocket connections, the presenceId is used to correlate the two.
+     */
+    presenceId?: string;
 }
 export interface InitAndAuthData {
     initialized: boolean;
@@ -125,6 +130,8 @@ export type PresenceData = {
     userId: string | undefined;
     clientId: number | string;
     permit?: UserPermitType;
+    presenceId?: string;
+    presenceActivity?: PresenceActivity;
 };
 export type PresencePayload = PresenceData & {
     timestamp: number;
@@ -215,3 +222,4 @@ export type ProductInformation = {
     product: string;
     subProduct?: string;
 };
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "9.46.0",
+	"version": "10.1.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.11.0",
-		"@atlaskit/editor-common": "^94.24.0",
+		"@atlaskit/editor-common": "^95.3.0",
 		"@atlaskit/editor-json-transformer": "^8.21.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/feature-gate-js-client": "^4.22.0",