@atlaskit/editor-plugin-show-diff 14.4.3 → 14.5.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.5.1
+
+### Patch Changes
+
+- [`0417aa8001bf1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0417aa8001bf1) -
+  Fix attributed changes not using agreed step type
+
+## 14.5.0
+
+### Minor Changes
+
+- [`a47ac4819a984`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a47ac4819a984) -
+  Attribution colouring now applies to single-actor diffs. Previously colouring required two or more
+  distinct actors to be worth distinguishing; it now surfaces the participant colour as soon as
+  there is an identifiable actor, while still respecting the attribution-colour gates.
+
 ## 14.4.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -409,7 +409,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
         stepIndex: stepIndex
       });
     }));
-    attributedChanges = (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions);
+    attributedChanges = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && diffType === 'step' ? (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions) : (0, _toConsumableArray2.default)(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
     var uncollapsedChanges = getAttributedChanges({

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

@@ -98,10 +98,13 @@ var isAttributionColoringEnabled = exports.isAttributionColoringEnabled = functi
   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;
+
+  // Colour whenever a step names an identifiable actor; a single actor still surfaces its
+  // participant colour. Only bail when nothing is attributable, so the attributed changeset is
+  // not built for a diff with no identities to colour.
+  return stepAttributions.some(function (attribution) {
+    return getAttributionKey(attribution) !== undefined;
+  });
 };
 
 /**

package/dist/es2019/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -372,7 +372,7 @@ const calculateDiffDecorationsInner = ({
       ...attribution,
       stepIndex
     })));
-    attributedChanges = diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions);
+    attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
     const uncollapsedChanges = getAttributedChanges({

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

@@ -75,8 +75,11 @@ 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;
+
+  // Colour whenever a step names an identifiable actor; a single actor still surfaces its
+  // participant colour. Only bail when nothing is attributable, so the attributed changeset is
+  // not built for a diff with no identities to colour.
+  return stepAttributions.some(attribution => getAttributionKey(attribution) !== undefined);
 };
 
 /**

package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -402,7 +402,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
         stepIndex: stepIndex
       });
     }));
-    attributedChanges = diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions);
+    attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
     var uncollapsedChanges = getAttributedChanges({

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

@@ -92,10 +92,13 @@ export var isAttributionColoringEnabled = function isAttributionColoringEnabled(
   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;
+
+  // Colour whenever a step names an identifiable actor; a single actor still surfaces its
+  // participant colour. Only bail when nothing is attributable, so the attributed changeset is
+  // not built for a diff with no identities to colour.
+  return stepAttributions.some(function (attribution) {
+    return getAttributionKey(attribution) !== undefined;
+  });
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.4.3",
+	"version": "14.5.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",