@atlaskit/editor-plugin-show-diff 16.1.0 → 16.2.0

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

@@ -1,11 +1,12 @@
+import type { AgentBrandColorScheme } from '@atlaskit/agent-color/agent-presence-color-types';
 /** Schemes consumers may explicitly request through the show-diff API. */
 export type PublicColorScheme = 'standard' | 'traditional';
 /** Attribution-only participant slots selected by the plugin, never by consumers. */
 export declare const PARTICIPANT_COLOR_SCHEMES: readonly ['red', 'blue', 'green', 'yellow', 'purple', 'magenta', 'teal', 'orange', 'lime', 'gray'];
 /** ADS accent hues used by the public and participant colour schemes. */
 export type AdsAccentColor = (typeof PARTICIPANT_COLOR_SCHEMES)[number];
-/** A public scheme or an attribution participant slot resolved internally for one change. */
-export type ColorScheme = PublicColorScheme | AdsAccentColor;
+export type AccentColor = AdsAccentColor | AgentBrandColorScheme;
+export type ColorScheme = PublicColorScheme | AccentColor;
 /**
  * A show-diff colour scheme. Colour fields are ADS hues that `factory.ts` expands into token paths;
  * the rest encode structural differences no colour can express. Ring widths, padding, radius and
@@ -15,15 +16,15 @@ export type DiffColorScheme = {
     /** Stacking order of the square added-cell overlay. The rounded variant is always 2. */
     addedCellOverlayZIndex: 1 | 2;
     /** Deleted inline content, active/focused state. */
-    deleteActiveColor: AdsAccentColor;
+    deleteActiveColor: AccentColor;
     /** Deleted inline content. */
-    deleteColor: AdsAccentColor;
+    deleteColor: AccentColor;
     /** Active deleted-block ring: pale `background.accent.*.subtler.pressed` vs saturated `border.accent.*`. */
     deletedBlockOutlineActiveEmphasis: 'background' | 'border';
     /** Deleted cell outline: `color.border.disabled` hairline vs opaque accent border. */
     deletedCellBorderProminence: 'subtle' | 'accent';
     /** Deleted cell overlays. Gray in both current schemes. */
-    deletedCellColor: AdsAccentColor;
+    deletedCellColor: AccentColor;
     /** Opacity of the deleted cell overlay background. Counterpart to `insertedCellOpacity`. */
     deletedCellOpacity: number;
     /**
@@ -62,11 +63,11 @@ export type DiffColorScheme = {
     /** Deleted row de-emphasis: tint the line-through, or tint the row text. Both read `deleteColor`. */
     deletedRowTreatment: 'strikeColor' | 'textTint';
     /** Optional text and strikethrough hue, independent of deletion borders. */
-    deleteTextColor?: AdsAccentColor;
+    deleteTextColor?: AccentColor;
     /** Inserted content, active/focused state. */
-    insertActiveColor: AdsAccentColor;
+    insertActiveColor: AccentColor;
     /** Inserted content, default state. */
-    insertColor: AdsAccentColor;
+    insertColor: AccentColor;
     /** Opacity of the inserted cell overlay background. */
     insertedCellOpacity: number;
     /** Bottom border tone for inserted text highlights. Defaults to accent. */

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/getScrollableDecorations.d.ts

@@ -18,8 +18,8 @@ export declare function isInlineDiffDecorationRenderableInDoc(doc: PMNode, from:
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
  * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
- *    directly touching ranges across decoration types into one result, using the union of all
- *    grouped ranges
+ *    directly touching ranges across decoration types into one result per contributor, using the
+ *    union of all grouped ranges
  *    (zero-width widgets can join a group without extending it). Under
  *    `platform_editor_ai_show_diff_patch_1`, a group that starts with content painting above
  * 	  the content that replaced it — reports that widget as its `scrollTarget` spec,

package/dist/types/pm-plugins/utils/baseNodeName.d.ts

@@ -0,0 +1,16 @@
+/**
+ * A node type's base name, with a schema variant's suffix stripped: `panel`, `panel_c1` and
+ * `panel_c1_root_only` all resolve to `panel`.
+ *
+ * Package-local rather than `getBaseNodeTypeName` from editor-common, which enumerates the variants
+ * it happens to know (`panel_c1` alone) and is shared with features outside this one. Derived
+ * instead of listed, so a variant added later needs no change here: the schema generator names a
+ * variant `<type>_<variant>`, and every other node name in the ADF schema is camelCase, so the
+ * first `_` is the boundary.
+ *
+ * Gated, so the diff behaves exactly as before for anyone outside the rollout.
+ *
+ * For taggability only — this gate is weaker than the ones attribution needs, so resolving a variant
+ * in the styling decisions would move the legacy diff for readers who see no tags.
+ */
+export declare const resolveBaseNodeName: (name: string) => string;

package/dist/types/pm-plugins/utils/taggableBlockNodes.d.ts

@@ -0,0 +1,14 @@
+import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Whether this node hosts a contributor tag of its own. Navigation grouping does not consult this:
+ * a run of these one contributor inserted is a single stop, tagged on the leading block.
+ *
+ * Resolved through `resolveBaseNodeName` so a schema variant counts as the type it is a variant of:
+ * `panel_c1` is the panel the table-in-panel schema inserts, and matching on `type.name` left it
+ * untagged (EDITOR-8932).
+ *
+ * By name, because the decoration spec carries `nodeName` rather than the type it came from.
+ */
+export declare const isTaggableBlockNodeName: (name: string | undefined) => boolean;
+/** As above, from the node type itself. */
+export declare const isTaggableBlockNode: (nodeType: NodeType) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.1.0",
+	"version": "16.2.0",
 	"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
@@ -21,6 +26,7 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.5.0",
+		"@atlaskit/agent-color": "^0.2.0",
 		"@atlaskit/avatar": "^28.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^18.0.0",
@@ -33,8 +39,8 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^198.0.0",
-		"@atlaskit/tokens": "^17.0.0",
+		"@atlaskit/tmp-editor-statsig": "^199.0.0",
+		"@atlaskit/tokens": "^18.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"bind-event-listener": "^3.0.0",
@@ -58,14 +64,14 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^32.0.0",
-		"@atlassian/editor-plugin-ai": "^72.3.0",
+		"@atlassian/editor-plugin-ai": "^72.4.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.10.0",
+		"@atlaskit/editor-common": "^122.12.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 +86,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"
 		},