@atlaskit/editor-plugin-show-diff 14.2.2 → 14.2.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.2.3
+
+### Patch Changes
+
+- [`e3b2afdd0a76a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3b2afdd0a76a) -
+  [ux] Preserve the configured colour scheme for attributed diffs with zero or one distinct
+  contributor behind `confluence_ncs_step_diffing_version_history` and
+  `platform_editor_show_diff_color_scheme_refactor`.
+- [`ee583927e98cc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ee583927e98cc) -
+  [ux] Gate Post Stream Review smart diff behavior behind `platform_editor_ai_smart_diff` and its
+  diff indicators behind `platform_editor_diff_plugin_show_indicators`. Require the smart diff gate
+  when selecting the show-diff plugin's default diff type.
+- Updated dependencies
+
 ## 14.2.2
 
 ### Patch Changes

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

@@ -27,9 +27,13 @@ var areAttributionColorGatesEnabled = exports.areAttributionColorGatesEnabled =
   return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor');
 };
 var isAttributionColoringEnabled = exports.isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
-  return areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(function (attribution) {
-    return getAttributionKey(attribution) !== undefined;
-  })) === true;
+  if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
+    return false;
+  }
+  var attributionKeys = new Set(stepAttributions.map(getAttributionKey).filter(function (key) {
+    return key !== undefined;
+  }));
+  return attributionKeys.size > 1;
 };
 var createAttributionColorMap = exports.createAttributionColorMap = function createAttributionColorMap(stepAttributions) {
   var keys = Array.from(new Set(stepAttributions.map(getAttributionKey).filter(function (key) {

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

@@ -19,5 +19,5 @@ var isExtendedEnabled = exports.isExtendedEnabled = function isExtendedEnabled(d
   return (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff');
 };
 var getDefaultDiffType = exports.getDefaultDiffType = function getDefaultDiffType() {
-  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';
+  return (0, _fg.fg)('platform_editor_ai_smart_diff') ? 'smart' : 'inline';
 };

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

@@ -15,7 +15,13 @@ export const getAttributionKey = attribution => {
   return `user:${userId !== null && userId !== void 0 ? userId : ''}|agent:${agentIdentity}`;
 };
 export const areAttributionColorGatesEnabled = () => fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
-export const isAttributionColoringEnabled = stepAttributions => areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(attribution => getAttributionKey(attribution) !== undefined)) === true;
+export const isAttributionColoringEnabled = stepAttributions => {
+  if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
+    return false;
+  }
+  const attributionKeys = new Set(stepAttributions.map(getAttributionKey).filter(key => key !== undefined));
+  return attributionKeys.size > 1;
+};
 export const createAttributionColorMap = stepAttributions => {
   const keys = Array.from(new Set(stepAttributions.map(getAttributionKey).filter(key => key !== undefined))).sort();
   return new Map(keys.map((key, index) => [key, ATTRIBUTION_COLOR_PALETTE[index % ATTRIBUTION_COLOR_PALETTE.length]]));

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

@@ -10,4 +10,4 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
  * when `smart` is active even if `platform_editor_diff_plugin_extended` is off.
  */
 export const isExtendedEnabled = diffType => expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && fg('platform_editor_ai_smart_diff');
-export const getDefaultDiffType = () => fg('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';
+export const getDefaultDiffType = () => fg('platform_editor_ai_smart_diff') ? 'smart' : 'inline';

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

@@ -20,9 +20,13 @@ export var areAttributionColorGatesEnabled = function areAttributionColorGatesEn
   return fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
 };
 export var isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
-  return areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(function (attribution) {
-    return getAttributionKey(attribution) !== undefined;
-  })) === true;
+  if (!areAttributionColorGatesEnabled() || !(stepAttributions !== null && stepAttributions !== void 0 && stepAttributions.length)) {
+    return false;
+  }
+  var attributionKeys = new Set(stepAttributions.map(getAttributionKey).filter(function (key) {
+    return key !== undefined;
+  }));
+  return attributionKeys.size > 1;
 };
 export var createAttributionColorMap = function createAttributionColorMap(stepAttributions) {
   var keys = Array.from(new Set(stepAttributions.map(getAttributionKey).filter(function (key) {

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

@@ -13,5 +13,5 @@ export var isExtendedEnabled = function isExtendedEnabled(diffType) {
   return expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || diffType === 'smart' && fg('platform_editor_ai_smart_diff');
 };
 export var getDefaultDiffType = function getDefaultDiffType() {
-  return fg('confluence_ncs_step_diffing_version_history') ? 'smart' : 'inline';
+  return fg('platform_editor_ai_smart_diff') ? 'smart' : 'inline';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.2.2",
+	"version": "14.2.3",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^164.0.0",
+		"@atlaskit/tmp-editor-statsig": "^165.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -42,7 +42,7 @@
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^18.2.0",
 		"@atlaskit/editor-core": "^226.1.0",
-		"@atlaskit/editor-json-transformer": "^9.6.0",
+		"@atlaskit/editor-json-transformer": "^9.7.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
 		"@atlaskit/form": "^17.1.0",
 		"@atlaskit/primitives": "^22.4.0",
@@ -59,7 +59,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.4.0",
+		"@atlaskit/editor-common": "^120.6.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {