@atlaskit/editor-plugin-show-diff 14.0.4 → 14.1.0

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

@@ -2,8 +2,9 @@ import type { Change } from 'prosemirror-changeset';
 import type { IntlShape } from 'react-intl';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme, DiffType } from '../../showDiffPluginType';
+import type { DiffType } from '../../showDiffPluginType';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
+import type { ColorScheme } from './colorSchemes/types';
 /**
  * This function is used to create a decoration widget to show content
  * that is not in the current document.

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

@@ -1,6 +1,7 @@
 import type { IntlShape } from 'react-intl';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { ColorScheme, DiffType } from '../../../showDiffPluginType';
+import type { DiffType } from '../../../showDiffPluginType';
+import type { ColorScheme } from '../colorSchemes/types';
 /**
  * Handles all block node rendering with appropriate deleted styling.
  * For heading nodes, applies styles directly to preserve natural margins.

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

@@ -1,4 +1,5 @@
-import type { ColorScheme, DiffType } from '../../../showDiffPluginType';
+import type { DiffType } from '../../../showDiffPluginType';
+import type { ColorScheme } from '../colorSchemes/types';
 /**
  * Node-name classification shared by the style resolvers below and by the routing in
  * `wrapBlockNodeView.ts`.

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 { DeletedDiffPlacement, DiffDescriptor, DiffParams, DiffType, InlineDeletedDiffPlacement, ShowDiffPlugin, SmartDiffThresholds } from '../showDiffPluginType';
+import type { DeletedDiffPlacement, DiffDescriptor, DiffParams, DiffStepAttribution, DiffType, InlineDeletedDiffPlacement, ShowDiffPlugin, SmartDiffThresholds } from '../showDiffPluginType';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
 export type ShowDiffPluginState = {
     activeIndex?: number;
@@ -48,6 +48,8 @@ export type ShowDiffPluginState = {
      * meta. Only relevant when `diffType === 'smart'`.
      */
     smartThresholds?: Partial<SmartDiffThresholds>;
+    /** Internal attribution derived from the public attributed-step input. */
+    stepAttributions?: Array<DiffStepAttribution | undefined>;
     steps: ProseMirrorStep[];
 };
 export declare const createPlugin: (config: DiffParams | undefined, getIntl: () => IntlShape, api: ExtractInjectionAPI<ShowDiffPlugin> | undefined, onEditorView?: (editorView: EditorView | undefined) => void) => SafePlugin<ShowDiffPluginState>;

package/dist/types/showDiffPluginType.d.ts

@@ -8,6 +8,24 @@ import type { Step } from '@atlaskit/editor-prosemirror/transform-override';
 import type { SmartDiffThresholds as SmartDiffThresholdsInternal } from './pm-plugins/calculateDiff/smart/thresholds';
 export type ColorScheme = 'standard' | 'traditional';
 export type DiffType = 'inline' | 'block' | 'step' | 'smart';
+/**
+ * Attribution for a ProseMirror step.
+ *
+ * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
+ * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
+ * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ */
+export type DiffStepAttribution = {
+    agentId?: string;
+    agentType?: string;
+    userId?: string;
+    wasOffline?: boolean;
+};
+/** Keeps a step and its attribution coupled through mapping and filtering. */
+export type StepWithAttribution<TStep> = {
+    step: TStep;
+    stepAttribution?: DiffStepAttribution;
+};
 /**
  * Where node/paragraph-level deleted content is rendered relative to the new (replacement)
  * content in the `smart` diffType:
@@ -95,6 +113,15 @@ export type PMDiffParams = {
      */
     steps: Step[];
 };
+/**
+ * Attributed alternative to `PMDiffParams`. When agent colouring is enabled, changes are grouped
+ * by `userId`, with `agentId` used as a tie-breaker.
+ */
+type PMDiffParamsWithAttribution = Omit<PMDiffParams, 'steps'> & {
+    steps?: never;
+    stepsWithAttribution: Array<StepWithAttribution<Step>>;
+};
+export type ShowDiffParams = PMDiffParams | PMDiffParamsWithAttribution;
 export type ACTION = 'SHOW_DIFF' | 'HIDE_DIFF' | 'SCROLL_TO_NEXT' | 'SCROLL_TO_PREVIOUS';
 export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
     actions: {
@@ -113,7 +140,7 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         hideDiff: EditorCommand;
         scrollToNext: EditorCommand;
         scrollToPrevious: EditorCommand;
-        showDiff: (config: PMDiffParams) => EditorCommand;
+        showDiff: (config: ShowDiffParams) => EditorCommand;
     };
     dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<UserIntentPlugin>];
     pluginConfiguration: DiffParams | undefined;
@@ -142,3 +169,4 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         showIndicators?: boolean;
     };
 }>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.0.4",
+	"version": "14.1.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -53,13 +53,13 @@
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
 		"@atlassian/editor-ai-injected-editors": "^30.0.0",
-		"@atlassian/editor-plugin-ai": "^70.0.0",
+		"@atlassian/editor-plugin-ai": "^70.1.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.2.0",
+		"@atlaskit/editor-common": "^120.3.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {