@atlaskit/editor-plugin-show-diff 16.0.17 → 16.1.1

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

@@ -87,7 +87,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
         var newPluginState = currentPluginState;
         if (meta) {
           if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SHOW_DIFF' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'REVEAL_COMPLETE') {
-            var _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9, _newPluginState0, _newPluginState1;
+            var _newPluginState$color, _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9, _newPluginState0, _newPluginState1, _newPluginState10;
             // REVEAL_COMPLETE repaints with the reveal dropped, so the decorations render their
             // ordinary resting style. Without it the reveal stays in state indefinitely and the
             // next unrelated repaint re-emits the hidden, zero-width highlight with no animation
@@ -107,23 +107,23 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                 state: newState,
                 pluginState: newPluginState,
                 nodeViewSerializer: nodeViewSerializer,
-                colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
+                colorScheme: (_newPluginState$color = (_newPluginState = newPluginState) === null || _newPluginState === void 0 ? void 0 : _newPluginState.colorScheme) !== null && _newPluginState$color !== void 0 ? _newPluginState$color : config === null || config === void 0 ? void 0 : config.colorScheme,
                 intl: getIntl(),
                 activeIndexPos: newPluginState.activeIndexPos,
                 api: api,
                 tagMountContext: tagMountContext
-              }, isExtendedEnabled((_newPluginState = newPluginState) === null || _newPluginState === void 0 ? void 0 : _newPluginState.diffType) ? {
-                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,
-                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,
-                inlineDeletedDiffPlacement: (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.inlineDeletedDiffPlacement,
+              }, isExtendedEnabled((_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.diffType) ? {
+                isInverted: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.isInverted,
+                diffType: (_newPluginState4 = newPluginState) === null || _newPluginState4 === void 0 ? void 0 : _newPluginState4.diffType,
+                hideDeletedDiffs: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.hideDeletedDiffs,
+                hideAddedDiffsUnderline: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.hideAddedDiffsUnderline,
+                showIndicators: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.showIndicators,
+                smartThresholds: (_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.smartThresholds,
+                deletedDiffPlacement: (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.deletedDiffPlacement,
+                inlineDeletedDiffPlacement: (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.inlineDeletedDiffPlacement,
                 // SHOW_DIFF only. The scroll-to-next recalculation further down deliberately
                 // omits this so stepping through changes cannot replay the choreography.
-                reveal: (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.reveal
+                reveal: (_newPluginState1 = newPluginState) === null || _newPluginState1 === void 0 ? void 0 : _newPluginState1.reveal
               } : {})),
               contributorTags = _calculateDiffDecorat.contributorTags,
               decorations = _calculateDiffDecorat.decorations,
@@ -131,7 +131,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
             // Update the decorations and their ids
             newPluginState.decorations = decorations;
             newPluginState.contributorTags = contributorTags;
-            if (isExtendedEnabled((_newPluginState1 = newPluginState) === null || _newPluginState1 === void 0 ? void 0 : _newPluginState1.diffType)) {
+            if (isExtendedEnabled((_newPluginState10 = newPluginState) === null || _newPluginState10 === void 0 ? void 0 : _newPluginState10.diffType)) {
               newPluginState.diffDescriptors = diffDescriptors;
             }
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'HIDE_DIFF') {
@@ -140,7 +140,9 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               isDisplayingChanges: false,
               activeIndex: undefined,
               contributorTags: [],
-              reveal: undefined
+              reveal: undefined,
+              // Per-call override — do not let it leak into the next, unrelated `showDiff` call.
+              colorScheme: undefined
             }, isExtendedEnabled(currentPluginState.diffType) ? {
               isInverted: false,
               diffType: getDefaultDiffType(),
@@ -149,11 +151,11 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               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 _newPluginState10;
+            var _newPluginState11;
             // Update the active index in plugin state and recalculate decorations
-            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState10 = newPluginState) === null || _newPluginState10 === void 0 ? void 0 : _newPluginState10.diffType);
+            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState11 = newPluginState) === null || _newPluginState11 === void 0 ? void 0 : _newPluginState11.diffType);
             if (_decorations.length > 0) {
-              var _currentPluginState$a;
+              var _currentPluginState$a, _newPluginState$color2, _newPluginState12;
               // Initialize to -1 if undefined so that the first "next" scroll takes us to index 0 (first change).
               // This allows the UI to start with no selection and only highlight on first user interaction.
               var nextIndex = (_currentPluginState$a = currentPluginState.activeIndex) !== null && _currentPluginState$a !== void 0 ? _currentPluginState$a : -1;
@@ -181,7 +183,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                   state: newState,
                   pluginState: newPluginState,
                   nodeViewSerializer: nodeViewSerializer,
-                  colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
+                  colorScheme: (_newPluginState$color2 = (_newPluginState12 = newPluginState) === null || _newPluginState12 === void 0 ? void 0 : _newPluginState12.colorScheme) !== null && _newPluginState$color2 !== void 0 ? _newPluginState$color2 : config === null || config === void 0 ? void 0 : config.colorScheme,
                   intl: getIntl(),
                   activeIndexPos: newPluginState.activeIndexPos,
                   api: api,

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

@@ -325,11 +325,11 @@ export var ContributorTagController = /*#__PURE__*/function () {
 
       // Hand-rolled avatar stack: `@atlaskit/avatar-group` cannot render below 24px and the tag uses
       // 16px avatars.
-      var stack = model.connectedContributor ? [].concat(_toConsumableArray(user ? [{
-        contributor: user,
-        stackIndex: 1
-      }] : []), _toConsumableArray(agent ? [{
+      var stack = model.connectedContributor ? [].concat(_toConsumableArray(agent ? [{
         contributor: agent,
+        stackIndex: 1
+      }] : []), _toConsumableArray(user ? [{
+        contributor: user,
         stackIndex: 0
       }] : [])) : [{
         contributor: model.contributor

package/dist/types/entry-points/show-diff-plugin-type.d.ts

@@ -1 +1 @@
-export type { DeletedDiffPlacement, DeletedDiffWidget, DiffContributorProfile, DiffParams, DiffStepAttribution, DiffType, PMDiffParams, RevealMode, RevealOptions, ShowDiffParams, ShowDiffPlugin, SmartDiffThresholds, StepWithAttribution, } from '../showDiffPluginType';
+export type { ColorScheme, DeletedDiffPlacement, DeletedDiffWidget, DiffContributorProfile, DiffParams, DiffStepAttribution, DiffType, PMDiffParams, RevealMode, RevealOptions, ShowDiffParams, ShowDiffPlugin, SmartDiffThresholds, StepWithAttribution, } from '../showDiffPluginType';

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

@@ -1,6 +1,6 @@
 import type { Change } from 'prosemirror-changeset';
 import type { DiffContributors, DiffStepAttribution, TagContributor } from '../../../showDiffPluginType';
-import { type AdsAccentColor, type ColorScheme, type PublicColorScheme } from './types';
+import { type AdsAccentColor, type ColorScheme } from './types';
 export type DiffAttributionSpanData = DiffStepAttribution & {
     stepIndex: number;
 };
@@ -31,4 +31,4 @@ export declare const createAttributionColorMap: (stepAttributions: Array<DiffSte
  * back to the latest overlapping attributed step.
  */
 export declare const getAttributionKeyForChange: (change: Change, attributedChanges: Change[]) => string | undefined;
-export declare const getColorSchemeForChange: (change: Change, attributedChanges: Change[], attributionColors: Map<string, AdsAccentColor>, fallback: PublicColorScheme | undefined) => ColorScheme | undefined;
+export declare const getColorSchemeForChange: (change: Change, attributedChanges: Change[], attributionColors: Map<string, AdsAccentColor>, fallback: ColorScheme | undefined) => ColorScheme | undefined;

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

@@ -0,0 +1,23 @@
+/**
+ * Keeps a block node rendered inside a diff widget from losing its own top margin.
+ *
+ * The editor's leading-block margin reset is written against the parent element, not the document
+ * position, so it fires wherever a text block is a first child — including inside the widget's own
+ * `span`, which is what a whole-block deletion renders into. The widget then has no margin of its
+ * own, and the block sits flush against whatever is above it, regardless of where in the document
+ * the widget landed.
+ *
+ * The margin is not re-supplied; it is never taken away. Prepending an element the reset does not
+ * select moves the real block off the leading position, so the ordinary `.ProseMirror p`,
+ * `.ProseMirror h2` and similar rules go on applying to it untouched. That is why this needs no
+ * knowledge of which margin the block should have — unlike `createNodeShapedMarginSpacer`, which
+ * replicates a margin that has already been zeroed and cannot be read back.
+ *
+ * Unconditional, because the absorber generates no box: it costs nothing in a widget holding
+ * inline content, which the reset was never going to match anyway. Deciding here instead would mean
+ * restating the reset's selector list, and a copy of another package's CSS drifts silently.
+ */
+export declare const absorbFirstChildMarginReset: ({ dom, testId, }: {
+    dom: HTMLElement;
+    testId: string;
+}) => void;

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

@@ -0,0 +1,23 @@
+/**
+ * An empty, invisible element whose only job is to occupy a position in the DOM.
+ *
+ * At the top of the document `firstBlockNodeStyles` zeroes the top margin of whatever element
+ * follows a leading `.ProseMirror-widget`, and it does so with `!important` — which no inline style
+ * can outrank. This takes that hit so the shaped spacer after it, one position further along, keeps
+ * the margin it is there to supply.
+ *
+ * It contributes no height (no content, border or padding) and margins collapse through it, so it
+ * cannot affect layout beyond the selector it absorbs.
+ */
+export declare const createMarginAbsorber: ({ testId }: {
+    testId: string;
+}) => HTMLElement;
+/**
+ * An absorber that occupies a DOM position without generating a box.
+ *
+ * Not interchangeable with `createMarginAbsorber`: a rule that selects the *rendered* sibling of a
+ * leading widget needs an element that generates a box, and this one does not.
+ */
+export declare const createBoxlessMarginAbsorber: ({ testId }: {
+    testId: string;
+}) => HTMLElement;

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

@@ -0,0 +1,26 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { NodeViewSerializer } from '../../NodeViewSerializer';
+/**
+ * An invisible element shaped like `node`, used to supply the top margin `node` no longer gets.
+ *
+ * A node at the start of its parent has its top margin reset, so a diff widget rendered above it
+ * sits flush against it. The reset cannot simply be taken off the node: the container variants skip
+ * widgets when counting — `nth-child(1 of :not(style, .ProseMirror-gapcursor, .ProseMirror-widget,
+ * span))` in layout columns, expands, sync blocks and table cells — so no amount of extra elements
+ * moves the match. That exclusion is what makes this work instead: the spacer is a
+ * `.ProseMirror-widget`, so it is never the counted first child and keeps its own margin, while the
+ * real node goes on taking the reset.
+ *
+ * The margin is not measured. Reading it off the real node is impossible — by then the reset has
+ * set it to `0`, and both `firstBlockNodeStyles` (`!important`) and block controls' `firstNodeDec`
+ * (an inline style) make it unrecoverable. Instead the spacer carries the node's own tag, classes
+ * and attributes, so the same rules that would have given the node its margin match the spacer
+ * (`.ProseMirror p`, `.ProseMirror h2`, the root-list rule, and so on).
+ *
+ * Returns `null` when the node is not safely shapeable or serialization fails.
+ */
+export declare const createNodeShapedMarginSpacer: ({ node, serializer, testId, }: {
+    node: PMNode;
+    serializer: NodeViewSerializer;
+    testId: string;
+}) => HTMLElement | null;

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

@@ -0,0 +1,13 @@
+import type { Node as PMNode, ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Resolves a document position, or returns `null` if it cannot be resolved.
+ *
+ * `Node.resolve` throws a `RangeError` for a position outside the document. Diff decorations are
+ * built from change ranges computed against a document that may since have moved on, so a position
+ * arriving out of range is a normal outcome rather than a defect — but an exception escaping here
+ * takes down the whole decoration set, leaving the diff unrendered.
+ *
+ * Callers are expected to treat `null` as "cannot tell" and fall back to behaviour that does not
+ * need the resolved position.
+ */
+export declare const safeResolve: (doc: PMNode, pos: number) => ResolvedPos | null;

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

@@ -6,7 +6,7 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { ContributorTagModel, DeletedDiffPlacement, DiffDescriptor, DiffParams, DiffStepAttribution, DiffType, InlineDeletedDiffPlacement, RevealOptions, ShowDiffPlugin, SmartDiffThresholds } from '../showDiffPluginType';
+import type { ColorScheme, ContributorTagModel, DeletedDiffPlacement, DiffDescriptor, DiffParams, DiffStepAttribution, DiffType, InlineDeletedDiffPlacement, RevealOptions, ShowDiffPlugin, SmartDiffThresholds } from '../showDiffPluginType';
 import type { ResolvedDiffContributors } from './decorations/colorSchemes/attributions';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
 export type ShowDiffPluginState = {
@@ -15,6 +15,12 @@ export type ShowDiffPluginState = {
         from: number;
         to: number;
     };
+    /**
+     * Per-call override, set via SHOW_DIFF meta. Falls back to the plugin's configured
+     * `DiffParams.colorScheme` (see `createPlugin`'s `config` argument) when unset, and persists
+     * across `SCROLL_TO_NEXT`/`SCROLL_TO_PREVIOUS` repaints of the same diff. Reset on HIDE_DIFF.
+     */
+    colorScheme?: ColorScheme;
     /** Set via SHOW_DIFF meta, after `normalizeShowDiffParams` has keyed the public list. */
     contributors?: ResolvedDiffContributors;
     /** Resolved per calculation, never set via meta. */

package/dist/types/showDiffPluginType.d.ts

@@ -8,8 +8,16 @@ import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform-override';
 import type { SmartDiffThresholds as SmartDiffThresholdsInternal } from './pm-plugins/calculateDiff/smart/thresholds';
-import type { ColorScheme as ResolvedColorScheme, PublicColorScheme } from './pm-plugins/decorations/colorSchemes/types';
-export type ColorScheme = PublicColorScheme;
+import type { ColorScheme as ResolvedColorScheme } from './pm-plugins/decorations/colorSchemes/types';
+/**
+ * `'standard'` (purple insertions, default) and `'traditional'` (green/red) are the two
+ * plugin-configured schemes. The remaining accent names are the attribution palette used for
+ * per-contributor colouring (`stepsWithAttribution`) — callers of the imperative `showDiff`
+ * command (see `PMDiffParams.colorScheme`) can also pass one of these directly to match a
+ * specific contributor's colour outside of attribution mode, for example matching a Review
+ * moment diff to the streaming highlight of the agent that produced it.
+ */
+export type ColorScheme = ResolvedColorScheme;
 export type DiffType = 'inline' | 'block' | 'step' | 'smart';
 /**
  * Attribution for a ProseMirror step.
@@ -143,6 +151,13 @@ export type DiffParams = {
     steps: StepJson[];
 };
 export type PMDiffParams = {
+    /**
+     * Overrides the colour scheme for this repaint only. Unset falls back to the plugin's
+     * configured `DiffParams.colorScheme` (ultimately `'standard'`, purple). Persists across
+     * `SCROLL_TO_NEXT`/`SCROLL_TO_PREVIOUS` repaints of the same diff, and resets when the diff
+     * is hidden.
+     */
+    colorScheme?: ColorScheme;
     /**
      * For the `smart` diffType, where node/paragraph-level deleted content is rendered relative to
      * the new content. Defaults to `'top'`. Ignored for other diff types.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.0.17",
+	"version": "16.1.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -8,6 +8,11 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"atlassian": {
+		"website": {
+			"tags": [
+				"platform-labs"
+			]
+		},
 		"team": "Editor: Lego",
 		"releaseModel": "continuous",
 		"singleton": true
@@ -20,7 +25,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.4.0",
+		"@atlaskit/adf-schema": "^57.5.0",
 		"@atlaskit/avatar": "^28.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^18.0.0",
@@ -33,8 +38,8 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^197.0.0",
-		"@atlaskit/tokens": "^17.0.0",
+		"@atlaskit/tmp-editor-statsig": "^199.0.0",
+		"@atlaskit/tokens": "^18.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"bind-event-listener": "^3.0.0",
@@ -58,14 +63,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^32.0.0",
-		"@atlassian/editor-plugin-ai": "^72.2.0",
+		"@atlassian/editor-plugin-ai": "^72.3.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.9.0",
+		"@atlaskit/editor-common": "^122.11.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -80,6 +85,9 @@
 		"platform_editor_ai_show_diff_patch_1": {
 			"type": "boolean"
 		},
+		"platform_editor_ai_show_diff_patch_2": {
+			"type": "boolean"
+		},
 		"platform_editor_ai_smart_diff": {
 			"type": "boolean"
 		},