@atlaskit/editor-plugin-show-diff 16.0.14 → 16.0.16

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 16.0.16
+
+### Patch Changes
+
+- [`b56b3a7dbfb5a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b56b3a7dbfb5a) -
+  [ux] Show contributor tags at the top-left of removed table rows and above table interaction
+  overlays and sticky header rows. Behind `confluence_ncs_step_diffing_version_history`.
+- Updated dependencies
+
+## 16.0.15
+
+### Patch Changes
+
+- [`442abbe2a88e0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/442abbe2a88e0) -
+  Normalize documents before relaxed show-diff comparisons when Confluence version-history diffing
+  is enabled.
+- Updated dependencies
+
 ## 16.0.14
 
 ### Patch Changes

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

@@ -11,13 +11,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
+var _areDocsEqualByBlockStructureAndText = require("@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _unsafeExpValNoExposure = require("@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-var _areDocsEqualByBlockStructureAndText = require("../areDocsEqualByBlockStructureAndText");
 var _createAnchorDecorationWidgets = require("../decorations/createAnchorDecorationWidgets");
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
 var _createInlineChangedDecoration = require("../decorations/createInlineChangedDecoration");

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

@@ -19,6 +19,7 @@ var _factory = require("./colorSchemes/factory");
 var _schemes = require("./colorSchemes/schemes");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _createChangedRowDecorationWidgetsStyles = require("./createChangedRowDecorationWidgets.styles.legacy");
+var _createContributorTagWidget = require("./createContributorTagWidget");
 var _decorationKeys = require("./decorationKeys");
 var _findSafeInsertPos = require("./utils/findSafeInsertPos");
 var _tableCellEdgeAttrs = require("./utils/tableCellEdgeAttrs");
@@ -105,20 +106,40 @@ var extractChangedRows = function extractChangedRows(_ref) {
     }
   });
 
-  // Filter changes that never truly got deleted
+  // Filter changes that never truly got deleted. Compare the number of equivalent rows rather
+  // than only checking whether one still exists: deleting two of three identical empty rows should
+  // retain two changed rows even though the third remains in the new table.
+  var equivalentRowDeletionCounts = [];
   return changedRows.filter(function (changedRow) {
     // A replacement leaves every sibling row in place, so asking "does this row still exist
     // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
-    // sibling. Compare it against the row at the same index instead. Deletions must keep the
-    // whole-table `some()`: their indices shift, so an index comparison would let every
-    // surviving row through and draw a widget for each one.
+    // sibling. Compare it against the row at the same index instead.
     if (handleRowReplacement) {
       var counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
       return !counterpart || !(0, _document.areNodesEqualIgnoreAttrs)(counterpart, changedRow.rowNode);
     }
-    return !tableNew.node.children.some(function (newRow) {
-      return (0, _document.areNodesEqualIgnoreAttrs)(newRow, changedRow.rowNode);
+    var deletionCount = equivalentRowDeletionCounts.find(function (_ref2) {
+      var rowNode = _ref2.rowNode;
+      return (0, _document.areNodesEqualIgnoreAttrs)(rowNode, changedRow.rowNode);
     });
+    if (!deletionCount) {
+      var oldRowCount = tableOld.node.children.filter(function (oldRow) {
+        return (0, _document.areNodesEqualIgnoreAttrs)(oldRow, changedRow.rowNode);
+      }).length;
+      var newRowCount = tableNew.node.children.filter(function (newRow) {
+        return (0, _document.areNodesEqualIgnoreAttrs)(newRow, changedRow.rowNode);
+      }).length;
+      deletionCount = {
+        remaining: Math.max(0, oldRowCount - newRowCount),
+        rowNode: changedRow.rowNode
+      };
+      equivalentRowDeletionCounts.push(deletionCount);
+    }
+    if (deletionCount.remaining === 0) {
+      return false;
+    }
+    deletionCount.remaining--;
+    return true;
   });
 };
 
@@ -201,11 +222,11 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
 /**
  * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
-  var changes = _ref2.changes,
-    originalDoc = _ref2.originalDoc,
-    newDoc = _ref2.newDoc,
-    diffType = _ref2.diffType;
+var expandDiffForChangedRows = function expandDiffForChangedRows(_ref3) {
+  var changes = _ref3.changes,
+    originalDoc = _ref3.originalDoc,
+    newDoc = _ref3.newDoc,
+    diffType = _ref3.diffType;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -234,17 +255,22 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref3) {
-  var changes = _ref3.changes,
-    originalDoc = _ref3.originalDoc,
-    newDoc = _ref3.newDoc,
-    nodeViewSerializer = _ref3.nodeViewSerializer,
-    colorScheme = _ref3.colorScheme,
-    _ref3$isInserted = _ref3.isInserted,
-    isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType,
-    _ref3$showIndicators = _ref3.showIndicators,
-    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators;
+var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref4) {
+  var attributionKey = _ref4.attributionKey,
+    changes = _ref4.changes,
+    originalDoc = _ref4.originalDoc,
+    newDoc = _ref4.newDoc,
+    nodeViewSerializer = _ref4.nodeViewSerializer,
+    colorScheme = _ref4.colorScheme,
+    isActive = _ref4.isActive,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? false : _ref4$isInserted,
+    diffType = _ref4.diffType,
+    _ref4$showIndicators = _ref4.showIndicators,
+    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
+    _ref4$showContributor = _ref4.showContributorTags,
+    showContributorTags = _ref4$showContributor === void 0 ? false : _ref4$showContributor,
+    tagMountContext = _ref4.tagMountContext;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -261,8 +287,12 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
-    var diffId = crypto.randomUUID();
+
+    // Stable while contributor tags are enabled so a decoration recalculation preserves the tag's
+    // identity and controller state.
+    var diffId = showContributorTags ? "widget-row-".concat(changedRow.fromA, "-").concat(changedRow.toA) : crypto.randomUUID();
     var decorations = [];
+    var rowAnchorNames = [];
 
     // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
     // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
@@ -270,9 +300,9 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     // bar covers only the row being changed. `createNodeChangedDecorationWidget` sets the same
     // property on its own widget DOM for non-table content; this path returns before reaching it.
     if (showIndicators && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-      rowDOM.style.setProperty('anchor-name', "--".concat((0, _decorationKeys.buildAnchorDecorationKey)({
+      rowAnchorNames.push((0, _decorationKeys.buildAnchorDecorationKey)({
         diffId: diffId
-      })));
+      }));
 
       // A table's content can extend past the doc margin, so the bar also needs a left anchor
       // measured against the table itself or it is clipped once the table is resized.
@@ -285,14 +315,47 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
         decorations.push(leftAnchor);
       }
     }
-    decorations.push(_view.Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
+    var tagAnchorName = showContributorTags && (0, _createContributorTagWidget.isContributorTagWidgetEnabled)() ? (0, _decorationKeys.buildAnchorDecorationKey)({
+      diffId: diffId,
+      anchorType: _decorationKeys.AnchorTypeKey.tag
+    }) : undefined;
+    var tagWidget = tagAnchorName ? (0, _createContributorTagWidget.createContributorTagWidget)({
+      anchorAtRangeStart: true,
+      anchorName: tagAnchorName,
+      diffId: diffId,
+      doc: newDoc,
+      from: safeInsertPos,
+      mountContext: tagMountContext,
+      to: safeInsertPos
+    }) : undefined;
+    if (tagAnchorName) {
+      // The tag host is a separate, table-safe widget. CSS anchor positioning aligns it to this
+      // synthetic row without placing non-cell DOM inside the `<tr>` or inheriting its deletion
+      // opacity and strikethrough.
+      rowAnchorNames.push(tagAnchorName);
+    }
+    if (rowAnchorNames.length > 0) {
+      rowDOM.style.setProperty('anchor-name', rowAnchorNames.map(function (anchorName) {
+        return "--".concat(anchorName);
+      }).join(', '));
+    }
+    if (tagWidget) {
+      // Lets the contributor tag reveal when any part of the deleted row is hovered.
+      rowDOM.setAttribute('data-diff-id', diffId);
+    }
+    var rowWidget = _view.Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
+      attributionKey: tagWidget ? attributionKey : undefined,
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: diffId,
-      isActive: false,
+      isActive: isActive,
       isInserted: isInserted,
       diffType: diffType
-    }))));
+    })));
+    decorations.push(rowWidget);
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
     return decorations;
   });
 };

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

@@ -166,16 +166,20 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   }
   if (isTableRowContent) {
     return (0, _createChangedRowDecorationWidgets.createChangedRowDecorationWidgets)({
+      attributionKey: attributionKey,
       changes: [change],
       originalDoc: doc,
       newDoc: newDoc,
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
+      isActive: isActive,
       isInserted: isInserted,
       diffType: diffType,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
-      showIndicators: showIndicators
+      showIndicators: showIndicators,
+      showContributorTags: showContributorTags,
+      tagMountContext: tagMountContext
     });
   }
   var serializer = nodeViewSerializer;

package/dist/cjs/ui/ContributorTag/buildContributorTagDom.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.buildContributorTagDom = exports.TAG_EXIT_FALLBACK_MS = exports.MAX_TAG_WIDTH = exports.CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_TOOLTIP_STYLES = exports.CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE = exports.CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_CLASS = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
 var CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
 
@@ -20,15 +21,15 @@ var MAX_TAG_WIDTH = exports.MAX_TAG_WIDTH = '200px';
 /**
  * The tag sits on the line above the change, so it has to paint over that line to be readable —
  * including any diff highlight already on it, which would otherwise slice straight through the tag.
- * Hence one level above `akEditorUnitZIndex`, where the highlights sit; exported because the
- * change's own highlight is stacked one level below it — see `stackBelowContributorTagStyle` in
- * `createInlineChangedDecoration`.
+ * It also has to paint above table interaction overlays and sticky-capable header rows, which use
+ * `akEditorSmallZIndex`. The change's own highlight is stacked one level below it — see
+ * `stackBelowContributorTagStyle` in `createInlineChangedDecoration`.
  *
  * Painting above its own highlight is only safe because the tag can never reach it: `bottom: 100%`
  * puts the root's bottom edge exactly on the highlight's top edge, and the root's `overflow: clip`
  * keeps every pixel the tag paints inside it.
  */
-var CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_Z_INDEX = 2;
+var CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_Z_INDEX = _constants.akEditorSmallZIndex + 1;
 
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are

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

@@ -1,13 +1,13 @@
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';

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

@@ -10,7 +10,8 @@ import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDel
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
-import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
+import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -86,18 +87,35 @@ const extractChangedRows = ({
     }
   });
 
-  // Filter changes that never truly got deleted
+  // Filter changes that never truly got deleted. Compare the number of equivalent rows rather
+  // than only checking whether one still exists: deleting two of three identical empty rows should
+  // retain two changed rows even though the third remains in the new table.
+  const equivalentRowDeletionCounts = [];
   return changedRows.filter(changedRow => {
     // A replacement leaves every sibling row in place, so asking "does this row still exist
     // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
-    // sibling. Compare it against the row at the same index instead. Deletions must keep the
-    // whole-table `some()`: their indices shift, so an index comparison would let every
-    // surviving row through and draw a widget for each one.
+    // sibling. Compare it against the row at the same index instead.
     if (handleRowReplacement) {
       const counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
       return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
     }
-    return !tableNew.node.children.some(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode));
+    let deletionCount = equivalentRowDeletionCounts.find(({
+      rowNode
+    }) => areNodesEqualIgnoreAttrs(rowNode, changedRow.rowNode));
+    if (!deletionCount) {
+      const oldRowCount = tableOld.node.children.filter(oldRow => areNodesEqualIgnoreAttrs(oldRow, changedRow.rowNode)).length;
+      const newRowCount = tableNew.node.children.filter(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode)).length;
+      deletionCount = {
+        remaining: Math.max(0, oldRowCount - newRowCount),
+        rowNode: changedRow.rowNode
+      };
+      equivalentRowDeletionCounts.push(deletionCount);
+    }
+    if (deletionCount.remaining === 0) {
+      return false;
+    }
+    deletionCount.remaining--;
+    return true;
   });
 };
 
@@ -206,14 +224,18 @@ const expandDiffForChangedRows = ({
  * Main function to handle deleted rows - computes diff and creates decorations
  */
 export const createChangedRowDecorationWidgets = ({
+  attributionKey,
   changes,
   originalDoc,
   newDoc,
   nodeViewSerializer,
   colorScheme,
+  isActive,
   isInserted = false,
   diffType,
-  showIndicators = false
+  showIndicators = false,
+  showContributorTags = false,
+  tagMountContext
 }) => {
   // First, expand the changes to include complete deleted rows
   const changedRows = expandDiffForChangedRows({
@@ -229,8 +251,12 @@ export const createChangedRowDecorationWidgets = ({
     const safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
-    const diffId = crypto.randomUUID();
+
+    // Stable while contributor tags are enabled so a decoration recalculation preserves the tag's
+    // identity and controller state.
+    const diffId = showContributorTags ? `widget-row-${changedRow.fromA}-${changedRow.toA}` : crypto.randomUUID();
     const decorations = [];
+    const rowAnchorNames = [];
 
     // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
     // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
@@ -238,9 +264,9 @@ export const createChangedRowDecorationWidgets = ({
     // bar covers only the row being changed. `createNodeChangedDecorationWidget` sets the same
     // property on its own widget DOM for non-table content; this path returns before reaching it.
     if (showIndicators && isExtendedEnabled(diffType) && fg('platform_editor_ai_show_diff_patch_1')) {
-      rowDOM.style.setProperty('anchor-name', `--${buildAnchorDecorationKey({
+      rowAnchorNames.push(buildAnchorDecorationKey({
         diffId
-      })}`);
+      }));
 
       // A table's content can extend past the doc margin, so the bar also needs a left anchor
       // measured against the table itself or it is clipped once the table is resized.
@@ -253,16 +279,47 @@ export const createChangedRowDecorationWidgets = ({
         decorations.push(leftAnchor);
       }
     }
-    decorations.push(Decoration.widget(safeInsertPos, rowDOM, {
+    const tagAnchorName = showContributorTags && isContributorTagWidgetEnabled() ? buildAnchorDecorationKey({
+      diffId,
+      anchorType: AnchorTypeKey.tag
+    }) : undefined;
+    const tagWidget = tagAnchorName ? createContributorTagWidget({
+      anchorAtRangeStart: true,
+      anchorName: tagAnchorName,
+      diffId,
+      doc: newDoc,
+      from: safeInsertPos,
+      mountContext: tagMountContext,
+      to: safeInsertPos
+    }) : undefined;
+    if (tagAnchorName) {
+      // The tag host is a separate, table-safe widget. CSS anchor positioning aligns it to this
+      // synthetic row without placing non-cell DOM inside the `<tr>` or inheriting its deletion
+      // opacity and strikethrough.
+      rowAnchorNames.push(tagAnchorName);
+    }
+    if (rowAnchorNames.length > 0) {
+      rowDOM.style.setProperty('anchor-name', rowAnchorNames.map(anchorName => `--${anchorName}`).join(', '));
+    }
+    if (tagWidget) {
+      // Lets the contributor tag reveal when any part of the deleted row is hovered.
+      rowDOM.setAttribute('data-diff-id', diffId);
+    }
+    const rowWidget = Decoration.widget(safeInsertPos, rowDOM, {
       ...buildDiffDecorationSpec({
+        attributionKey: tagWidget ? attributionKey : undefined,
         colorScheme,
         decorationType: 'widget',
         diffId,
-        isActive: false,
+        isActive,
         isInserted,
         diffType
       })
-    }));
+    });
+    decorations.push(rowWidget);
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
     return decorations;
   });
 };

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

@@ -150,16 +150,20 @@ export const createNodeChangedDecorationWidget = ({
   }
   if (isTableRowContent) {
     return createChangedRowDecorationWidgets({
+      attributionKey,
       changes: [change],
       originalDoc: doc,
       newDoc,
       nodeViewSerializer,
       colorScheme,
+      isActive,
       isInserted,
       diffType,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
-      showIndicators
+      showIndicators,
+      showContributorTags,
+      tagMountContext
     });
   }
   const serializer = nodeViewSerializer;

package/dist/es2019/ui/ContributorTag/buildContributorTagDom.js

@@ -1,4 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
+import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles/constants';
 export const CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
 export const CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
 
@@ -12,15 +13,15 @@ export const MAX_TAG_WIDTH = '200px';
 /**
  * The tag sits on the line above the change, so it has to paint over that line to be readable —
  * including any diff highlight already on it, which would otherwise slice straight through the tag.
- * Hence one level above `akEditorUnitZIndex`, where the highlights sit; exported because the
- * change's own highlight is stacked one level below it — see `stackBelowContributorTagStyle` in
- * `createInlineChangedDecoration`.
+ * It also has to paint above table interaction overlays and sticky-capable header rows, which use
+ * `akEditorSmallZIndex`. The change's own highlight is stacked one level below it — see
+ * `stackBelowContributorTagStyle` in `createInlineChangedDecoration`.
  *
  * Painting above its own highlight is only safe because the tag can never reach it: `bottom: 100%`
  * puts the root's bottom edge exactly on the highlight's top edge, and the root's `overflow: clip`
  * keeps every pixel the tag paints inside it.
  */
-export const CONTRIBUTOR_TAG_Z_INDEX = 2;
+export const CONTRIBUTOR_TAG_Z_INDEX = akEditorSmallZIndex + 1;
 
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are

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

@@ -9,13 +9,13 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';

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

@@ -17,7 +17,8 @@ import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDel
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
-import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
+import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -98,20 +99,40 @@ var extractChangedRows = function extractChangedRows(_ref) {
     }
   });
 
-  // Filter changes that never truly got deleted
+  // Filter changes that never truly got deleted. Compare the number of equivalent rows rather
+  // than only checking whether one still exists: deleting two of three identical empty rows should
+  // retain two changed rows even though the third remains in the new table.
+  var equivalentRowDeletionCounts = [];
   return changedRows.filter(function (changedRow) {
     // A replacement leaves every sibling row in place, so asking "does this row still exist
     // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
-    // sibling. Compare it against the row at the same index instead. Deletions must keep the
-    // whole-table `some()`: their indices shift, so an index comparison would let every
-    // surviving row through and draw a widget for each one.
+    // sibling. Compare it against the row at the same index instead.
     if (handleRowReplacement) {
       var counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
       return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
     }
-    return !tableNew.node.children.some(function (newRow) {
-      return areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode);
+    var deletionCount = equivalentRowDeletionCounts.find(function (_ref2) {
+      var rowNode = _ref2.rowNode;
+      return areNodesEqualIgnoreAttrs(rowNode, changedRow.rowNode);
     });
+    if (!deletionCount) {
+      var oldRowCount = tableOld.node.children.filter(function (oldRow) {
+        return areNodesEqualIgnoreAttrs(oldRow, changedRow.rowNode);
+      }).length;
+      var newRowCount = tableNew.node.children.filter(function (newRow) {
+        return areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode);
+      }).length;
+      deletionCount = {
+        remaining: Math.max(0, oldRowCount - newRowCount),
+        rowNode: changedRow.rowNode
+      };
+      equivalentRowDeletionCounts.push(deletionCount);
+    }
+    if (deletionCount.remaining === 0) {
+      return false;
+    }
+    deletionCount.remaining--;
+    return true;
   });
 };
 
@@ -194,11 +215,11 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
 /**
  * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
-  var changes = _ref2.changes,
-    originalDoc = _ref2.originalDoc,
-    newDoc = _ref2.newDoc,
-    diffType = _ref2.diffType;
+var expandDiffForChangedRows = function expandDiffForChangedRows(_ref3) {
+  var changes = _ref3.changes,
+    originalDoc = _ref3.originalDoc,
+    newDoc = _ref3.newDoc,
+    diffType = _ref3.diffType;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -227,17 +248,22 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref3) {
-  var changes = _ref3.changes,
-    originalDoc = _ref3.originalDoc,
-    newDoc = _ref3.newDoc,
-    nodeViewSerializer = _ref3.nodeViewSerializer,
-    colorScheme = _ref3.colorScheme,
-    _ref3$isInserted = _ref3.isInserted,
-    isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType,
-    _ref3$showIndicators = _ref3.showIndicators,
-    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators;
+export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref4) {
+  var attributionKey = _ref4.attributionKey,
+    changes = _ref4.changes,
+    originalDoc = _ref4.originalDoc,
+    newDoc = _ref4.newDoc,
+    nodeViewSerializer = _ref4.nodeViewSerializer,
+    colorScheme = _ref4.colorScheme,
+    isActive = _ref4.isActive,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? false : _ref4$isInserted,
+    diffType = _ref4.diffType,
+    _ref4$showIndicators = _ref4.showIndicators,
+    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
+    _ref4$showContributor = _ref4.showContributorTags,
+    showContributorTags = _ref4$showContributor === void 0 ? false : _ref4$showContributor,
+    tagMountContext = _ref4.tagMountContext;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -254,8 +280,12 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     var safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
-    var diffId = crypto.randomUUID();
+
+    // Stable while contributor tags are enabled so a decoration recalculation preserves the tag's
+    // identity and controller state.
+    var diffId = showContributorTags ? "widget-row-".concat(changedRow.fromA, "-").concat(changedRow.toA) : crypto.randomUUID();
     var decorations = [];
+    var rowAnchorNames = [];
 
     // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
     // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
@@ -263,9 +293,9 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     // bar covers only the row being changed. `createNodeChangedDecorationWidget` sets the same
     // property on its own widget DOM for non-table content; this path returns before reaching it.
     if (showIndicators && isExtendedEnabled(diffType) && fg('platform_editor_ai_show_diff_patch_1')) {
-      rowDOM.style.setProperty('anchor-name', "--".concat(buildAnchorDecorationKey({
+      rowAnchorNames.push(buildAnchorDecorationKey({
         diffId: diffId
-      })));
+      }));
 
       // A table's content can extend past the doc margin, so the bar also needs a left anchor
       // measured against the table itself or it is clipped once the table is resized.
@@ -278,14 +308,47 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
         decorations.push(leftAnchor);
       }
     }
-    decorations.push(Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
+    var tagAnchorName = showContributorTags && isContributorTagWidgetEnabled() ? buildAnchorDecorationKey({
+      diffId: diffId,
+      anchorType: AnchorTypeKey.tag
+    }) : undefined;
+    var tagWidget = tagAnchorName ? createContributorTagWidget({
+      anchorAtRangeStart: true,
+      anchorName: tagAnchorName,
+      diffId: diffId,
+      doc: newDoc,
+      from: safeInsertPos,
+      mountContext: tagMountContext,
+      to: safeInsertPos
+    }) : undefined;
+    if (tagAnchorName) {
+      // The tag host is a separate, table-safe widget. CSS anchor positioning aligns it to this
+      // synthetic row without placing non-cell DOM inside the `<tr>` or inheriting its deletion
+      // opacity and strikethrough.
+      rowAnchorNames.push(tagAnchorName);
+    }
+    if (rowAnchorNames.length > 0) {
+      rowDOM.style.setProperty('anchor-name', rowAnchorNames.map(function (anchorName) {
+        return "--".concat(anchorName);
+      }).join(', '));
+    }
+    if (tagWidget) {
+      // Lets the contributor tag reveal when any part of the deleted row is hovered.
+      rowDOM.setAttribute('data-diff-id', diffId);
+    }
+    var rowWidget = Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
+      attributionKey: tagWidget ? attributionKey : undefined,
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: diffId,
-      isActive: false,
+      isActive: isActive,
       isInserted: isInserted,
       diffType: diffType
-    }))));
+    })));
+    decorations.push(rowWidget);
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
     return decorations;
   });
 };

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

@@ -159,16 +159,20 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   }
   if (isTableRowContent) {
     return createChangedRowDecorationWidgets({
+      attributionKey: attributionKey,
       changes: [change],
       originalDoc: doc,
       newDoc: newDoc,
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
+      isActive: isActive,
       isInserted: isInserted,
       diffType: diffType,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
-      showIndicators: showIndicators
+      showIndicators: showIndicators,
+      showContributorTags: showContributorTags,
+      tagMountContext: tagMountContext
     });
   }
   var serializer = nodeViewSerializer;

package/dist/esm/ui/ContributorTag/buildContributorTagDom.js

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
+import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles/constants';
 export var CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
 export var CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
 
@@ -13,15 +14,15 @@ export var MAX_TAG_WIDTH = '200px';
 /**
  * The tag sits on the line above the change, so it has to paint over that line to be readable —
  * including any diff highlight already on it, which would otherwise slice straight through the tag.
- * Hence one level above `akEditorUnitZIndex`, where the highlights sit; exported because the
- * change's own highlight is stacked one level below it — see `stackBelowContributorTagStyle` in
- * `createInlineChangedDecoration`.
+ * It also has to paint above table interaction overlays and sticky-capable header rows, which use
+ * `akEditorSmallZIndex`. The change's own highlight is stacked one level below it — see
+ * `stackBelowContributorTagStyle` in `createInlineChangedDecoration`.
  *
  * Painting above its own highlight is only safe because the tag can never reach it: `bottom: 100%`
  * puts the root's bottom edge exactly on the highlight's top edge, and the root's `overflow: clip`
  * keeps every pixel the tag paints inside it.
  */
-export var CONTRIBUTOR_TAG_Z_INDEX = 2;
+export var CONTRIBUTOR_TAG_Z_INDEX = akEditorSmallZIndex + 1;
 
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are

package/dist/types/pm-plugins/decorations/createChangedRowDecorationWidgets.d.ts

@@ -4,18 +4,23 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { DiffType } from '../../showDiffPluginType';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
 import type { ColorScheme } from './colorSchemes/types';
+import { type ContributorTagMountContext } from './createContributorTagWidget';
 type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export declare const createChangedRowDecorationWidgets: ({ changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isInserted, diffType, showIndicators, }: {
+export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, diffType, showIndicators, showContributorTags, tagMountContext, }: {
+    attributionKey?: string;
     changes: SimpleChange[];
     colorScheme?: ColorScheme;
     diffType?: DiffType;
+    isActive?: boolean;
     isInserted?: boolean;
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
     originalDoc: PMNode;
+    showContributorTags?: boolean;
     showIndicators?: boolean;
+    tagMountContext?: ContributorTagMountContext;
 }) => Decoration[];
 export {};

package/dist/types/ui/ContributorTag/buildContributorTagDom.d.ts

@@ -9,15 +9,15 @@ export declare const MAX_TAG_WIDTH = "200px";
 /**
  * The tag sits on the line above the change, so it has to paint over that line to be readable —
  * including any diff highlight already on it, which would otherwise slice straight through the tag.
- * Hence one level above `akEditorUnitZIndex`, where the highlights sit; exported because the
- * change's own highlight is stacked one level below it — see `stackBelowContributorTagStyle` in
- * `createInlineChangedDecoration`.
+ * It also has to paint above table interaction overlays and sticky-capable header rows, which use
+ * `akEditorSmallZIndex`. The change's own highlight is stacked one level below it — see
+ * `stackBelowContributorTagStyle` in `createInlineChangedDecoration`.
  *
  * Painting above its own highlight is only safe because the tag can never reach it: `bottom: 100%`
  * puts the root's bottom edge exactly on the highlight's top edge, and the root's `overflow: clip`
  * keeps every pixel the tag paints inside it.
  */
-export declare const CONTRIBUTOR_TAG_Z_INDEX = 2;
+export declare const CONTRIBUTOR_TAG_Z_INDEX: number;
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are
  * `contributorTagStyles` in both EditorContentContainer stylesheets, keyed on this literal and the

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.0.14",
+	"version": "16.0.16",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^196.0.0",
+		"@atlaskit/tmp-editor-statsig": "^197.0.0",
 		"@atlaskit/tokens": "^17.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",

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

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.areDocsEqualByBlockStructureAndText = areDocsEqualByBlockStructureAndText;
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-/**
- * 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) {
-    return false;
-  }
-  for (var i = 0; i < node1.childCount; i++) {
-    if (!isBlockStructureEqual(node1.child(i), node2.child(i))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * 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) {
-  if (doc1.textContent !== doc2.textContent) {
-    return false;
-  }
-  // 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);
-}

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

@@ -1,50 +0,0 @@
-import { Transform } from '@atlaskit/editor-prosemirror/transform';
-
-/**
- * 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 (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) {
-    return false;
-  }
-  for (let i = 0; i < node1.childCount; i++) {
-    if (!isBlockStructureEqual(node1.child(i), node2.child(i))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * 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) {
-  if (doc1.textContent !== doc2.textContent) {
-    return false;
-  }
-  // 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);
-}

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

@@ -1,50 +0,0 @@
-import { Transform } from '@atlaskit/editor-prosemirror/transform';
-
-/**
- * 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 (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) {
-    return false;
-  }
-  for (var i = 0; i < node1.childCount; i++) {
-    if (!isBlockStructureEqual(node1.child(i), node2.child(i))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * 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) {
-  if (doc1.textContent !== doc2.textContent) {
-    return false;
-  }
-  // 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);
-}

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

@@ -1,12 +0,0 @@
-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;