@atlaskit/editor-plugin-collab-edit 2.6.4 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.1.0
+
+### Minor Changes
+
+- [#117768](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/117768)
+  [`d55a8d95dd68a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d55a8d95dd68a) -
+  Add support for presenceActivity changes within collab provider. Remove unused code from original
+  presence experiment.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.0.0
+
+### Major Changes
+
+- [#117363](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117363)
+  [`10a0f7f6c2027`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10a0f7f6c2027) -
+  This package's `peerDependencies` have been adjusted for `react` and/or `react-dom` to reflect the
+  status of only supporting React 18 going forward. No explicit breaking change to React support has
+  been made in this release, but this is to signify going forward, breaking changes for React 16 or
+  React 17 may come via non-major semver releases.
+
+  Please refer this community post for more details:
+  https://community.developer.atlassian.com/t/rfc-78-dropping-support-for-react-16-and-rendering-in-a-react-18-concurrent-root-in-jira-and-confluence/87026
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.6.4
 
 ### Patch Changes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "2.6.4",
+	"version": "3.1.0",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,31 +33,31 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.2.1",
 		"@atlaskit/custom-steps": "^0.10.0",
-		"@atlaskit/editor-common": "^99.17.0",
+		"@atlaskit/editor-common": "^100.4.0",
 		"@atlaskit/editor-json-transformer": "^8.23.0",
-		"@atlaskit/editor-plugin-analytics": "1.12.1",
-		"@atlaskit/editor-plugin-connectivity": "^1.3.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^2.2.0",
+		"@atlaskit/editor-plugin-analytics": "2.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-shared-styles": "^3.3.0",
+		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.14.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0 || ^17.0.0 || ~18.2.0",
-		"react-dom": "^16.8.0 || ^17.0.0 || ^18.2.0"
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0"
 	},
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/editor-plugin-mentions": "^2.15.0",
-		"@atlaskit/editor-plugin-text-formatting": "^1.18.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.13.0",
-		"@atlaskit/editor-plugin-unsupported-content": "^1.11.0",
-		"@atlaskit/editor-test-helpers": "^21.3.0",
+		"@atlaskit/editor-plugin-mentions": "^4.0.0",
+		"@atlaskit/editor-plugin-text-formatting": "^2.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^2.0.0",
+		"@atlaskit/editor-plugin-unsupported-content": "^2.0.0",
+		"@atlaskit/editor-test-helpers": "^22.0.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/synchrony-test-helpers": "^3.1.0",
 		"@atlaskit/util-data-test": "^18.0.0",