@atlaskit/editor-plugin-collab-edit 18.0.7 → 18.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 18.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 18.1.0
+
+### Minor Changes
+
+- [`920a9bc294e07`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/920a9bc294e07) -
+  Show names for supported external agents, plus Claude branding and its consistent orange diff
+  colour. Share the Claude colour override through getParticipantColor for diff attribution and
+  collaboration telepointers behind confluence_ncs_step_diffing_version_history.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 18.0.7
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main/plugin-state.js

@@ -129,6 +129,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
       if (telepointerData) {
         var sessionId = telepointerData.sessionId;
         if (participants.get(sessionId) && sessionId !== sid) {
+          var _participants$get;
           var oldPointers = (0, _utils.findPointers)(this.getPresenceId(sessionId), this.decorationSet);
           if (oldPointers) {
             remove = remove.concat(oldPointers);
@@ -153,7 +154,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
           } catch (err) {
             this.onError(err);
           }
-          add = add.concat((0, _utils.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), (0, _utils.hasExistingNudge)(sessionId, this.nudgeAnimations)));
+          add = add.concat((0, _utils.createTelepointers)(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), (0, _utils.hasExistingNudge)(sessionId, this.nudgeAnimations), (_participants$get = participants.get(sessionId)) === null || _participants$get === void 0 ? void 0 : _participants$get.agentType));
         }
       }
       if (tr.docChanged) {
@@ -165,6 +166,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
               if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
                 var step = tr.steps.filter(_utils.isReplaceStep)[0];
                 if (step) {
+                  var _participants$get2;
                   var _spec$pointer = spec.pointer,
                     _sessionId = _spec$pointer.sessionId,
                     presenceId = _spec$pointer.presenceId;
@@ -172,7 +174,7 @@ var PluginState = exports.PluginState = /*#__PURE__*/function () {
                     size = _ref.slice.content.size,
                     _from = _ref.from;
                   var pos = getValidPos(tr, size ? Math.min(_from + size, tr.doc.nodeSize - 3) : Math.max(_from, 1));
-                  add = add.concat((0, _utils.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId), presenceId, _this.getFullName(_sessionId), (0, _utils.hasExistingNudge)(_sessionId, _this.nudgeAnimations)));
+                  add = add.concat((0, _utils.createTelepointers)(pos, pos, _sessionId, false, _this.getInitial(_sessionId), presenceId, _this.getFullName(_sessionId), (0, _utils.hasExistingNudge)(_sessionId, _this.nudgeAnimations), (_participants$get2 = participants.get(_sessionId)) === null || _participants$get2 === void 0 ? void 0 : _participants$get2.agentType));
                 }
               }
             }

package/dist/cjs/pm-plugins/track-step-metrics.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateNcsSessionStepMetrics = exports.updateNcsActiveSessions = exports.getNcsSessionStepMetrics = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ncsStepMetrics = require("@atlaskit/editor-common/ncs-step-metrics");
-var _frontendUtilities = require("@atlaskit/frontend-utilities");
+var _StorageClient = require("@atlaskit/frontend-utilities/StorageClient");
 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; }
-var storageClient = new _frontendUtilities.StorageClient(_ncsStepMetrics.NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
+var storageClient = new _StorageClient.StorageClient(_ncsStepMetrics.NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**
  * Gets the current step session metrics for a given session ID

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

@@ -18,7 +18,8 @@ var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _utils = require("@atlaskit/editor-shared-styles/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _preserveNodeIdentity = require("./preserve-node-identity");
 var findPointers = exports.findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(
@@ -34,17 +35,17 @@ function style(options) {
   var borderWidth = "var(--ds-border-width-focused, 2px)";
   return "border-right: ".concat(borderWidth, " solid ").concat(color, "; margin-right: calc(-1 * ").concat(borderWidth, "); z-index: 1");
 }
-function getAvatarColor(str) {
-  var participantColor = (0, _editorSharedStyles.getParticipantColor)(str);
+function getAvatarColor(str, agentType) {
+  var participantColor = (0, _utils.getParticipantColor)(str, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? agentType : undefined);
   return {
     index: participantColor.index,
     backgroundColor: participantColor.color.backgroundColor,
     textColor: participantColor.color.textColor
   };
 }
-var createTelepointers = exports.createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged) {
+var createTelepointers = exports.createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged, agentType) {
   var decorations = [];
-  var avatarColor = getAvatarColor(presenceId);
+  var avatarColor = getAvatarColor(presenceId, agentType);
   var color = avatarColor.index.toString();
   if (isSelection) {
     var className = "telepointer color-".concat(color, " telepointer-selection");

package/dist/es2019/pm-plugins/main/plugin-state.js

@@ -101,6 +101,7 @@ export class PluginState {
         sessionId
       } = telepointerData;
       if (participants.get(sessionId) && sessionId !== sid) {
+        var _participants$get;
         const oldPointers = findPointers(this.getPresenceId(sessionId), this.decorationSet);
         if (oldPointers) {
           remove = remove.concat(oldPointers);
@@ -125,7 +126,7 @@ export class PluginState {
         } catch (err) {
           this.onError(err);
         }
-        add = add.concat(createTelepointers(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations)));
+        add = add.concat(createTelepointers(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations), (_participants$get = participants.get(sessionId)) === null || _participants$get === void 0 ? void 0 : _participants$get.agentType));
       }
     }
     if (tr.docChanged) {
@@ -137,6 +138,7 @@ export class PluginState {
             if (spec.pointer && spec.pointer.sessionId && spec.key === `telepointer-${spec.pointer.sessionId}`) {
               const step = tr.steps.filter(isReplaceStep)[0];
               if (step) {
+                var _participants$get2;
                 const {
                   sessionId,
                   presenceId
@@ -152,7 +154,7 @@ export class PluginState {
                   // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } = step;
                 const pos = getValidPos(tr, size ? Math.min(from + size, tr.doc.nodeSize - 3) : Math.max(from, 1));
-                add = add.concat(createTelepointers(pos, pos, sessionId, false, this.getInitial(sessionId), presenceId, this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations)));
+                add = add.concat(createTelepointers(pos, pos, sessionId, false, this.getInitial(sessionId), presenceId, this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations), (_participants$get2 = participants.get(sessionId)) === null || _participants$get2 === void 0 ? void 0 : _participants$get2.agentType));
               }
             }
           }

package/dist/es2019/pm-plugins/track-step-metrics.js

@@ -1,5 +1,5 @@
 import { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
-import { StorageClient } from '@atlaskit/frontend-utilities';
+import { StorageClient } from '@atlaskit/frontend-utilities/StorageClient';
 const storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**

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

@@ -8,7 +8,8 @@ import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { getParticipantColor } from '@atlaskit/editor-shared-styles';
+import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { preserveNodeIdentity } from './preserve-node-identity';
 export const findPointers = (id, decorations) => decorations.find().reduce(
 // `pointer` is absent on non-telepointer decorations (e.g. the agent-shimmer
@@ -22,17 +23,17 @@ function style(options) {
   const borderWidth = "var(--ds-border-width-focused, 2px)";
   return `border-right: ${borderWidth} solid ${color}; margin-right: calc(-1 * ${borderWidth}); z-index: 1`;
 }
-export function getAvatarColor(str) {
-  const participantColor = getParticipantColor(str);
+export function getAvatarColor(str, agentType) {
+  const participantColor = getParticipantColor(str, fg('confluence_ncs_step_diffing_version_history') ? agentType : undefined);
   return {
     index: participantColor.index,
     backgroundColor: participantColor.color.backgroundColor,
     textColor: participantColor.color.textColor
   };
 }
-export const createTelepointers = (from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged) => {
+export const createTelepointers = (from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged, agentType) => {
   const decorations = [];
-  const avatarColor = getAvatarColor(presenceId);
+  const avatarColor = getAvatarColor(presenceId, agentType);
   const color = avatarColor.index.toString();
   if (isSelection) {
     const className = `telepointer color-${color} telepointer-selection`;

package/dist/esm/pm-plugins/main/plugin-state.js

@@ -123,6 +123,7 @@ export var PluginState = /*#__PURE__*/function () {
       if (telepointerData) {
         var sessionId = telepointerData.sessionId;
         if (participants.get(sessionId) && sessionId !== sid) {
+          var _participants$get;
           var oldPointers = findPointers(this.getPresenceId(sessionId), this.decorationSet);
           if (oldPointers) {
             remove = remove.concat(oldPointers);
@@ -147,7 +148,7 @@ export var PluginState = /*#__PURE__*/function () {
           } catch (err) {
             this.onError(err);
           }
-          add = add.concat(createTelepointers(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations)));
+          add = add.concat(createTelepointers(from, to, sessionId, isSelection, this.getInitial(sessionId), this.getPresenceId(sessionId), this.getFullName(sessionId), hasExistingNudge(sessionId, this.nudgeAnimations), (_participants$get = participants.get(sessionId)) === null || _participants$get === void 0 ? void 0 : _participants$get.agentType));
         }
       }
       if (tr.docChanged) {
@@ -159,6 +160,7 @@ export var PluginState = /*#__PURE__*/function () {
               if (spec.pointer && spec.pointer.sessionId && spec.key === "telepointer-".concat(spec.pointer.sessionId)) {
                 var step = tr.steps.filter(isReplaceStep)[0];
                 if (step) {
+                  var _participants$get2;
                   var _spec$pointer = spec.pointer,
                     _sessionId = _spec$pointer.sessionId,
                     presenceId = _spec$pointer.presenceId;
@@ -166,7 +168,7 @@ export var PluginState = /*#__PURE__*/function () {
                     size = _ref.slice.content.size,
                     _from = _ref.from;
                   var pos = getValidPos(tr, size ? Math.min(_from + size, tr.doc.nodeSize - 3) : Math.max(_from, 1));
-                  add = add.concat(createTelepointers(pos, pos, _sessionId, false, _this.getInitial(_sessionId), presenceId, _this.getFullName(_sessionId), hasExistingNudge(_sessionId, _this.nudgeAnimations)));
+                  add = add.concat(createTelepointers(pos, pos, _sessionId, false, _this.getInitial(_sessionId), presenceId, _this.getFullName(_sessionId), hasExistingNudge(_sessionId, _this.nudgeAnimations), (_participants$get2 = participants.get(_sessionId)) === null || _participants$get2 === void 0 ? void 0 : _participants$get2.agentType));
                 }
               }
             }

package/dist/esm/pm-plugins/track-step-metrics.js

@@ -2,7 +2,7 @@ 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 { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
-import { StorageClient } from '@atlaskit/frontend-utilities';
+import { StorageClient } from '@atlaskit/frontend-utilities/StorageClient';
 var storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**

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

@@ -9,7 +9,8 @@ import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import { Transaction, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AttrStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { getParticipantColor } from '@atlaskit/editor-shared-styles';
+import { getParticipantColor } from '@atlaskit/editor-shared-styles/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { preserveNodeIdentity } from './preserve-node-identity';
 export var findPointers = function findPointers(id, decorations) {
   return decorations.find().reduce(
@@ -25,17 +26,17 @@ function style(options) {
   var borderWidth = "var(--ds-border-width-focused, 2px)";
   return "border-right: ".concat(borderWidth, " solid ").concat(color, "; margin-right: calc(-1 * ").concat(borderWidth, "); z-index: 1");
 }
-export function getAvatarColor(str) {
-  var participantColor = getParticipantColor(str);
+export function getAvatarColor(str, agentType) {
+  var participantColor = getParticipantColor(str, fg('confluence_ncs_step_diffing_version_history') ? agentType : undefined);
   return {
     index: participantColor.index,
     backgroundColor: participantColor.color.backgroundColor,
     textColor: participantColor.color.textColor
   };
 }
-export var createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged) {
+export var createTelepointers = function createTelepointers(from, to, sessionId, isSelection, initial, presenceId, fullName, isNudged, agentType) {
   var decorations = [];
-  var avatarColor = getAvatarColor(presenceId);
+  var avatarColor = getAvatarColor(presenceId, agentType);
   var color = avatarColor.index.toString();
   if (isSelection) {
     var className = "telepointer color-".concat(color, " telepointer-selection");

package/dist/types/collabEditPluginType.d.ts

@@ -25,7 +25,7 @@ export type CollabEditPlugin = NextEditorPlugin<'collabEdit', {
             mark: Mark;
             pos: number;
         }) => boolean;
-        getAvatarColor: (str: string) => {
+        getAvatarColor: (str: string, agentType?: string) => {
             backgroundColor: string;
             index: number;
             textColor: string;

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

@@ -7,12 +7,12 @@ import type { Step } from '@atlaskit/editor-prosemirror/transform-override';
 import type { DecorationSet, EditorView } from '@atlaskit/editor-prosemirror/view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 export declare const findPointers: (id: string, decorations: DecorationSet) => Decoration[];
-export declare function getAvatarColor(str: string): {
+export declare function getAvatarColor(str: string, agentType?: string): {
     backgroundColor: string;
     index: number;
     textColor: string;
 };
-export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string, presenceId: string, fullName: string, isNudged: boolean) => Decoration[];
+export declare const createTelepointers: (from: number, to: number, sessionId: string, isSelection: boolean, initial: string, presenceId: string, fullName: string, isNudged: boolean, agentType?: string) => Decoration[];
 export declare const replaceDocument: (doc: any, state: EditorState, version?: number, options?: CollabEditOptions, reserveCursor?: boolean, editorAnalyticsAPI?: EditorAnalyticsAPI) => Transaction;
 export declare const scrollToCollabCursor: (editorView: EditorView, participants: CollabParticipant[], sessionId: string | undefined, index: number, editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => void;
 export declare const getPositionOfTelepointer: (sessionId: string, decorationSet: DecorationSet) => undefined | number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "18.0.7",
+	"version": "18.1.1",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,13 +27,13 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^19.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^16.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
-		"@atlaskit/editor-shared-styles": "^4.1.0",
+		"@atlaskit/editor-shared-styles": "^4.2.0",
 		"@atlaskit/frontend-utilities": "^4.4.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-collab": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^185.0.0",
-		"@atlaskit/tokens": "^16.11.0",
+		"@atlaskit/tmp-editor-statsig": "^187.0.0",
+		"@atlaskit/tokens": "^16.12.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},
@@ -49,6 +49,10 @@
 		"wait-for-expect": "^1.2.0"
 	},
 	"platform-feature-flags": {
+		"confluence_ncs_step_diffing_version_history": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_agent_be_review_undo": {
 			"type": "boolean"
 		},