@atlaskit/editor-plugin-show-diff 10.7.0 → 10.7.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 10.7.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.7.1
+
+### Patch Changes
+
+- [`f8eddc13a614d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f8eddc13a614d) -
+  Resolve inline anchor positions into inline content depending on if delete widget is rendered to
+  prevent indicators extending at the top
+- Updated dependencies
+
 ## 10.7.0
 
 ### Minor Changes

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

@@ -255,6 +255,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
       // emit ONE inline decoration per leaf text-bearing block within the range — the text
       // gets highlighted, and structural gaps never do.
       var isSmartNodeLevel = diffType === 'smart' && (0, _platformFeatureFlags.fg)('platform_editor_ai_smart_diff') && (0, _helpers.smartChangeLevel)(change) === 'node';
+      // Whether the deleted-content widget will actually be rendered for this
+      // change. Used to decide if indicator anchor positions should be adjusted
+      // inward — when the widget is present the anchor must stay at the block
+      // boundary to keep the indicator bar continuous with the deleted content.
+      var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
@@ -276,7 +281,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
               showIndicators: showIndicators,
-              hideAddedDiffsUnderline: hideAddedDiffsUnderline
+              hideAddedDiffsUnderline: hideAddedDiffsUnderline,
+              hasDeletedWidget: willRenderDeletedWidget
             }))));
           }
         } catch (err) {
@@ -295,7 +301,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
           showIndicators: showIndicators,
-          hideAddedDiffsUnderline: hideAddedDiffsUnderline
+          hideAddedDiffsUnderline: hideAddedDiffsUnderline,
+          hasDeletedWidget: willRenderDeletedWidget
         }))));
       }
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({

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

@@ -53,7 +53,9 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
     diffType = _ref.diffType,
     _ref$hideAddedDiffsUn = _ref.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref$hideAddedDiffsUn === void 0 ? false : _ref$hideAddedDiffsUn,
-    inlineNodeName = _ref.inlineNodeName;
+    inlineNodeName = _ref.inlineNodeName,
+    _ref$hasDeletedWidget = _ref.hasDeletedWidget,
+    hasDeletedWidget = _ref$hasDeletedWidget === void 0 ? false : _ref$hasDeletedWidget;
   var diffId = crypto.randomUUID();
   if (shouldHideDeleted) {
     return [_view.Decoration.inline(change.fromB, change.toB, {
@@ -104,10 +106,28 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
     isActive: isActive
   }))];
   if (showIndicators && doc && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+    // For paragraphs, fromB/toB land on the outer block
+    // boundary. Adjust anchor widgets into inline content so the indicator
+    // bar doesn't extend into the preceding block's margin.
+    // Skip when the deleted-content widget is rendered — the anchor must
+    // stay at the boundary to keep the indicator continuous.
+    var anchorFrom = change.fromB;
+    var anchorTo = change.toB;
+    if (!hasDeletedWidget) {
+      var _$from$nodeAfter, _$to$nodeBefore;
+      var $from = doc.resolve(anchorFrom);
+      if (!$from.parent.inlineContent && (_$from$nodeAfter = $from.nodeAfter) !== null && _$from$nodeAfter !== void 0 && _$from$nodeAfter.isTextblock) {
+        anchorFrom = anchorFrom + 1;
+      }
+      var $to = doc.resolve(anchorTo);
+      if (!$to.parent.inlineContent && (_$to$nodeBefore = $to.nodeBefore) !== null && _$to$nodeBefore !== void 0 && _$to$nodeBefore.isTextblock) {
+        anchorTo = anchorTo - 1;
+      }
+    }
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createAnchorDecorationWidgets.createInlineIndicatorAnchorWidgets)({
       doc: doc,
-      from: change.fromB,
-      to: change.toB,
+      from: anchorFrom,
+      to: anchorTo,
       diffId: diffId
     })));
   }

package/dist/cjs/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v2.0.0 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

package/dist/cjs/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v2.0.0 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -229,6 +229,11 @@ const calculateDiffDecorationsInner = ({
       // emit ONE inline decoration per leaf text-bearing block within the range — the text
       // gets highlighted, and structural gaps never do.
       const isSmartNodeLevel = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && smartChangeLevel(change) === 'node';
+      // Whether the deleted-content widget will actually be rendered for this
+      // change. Used to decide if indicator anchor positions should be adjusted
+      // inward — when the widget is present the anchor must stay at the block
+      // boundary to keep the indicator bar continuous with the deleted content.
+      const willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         for (const [from, to] of leafTextblockRanges(tr.doc, change.fromB, change.toB)) {
           decorations.push(...createInlineChangedDecoration({
@@ -244,7 +249,8 @@ const calculateDiffDecorationsInner = ({
               isInserted,
               shouldHideDeleted,
               showIndicators,
-              hideAddedDiffsUnderline
+              hideAddedDiffsUnderline,
+              hasDeletedWidget: willRenderDeletedWidget
             })
           }));
         }
@@ -259,7 +265,8 @@ const calculateDiffDecorationsInner = ({
             isInserted,
             shouldHideDeleted,
             showIndicators,
-            hideAddedDiffsUnderline
+            hideAddedDiffsUnderline,
+            hasDeletedWidget: willRenderDeletedWidget
           })
         }));
       }

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

@@ -36,7 +36,8 @@ export const createInlineChangedDecoration = ({
   doc,
   diffType,
   hideAddedDiffsUnderline = false,
-  inlineNodeName
+  inlineNodeName,
+  hasDeletedWidget = false
 }) => {
   const diffId = crypto.randomUUID();
   if (shouldHideDeleted) {
@@ -88,10 +89,28 @@ export const createInlineChangedDecoration = ({
     isActive
   }))];
   if (showIndicators && doc && isExtendedEnabled(diffType)) {
+    // For paragraphs, fromB/toB land on the outer block
+    // boundary. Adjust anchor widgets into inline content so the indicator
+    // bar doesn't extend into the preceding block's margin.
+    // Skip when the deleted-content widget is rendered — the anchor must
+    // stay at the boundary to keep the indicator continuous.
+    let anchorFrom = change.fromB;
+    let anchorTo = change.toB;
+    if (!hasDeletedWidget) {
+      var _$from$nodeAfter, _$to$nodeBefore;
+      const $from = doc.resolve(anchorFrom);
+      if (!$from.parent.inlineContent && (_$from$nodeAfter = $from.nodeAfter) !== null && _$from$nodeAfter !== void 0 && _$from$nodeAfter.isTextblock) {
+        anchorFrom = anchorFrom + 1;
+      }
+      const $to = doc.resolve(anchorTo);
+      if (!$to.parent.inlineContent && (_$to$nodeBefore = $to.nodeBefore) !== null && _$to$nodeBefore !== void 0 && _$to$nodeBefore.isTextblock) {
+        anchorTo = anchorTo - 1;
+      }
+    }
     decorations.push(...createInlineIndicatorAnchorWidgets({
       doc,
-      from: change.fromB,
-      to: change.toB,
+      from: anchorFrom,
+      to: anchorTo,
       diffId
     }));
   }

package/dist/es2019/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v2.0.0 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/es2019/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v2.0.0 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

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

@@ -249,6 +249,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
       // emit ONE inline decoration per leaf text-bearing block within the range — the text
       // gets highlighted, and structural gaps never do.
       var isSmartNodeLevel = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && smartChangeLevel(change) === 'node';
+      // Whether the deleted-content widget will actually be rendered for this
+      // change. Used to decide if indicator anchor positions should be adjusted
+      // inward — when the widget is present the anchor must stay at the block
+      // boundary to keep the indicator bar continuous with the deleted content.
+      var willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
@@ -270,7 +275,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
               showIndicators: showIndicators,
-              hideAddedDiffsUnderline: hideAddedDiffsUnderline
+              hideAddedDiffsUnderline: hideAddedDiffsUnderline,
+              hasDeletedWidget: willRenderDeletedWidget
             }))));
           }
         } catch (err) {
@@ -289,7 +295,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
           showIndicators: showIndicators,
-          hideAddedDiffsUnderline: hideAddedDiffsUnderline
+          hideAddedDiffsUnderline: hideAddedDiffsUnderline,
+          hasDeletedWidget: willRenderDeletedWidget
         }))));
       }
       decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({

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

@@ -46,7 +46,9 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     diffType = _ref.diffType,
     _ref$hideAddedDiffsUn = _ref.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref$hideAddedDiffsUn === void 0 ? false : _ref$hideAddedDiffsUn,
-    inlineNodeName = _ref.inlineNodeName;
+    inlineNodeName = _ref.inlineNodeName,
+    _ref$hasDeletedWidget = _ref.hasDeletedWidget,
+    hasDeletedWidget = _ref$hasDeletedWidget === void 0 ? false : _ref$hasDeletedWidget;
   var diffId = crypto.randomUUID();
   if (shouldHideDeleted) {
     return [Decoration.inline(change.fromB, change.toB, {
@@ -97,10 +99,28 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     isActive: isActive
   }))];
   if (showIndicators && doc && isExtendedEnabled(diffType)) {
+    // For paragraphs, fromB/toB land on the outer block
+    // boundary. Adjust anchor widgets into inline content so the indicator
+    // bar doesn't extend into the preceding block's margin.
+    // Skip when the deleted-content widget is rendered — the anchor must
+    // stay at the boundary to keep the indicator continuous.
+    var anchorFrom = change.fromB;
+    var anchorTo = change.toB;
+    if (!hasDeletedWidget) {
+      var _$from$nodeAfter, _$to$nodeBefore;
+      var $from = doc.resolve(anchorFrom);
+      if (!$from.parent.inlineContent && (_$from$nodeAfter = $from.nodeAfter) !== null && _$from$nodeAfter !== void 0 && _$from$nodeAfter.isTextblock) {
+        anchorFrom = anchorFrom + 1;
+      }
+      var $to = doc.resolve(anchorTo);
+      if (!$to.parent.inlineContent && (_$to$nodeBefore = $to.nodeBefore) !== null && _$to$nodeBefore !== void 0 && _$to$nodeBefore.isTextblock) {
+        anchorTo = anchorTo - 1;
+      }
+    }
     decorations.push.apply(decorations, _toConsumableArray(createInlineIndicatorAnchorWidgets({
       doc: doc,
-      from: change.fromB,
-      to: change.toB,
+      from: anchorFrom,
+      to: anchorTo,
       diffId: diffId
     })));
   }

package/dist/esm/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v2.0.0 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/esm/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v0.40.0 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v2.0.0 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

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

@@ -8,7 +8,7 @@ import type { InlineAttrChangeNodeName } from './utils/getAttrChangeRanges';
  * @param change Changeset "change" containing information about the change content + range
  * @returns Prosemirror inline decoration
  */
-export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, isAtomicInlineNode, shouldHideDeleted, showIndicators, doc, diffType, hideAddedDiffsUnderline, inlineNodeName, }: {
+export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, isAtomicInlineNode, shouldHideDeleted, showIndicators, doc, diffType, hideAddedDiffsUnderline, inlineNodeName, hasDeletedWidget, }: {
     change: {
         fromB: number;
         toB: number;
@@ -16,6 +16,7 @@ export declare const createInlineChangedDecoration: ({ change, colorScheme, isAc
     colorScheme?: ColorScheme;
     diffType?: DiffType;
     doc?: PMNode;
+    hasDeletedWidget?: boolean;
     hideAddedDiffsUnderline?: boolean;
     inlineNodeName?: InlineAttrChangeNodeName;
     isActive?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "10.7.0",
+	"version": "10.7.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -20,7 +20,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^56.2.0",
+		"@atlaskit/adf-schema": "^56.4.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.1.0",
 		"@atlaskit/editor-plugin-expand": "^13.2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^135.7.0",
+		"@atlaskit/tmp-editor-statsig": "^136.0.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.0",
@@ -38,10 +38,10 @@
 	},
 	"devDependencies": {
 		"@atlaskit/adf-utils": "^20.4.0",
-		"@atlaskit/button": "^24.3.0",
+		"@atlaskit/button": "^25.0.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^17.2.0",
-		"@atlaskit/editor-core": "^221.16.0",
+		"@atlaskit/editor-core": "^221.17.0",
 		"@atlaskit/editor-json-transformer": "^9.2.0",
 		"@atlaskit/form": "^16.1.0",
 		"@atlaskit/primitives": "^22.2.0",
@@ -54,7 +54,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.45.0",
+		"@atlaskit/editor-common": "^116.48.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {