@atlaskit/editor-plugin-show-diff 10.3.0 → 10.4.0

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

@@ -35,6 +35,7 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
           isInverted: false,
           diffType: 'inline',
           hideDeletedDiffs: false,
+          hideAddedDiffsUnderline: false,
           showIndicators: false,
           diffDescriptors: []
         } : {});
@@ -44,7 +45,7 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
         var newPluginState = currentPluginState;
         if (meta) {
           if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SHOW_DIFF') {
-            var _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8;
+            var _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9;
             // Update the plugin state with the new metadata
             newPluginState = _objectSpread(_objectSpread(_objectSpread({}, currentPluginState), meta), {}, {
               isDisplayingChanges: true,
@@ -63,15 +64,16 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
                 isInverted: (_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.isInverted,
                 diffType: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.diffType,
                 hideDeletedDiffs: (_newPluginState4 = newPluginState) === null || _newPluginState4 === void 0 ? void 0 : _newPluginState4.hideDeletedDiffs,
-                showIndicators: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.showIndicators,
-                smartThresholds: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.smartThresholds,
-                deletedDiffPlacement: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.deletedDiffPlacement
+                hideAddedDiffsUnderline: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.hideAddedDiffsUnderline,
+                showIndicators: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.showIndicators,
+                smartThresholds: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.smartThresholds,
+                deletedDiffPlacement: (_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.deletedDiffPlacement
               } : {})),
               decorations = _calculateDiffDecorat.decorations,
               diffDescriptors = _calculateDiffDecorat.diffDescriptors;
             // Update the decorations and their ids
             newPluginState.decorations = decorations;
-            if (isExtendedEnabled((_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.diffType)) {
+            if (isExtendedEnabled((_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.diffType)) {
               newPluginState.diffDescriptors = diffDescriptors;
             }
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'HIDE_DIFF') {
@@ -83,12 +85,13 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
               isInverted: false,
               diffType: 'inline',
               hideDeletedDiffs: false,
+              hideAddedDiffsUnderline: false,
               diffDescriptors: []
             } : {});
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') {
-            var _newPluginState9;
+            var _newPluginState0;
             // Update the active index in plugin state and recalculate decorations
-            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.diffType);
+            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.diffType);
             if (_decorations.length > 0) {
               var _currentPluginState$a;
               // Initialize to -1 if undefined so that the first "next" scroll takes us to index 0 (first change).
@@ -126,6 +129,7 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
                   isInverted: newPluginState.isInverted,
                   diffType: newPluginState.diffType,
                   hideDeletedDiffs: newPluginState.hideDeletedDiffs,
+                  hideAddedDiffsUnderline: newPluginState.hideAddedDiffsUnderline,
                   showIndicators: newPluginState.showIndicators,
                   smartThresholds: newPluginState.smartThresholds,
                   deletedDiffPlacement: newPluginState.deletedDiffPlacement

package/dist/types/pm-plugins/calculateDiff/calculateDiffDecorations.d.ts

@@ -10,7 +10,7 @@ type CalculatedDiffs = {
     decorations: DecorationSet;
     diffDescriptors: DiffDescriptor[];
 };
-export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, hideDeletedDiffs, showIndicators, }: {
+export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, hideDeletedDiffs, hideAddedDiffsUnderline, showIndicators, }: {
     activeIndexPos?: {
         from: number;
         to: number;
@@ -18,6 +18,7 @@ export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState,
     api: ExtractInjectionAPI<ShowDiffPlugin> | undefined;
     colorScheme?: ColorScheme;
     deletedDiffPlacement?: DeletedDiffPlacement;
+    hideAddedDiffsUnderline?: boolean;
     hideDeletedDiffs?: boolean;
     intl: IntlShape;
     nodeViewSerializer: NodeViewSerializer;

package/dist/types/pm-plugins/decorations/colorSchemes/standard.d.ts

@@ -4,6 +4,15 @@ export declare const editingStyleActive: string;
 export declare const editingStyleExtended: string;
 export declare const editingContentStyleInBlockExtended: string;
 export declare const editingStyleActiveExtended: string;
+/**
+ * Underline-free variants of the extended inserted-content styles. Used when the `showDiff`
+ * command is called with `hideAddedDiffsUnderline: true` to remove ONLY the dark-purple
+ * `borderBottom` underline from added/updated content while keeping the purple background
+ * highlight and padding. See the `editing*Extended` constants above for the full versions.
+ */
+export declare const editingStyleExtendedNoUnderline: string;
+export declare const editingStyleActiveExtendedNoUnderline: string;
+export declare const editingContentStyleInBlockExtendedNoUnderline: string;
 export declare const deletedContentStyle: string;
 export declare const deletedContentStyleActive: string;
 export declare const deletedContentStyleNew: string;

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

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

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

@@ -8,7 +8,7 @@ import type { NodeViewSerializer } from '../NodeViewSerializer';
  * This function is used to create a decoration widget to show content
  * that is not in the current document.
  */
-export declare const createNodeChangedDecorationWidget: ({ change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, showIndicators, placeBelow, diffType, }: {
+export declare const createNodeChangedDecorationWidget: ({ change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, showIndicators, placeBelow, diffType, hideAddedDiffsUnderline, }: {
     activeIndexPos?: {
         from: number;
         to: number;
@@ -17,6 +17,7 @@ export declare const createNodeChangedDecorationWidget: ({ change, doc, nodeView
     colorScheme?: ColorScheme;
     diffType?: DiffType;
     doc: PMNode;
+    hideAddedDiffsUnderline?: boolean;
     intl: IntlShape;
     isInserted?: boolean;
     newDoc: PMNode;

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

@@ -6,10 +6,11 @@ import type { ColorScheme, DiffType } from '../../../showDiffPluginType';
  * For heading nodes, applies styles directly to preserve natural margins.
  * For other block nodes, uses wrapper approach with optional lozenge.
  */
-export declare const wrapBlockNodeView: ({ dom, nodeView, targetNode, colorScheme, intl, isActive, isInserted, diffType, }: {
+export declare const wrapBlockNodeView: ({ dom, nodeView, targetNode, colorScheme, intl, isActive, isInserted, diffType, hideAddedDiffsUnderline, }: {
     colorScheme?: ColorScheme;
     diffType?: DiffType;
     dom: HTMLElement;
+    hideAddedDiffsUnderline?: boolean;
     intl: IntlShape;
     isActive?: boolean;
     isInserted: boolean;

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

@@ -26,6 +26,7 @@ export type ShowDiffPluginState = {
     diffDescriptors?: DiffDescriptor[];
     diffType?: DiffType;
     hideDeletedDiffs?: boolean;
+    hideAddedDiffsUnderline?: boolean;
     isDisplayingChanges: boolean;
     isInverted?: boolean;
     originalDoc: PMNode | undefined;

package/dist/types/showDiffPluginType.d.ts

@@ -41,14 +41,16 @@ export type PMDiffParams = {
      */
     deletedDiffPlacement?: DeletedDiffPlacement;
     diffType?: DiffType;
+    /**
+     * When true, removes only the dark-purple underline (`border-bottom`) from added/updated
+     * (inserted) diff content, keeping the purple background highlight and all other styling.
+     * Only affects the extended (`smart`) styles. Defaults to `false`, and is a no-op unless the
+     * relevant gate is enabled.
+     */
+    hideAddedDiffsUnderline?: boolean;
     hideDeletedDiffs?: boolean;
     isInverted?: boolean;
     originalDoc: Node;
-    /**
-     * Optional overrides for the `smart` diffType density thresholds. Ignored for other
-     * diff types. Partial — omitted fields fall back to defaults.
-     */
-    smartThresholds?: Partial<SmartDiffThresholds>;
     /**
      * When true, the editor will scroll to bring the first diff decoration into view
      * after the diff is shown.
@@ -58,6 +60,11 @@ export type PMDiffParams = {
      * Whether to show indicators at the doc margin for the diffs.
      */
     showIndicators?: boolean;
+    /**
+     * Optional overrides for the `smart` diffType density thresholds. Ignored for other
+     * diff types. Partial — omitted fields fall back to defaults.
+     */
+    smartThresholds?: Partial<SmartDiffThresholds>;
     /**
      * Prosemirror steps. This is used to calculate and show the diff in the editor
      */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "10.3.0",
+	"version": "10.4.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,7 +29,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/tmp-editor-statsig": "^124.1.0",
-		"@atlaskit/tokens": "^15.5.0",
+		"@atlaskit/tokens": "^15.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"lodash": "^4.17.21",
@@ -41,10 +41,10 @@
 		"@atlaskit/button": "^24.3.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/dropdown-menu": "^17.1.0",
-		"@atlaskit/editor-core": "^221.7.0",
+		"@atlaskit/editor-core": "^221.8.0",
 		"@atlaskit/editor-json-transformer": "^9.0.0",
 		"@atlaskit/form": "^16.1.0",
-		"@atlaskit/primitives": "^20.5.0",
+		"@atlaskit/primitives": "^20.6.0",
 		"@atlaskit/section-message": "^9.2.0",
 		"@atlaskit/textarea": "^9.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
@@ -54,7 +54,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.24.0",
+		"@atlaskit/editor-common": "^116.25.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {