@atlaskit/editor-plugin-show-diff 8.4.0 → 8.4.1

package/CHANGELOG.md

@@ -1,10 +1,18 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 8.4.1
+
+### Patch Changes
+
+- [`8a9f26c6c71bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a9f26c6c71bc) -
+  [ux] Improve diff logic for some nodes and edge cases where marks are causing the diff to fail
+- Updated dependencies
+
 ## 8.4.0
 
 ### Minor Changes
 
-- [`41168b2bd2790`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/41168b2bd2790) -
+- [`ebab8f80bfc40`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ebab8f80bfc40) -
   Autofix: add explicit package exports (barrel removal)
 
 ### Patch Changes

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

@@ -4,8 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.areDocsEqualByBlockStructureAndText = areDocsEqualByBlockStructureAndText;
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
- * Returns true if both nodes have the same tree structure (type and child count at every level).
+ * Returns a copy of the document with all marks removed from all text.
+ * This normalises mark fragmentation — e.g. annotation marks reordering can split
+ * a single text run into many text nodes, making structural comparison unreliable.
+ * After stripping, ProseMirror will merge adjacent text nodes so childCounts are stable.
+ */
+function stripMarks(doc) {
+  var tr = new _transform.Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+
+/**
+ * Returns true if both (mark-stripped) nodes have the same block tree structure (node type and child count at every level)
  */
 function isBlockStructureEqual(node1, node2) {
   if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
@@ -23,7 +37,23 @@ function isBlockStructureEqual(node1, node2) {
  * Looser equality for "safe diff" cases: same full text content and same block structure
  * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
  * This is safe because we ensure decorations get applied to valid positions.
+ *
+ * Marks are intentionally ignored — two documents that differ only in mark application
+ * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
+ * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
+ * does not produce false inequalities.
  */
 function areDocsEqualByBlockStructureAndText(doc1, doc2) {
-  return doc1.textContent === doc2.textContent && doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  if (doc1.textContent !== doc2.textContent) {
+    return false;
+  }
+  if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+    // Strip marks before comparing so that mark-driven text fragmentation
+    // (e.g. annotation mark reordering producing different childCounts) does not
+    // cause false inequalities.
+    var stripped1 = stripMarks(doc1);
+    var stripped2 = stripMarks(doc2);
+    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+  }
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
 }

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

@@ -221,15 +221,26 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     }));
   });
   (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrSteps).forEach(function (change) {
-    decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration({
-      doc: tr.doc,
-      from: change.fromB,
-      to: change.toB,
-      colorScheme: colorScheme,
-      isInserted: true,
-      activeIndexPos: activeIndexPos,
-      intl: intl
-    })));
+    if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+      // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
+      var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+      decorations.push((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
+        change: change,
+        colorScheme: colorScheme,
+        isActive: isActive,
+        isInserted: true
+      }));
+    } else {
+      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration({
+        doc: tr.doc,
+        from: change.fromB,
+        to: change.toB,
+        colorScheme: colorScheme,
+        isInserted: true,
+        activeIndexPos: activeIndexPos,
+        intl: intl
+      })));
+    }
   });
   return _view.DecorationSet.empty.add(tr.doc, decorations);
 };

package/dist/cjs/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBlockChangedDecoration = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -33,7 +35,7 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList'].concat((0, _toConsumableArray2.default)((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), ['bulletList', 'orderedList', 'layoutSection']).includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }

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

@@ -1,32 +1,91 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.stepIsValidAttrChange = exports.getAttrChangeRanges = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var filterUndefined = function filterUndefined(x) {
   return !!x;
 };
 
-// Currently allow attributes that indicats a change in media image
-var allowedAttrs = ['id', 'collection', 'url'];
+// Attributes that indicate a change in media image
+var mediaAttrs = ['id', 'collection', 'url'];
+
+// Attribute that indicates a date change
+var dateAttrs = ['timestamp'];
+
+// Attribute that indicates a task item state change
+var taskItemAttrs = ['state'];
+
+// Attributes excluded from extension change detection (not meaningful content changes)
+var extensionExcludedAttrs = ['localId'];
+
+// Extension node type names
+var extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+var getStepAttrs = function getStepAttrs(step) {
+  if (step instanceof _transform.AttrStep) {
+    return [step.attr];
+  }
+  if (step instanceof _steps.SetAttrsStep && step.attrs) {
+    return Object.keys(step.attrs);
+  }
+  return [];
+};
 var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRanges(doc, steps) {
   return steps.map(function (step) {
-    if (step instanceof _transform.AttrStep && allowedAttrs.includes(step.attr) || step instanceof _steps.SetAttrsStep && step.attrs && (0, _toConsumableArray2.default)(Object.keys(step.attrs)).some(function (v) {
-      return allowedAttrs.includes(v);
-    })) {
-      var $pos = doc.resolve(step.pos);
-      if ($pos.parent.type === doc.type.schema.nodes.mediaSingle) {
-        var startPos = $pos.pos + $pos.parentOffset;
+    if (!(step instanceof _transform.AttrStep) && !(step instanceof _steps.SetAttrsStep)) {
+      return undefined;
+    }
+    var stepAttrs = getStepAttrs(step);
+    var $pos = doc.resolve(step.pos);
+    var nodeAtPos = doc.nodeAt(step.pos);
+    if ((0, _expValEquals.expValEquals)('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+      // date node: timestamp attribute change — highlight the date node itself (inline)
+      if (stepAttrs.some(function (v) {
+        return dateAttrs.includes(v);
+      }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date') {
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline: true
+        };
+      }
+
+      // taskItem node: state attribute change — highlight the taskItem node
+      if (stepAttrs.some(function (v) {
+        return taskItemAttrs.includes(v);
+      }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
         return {
-          fromB: startPos,
-          toB: startPos + $pos.parent.nodeSize - 1
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize
         };
       }
+
+      // extension nodes: any attribute change except localId — highlight the node
+      if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(function (v) {
+        return !extensionExcludedAttrs.includes(v);
+      })) {
+        var isInline = nodeAtPos.type.name === 'inlineExtension';
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline: isInline
+        };
+      }
+    }
+
+    // media node: id/collection/url attribute change — highlight the mediaSingle parent
+    if (stepAttrs.some(function (v) {
+      return mediaAttrs.includes(v);
+    }) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+      var startPos = $pos.pos + $pos.parentOffset;
+      return {
+        fromB: startPos,
+        toB: startPos + $pos.parent.nodeSize - 1
+      };
     }
     return undefined;
   }).filter(filterUndefined);

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

@@ -1,5 +1,20 @@
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+/**
+ * Returns a copy of the document with all marks removed from all text.
+ * This normalises mark fragmentation — e.g. annotation marks reordering can split
+ * a single text run into many text nodes, making structural comparison unreliable.
+ * After stripping, ProseMirror will merge adjacent text nodes so childCounts are stable.
+ */
+function stripMarks(doc) {
+  const tr = new Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+
 /**
- * Returns true if both nodes have the same tree structure (type and child count at every level).
+ * Returns true if both (mark-stripped) nodes have the same block tree structure (node type and child count at every level)
  */
 function isBlockStructureEqual(node1, node2) {
   if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
@@ -17,7 +32,23 @@ function isBlockStructureEqual(node1, node2) {
  * Looser equality for "safe diff" cases: same full text content and same block structure
  * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
  * This is safe because we ensure decorations get applied to valid positions.
+ *
+ * Marks are intentionally ignored — two documents that differ only in mark application
+ * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
+ * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
+ * does not produce false inequalities.
  */
 export function areDocsEqualByBlockStructureAndText(doc1, doc2) {
-  return doc1.textContent === doc2.textContent && doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  if (doc1.textContent !== doc2.textContent) {
+    return false;
+  }
+  if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+    // Strip marks before comparing so that mark-driven text fragmentation
+    // (e.g. annotation mark reordering producing different childCounts) does not
+    // cause false inequalities.
+    const stripped1 = stripMarks(doc1);
+    const stripped2 = stripMarks(doc2);
+    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+  }
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
 }

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

@@ -202,15 +202,26 @@ const calculateDiffDecorationsInner = ({
     }));
   });
   getAttrChangeRanges(tr.doc, attrSteps).forEach(change => {
-    decorations.push(...calculateNodesForBlockDecoration({
-      doc: tr.doc,
-      from: change.fromB,
-      to: change.toB,
-      colorScheme,
-      isInserted: true,
-      activeIndexPos,
-      intl
-    }));
+    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+      // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
+      const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+      decorations.push(createInlineChangedDecoration({
+        change,
+        colorScheme,
+        isActive,
+        isInserted: true
+      }));
+    } else {
+      decorations.push(...calculateNodesForBlockDecoration({
+        doc: tr.doc,
+        from: change.fromB,
+        to: change.toB,
+        colorScheme,
+        isInserted: true,
+        activeIndexPos,
+        intl
+      }));
+    }
   });
   return DecorationSet.empty.add(tr.doc, decorations);
 };

package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -26,7 +26,7 @@ const getBlockNodeStyle = ({
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList', ...(expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }

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

@@ -1,20 +1,75 @@
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const filterUndefined = x => !!x;
 
-// Currently allow attributes that indicats a change in media image
-const allowedAttrs = ['id', 'collection', 'url'];
+// Attributes that indicate a change in media image
+const mediaAttrs = ['id', 'collection', 'url'];
+
+// Attribute that indicates a date change
+const dateAttrs = ['timestamp'];
+
+// Attribute that indicates a task item state change
+const taskItemAttrs = ['state'];
+
+// Attributes excluded from extension change detection (not meaningful content changes)
+const extensionExcludedAttrs = ['localId'];
+
+// Extension node type names
+const extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+const getStepAttrs = step => {
+  if (step instanceof AttrStep) {
+    return [step.attr];
+  }
+  if (step instanceof SetAttrsStep && step.attrs) {
+    return Object.keys(step.attrs);
+  }
+  return [];
+};
 export const getAttrChangeRanges = (doc, steps) => {
   return steps.map(step => {
-    if (step instanceof AttrStep && allowedAttrs.includes(step.attr) || step instanceof SetAttrsStep && step.attrs && [...Object.keys(step.attrs)].some(v => allowedAttrs.includes(v))) {
-      const $pos = doc.resolve(step.pos);
-      if ($pos.parent.type === doc.type.schema.nodes.mediaSingle) {
-        const startPos = $pos.pos + $pos.parentOffset;
+    if (!(step instanceof AttrStep) && !(step instanceof SetAttrsStep)) {
+      return undefined;
+    }
+    const stepAttrs = getStepAttrs(step);
+    const $pos = doc.resolve(step.pos);
+    const nodeAtPos = doc.nodeAt(step.pos);
+    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+      // date node: timestamp attribute change — highlight the date node itself (inline)
+      if (stepAttrs.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date') {
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline: true
+        };
+      }
+
+      // taskItem node: state attribute change — highlight the taskItem node
+      if (stepAttrs.some(v => taskItemAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
         return {
-          fromB: startPos,
-          toB: startPos + $pos.parent.nodeSize - 1
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize
         };
       }
+
+      // extension nodes: any attribute change except localId — highlight the node
+      if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(v => !extensionExcludedAttrs.includes(v))) {
+        const isInline = nodeAtPos.type.name === 'inlineExtension';
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline
+        };
+      }
+    }
+
+    // media node: id/collection/url attribute change — highlight the mediaSingle parent
+    if (stepAttrs.some(v => mediaAttrs.includes(v)) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+      const startPos = $pos.pos + $pos.parentOffset;
+      return {
+        fromB: startPos,
+        toB: startPos + $pos.parent.nodeSize - 1
+      };
     }
     return undefined;
   }).filter(filterUndefined);

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

@@ -1,5 +1,20 @@
+import { Transform } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
+/**
+ * Returns a copy of the document with all marks removed from all text.
+ * This normalises mark fragmentation — e.g. annotation marks reordering can split
+ * a single text run into many text nodes, making structural comparison unreliable.
+ * After stripping, ProseMirror will merge adjacent text nodes so childCounts are stable.
+ */
+function stripMarks(doc) {
+  var tr = new Transform(doc);
+  tr.removeMark(0, doc.content.size);
+  return tr.doc;
+}
+
 /**
- * Returns true if both nodes have the same tree structure (type and child count at every level).
+ * Returns true if both (mark-stripped) nodes have the same block tree structure (node type and child count at every level)
  */
 function isBlockStructureEqual(node1, node2) {
   if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
@@ -17,7 +32,23 @@ function isBlockStructureEqual(node1, node2) {
  * Looser equality for "safe diff" cases: same full text content and same block structure
  * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
  * This is safe because we ensure decorations get applied to valid positions.
+ *
+ * Marks are intentionally ignored — two documents that differ only in mark application
+ * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
+ * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
+ * does not produce false inequalities.
  */
 export function areDocsEqualByBlockStructureAndText(doc1, doc2) {
-  return doc1.textContent === doc2.textContent && doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  if (doc1.textContent !== doc2.textContent) {
+    return false;
+  }
+  if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+    // Strip marks before comparing so that mark-driven text fragmentation
+    // (e.g. annotation mark reordering producing different childCounts) does not
+    // cause false inequalities.
+    var stripped1 = stripMarks(doc1);
+    var stripped2 = stripMarks(doc2);
+    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
+  }
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
 }

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

@@ -215,15 +215,26 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     }));
   });
   getAttrChangeRanges(tr.doc, attrSteps).forEach(function (change) {
-    decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration({
-      doc: tr.doc,
-      from: change.fromB,
-      to: change.toB,
-      colorScheme: colorScheme,
-      isInserted: true,
-      activeIndexPos: activeIndexPos,
-      intl: intl
-    })));
+    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+      // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
+      var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+      decorations.push(createInlineChangedDecoration({
+        change: change,
+        colorScheme: colorScheme,
+        isActive: isActive,
+        isInserted: true
+      }));
+    } else {
+      decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration({
+        doc: tr.doc,
+        from: change.fromB,
+        to: change.toB,
+        colorScheme: colorScheme,
+        isInserted: true,
+        activeIndexPos: activeIndexPos,
+        intl: intl
+      })));
+    }
   });
   return DecorationSet.empty.add(tr.doc, decorations);
 };

package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -27,7 +28,7 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList'].concat(_toConsumableArray(expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), ['bulletList', 'orderedList', 'layoutSection']).includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }

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

@@ -1,25 +1,85 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var filterUndefined = function filterUndefined(x) {
   return !!x;
 };
 
-// Currently allow attributes that indicats a change in media image
-var allowedAttrs = ['id', 'collection', 'url'];
+// Attributes that indicate a change in media image
+var mediaAttrs = ['id', 'collection', 'url'];
+
+// Attribute that indicates a date change
+var dateAttrs = ['timestamp'];
+
+// Attribute that indicates a task item state change
+var taskItemAttrs = ['state'];
+
+// Attributes excluded from extension change detection (not meaningful content changes)
+var extensionExcludedAttrs = ['localId'];
+
+// Extension node type names
+var extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+var getStepAttrs = function getStepAttrs(step) {
+  if (step instanceof AttrStep) {
+    return [step.attr];
+  }
+  if (step instanceof SetAttrsStep && step.attrs) {
+    return Object.keys(step.attrs);
+  }
+  return [];
+};
 export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps) {
   return steps.map(function (step) {
-    if (step instanceof AttrStep && allowedAttrs.includes(step.attr) || step instanceof SetAttrsStep && step.attrs && _toConsumableArray(Object.keys(step.attrs)).some(function (v) {
-      return allowedAttrs.includes(v);
-    })) {
-      var $pos = doc.resolve(step.pos);
-      if ($pos.parent.type === doc.type.schema.nodes.mediaSingle) {
-        var startPos = $pos.pos + $pos.parentOffset;
+    if (!(step instanceof AttrStep) && !(step instanceof SetAttrsStep)) {
+      return undefined;
+    }
+    var stepAttrs = getStepAttrs(step);
+    var $pos = doc.resolve(step.pos);
+    var nodeAtPos = doc.nodeAt(step.pos);
+    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
+      // date node: timestamp attribute change — highlight the date node itself (inline)
+      if (stepAttrs.some(function (v) {
+        return dateAttrs.includes(v);
+      }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date') {
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline: true
+        };
+      }
+
+      // taskItem node: state attribute change — highlight the taskItem node
+      if (stepAttrs.some(function (v) {
+        return taskItemAttrs.includes(v);
+      }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
         return {
-          fromB: startPos,
-          toB: startPos + $pos.parent.nodeSize - 1
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize
         };
       }
+
+      // extension nodes: any attribute change except localId — highlight the node
+      if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(function (v) {
+        return !extensionExcludedAttrs.includes(v);
+      })) {
+        var isInline = nodeAtPos.type.name === 'inlineExtension';
+        return {
+          fromB: step.pos,
+          toB: step.pos + nodeAtPos.nodeSize,
+          isInline: isInline
+        };
+      }
+    }
+
+    // media node: id/collection/url attribute change — highlight the mediaSingle parent
+    if (stepAttrs.some(function (v) {
+      return mediaAttrs.includes(v);
+    }) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+      var startPos = $pos.pos + $pos.parentOffset;
+      return {
+        fromB: startPos,
+        toB: startPos + $pos.parent.nodeSize - 1
+      };
     }
     return undefined;
   }).filter(filterUndefined);

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

@@ -3,5 +3,10 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
  * Looser equality for "safe diff" cases: same full text content and same block structure
  * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
  * This is safe because we ensure decorations get applied to valid positions.
+ *
+ * Marks are intentionally ignored — two documents that differ only in mark application
+ * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
+ * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
+ * does not produce false inequalities.
  */
 export declare function areDocsEqualByBlockStructureAndText(doc1: PMNode, doc2: PMNode): boolean;

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

@@ -2,6 +2,8 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 type StepRange = {
     fromB: number;
+    /** Whether the changed node is inline (true) or block (false/undefined) */
+    isInline?: boolean;
     toB: number;
 };
 export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[]) => StepRange[];

package/dist/types-ts4.5/pm-plugins/areDocsEqualByBlockStructureAndText.d.ts

@@ -3,5 +3,10 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
  * Looser equality for "safe diff" cases: same full text content and same block structure
  * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
  * This is safe because we ensure decorations get applied to valid positions.
+ *
+ * Marks are intentionally ignored — two documents that differ only in mark application
+ * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
+ * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
+ * does not produce false inequalities.
  */
 export declare function areDocsEqualByBlockStructureAndText(doc1: PMNode, doc2: PMNode): boolean;

package/dist/types-ts4.5/pm-plugins/decorations/utils/getAttrChangeRanges.d.ts

@@ -2,6 +2,8 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { type Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 type StepRange = {
     fromB: number;
+    /** Whether the changed node is inline (true) or block (false/undefined) */
+    isInline?: boolean;
     toB: number;
 };
 export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[]) => StepRange[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "8.4.0",
+	"version": "8.4.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^80.0.0",
+		"@atlaskit/tmp-editor-statsig": "^80.1.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",