@atlaskit/editor-plugin-show-diff 12.1.2 → 12.1.4

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 12.1.4
+
+### Patch Changes
+
+- [`522f40dd846c1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/522f40dd846c1) -
+  Fix table-cell diffs in the Post Stream Review experience. Recolouring a table cell is now
+  surfaced in the review with a highlight and a navigable step-through segment, and stepping onto a
+  cell no longer renders a blank cell.
+  - The AI modal mount-point widget could be positioned directly inside a table row, where the
+    browser wrapped it in an anonymous table cell — a blank column that hid the real cell's content.
+    It is now kept out of table structure.
+  - `prosemirror-changeset`'s default token encoder ignores node attributes, so a cell recolour
+    produced no change at all. An attribute-aware encoder now folds an allow-list of table-cell
+    attributes into the diff.
+  - The smart classifier discarded attribute changes on table cells because they sit on the node
+    boundary rather than inside the cell's content. It now emits a whole-cell change when a rigid
+    wrapper's own attributes differ.
+
+- [`3fd2c0404aff0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3fd2c0404aff0) -
+  Introduce a data-driven colour-scheme pattern for show-diff decorations: a `DiffColorScheme` type
+  (`types.ts`), shared CSS-generating functions (`factory.ts`) and the two scheme definitions
+  (`schemes.ts`).
+
+  Most scheme fields are ADS accent colour names; seven encode structural differences that no colour
+  can express (`insertUnderlineStyle`, `deletedQuoteNodeShape`, `deletedCellBorderProminence`,
+  `deletedRowTreatment`, `deletedBlockOutlineActiveEmphasis`, `addedCellOverlayZIndex`,
+  `roundedAddedCellOverlayInheritsBorder`), so a new scheme has to decide each of those too.
+
+  Additive only — nothing consumes the factory yet. `standard.ts` and `traditional.ts` are unchanged
+  and remain the source of every rendered style, so there is no behaviour or visual change. Wiring
+  the decoration consumers up behind a feature gate follows separately.
+
+- Updated dependencies
+
+## 12.1.3
+
+### Patch Changes
+
+- [`774c01e2f1cdd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/774c01e2f1cdd) -
+  Remove the `platform_editor_diff_granular_extended` experiment and retain its disabled behavior.
+- Updated dependencies
+
 ## 12.1.2
 
 ### Patch Changes

package/compass.yml

@@ -1,7 +1,7 @@
 configVersion: 1
 id: ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/1617e71c-fdf1-40c0-b143-03bf8d5a1648
 name: '@atlaskit/editor-plugin-show-diff'
-ownerId: ari:cloud:identity::team/ce353f56-2a90-491b-b272-b90dca4fffa2 # Editor FE Platform
+ownerId: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb # Editor Developers
 labels:
   - platform-code
   - platform-afm
@@ -16,14 +16,14 @@ links:
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master
   - name: Slack Channel
     type: CHAT_CHANNEL
-    url: https://atlassian.enterprise.slack.com/archives/C03SD6QJWPP # #cc-editor-lego
+    url: https://atlassian.enterprise.slack.com/archives/CFG3PSQ9E # #help-editor
   - name: Editor Plugin Show Diff
     type: REPOSITORY
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/editor/editor-plugin-show-diff
 customFields:
   - name: Department
     type: text
-    value: Eng - Editor Frontend Platform
+    value: Editor Developers
   - name: Trusted Reviewer Teams
     type: text
     value: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb

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

@@ -0,0 +1,76 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.attrAwareTokenEncoder = void 0;
+/**
+ * Attribute-aware token encoder for `prosemirror-changeset`.
+ *
+ * The library's default encoder reduces a node's open token to `node.type.name`,
+ * ignoring attributes. An attribute-only change (e.g. recolouring a table cell's
+ * `background`) therefore tokenises identically on both sides and reports no
+ * change at all.
+ *
+ * This encoder folds an allow-listed set of attributes into the open token so
+ * such changes register. Everything else encodes exactly as the default. The
+ * allow-list is deliberately narrow — folding in ephemeral attrs like `localId`
+ * would produce phantom diffs.
+ */
+
+var DIFFED_ATTRS_BY_NODE_TYPE = {
+  tableCell: ['background', 'colspan', 'rowspan'],
+  tableHeader: ['background', 'colspan', 'rowspan']
+};
+
+/**
+ * Builds a stable composite token. Iterates the allow-list rather than
+ * `Object.keys` so ordering is deterministic for string comparison.
+ */
+var encodeNodeWithAttrs = function encodeNodeWithAttrs(node, attrNames) {
+  var _node$attrs;
+  var attrs = (_node$attrs = node.attrs) !== null && _node$attrs !== void 0 ? _node$attrs : {};
+  // Deterministic order: iterate the allow-list, not `Object.keys(attrs)`.
+  var parts = attrNames.map(function (name) {
+    var _attrs$name;
+    return "".concat(name, "=").concat(JSON.stringify((_attrs$name = attrs[name]) !== null && _attrs$name !== void 0 ? _attrs$name : null));
+  });
+  return "".concat(node.type.name, "|").concat(parts.join('|'));
+};
+
+/**
+ * Identical to the library default except that allow-listed node types encode
+ * their allow-listed attributes into the open token. Characters and node-end
+ * tokens are left as-is, hence the `string | number` token type.
+ */
+var attrAwareTokenEncoder = exports.attrAwareTokenEncoder = {
+  encodeCharacter: function encodeCharacter(char, _marks) {
+    return char;
+  },
+  encodeNodeStart: function encodeNodeStart(node) {
+    var attrNames = DIFFED_ATTRS_BY_NODE_TYPE[node.type.name];
+    if (attrNames) {
+      return encodeNodeWithAttrs(node, attrNames);
+    }
+    return node.type.name;
+  },
+  encodeNodeEnd: function encodeNodeEnd(node) {
+    return -typeID(node.type);
+  },
+  compareTokens: function compareTokens(a, b) {
+    return a === b;
+  }
+};
+
+/**
+ * Mirrors the library's private `typeID` so node-end tokens match the default
+ * encoding exactly. Reimplemented here because it is not exported.
+ */
+function typeID(type) {
+  var cache = type.schema.cached.changeSetIDs || (type.schema.cached.changeSetIDs = Object.create(null));
+  var id = cache[type.name];
+  if (id == null) {
+    cache[type.name] = id = Object.keys(type.schema.nodes).indexOf(type.name) + 1;
+  }
+  return id;
+}

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

@@ -19,13 +19,13 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _areDocsEqualByBlockStructureAndText = require("../areDocsEqualByBlockStructureAndText");
 var _createAnchorDecorationWidgets = require("../decorations/createAnchorDecorationWidgets");
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
-var _createGranularBlockReferenceWidget = require("../decorations/createGranularBlockReferenceWidget");
 var _createInlineChangedDecoration = require("../decorations/createInlineChangedDecoration");
 var _createNodeChangedDecorationWidget = require("../decorations/createNodeChangedDecorationWidget");
 var _decorationKeys = require("../decorations/decorationKeys");
 var _getAttrChangeRanges = require("../decorations/utils/getAttrChangeRanges");
 var _getMarkChangeRanges = require("../decorations/utils/getMarkChangeRanges");
 var _isExtendedEnabled = require("../isExtendedEnabled");
+var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _diffBySteps = require("./diffBySteps");
 var _groupChangesByBlock = require("./groupChangesByBlock");
 var _optimizeChanges = require("./optimizeChanges");
@@ -238,7 +238,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       };
     }
   }
-  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);
+  // The attribute-aware encoder is only needed by the smart classifier and is
+  // gated with it; other diff types keep the library default so their output is
+  // unchanged.
+  var tokenEncoder = diffType === 'smart' && (0, _platformFeatureFlags.fg)('platform_editor_ai_smart_diff') ? _attrAwareTokenEncoder.attrAwareTokenEncoder : undefined;
+  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
   var changes = getChanges({
     changeset: changeset,
     originalDoc: originalDoc,
@@ -260,7 +264,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   var isInserted = !isInverted;
-  var createDecorationsForChange = function createDecorationsForChange(change, showGranularWithBlock) {
+  var createDecorationsForChange = function createDecorationsForChange(change) {
     var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
@@ -272,10 +276,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       inlineDeletedDiffPlacement: inlineDeletedDiffPlacement
     });
     if (change.inserted.length > 0) {
-      // shouldHideDeleted for block/node decorations: suppressed when isInverted + hideDeletedDiffs,
-      // or when showGranularWithBlock (block reference widget is shown instead).
-      // isInverted gates both — on an inverted diff the inserted side is visually the deleted side.
-      var shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? isInverted && (hideDeletedDiffs || showGranularWithBlock && change.deleted.length > 0) : false;
+      // On an inverted diff the inserted side is visually the deleted side.
+      var shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? isInverted && hideDeletedDiffs : false;
 
       // For `smart` NODE-level promotions the change range spans a whole container
       // (e.g. an entire list/table/layout, using outer node bounds). Applying a SINGLE
@@ -292,7 +294,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
-      var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
+      var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
@@ -356,7 +358,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       }))));
     }
     if (change.deleted.length > 0) {
-      var _shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0 : false;
+      var _shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? !isInverted && hideDeletedDiffs && change.inserted.length > 0 : false;
       if (!_shouldHideDeleted) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread(_objectSpread({
           change: change,
@@ -377,88 +379,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       }
     }
   };
-  if (diffType === 'step' && (0, _expValEquals.expValEquals)('platform_editor_diff_granular_extended', 'isEnabled', true)) {
-    // Uses getStepChanges instead of getChanges so that we have per-step granularity metadata.
-    // Specifically, we need to know how many granular changes each step produced in order to
-    // apply the shouldHideDeleted suppression threshold (> 3 granular changes per step).
-    // getChanges returns a flat Change[] with no per-step grouping, making this count impossible
-    // to derive after the fact without re-introducing per-change metadata.
-    var stepChanges = (0, _diffBySteps.getStepChanges)(originalDoc, steps);
-    stepChanges.forEach(function (_ref5) {
-      var isGranular = _ref5.isGranular,
-        stepChangeList = _ref5.changes;
-      var granularCount = isGranular ? stepChangeList.length : 0;
-
-      // Calculate the average ratio of changed content on both A (original) and B (new)
-      // sides of the diff. If 30% or more of the block has changed on average, we show
-      // the block reference widget even if the granular change count is below the threshold.
-      // Block length is derived from the enclosing text block boundaries rather than the
-      // first/last change positions, so unchanged words at the start/end are accounted for.
-      var avgChangedRatio = 0;
-      if (isGranular && stepChangeList.length > 0) {
-        var first = stepChangeList[0];
-        var last = stepChangeList[stepChangeList.length - 1];
-        var resolvedA = originalDoc.resolve(first.fromA);
-        var resolvedB = tr.doc.resolve(first.fromB);
-        var blockStartA = first.fromA;
-        var blockEndA = last.toA;
-        var blockStartB = first.fromB;
-        var blockEndB = last.toB;
-        for (var depth = resolvedA.depth; depth >= 0; depth--) {
-          var node = resolvedA.node(depth);
-          if (node.isTextblock) {
-            blockStartA = resolvedA.start(depth);
-            blockEndA = blockStartA + node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        for (var _depth = resolvedB.depth; _depth >= 0; _depth--) {
-          var _node = resolvedB.node(_depth);
-          if (_node.isTextblock) {
-            blockStartB = resolvedB.start(_depth);
-            blockEndB = blockStartB + _node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        var blockLengthA = blockEndA - blockStartA;
-        var blockLengthB = blockEndB - blockStartB;
-        var totalChangedA = stepChangeList.reduce(function (sum, c) {
-          return sum + (c.toA - c.fromA);
-        }, 0);
-        var totalChangedB = stepChangeList.reduce(function (sum, c) {
-          return sum + (c.toB - c.fromB);
-        }, 0);
-        var ratioA = blockLengthA > 0 ? totalChangedA / blockLengthA : 0;
-        var ratioB = blockLengthB > 0 ? totalChangedB / blockLengthB : 0;
-        avgChangedRatio = (ratioA + ratioB) / 2;
-      }
-      var showGranularWithBlock = isGranular && granularCount !== 1 && (granularCount > 3 || avgChangedRatio >= 0.3);
-      stepChangeList.forEach(function (change) {
-        createDecorationsForChange(change, showGranularWithBlock);
-      });
-      if (showGranularWithBlock && stepChangeList.length > 0 && !hideDeletedDiffs) {
-        var lastChange = stepChangeList[stepChangeList.length - 1];
-        var granularBlockDiffId = crypto.randomUUID();
-        var blockWidgets = (0, _createGranularBlockReferenceWidget.createGranularBlockReferenceWidget)({
-          change: lastChange,
-          originalDoc: originalDoc,
-          newDoc: tr.doc,
-          isInverted: isInverted,
-          nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
-          intl: intl,
-          activeIndexPos: activeIndexPos,
-          diffId: granularBlockDiffId,
-          showIndicators: showIndicators
-        });
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)(blockWidgets));
-      }
-    });
-  } else {
-    changes.forEach(function (change) {
-      createDecorationsForChange(change, /* showGranularWithBlock */false);
-    });
-  }
+  changes.forEach(function (change) {
+    createDecorationsForChange(change);
+  });
   (0, _getMarkChangeRanges.getMarkChangeRanges)(steps).forEach(function (change) {
     var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
@@ -530,42 +453,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref6, _ref7) {
-  var _ref1;
+function (_ref5, _ref6) {
+  var _ref0;
+  var _ref7 = (0, _slicedToArray2.default)(_ref5, 1),
+    _ref7$ = _ref7[0],
+    pluginState = _ref7$.pluginState,
+    state = _ref7$.state,
+    colorScheme = _ref7$.colorScheme,
+    intl = _ref7$.intl,
+    activeIndexPos = _ref7$.activeIndexPos,
+    isInverted = _ref7$.isInverted,
+    diffType = _ref7$.diffType,
+    hideDeletedDiffs = _ref7$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
+    showIndicators = _ref7$.showIndicators,
+    smartThresholds = _ref7$.smartThresholds,
+    deletedDiffPlacement = _ref7$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref7$.inlineDeletedDiffPlacement;
   var _ref8 = (0, _slicedToArray2.default)(_ref6, 1),
     _ref8$ = _ref8[0],
-    pluginState = _ref8$.pluginState,
-    state = _ref8$.state,
-    colorScheme = _ref8$.colorScheme,
-    intl = _ref8$.intl,
-    activeIndexPos = _ref8$.activeIndexPos,
-    isInverted = _ref8$.isInverted,
-    diffType = _ref8$.diffType,
-    hideDeletedDiffs = _ref8$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
-    showIndicators = _ref8$.showIndicators,
-    smartThresholds = _ref8$.smartThresholds,
-    deletedDiffPlacement = _ref8$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
-  var _ref9 = (0, _slicedToArray2.default)(_ref7, 1),
-    _ref9$ = _ref9[0],
-    lastPluginState = _ref9$.pluginState,
-    lastState = _ref9$.state,
-    lastColorScheme = _ref9$.colorScheme,
-    lastIntl = _ref9$.intl,
-    lastActiveIndexPos = _ref9$.activeIndexPos,
-    lastIsInverted = _ref9$.isInverted,
-    lastDiffType = _ref9$.diffType,
-    lastHideDeletedDiffs = _ref9$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref9$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref9$.showIndicators,
-    lastSmartThresholds = _ref9$.smartThresholds,
-    lastDeletedDiffPlacement = _ref9$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref9$.inlineDeletedDiffPlacement;
+    lastPluginState = _ref8$.pluginState,
+    lastState = _ref8$.state,
+    lastColorScheme = _ref8$.colorScheme,
+    lastIntl = _ref8$.intl,
+    lastActiveIndexPos = _ref8$.activeIndexPos,
+    lastIsInverted = _ref8$.isInverted,
+    lastDiffType = _ref8$.diffType,
+    lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref8$.showIndicators,
+    lastSmartThresholds = _ref8$.smartThresholds,
+    lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref0;
-    return (_ref0 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref0 !== void 0 ? _ref0 : false;
+    var _ref9;
+    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
   }
-  return (_ref1 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref1 !== void 0 ? _ref1 : false;
+  return (_ref0 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
 });

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.computeDiffChanges = void 0;
 var _prosemirrorChangeset = require("prosemirror-changeset");
+var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _diffBySteps = require("./diffBySteps");
 var _groupChangesByBlock = require("./groupChangesByBlock");
 var _optimizeChanges = require("./optimizeChanges");
@@ -80,7 +81,13 @@ var computeDiffChanges = exports.computeDiffChanges = function computeDiffChange
       newDoc: originalDoc
     };
   }
-  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, steppedDoc);
+
+  // The attribute-aware encoder only affects the `smart` classification, so it is
+  // applied only for that type. (This utility intentionally applies no feature
+  // gate — see the file docstring — but a caller requesting `smart` is already
+  // behind the smart-diff gate.)
+  var tokenEncoder = diffType === 'smart' ? _attrAwareTokenEncoder.attrAwareTokenEncoder : undefined;
+  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, steppedDoc);
   if (diffType === 'smart') {
     return {
       changes: (0, _classifySmartChanges.classifySmartChanges)({

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

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getStepChanges = exports.diffBySteps = void 0;
+exports.diffBySteps = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _optimizeChanges = require("./optimizeChanges");
 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; }
@@ -328,7 +329,7 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
     var fromB = mapPosition(afterStepToFinal, fromAfterStep);
     var toB = mapPosition(afterStepToFinal, toAfterStep);
     if (shouldCheckGranularDiff(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
-      var granularStepChanges = _prosemirrorChangeset.ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
+      var granularStepChanges = _prosemirrorChangeset.ChangeSet.create(rangedStep.before, undefined, _attrAwareTokenEncoder.attrAwareTokenEncoder).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
 
       // `simplifyChanges` reads text using `Change.fromB`/`toB`, which are
       // positions in the post-step doc (the "B" doc). Passing the pre-step
@@ -407,127 +408,4 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
     });
   }
   return mergeOverlappingByNewDocRange(changes);
-};
-
-/**
- * A fork of `diffBySteps` that returns changes grouped per step, rather than as a flat list.
- *
- * Why forked rather than refactoring `diffBySteps`:
- * - `diffBySteps` returns a flat `Change[]` and is consumed by the existing decoration path.
- *   Changing its return shape would require threading per-step metadata through all callers,
- *   adding complexity to a stable code path.
- * - The per-step grouping is only needed for the `platform_editor_diff_granular_extended` gate,
- *   where we need to know how many granular changes a single step produced in order to decide
- *   whether to suppress deleted decorations (threshold: > 3 granular changes per step).
- * - Keeping the two functions separate means each has a clear, focused contract and neither
- *   accumulates the other's concerns. Shared logic (mapping helpers, `mergeOverlappingByNewDocRange`,
- *   `shouldCheckGranularDiff`, etc.) is already extracted and reused by both.
- */
-var getStepChanges = exports.getStepChanges = function getStepChanges(originalDoc, steps) {
-  var result = [];
-  var currentDoc = originalDoc;
-  var successfulStepMaps = [];
-  var rangedSteps = [];
-  var _iterator4 = _createForOfIteratorHelper(steps),
-    _step4;
-  try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var step = _step4.value;
-      var before = currentDoc;
-      var stepResult = step.apply(currentDoc);
-      if (stepResult.failed !== null || !stepResult.doc) {
-        continue;
-      }
-      var stepMap = step.getMap();
-      var rangeStep = step;
-      if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
-        rangedSteps.push({
-          before: before,
-          doc: stepResult.doc,
-          from: rangeStep.from,
-          to: rangeStep.to,
-          mapIndex: successfulStepMaps.length,
-          step: step,
-          stepMap: stepMap
-        });
-      }
-      successfulStepMaps.push(stepMap);
-      currentDoc = stepResult.doc;
-    }
-  } catch (err) {
-    _iterator4.e(err);
-  } finally {
-    _iterator4.f();
-  }
-  for (var _i2 = 0, _rangedSteps2 = rangedSteps; _i2 < _rangedSteps2.length; _i2++) {
-    var rangedStep = _rangedSteps2[_i2];
-    var originalToBeforeStep = createMapping(successfulStepMaps.slice(0, rangedStep.mapIndex));
-    var beforeStepToOriginal = originalToBeforeStep.invert();
-    var fromA = mapPosition(beforeStepToOriginal, rangedStep.from);
-    var toA = mapPosition(beforeStepToOriginal, rangedStep.to);
-    var fromAfterStep = rangedStep.stepMap.map(rangedStep.from, -1);
-    var toAfterStep = rangedStep.stepMap.map(rangedStep.to, 1);
-    var afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
-    var fromB = mapPosition(afterStepToFinal, fromAfterStep);
-    var toB = mapPosition(afterStepToFinal, toAfterStep);
-    if (shouldCheckGranularDiff(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
-      var granularStepChanges = _prosemirrorChangeset.ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
-      var optimizedGranularStepChanges = (0, _optimizeChanges.optimizeChanges)((0, _prosemirrorChangeset.simplifyChanges)(granularStepChanges.changes, rangedStep.doc));
-      var stepChanges = [];
-      var _iterator5 = _createForOfIteratorHelper(optimizedGranularStepChanges),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var granularChange = _step5.value;
-          var expandedA = expandToWordBoundaries(rangedStep.before, granularChange.fromA, granularChange.toA);
-          var expandedB = expandToWordBoundaries(rangedStep.doc, granularChange.fromB, granularChange.toB);
-          var aLeftDelta = granularChange.fromA - expandedA.from;
-          var aRightDelta = expandedA.to - granularChange.toA;
-          var bLeftDelta = granularChange.fromB - expandedB.from;
-          var bRightDelta = expandedB.to - granularChange.toB;
-          var finalA = expandedA;
-          var finalB = expandedB;
-          if (aLeftDelta > bLeftDelta || aRightDelta > bRightDelta) {
-            var extraLeft = Math.max(0, aLeftDelta - bLeftDelta);
-            var extraRight = Math.max(0, aRightDelta - bRightDelta);
-            finalB = expandToWordBoundaries(rangedStep.doc, Math.max(expandedB.from - extraLeft, 0), expandedB.to + extraRight);
-          }
-          if (bLeftDelta > aLeftDelta || bRightDelta > aRightDelta) {
-            var _extraLeft2 = Math.max(0, bLeftDelta - aLeftDelta);
-            var _extraRight2 = Math.max(0, bRightDelta - aRightDelta);
-            finalA = expandToWordBoundaries(rangedStep.before, Math.max(expandedA.from - _extraLeft2, 0), expandedA.to + _extraRight2);
-          }
-          stepChanges.push({
-            fromA: mapPosition(beforeStepToOriginal, finalA.from),
-            toA: mapPosition(beforeStepToOriginal, finalA.to),
-            fromB: mapPosition(afterStepToFinal, finalB.from),
-            toB: mapPosition(afterStepToFinal, finalB.to),
-            deleted: createSpans(Math.max(0, finalA.to - finalA.from)),
-            inserted: createSpans(Math.max(0, finalB.to - finalB.from))
-          });
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
-      result.push({
-        isGranular: true,
-        changes: mergeOverlappingByNewDocRange(stepChanges)
-      });
-      continue;
-    }
-    result.push({
-      isGranular: false,
-      changes: [{
-        fromA: fromA,
-        toA: toA,
-        fromB: fromB,
-        toB: toB,
-        deleted: createSpans(Math.max(0, toA - fromA)),
-        inserted: createSpans(Math.max(0, toB - fromB))
-      }]
-    });
-  }
-  return result;
 };

package/dist/cjs/pm-plugins/calculateDiff/smart/classifySmartChanges.js

@@ -772,6 +772,15 @@ var _classifyChild = function classifyChild(childA, childB, changes, originalDoc
     var childrenB = childRefs(blockB);
     var childrenA = wrapperA ? childRefs(wrapperA) : [];
     var out = [];
+
+    // An attribute-only change on the wrapper itself (e.g. a table cell's
+    // `background`) sits on the node boundary, not inside any inner child, so the
+    // recursion below would emit nothing and the change would be dropped. Emit a
+    // whole-wrapper change instead, which also subsumes any inner content change.
+    if (wrapperA && !wrapperA.node.sameMarkup(blockB.node)) {
+      out.push((0, _helpers.makePromotedChange)(wrapperA.from, wrapperA.to, blockB.from, blockB.to, 'node'));
+      return out;
+    }
     // LCS-align inner children (mirrors classifyContainer) so a paragraph inserted/deleted
     // inside the cell/column does not mis-pair every subsequent inner child by index. We never
     // promote the wrapper itself here — we only classify each inner child.