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

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/createInlineChangedDecoration.js

@@ -7,7 +7,7 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { CONTRIBUTOR_TAG_Z_INDEX } from '../../ui/ContributorTag/buildContributorTagDom';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { hasVisibleContent } from '../utils/hasVisibleContent';
+import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { buildAtomicInlineChangedCSSVariables, buildDeletedInlineContentStyleExtended, buildDeletedInlineStyle, buildDeletedInlineStyleStandard, buildInsertStyle, buildInsertStyleActive, buildInsertStyleExtended, buildInsertStyleExtendedActive, buildInsertStyleExtendedNoUnderline, buildInsertStyleExtendedNoUnderlineActive } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
@@ -156,11 +156,9 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
   // tag host's key, remounting every tag mid-step. Random ids are kept when tags are off.
   var diffId = showContributorTags ? "inline-".concat(change.fromB, "-").concat(change.toB) : crypto.randomUUID();
 
-  // Whether this highlight hosts a tag. A range of nothing but whitespace has nothing to caption,
-  // so it stays unattributed: the spec is the only route attribution takes to
-  // `extractContributorTags`, so dropping the key there is what keeps a tag from being resolved for
-  // a host that is never emitted (EDITOR-8855).
-  var canTagChange = showContributorTags && !!doc && isExtendedEnabled(diffType) && isContributorTagWidgetEnabled() && hasVisibleContent(doc.slice(change.fromB, change.toB).content);
+  // Match the rendered shape: whitespace text is eligible, while an empty paragraph is structural
+  // content with no tag host.
+  var canTagChange = showContributorTags && !!doc && isExtendedEnabled(diffType) && isContributorTagWidgetEnabled() && !isEmptyParagraphSlice(doc.slice(change.fromB, change.toB));
   if (shouldHideDeleted) {
     return [Decoration.inline(change.fromB, change.toB, {
       style: displayNoneStyle

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

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { hasVisibleContent } from '../utils/hasVisibleContent';
+import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
 import { createContributorTagHost, unmountContributorTag } from './createContributorTagWidget';
@@ -94,7 +94,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
  * that is not in the current document.
  */
 export var createNodeChangedDecorationWidget = function createNodeChangedDecorationWidget(_ref2) {
-  var _slice$content, _slice$content2, _slice$content3, _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _slice$content$firstC2;
+  var _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _slice$content$firstC2;
   var attributionKey = _ref2.attributionKey,
     change = _ref2.change,
     doc = _ref2.doc,
@@ -117,7 +117,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     reveal = _ref2.reveal,
     tagMountContext = _ref2.tagMountContext;
   var slice = doc.slice(change.fromA, change.toA);
-  var shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || (_slice$content2 = _slice$content2.firstChild) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.type.name) === 'paragraph' && (slice === null || slice === void 0 || (_slice$content3 = slice.content) === null || _slice$content3 === void 0 || (_slice$content3 = _slice$content3.firstChild) === null || _slice$content3 === void 0 ? void 0 : _slice$content3.content.size) === 0;
+  var shouldSkipDeletedEmptyParagraphDecoration = !isInserted && isEmptyParagraphSlice(slice);
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
   // For `placeBelow`, anchor at the END of the new content (change.toB) so the deleted
@@ -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;
@@ -219,10 +223,9 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // Derived from the deleted range so it survives a recalculation — see the same reasoning in
   // `createInlineChangedDecoration`.
   var diffId = showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : crypto.randomUUID();
-  // Whether this widget hosts a tag. Removing nothing but whitespace leaves no visible deleted
-  // content to caption, so the change stays unattributed — matching the inline half's rule in
-  // `createInlineChangedDecoration` (EDITOR-8855).
-  var canTagWidget = showContributorTags && hasVisibleContent(slice.content);
+  // Match the rendering predicate above: an empty paragraph has no widget to tag, while whitespace
+  // text in a rendered widget remains eligible.
+  var canTagWidget = showContributorTags && !shouldSkipDeletedEmptyParagraphDecoration;
   var decorations = [];
   var replacementNode = newDoc.nodeAt(change.fromB);
   var firstReplacedNode = slice.content.firstChild;

package/dist/esm/pm-plugins/utils/isEmptyParagraphSlice.js

@@ -0,0 +1,5 @@
+/** Whether a slice contains exactly one structurally empty paragraph. */
+export var isEmptyParagraphSlice = function isEmptyParagraphSlice(slice) {
+  var _slice$content$firstC;
+  return (slice === null || slice === void 0 ? void 0 : slice.content.childCount) === 1 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'paragraph' && slice.content.firstChild.content.size === 0;
+};

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/pm-plugins/utils/isEmptyParagraphSlice.d.ts

@@ -0,0 +1,3 @@
+import type { Slice } from '@atlaskit/editor-prosemirror/model';
+/** Whether a slice contains exactly one structurally empty paragraph. */
+export declare const isEmptyParagraphSlice: (slice: Slice | undefined) => boolean;

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.13",
+	"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/cjs/pm-plugins/utils/hasVisibleContent.js

@@ -1,37 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasVisibleContent = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _charsByOffset = require("./charsByOffset");
-/**
- * Whether `fragment` holds anything a reader can see.
- *
- * Text counts once it carries a single non-whitespace character; a leaf node (mention, emoji, date,
- * media, rule, hardBreak, …) counts in its own right, exactly as `resolveTagAnchorPos` treats one.
- * Everything else is descended into, so a paragraph is visible when its content is.
- *
- * A change whose content is nothing but whitespace — a space typed between two words, a run of
- * trailing spaces, an added blank paragraph — has no visible content for a contributor tag to
- * caption, so it carries no tag (EDITOR-8855).
- */
-var _hasVisibleContent = exports.hasVisibleContent = function hasVisibleContent(fragment) {
-  var visible = false;
-  fragment.forEach(function (node) {
-    if (visible) {
-      return;
-    }
-    if (node.isText) {
-      var _node$text;
-      visible = (0, _toConsumableArray2.default)((_node$text = node.text) !== null && _node$text !== void 0 ? _node$text : '').some(function (char) {
-        return !(0, _charsByOffset.isWhitespaceChar)(char);
-      });
-      return;
-    }
-    visible = node.isLeaf || _hasVisibleContent(node.content);
-  });
-  return visible;
-};

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/es2019/pm-plugins/utils/hasVisibleContent.js

@@ -1,28 +0,0 @@
-import { isWhitespaceChar } from './charsByOffset';
-
-/**
- * Whether `fragment` holds anything a reader can see.
- *
- * Text counts once it carries a single non-whitespace character; a leaf node (mention, emoji, date,
- * media, rule, hardBreak, …) counts in its own right, exactly as `resolveTagAnchorPos` treats one.
- * Everything else is descended into, so a paragraph is visible when its content is.
- *
- * A change whose content is nothing but whitespace — a space typed between two words, a run of
- * trailing spaces, an added blank paragraph — has no visible content for a contributor tag to
- * caption, so it carries no tag (EDITOR-8855).
- */
-export const hasVisibleContent = fragment => {
-  let visible = false;
-  fragment.forEach(node => {
-    if (visible) {
-      return;
-    }
-    if (node.isText) {
-      var _node$text;
-      visible = [...((_node$text = node.text) !== null && _node$text !== void 0 ? _node$text : '')].some(char => !isWhitespaceChar(char));
-      return;
-    }
-    visible = node.isLeaf || hasVisibleContent(node.content);
-  });
-  return visible;
-};

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);
-}