@atlaskit/editor-plugin-show-diff 27.0.2 → 27.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 27.1.0
+
+### Minor Changes
+
+- [`1a9b1697e578d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1a9b1697e578d) -
+  Propagate named agent IDs through suggestion diff attribution so OOTB agent colour overrides are
+  applied.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/decorations/colorSchemes/attributions.js

@@ -164,6 +164,9 @@ var isContributorTagsEnabled = exports.isContributorTagsEnabled = function isCon
     return getAttributionKey(attribution) !== undefined;
   })) && contributors !== undefined && Object.keys(contributors).length > 0;
 };
+var getAttributionParticipantColor = function getAttributionParticipantColor(attribution, identity, contributors) {
+  return (0, _utils.getParticipantColor)(identity.colorSeed, getAgentBrandForColor(attribution, contributors), attribution === null || attribution === void 0 ? void 0 : attribution.agentNamedId);
+};
 var createAttributionColorMap = exports.createAttributionColorMap = function createAttributionColorMap(stepAttributions, contributors) {
   var colors = new Map();
   var allocatedColors = new Set();
@@ -179,9 +182,9 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
       if (!identity) {
         continue;
       }
-      var _getParticipantColor = (0, _utils.getParticipantColor)(identity.colorSeed, getAgentBrandForColor(attribution, contributors)),
-        index = _getParticipantColor.index,
-        isFixed = _getParticipantColor.isFixed;
+      var _getAttributionPartic = getAttributionParticipantColor(attribution, identity, contributors),
+        index = _getAttributionPartic.index,
+        isFixed = _getAttributionPartic.isFixed;
       var color = HASHED_PARTICIPANT_COLOR_SCHEMES[index];
       if (isFixed && color) {
         colors.set(identity.key, color);
@@ -202,8 +205,8 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
       if (!_identity || colors.has(_identity.key)) {
         continue;
       }
-      var _getParticipantColor2 = (0, _utils.getParticipantColor)(_identity.colorSeed, getAgentBrandForColor(_attribution, contributors)),
-        _index = _getParticipantColor2.index;
+      var _getAttributionPartic2 = getAttributionParticipantColor(_attribution, _identity, contributors),
+        _index = _getAttributionPartic2.index;
       var hashedColor = getSlotColor(_index);
       if (!hashedColor) {
         continue;

package/dist/cjs/showDiffPluginType.js

@@ -18,7 +18,8 @@ exports.DIFF_AGENT_BRANDS = exports.ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED = vo
  *
  * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
  * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
- * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ * is empty. `agentNamedId` carries a stable external configuration reference for presentation
+ * overrides. `wasOffline` preserves additional provenance without affecting identity.
  */
 
 /** Keeps a step and its attribution coupled through mapping and filtering. */

package/dist/es2019/pm-plugins/decorations/colorSchemes/attributions.js

@@ -131,6 +131,7 @@ export const isAttributionColoringEnabled = stepAttributions => {
  * a tag only has to name one.
  */
 export const isContributorTagsEnabled = (stepAttributions, contributors) => areAttributionColorGatesEnabled() && Boolean(stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(attribution => getAttributionKey(attribution) !== undefined)) && contributors !== undefined && Object.keys(contributors).length > 0;
+const getAttributionParticipantColor = (attribution, identity, contributors) => getParticipantColor(identity.colorSeed, getAgentBrandForColor(attribution, contributors), attribution === null || attribution === void 0 ? void 0 : attribution.agentNamedId);
 export const createAttributionColorMap = (stepAttributions, contributors) => {
   const colors = new Map();
   const allocatedColors = new Set();
@@ -145,7 +146,7 @@ export const createAttributionColorMap = (stepAttributions, contributors) => {
     const {
       index,
       isFixed
-    } = getParticipantColor(identity.colorSeed, getAgentBrandForColor(attribution, contributors));
+    } = getAttributionParticipantColor(attribution, identity, contributors);
     const color = HASHED_PARTICIPANT_COLOR_SCHEMES[index];
     if (isFixed && color) {
       colors.set(identity.key, color);
@@ -159,7 +160,7 @@ export const createAttributionColorMap = (stepAttributions, contributors) => {
     }
     const {
       index
-    } = getParticipantColor(identity.colorSeed, getAgentBrandForColor(attribution, contributors));
+    } = getAttributionParticipantColor(attribution, identity, contributors);
     const hashedColor = getSlotColor(index);
     if (!hashedColor) {
       continue;

package/dist/es2019/showDiffPluginType.js

@@ -12,7 +12,8 @@
  *
  * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
  * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
- * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ * is empty. `agentNamedId` carries a stable external configuration reference for presentation
+ * overrides. `wasOffline` preserves additional provenance without affecting identity.
  */
 
 /** Keeps a step and its attribution coupled through mapping and filtering. */

package/dist/esm/pm-plugins/decorations/colorSchemes/attributions.js

@@ -158,6 +158,9 @@ export var isContributorTagsEnabled = function isContributorTagsEnabled(stepAttr
     return getAttributionKey(attribution) !== undefined;
   })) && contributors !== undefined && Object.keys(contributors).length > 0;
 };
+var getAttributionParticipantColor = function getAttributionParticipantColor(attribution, identity, contributors) {
+  return getParticipantColor(identity.colorSeed, getAgentBrandForColor(attribution, contributors), attribution === null || attribution === void 0 ? void 0 : attribution.agentNamedId);
+};
 export var createAttributionColorMap = function createAttributionColorMap(stepAttributions, contributors) {
   var colors = new Map();
   var allocatedColors = new Set();
@@ -173,9 +176,9 @@ export var createAttributionColorMap = function createAttributionColorMap(stepAt
       if (!identity) {
         continue;
       }
-      var _getParticipantColor = getParticipantColor(identity.colorSeed, getAgentBrandForColor(attribution, contributors)),
-        index = _getParticipantColor.index,
-        isFixed = _getParticipantColor.isFixed;
+      var _getAttributionPartic = getAttributionParticipantColor(attribution, identity, contributors),
+        index = _getAttributionPartic.index,
+        isFixed = _getAttributionPartic.isFixed;
       var color = HASHED_PARTICIPANT_COLOR_SCHEMES[index];
       if (isFixed && color) {
         colors.set(identity.key, color);
@@ -196,8 +199,8 @@ export var createAttributionColorMap = function createAttributionColorMap(stepAt
       if (!_identity || colors.has(_identity.key)) {
         continue;
       }
-      var _getParticipantColor2 = getParticipantColor(_identity.colorSeed, getAgentBrandForColor(_attribution, contributors)),
-        _index = _getParticipantColor2.index;
+      var _getAttributionPartic2 = getAttributionParticipantColor(_attribution, _identity, contributors),
+        _index = _getAttributionPartic2.index;
       var hashedColor = getSlotColor(_index);
       if (!hashedColor) {
         continue;

package/dist/esm/showDiffPluginType.js

@@ -12,7 +12,8 @@
  *
  * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
  * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
- * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ * is empty. `agentNamedId` carries a stable external configuration reference for presentation
+ * overrides. `wasOffline` preserves additional provenance without affecting identity.
  */
 
 /** Keeps a step and its attribution coupled through mapping and filtering. */

package/dist/types/showDiffPluginType.d.ts

@@ -26,10 +26,12 @@ export type DiffType = 'inline' | 'block' | 'step' | 'smart';
  *
  * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
  * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
- * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ * is empty. `agentNamedId` carries a stable external configuration reference for presentation
+ * overrides. `wasOffline` preserves additional provenance without affecting identity.
  */
 export type DiffStepAttribution = {
     agentId?: string;
+    agentNamedId?: string;
     agentType?: string;
     userId?: string;
     wasOffline?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "27.0.2",
+	"version": "27.1.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/editor-plugin-limited-mode": "^26.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^27.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
-		"@atlaskit/editor-shared-styles": "^4.5.0",
+		"@atlaskit/editor-shared-styles": "^4.6.0",
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
@@ -50,7 +50,7 @@
 	},
 	"devDependencies": {
 		"@atlaskit/adf-utils": "^20.9.0",
-		"@atlaskit/button": "^25.5.0",
+		"@atlaskit/button": "^25.6.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^21.0.0",
 		"@atlaskit/editor-core": "^239.0.0",
@@ -71,7 +71,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^133.1.0",
+		"@atlaskit/editor-common": "^133.3.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"