@atlaskit/editor-plugin-show-diff 28.0.0 → 28.0.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 28.0.1
+
+### Patch Changes
+
+- [`57af9733630db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/57af9733630db) -
+  Keep replaced table-cell suggestions visible below sticky headers and scroll to the suggested
+  content instead of the deleted text in grouped inverted diffs under
+  platform_editor_ai_show_diff_patch_2_fix.
+- Updated dependencies
+
 ## 28.0.0
 
 ### Patch Changes

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

@@ -197,6 +197,9 @@ var createCellContentWidgets = function createCellContentWidgets(_ref2) {
     return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix')) {
+    dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
+  }
   var diffId = crypto.randomUUID();
   if (showIndicators && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix')) {
     // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this

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

@@ -78,7 +78,7 @@ function contributorOf(decoration) {
  *
  * One group per contributor within a run of touching ranges — see `contributorOf`.
  */
-function groupTouchingDecorations(decorations, isInlineDecoration) {
+function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
   if (decorations.length < 2) {
     return decorations;
   }
@@ -149,14 +149,23 @@ function groupTouchingDecorations(decorations, isInlineDecoration) {
       return representative;
     }
 
-    // Deleted content is a widget at the start of the added content that replaced it, on a more
-    // negative side so it paints above. That makes it the visual start of the edit, reachable
-    // only through its own DOM — resolving the group's start position lands on the added content
-    // painted after it. The group keeps its range, which navigation and the active-range
-    // calculation both need, and reports the widget as what to scroll to.
-    var scrollTarget = (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? group.find(function (decoration) {
-      return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
-    }) : undefined;
+    // A widget on a more negative side paints before the live content. A replaced cell can
+    // host it at from + 1; if no such widget exists, use the original lookup at from.
+    // Keep the group's range for navigation and active-range calculation, but scroll to the widget.
+    var scrollTarget;
+    var startNode = doc === null || doc === void 0 ? void 0 : doc.nodeAt(from);
+    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+      if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix') && ((startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableCell' || (startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableHeader')) {
+        scrollTarget = group.find(function (decoration) {
+          return decoration.from === from + 1 && decorationSide(decoration) < decorationSide(representative);
+        });
+      }
+      if (!scrollTarget) {
+        scrollTarget = group.find(function (decoration) {
+          return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
+        });
+      }
+    }
     if (!scrollTarget && representative.from === from && representative.to === to) {
       return representative;
     }
@@ -237,7 +246,7 @@ var getScrollableDecorations = exports.getScrollableDecorations = function getSc
   var result;
   if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
-    result = groupTouchingDecorations([].concat((0, _toConsumableArray2.default)(blocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets)), isInlineDecoration);
+    result = groupTouchingDecorations([].concat((0, _toConsumableArray2.default)(blocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets)), isInlineDecoration, doc);
   } else {
     // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
     var nonOverlappingBlocks = blocks.filter(function (block) {

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

@@ -9,7 +9,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from './createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './createInlineChangedDecoration';
-import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec, scrollMarginTopValue } from './decorationKeys';
 import { isCellAttrChanged, isCellBackgroundChanged, normalizeCellBackground } from './utils/cellAttrs';
 import { injectInnerWrapper, wrapBlockNodeView } from './utils/wrapBlockNodeView';
 const CELL_TYPE_NAMES = ['tableCell', 'tableHeader'];
@@ -183,6 +183,9 @@ const createCellContentWidgets = ({
     return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  if (fg('platform_editor_ai_show_diff_patch_2_fix')) {
+    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
   const diffId = crypto.randomUUID();
   if (showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix')) {
     // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this

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

@@ -67,7 +67,7 @@ function contributorOf(decoration) {
  *
  * One group per contributor within a run of touching ranges — see `contributorOf`.
  */
-function groupTouchingDecorations(decorations, isInlineDecoration) {
+function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
   if (decorations.length < 2) {
     return decorations;
   }
@@ -126,12 +126,19 @@ function groupTouchingDecorations(decorations, isInlineDecoration) {
       return representative;
     }
 
-    // Deleted content is a widget at the start of the added content that replaced it, on a more
-    // negative side so it paints above. That makes it the visual start of the edit, reachable
-    // only through its own DOM — resolving the group's start position lands on the added content
-    // painted after it. The group keeps its range, which navigation and the active-range
-    // calculation both need, and reports the widget as what to scroll to.
-    const scrollTarget = fg('platform_editor_ai_show_diff_patch_1') ? group.find(decoration => decoration.from === from && decorationSide(decoration) < decorationSide(representative)) : undefined;
+    // A widget on a more negative side paints before the live content. A replaced cell can
+    // host it at from + 1; if no such widget exists, use the original lookup at from.
+    // Keep the group's range for navigation and active-range calculation, but scroll to the widget.
+    let scrollTarget;
+    const startNode = doc === null || doc === void 0 ? void 0 : doc.nodeAt(from);
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      if (fg('platform_editor_ai_show_diff_patch_2_fix') && ((startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableCell' || (startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableHeader')) {
+        scrollTarget = group.find(decoration => decoration.from === from + 1 && decorationSide(decoration) < decorationSide(representative));
+      }
+      if (!scrollTarget) {
+        scrollTarget = group.find(decoration => decoration.from === from && decorationSide(decoration) < decorationSide(representative));
+      }
+    }
     if (!scrollTarget && representative.from === from && representative.to === to) {
       return representative;
     }
@@ -205,7 +212,7 @@ export const getScrollableDecorations = (set, doc) => {
   let result;
   if (fg('confluence_ncs_step_diffing_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
-    result = groupTouchingDecorations([...blocks, ...inlines, ...widgets], isInlineDecoration);
+    result = groupTouchingDecorations([...blocks, ...inlines, ...widgets], isInlineDecoration, doc);
   } else {
     // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
     const nonOverlappingBlocks = blocks.filter(block => !inlines.some(inline => isRangeFullyInside(block.from, block.to, inline.from, inline.to) || isRangeFullyInside(inline.from, inline.to, block.from, block.to)));

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

@@ -13,7 +13,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from './createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './createInlineChangedDecoration';
-import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec, scrollMarginTopValue } from './decorationKeys';
 import { isCellAttrChanged, isCellBackgroundChanged, normalizeCellBackground } from './utils/cellAttrs';
 import { injectInnerWrapper, wrapBlockNodeView } from './utils/wrapBlockNodeView';
 var CELL_TYPE_NAMES = ['tableCell', 'tableHeader'];
@@ -190,6 +190,9 @@ var createCellContentWidgets = function createCellContentWidgets(_ref2) {
     return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  if (fg('platform_editor_ai_show_diff_patch_2_fix')) {
+    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
   var diffId = crypto.randomUUID();
   if (showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix')) {
     // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this

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

@@ -71,7 +71,7 @@ function contributorOf(decoration) {
  *
  * One group per contributor within a run of touching ranges — see `contributorOf`.
  */
-function groupTouchingDecorations(decorations, isInlineDecoration) {
+function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
   if (decorations.length < 2) {
     return decorations;
   }
@@ -142,14 +142,23 @@ function groupTouchingDecorations(decorations, isInlineDecoration) {
       return representative;
     }
 
-    // Deleted content is a widget at the start of the added content that replaced it, on a more
-    // negative side so it paints above. That makes it the visual start of the edit, reachable
-    // only through its own DOM — resolving the group's start position lands on the added content
-    // painted after it. The group keeps its range, which navigation and the active-range
-    // calculation both need, and reports the widget as what to scroll to.
-    var scrollTarget = fg('platform_editor_ai_show_diff_patch_1') ? group.find(function (decoration) {
-      return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
-    }) : undefined;
+    // A widget on a more negative side paints before the live content. A replaced cell can
+    // host it at from + 1; if no such widget exists, use the original lookup at from.
+    // Keep the group's range for navigation and active-range calculation, but scroll to the widget.
+    var scrollTarget;
+    var startNode = doc === null || doc === void 0 ? void 0 : doc.nodeAt(from);
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      if (fg('platform_editor_ai_show_diff_patch_2_fix') && ((startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableCell' || (startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableHeader')) {
+        scrollTarget = group.find(function (decoration) {
+          return decoration.from === from + 1 && decorationSide(decoration) < decorationSide(representative);
+        });
+      }
+      if (!scrollTarget) {
+        scrollTarget = group.find(function (decoration) {
+          return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
+        });
+      }
+    }
     if (!scrollTarget && representative.from === from && representative.to === to) {
       return representative;
     }
@@ -230,7 +239,7 @@ export var getScrollableDecorations = function getScrollableDecorations(set, doc
   var result;
   if (fg('confluence_ncs_step_diffing_version_history')) {
     // Group overlapping or directly touching ranges into one customer-facing edit.
-    result = groupTouchingDecorations([].concat(_toConsumableArray(blocks), _toConsumableArray(inlines), _toConsumableArray(widgets)), isInlineDecoration);
+    result = groupTouchingDecorations([].concat(_toConsumableArray(blocks), _toConsumableArray(inlines), _toConsumableArray(widgets)), isInlineDecoration, doc);
   } else {
     // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
     var nonOverlappingBlocks = blocks.filter(function (block) {

package/package.json

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