@atlaskit/collab-provider 9.30.0 → 9.31.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/collab-provider
 
+## 9.31.0
+
+### Minor Changes
+
+- [#114811](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114811)
+  [`ad0d2f10ef71b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ad0d2f10ef71b) -
+  CONFONBO-3268: Changes for the experiment Teammate Presence: expose 2 new collab events to add
+  statuses (viewing/editing) to Confluence
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.30.1
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.30.0
 
 ### Minor Changes

package/afm-jira/tsconfig.json

@@ -0,0 +1,45 @@
+{
+  "extends": "../../../../tsconfig.entry-points.jira.json",
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es5",
+    "outDir": "../../../../../tsDist/@atlaskit__collab-provider/app",
+    "composite": true,
+    "rootDir": "../"
+  },
+  "include": [
+    "../src/**/*.ts",
+    "../src/**/*.tsx"
+  ],
+  "exclude": [
+    "../src/**/__tests__/*",
+    "../src/**/*.test.*",
+    "../src/**/test.*"
+  ],
+  "references": [
+    {
+      "path": "../../../analytics/analytics-gas-types/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../../analytics/analytics-listeners/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../editor-common/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../editor-json-transformer/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../prosemirror-collab/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../../data/ufo-external/afm-jira/tsconfig.json"
+    },
+    {
+      "path": "../../../elements/util-service-support/afm-jira/tsconfig.json"
+    }
+  ]
+}

package/dist/cjs/channel.js

@@ -618,6 +618,14 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           timestamp: timestamp
         }, data));
       });
+      this.socket.on('participant:activity-ack', function (_ref8) {
+        var data = _ref8.data;
+        _this2.emit('participant:activity-ack', data);
+      });
+      this.socket.on('participant:activity-join', function (_ref9) {
+        var data = _ref9.data;
+        _this2.emit('participant:activity-join', data);
+      });
       this.socket.on('presence:joined', function (data) {
         _this2.emit('presence:joined', data);
       });
@@ -627,11 +635,11 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref8) {
-        var sessionId = _ref8.sessionId,
-          timestamp = _ref8.timestamp,
-          data = _ref8.data,
-          clientId = _ref8.clientId;
+      this.socket.on('participant:updated', function (_ref10) {
+        var sessionId = _ref10.sessionId,
+          timestamp = _ref10.timestamp,
+          data = _ref10.data,
+          clientId = _ref10.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -647,7 +655,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         _this2.emit('status', data);
       });
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(reason) {
+        var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(reason) {
           var _this2$analyticsHelpe, reconnectionError;
           return _regenerator.default.wrap(function _callee7$(_context7) {
             while (1) switch (_context7.prev = _context7.next) {
@@ -680,7 +688,7 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
           }, _callee7);
         }));
         return function (_x10) {
-          return _ref9.apply(this, arguments);
+          return _ref11.apply(this, arguments);
         };
       }());
 

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

@@ -250,6 +250,40 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
+    /**
+     * sending new joiner's activity to existing participants
+     */
+    (0, _defineProperty2.default)(this, "onParticipantActivityJoin", function (payload) {
+      try {
+        logger('New participant joined: ', payload.activity);
+        var _data2 = {
+          userId: payload.userId,
+          activity: payload.activity
+        };
+        _this.emit('activity:join', _data2);
+      } catch (error) {
+        var _this$analyticsHelper8;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, "Error while sending 'activity:join'");
+      }
+    });
+    /**
+     * respond to new joiner with existing participant's activity
+     */
+    (0, _defineProperty2.default)(this, "onParticipantActivityAck", function (payload) {
+      try {
+        logger('Existing participants ack: ', payload.activity);
+        var _data3 = {
+          activity: payload.activity,
+          userId: _this.getPresenceData().userId
+        };
+        _this.emit('activity:ack', _data3);
+      } catch (error) {
+        var _this$analyticsHelper9;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, "Error while sending 'activity:ack'");
+      }
+    });
     /**
      * Called when a participant joins the session.
      *
@@ -263,9 +297,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         // This expose existing users to the newly joined user
         _this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper8;
+        var _this$analyticsHelper10;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper10 = _this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -281,9 +315,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
         _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper9;
+        var _this$analyticsHelper11;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**

package/dist/cjs/provider/index.js

@@ -31,6 +31,8 @@ var _internalErrors = require("../errors/internal-errors");
 var _const = require("../helpers/const");
 var _featureFlags = require("../feature-flags");
 var _api = require("../api/api");
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var logger = (0, _utils.createLogger)('Provider', 'black');
@@ -149,7 +151,7 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind((0, _assertThisInitialized2.default)(_this))).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
+      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind((0, _assertThisInitialized2.default)(_this))).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setUserId", function (id) {
       _this.userId = id;
@@ -419,17 +421,21 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "sendMessage",
     value: function sendMessage(data) {
+      var basePayload = {
+        userId: this.userId,
+        sessionId: this.sessionId,
+        clientId: this.clientId,
+        permit: this.permit
+      };
       try {
         if ((data === null || data === void 0 ? void 0 : data.type) === 'telepointer') {
-          var payload = {
-            userId: this.userId,
-            sessionId: this.sessionId,
-            clientId: this.clientId,
-            selection: data.selection,
-            permit: this.permit
-          };
-          var callback = (0, _telepointersHelper.telepointerCallback)(this.config.documentAri);
-          this.channel.broadcast('participant:telepointer', payload, callback);
+          this.channel.broadcast('participant:telepointer', _objectSpread(_objectSpread({}, basePayload), {}, {
+            selection: data.selection
+          }), (0, _telepointersHelper.telepointerCallback)(this.config.documentAri));
+        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
+          this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', _objectSpread(_objectSpread({}, basePayload), {}, {
+            activity: data.activity
+          }), activityCallback());
         }
       } catch (error) {
         var _this$analyticsHelper11;
@@ -547,4 +553,20 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
     }
   }]);
   return Provider;
-}(_emitter.Emitter);
+}(_emitter.Emitter);
+/**
+ * Callback for handling the broadcast response of participant activity.
+ * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
+ *
+ * @param activity The activity that was broadcast.
+ * @returns A function that handles the response from the broadcast operation.
+ */
+function activityCallback() {
+  return function (error) {
+    if (error) {
+      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
+      logger('Error broadcasting participant activity:', error);
+      return;
+    }
+  };
+}

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.30.0";
+var version = exports.version = "9.31.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/channel.js

@@ -426,6 +426,16 @@ export class Channel extends Emitter {
         ...data
       });
     });
+    this.socket.on('participant:activity-ack', ({
+      data
+    }) => {
+      this.emit('participant:activity-ack', data);
+    });
+    this.socket.on('participant:activity-join', ({
+      data
+    }) => {
+      this.emit('participant:activity-join', data);
+    });
     this.socket.on('presence:joined', data => {
       this.emit('presence:joined', data);
     });

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

@@ -199,6 +199,40 @@ export class ParticipantsService {
         (_this$analyticsHelper7 = this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 ? void 0 : _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
+    /**
+     * sending new joiner's activity to existing participants
+     */
+    _defineProperty(this, "onParticipantActivityJoin", payload => {
+      try {
+        logger('New participant joined: ', payload.activity);
+        const data = {
+          userId: payload.userId,
+          activity: payload.activity
+        };
+        this.emit('activity:join', data);
+      } catch (error) {
+        var _this$analyticsHelper8;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(error, `Error while sending 'activity:join'`);
+      }
+    });
+    /**
+     * respond to new joiner with existing participant's activity
+     */
+    _defineProperty(this, "onParticipantActivityAck", payload => {
+      try {
+        logger('Existing participants ack: ', payload.activity);
+        const data = {
+          activity: payload.activity,
+          userId: this.getPresenceData().userId
+        };
+        this.emit('activity:ack', data);
+      } catch (error) {
+        var _this$analyticsHelper9;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(error, `Error while sending 'activity:ack'`);
+      }
+    });
     /**
      * Called when a participant joins the session.
      *
@@ -212,9 +246,9 @@ export class ParticipantsService {
         // This expose existing users to the newly joined user
         this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper8;
+        var _this$analyticsHelper10;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 ? void 0 : _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 ? void 0 : _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -230,9 +264,9 @@ export class ParticipantsService {
         this.sendPresence();
         this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper9;
+        var _this$analyticsHelper11;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 ? void 0 : _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper11 = this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 ? void 0 : _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**

package/dist/es2019/provider/index.js

@@ -127,7 +127,7 @@ export class Provider extends Emitter {
       }).on('restore', this.documentService.onRestore).on('permission', permit => {
         this.permit = Object.assign(this.permit, permit);
         this.emit('permission', permit);
-      }).on('steps:added', this.documentService.onStepsAdded).on('metadata:changed', this.metadataService.onMetadataChanged).on('participant:telepointer', payload => this.participantsService.onParticipantTelepointer(payload, this.sessionId)).on('presence:joined', this.participantsService.onPresenceJoined).on('presence', this.participantsService.onPresence).on('participant:left', this.participantsService.onParticipantLeft).on('participant:updated', this.participantsService.onParticipantUpdated).on('disconnect', this.onDisconnected.bind(this)).on('error', this.onErrorHandled).on('status', this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
+      }).on('steps:added', this.documentService.onStepsAdded).on('metadata:changed', this.metadataService.onMetadataChanged).on('participant:telepointer', payload => this.participantsService.onParticipantTelepointer(payload, this.sessionId)).on('participant:activity-join', this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', this.participantsService.onParticipantActivityAck).on('presence:joined', this.participantsService.onPresenceJoined).on('presence', this.participantsService.onPresence).on('participant:left', this.participantsService.onParticipantLeft).on('participant:updated', this.participantsService.onParticipantUpdated).on('disconnect', this.onDisconnected.bind(this)).on('error', this.onErrorHandled).on('status', this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
     });
     _defineProperty(this, "setUserId", id => {
       this.userId = id;
@@ -358,17 +358,23 @@ export class Provider extends Emitter {
    * @param {string} data.sessionId Identifier identifying the session
    */
   sendMessage(data) {
+    const basePayload = {
+      userId: this.userId,
+      sessionId: this.sessionId,
+      clientId: this.clientId,
+      permit: this.permit
+    };
     try {
       if ((data === null || data === void 0 ? void 0 : data.type) === 'telepointer') {
-        const payload = {
-          userId: this.userId,
-          sessionId: this.sessionId,
-          clientId: this.clientId,
-          selection: data.selection,
-          permit: this.permit
-        };
-        const callback = telepointerCallback(this.config.documentAri);
-        this.channel.broadcast('participant:telepointer', payload, callback);
+        this.channel.broadcast('participant:telepointer', {
+          ...basePayload,
+          selection: data.selection
+        }, telepointerCallback(this.config.documentAri));
+      } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
+        this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', {
+          ...basePayload,
+          activity: data.activity
+        }, activityCallback());
       }
     } catch (error) {
       var _this$analyticsHelper11;
@@ -471,4 +477,21 @@ export class Provider extends Emitter {
       throw new SetMetadataError('Error while setting metadata', error);
     }
   }
+}
+
+/**
+ * Callback for handling the broadcast response of participant activity.
+ * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
+ *
+ * @param activity The activity that was broadcast.
+ * @returns A function that handles the response from the broadcast operation.
+ */
+function activityCallback() {
+  return error => {
+    if (error) {
+      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
+      logger('Error broadcasting participant activity:', error);
+      return;
+    }
+  };
 }

package/dist/es2019/version-wrapper.js

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

package/dist/esm/channel.js

@@ -611,6 +611,14 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
           timestamp: timestamp
         }, data));
       });
+      this.socket.on('participant:activity-ack', function (_ref8) {
+        var data = _ref8.data;
+        _this2.emit('participant:activity-ack', data);
+      });
+      this.socket.on('participant:activity-join', function (_ref9) {
+        var data = _ref9.data;
+        _this2.emit('participant:activity-join', data);
+      });
       this.socket.on('presence:joined', function (data) {
         _this2.emit('presence:joined', data);
       });
@@ -620,11 +628,11 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
       this.socket.on('participant:left', function (data) {
         _this2.emit('participant:left', data);
       });
-      this.socket.on('participant:updated', function (_ref8) {
-        var sessionId = _ref8.sessionId,
-          timestamp = _ref8.timestamp,
-          data = _ref8.data,
-          clientId = _ref8.clientId;
+      this.socket.on('participant:updated', function (_ref10) {
+        var sessionId = _ref10.sessionId,
+          timestamp = _ref10.timestamp,
+          data = _ref10.data,
+          clientId = _ref10.clientId;
         _this2.emit('participant:updated', _objectSpread({
           sessionId: sessionId,
           timestamp: timestamp,
@@ -640,7 +648,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
         _this2.emit('status', data);
       });
       this.socket.on('disconnect', /*#__PURE__*/function () {
-        var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(reason) {
+        var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(reason) {
           var _this2$analyticsHelpe, reconnectionError;
           return _regeneratorRuntime.wrap(function _callee7$(_context7) {
             while (1) switch (_context7.prev = _context7.next) {
@@ -673,7 +681,7 @@ export var Channel = /*#__PURE__*/function (_Emitter) {
           }, _callee7);
         }));
         return function (_x10) {
-          return _ref9.apply(this, arguments);
+          return _ref11.apply(this, arguments);
         };
       }());
 

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

@@ -243,6 +243,40 @@ export var ParticipantsService = /*#__PURE__*/function () {
         (_this$analyticsHelper7 = _this.analyticsHelper) === null || _this$analyticsHelper7 === void 0 || _this$analyticsHelper7.sendErrorEvent(error, 'Error while sending presence');
       }
     });
+    /**
+     * sending new joiner's activity to existing participants
+     */
+    _defineProperty(this, "onParticipantActivityJoin", function (payload) {
+      try {
+        logger('New participant joined: ', payload.activity);
+        var _data2 = {
+          userId: payload.userId,
+          activity: payload.activity
+        };
+        _this.emit('activity:join', _data2);
+      } catch (error) {
+        var _this$analyticsHelper8;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, "Error while sending 'activity:join'");
+      }
+    });
+    /**
+     * respond to new joiner with existing participant's activity
+     */
+    _defineProperty(this, "onParticipantActivityAck", function (payload) {
+      try {
+        logger('Existing participants ack: ', payload.activity);
+        var _data3 = {
+          activity: payload.activity,
+          userId: _this.getPresenceData().userId
+        };
+        _this.emit('activity:ack', _data3);
+      } catch (error) {
+        var _this$analyticsHelper9;
+        // We don't want to throw errors for Presence features as they tend to self-restore
+        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, "Error while sending 'activity:ack'");
+      }
+    });
     /**
      * Called when a participant joins the session.
      *
@@ -256,9 +290,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
         // This expose existing users to the newly joined user
         _this.sendPresence();
       } catch (error) {
-        var _this$analyticsHelper8;
+        var _this$analyticsHelper10;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper8 = _this.analyticsHelper) === null || _this$analyticsHelper8 === void 0 || _this$analyticsHelper8.sendErrorEvent(error, 'Error while joining presence');
+        (_this$analyticsHelper10 = _this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, 'Error while joining presence');
       }
     });
     /**
@@ -274,9 +308,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
         _this.sendPresence();
         _this.sendPresenceJoined();
       } catch (error) {
-        var _this$analyticsHelper9;
+        var _this$analyticsHelper11;
         // We don't want to throw errors for Presence features as they tend to self-restore
-        (_this$analyticsHelper9 = _this.analyticsHelper) === null || _this$analyticsHelper9 === void 0 || _this$analyticsHelper9.sendErrorEvent(error, 'Error while receiving presence');
+        (_this$analyticsHelper11 = _this.analyticsHelper) === null || _this$analyticsHelper11 === void 0 || _this$analyticsHelper11.sendErrorEvent(error, 'Error while receiving presence');
       }
     });
     /**

package/dist/esm/provider/index.js

@@ -7,6 +7,8 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -142,7 +144,7 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_assertThisInitialized(_this))).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
+      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_assertThisInitialized(_this))).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
     });
     _defineProperty(_assertThisInitialized(_this), "setUserId", function (id) {
       _this.userId = id;
@@ -412,17 +414,21 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "sendMessage",
     value: function sendMessage(data) {
+      var basePayload = {
+        userId: this.userId,
+        sessionId: this.sessionId,
+        clientId: this.clientId,
+        permit: this.permit
+      };
       try {
         if ((data === null || data === void 0 ? void 0 : data.type) === 'telepointer') {
-          var payload = {
-            userId: this.userId,
-            sessionId: this.sessionId,
-            clientId: this.clientId,
-            selection: data.selection,
-            permit: this.permit
-          };
-          var callback = telepointerCallback(this.config.documentAri);
-          this.channel.broadcast('participant:telepointer', payload, callback);
+          this.channel.broadcast('participant:telepointer', _objectSpread(_objectSpread({}, basePayload), {}, {
+            selection: data.selection
+          }), telepointerCallback(this.config.documentAri));
+        } else if ((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' || (data === null || data === void 0 ? void 0 : data.type) === 'activity:ack') {
+          this.channel.broadcast((data === null || data === void 0 ? void 0 : data.type) === 'activity:join' ? 'participant:activity-join' : 'participant:activity-ack', _objectSpread(_objectSpread({}, basePayload), {}, {
+            activity: data.activity
+          }), activityCallback());
         }
       } catch (error) {
         var _this$analyticsHelper11;
@@ -540,4 +546,21 @@ export var Provider = /*#__PURE__*/function (_Emitter) {
     }
   }]);
   return Provider;
-}(Emitter);
+}(Emitter);
+
+/**
+ * Callback for handling the broadcast response of participant activity.
+ * This example assumes a simple logging mechanism. It could be expanded to handle errors or other responses.
+ *
+ * @param activity The activity that was broadcast.
+ * @returns A function that handles the response from the broadcast operation.
+ */
+function activityCallback() {
+  return function (error) {
+    if (error) {
+      // Log or handle the error. This could involve retrying the broadcast or notifying the user.
+      logger('Error broadcasting participant activity:', error);
+      return;
+    }
+  };
+}

package/dist/esm/version-wrapper.js

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

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/types/participants/participants-service.d.ts

@@ -1,6 +1,6 @@
 import type AnalyticsHelper from '../analytics/analytics-helper';
-import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload } from '../types';
-import type { CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson } from '@atlaskit/editor-common/collab';
+import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload, ActivityPayload } from '../types';
+import type { CollabActivityData, CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson } from '@atlaskit/editor-common/collab';
 import type { GetUserType } from './participants-helper';
 import { ParticipantsState } from './participants-state';
 /**
@@ -23,7 +23,7 @@ export declare class ParticipantsService {
     private setUserId;
     private participantUpdateTimeout;
     private presenceUpdateTimeout;
-    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void);
+    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'activity:join' | 'activity:ack', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabActivityData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void);
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -78,6 +78,14 @@ export declare class ParticipantsService {
      */
     clearTimers: () => void;
     private sendPresence;
+    /**
+     * sending new joiner's activity to existing participants
+     */
+    onParticipantActivityJoin: (payload: ActivityPayload) => void;
+    /**
+     * respond to new joiner with existing participant's activity
+     */
+    onParticipantActivityAck: (payload: ActivityPayload) => void;
     /**
      * Called when a participant joins the session.
      *

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 } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
 export declare const MAX_STEP_REJECTED_ERROR_AGGRESSIVE = 2;
@@ -86,7 +86,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
      * @param {CollabSendableSelection} data.selection Object representing the selected element
      * @param {string} data.sessionId Identifier identifying the session
      */
-    sendMessage(data: CollabTelepointerPayload): void;
+    sendMessage(data: CollabTelepointerPayload | CollabActivityJoinPayload | CollabActivityAckPayload): void;
     private onDisconnected;
     /**
      * "Destroy" the provider, disconnect it's connection to the back-end service and unsubscribe all event listeners on the provider.

package/dist/types/types.d.ts

@@ -5,7 +5,7 @@ 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 { CollabInitPayload, StepJson, CollabSendableSelection, Metadata, UserPermitType } from '@atlaskit/editor-common/collab';
+import type { CollabInitPayload, StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity } from '@atlaskit/editor-common/collab';
 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;
@@ -115,7 +115,7 @@ export type InitPayload = {
 export type BroadcastIncomingPayload = {
     sessionId?: string;
     timestamp?: number;
-    data: PresencePayload | TelepointerPayload | StepsPayload | any;
+    data: PresencePayload | TelepointerPayload | StepsPayload | ActivityPayload | any;
 };
 export type PresenceData = {
     sessionId: string;
@@ -126,6 +126,10 @@ export type PresenceData = {
 export type PresencePayload = PresenceData & {
     timestamp: number;
 };
+export type ActivityPayload = {
+    userId: string | undefined;
+    activity: Activity;
+};
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;
 };
@@ -166,6 +170,8 @@ export type ChannelEvent = {
     'presence:joined': PresencePayload;
     presence: PresencePayload;
     'participant:left': PresencePayload;
+    'participant:activity-join': ActivityPayload;
+    'participant:activity-ack': ActivityPayload;
     'participant:telepointer': TelepointerPayload;
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {

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

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

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

@@ -1,6 +1,6 @@
 import type AnalyticsHelper from '../analytics/analytics-helper';
-import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload } from '../types';
-import type { CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson } from '@atlaskit/editor-common/collab';
+import type { CollabEventDisconnectedData, ChannelEvent, PresenceData, PresencePayload, TelepointerPayload, ActivityPayload } from '../types';
+import type { CollabActivityData, CollabEventPresenceData, CollabTelepointerPayload, ProviderParticipant, StepJson } from '@atlaskit/editor-common/collab';
 import type { GetUserType } from './participants-helper';
 import { ParticipantsState } from './participants-state';
 /**
@@ -23,7 +23,7 @@ export declare class ParticipantsService {
     private setUserId;
     private participantUpdateTimeout;
     private presenceUpdateTimeout;
-    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void);
+    constructor(analyticsHelper: AnalyticsHelper | undefined, participantsState: ParticipantsState, emit: (evt: 'presence' | 'telepointer' | 'disconnected' | 'activity:join' | 'activity:ack', data: CollabEventPresenceData | CollabTelepointerPayload | CollabEventDisconnectedData | CollabActivityData) => void, getUser: GetUserType, channelBroadcast: <K extends keyof ChannelEvent>(type: K, data: Omit<ChannelEvent[K], 'timestamp'>, callback?: Function) => void, sendPresenceJoined: () => void, getPresenceData: () => PresenceData, setUserId: (id: string) => void);
     /**
      * Carries out 3 things: 1) enriches the participant with user data, 2) updates the participantsState, 3) emits the presence event
      * @param payload Payload from incoming socket event
@@ -78,6 +78,14 @@ export declare class ParticipantsService {
      */
     clearTimers: () => void;
     private sendPresence;
+    /**
+     * sending new joiner's activity to existing participants
+     */
+    onParticipantActivityJoin: (payload: ActivityPayload) => void;
+    /**
+     * respond to new joiner with existing participant's activity
+     */
+    onParticipantActivityAck: (payload: ActivityPayload) => void;
     /**
      * Called when a participant joins the session.
      *

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 } from '@atlaskit/editor-common/collab';
+import type { CollabEditProvider, CollabEvents, CollabTelepointerPayload, ResolvedEditorState, Metadata, SyncUpErrorFunction, CollabActivityJoinPayload, CollabActivityAckPayload } from '@atlaskit/editor-common/collab';
 import { Api } from '../api/api';
 export declare const MAX_STEP_REJECTED_ERROR = 15;
 export declare const MAX_STEP_REJECTED_ERROR_AGGRESSIVE = 2;
@@ -86,7 +86,7 @@ export declare class Provider extends Emitter<CollabEvents> implements BaseEvent
      * @param {CollabSendableSelection} data.selection Object representing the selected element
      * @param {string} data.sessionId Identifier identifying the session
      */
-    sendMessage(data: CollabTelepointerPayload): void;
+    sendMessage(data: CollabTelepointerPayload | CollabActivityJoinPayload | CollabActivityAckPayload): void;
     private onDisconnected;
     /**
      * "Destroy" the provider, disconnect it's connection to the back-end service and unsubscribe all event listeners on the provider.

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

@@ -5,7 +5,7 @@ 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 { CollabInitPayload, StepJson, CollabSendableSelection, Metadata, UserPermitType } from '@atlaskit/editor-common/collab';
+import type { CollabInitPayload, StepJson, CollabSendableSelection, Metadata, UserPermitType, Activity } from '@atlaskit/editor-common/collab';
 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;
@@ -115,7 +115,7 @@ export type InitPayload = {
 export type BroadcastIncomingPayload = {
     sessionId?: string;
     timestamp?: number;
-    data: PresencePayload | TelepointerPayload | StepsPayload | any;
+    data: PresencePayload | TelepointerPayload | StepsPayload | ActivityPayload | any;
 };
 export type PresenceData = {
     sessionId: string;
@@ -126,6 +126,10 @@ export type PresenceData = {
 export type PresencePayload = PresenceData & {
     timestamp: number;
 };
+export type ActivityPayload = {
+    userId: string | undefined;
+    activity: Activity;
+};
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;
 };
@@ -166,6 +170,8 @@ export type ChannelEvent = {
     'presence:joined': PresencePayload;
     presence: PresencePayload;
     'participant:left': PresencePayload;
+    'participant:activity-join': ActivityPayload;
+    'participant:activity-ack': ActivityPayload;
     'participant:telepointer': TelepointerPayload;
     'participant:updated': PresencePayload;
     'steps:commit': StepsPayload & {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "9.30.0",
+	"version": "9.31.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
-		"@atlaskit/editor-common": "^82.12.0",
+		"@atlaskit/editor-common": "^83.1.0",
 		"@atlaskit/editor-json-transformer": "^8.14.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/platform-feature-flags": "^0.2.0",