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

package/dist/esm/showDiffPlugin.js

@@ -1,4 +1,6 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["stepsWithAttribution"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
@@ -7,9 +9,28 @@ import { getDeletedWidgets as _getDeletedWidgets } from './pm-plugins/getDeleted
 import { getScrollableDecorations } from './pm-plugins/getScrollableDecorations';
 import { createPlugin, showDiffPluginKey } from './pm-plugins/main';
 import { IndicatorBarContentComponent } from './ui/IndicatorBar/IndicatorBarContentComponent';
-export var showDiffPlugin = function showDiffPlugin(_ref) {
-  var api = _ref.api,
-    config = _ref.config;
+var normalizeShowDiffParams = function normalizeShowDiffParams(params) {
+  if (!params || !('stepsWithAttribution' in params)) {
+    return params ? _objectSpread(_objectSpread({}, params), {}, {
+      stepAttributions: []
+    }) : params;
+  }
+  var stepsWithAttribution = params.stepsWithAttribution,
+    rest = _objectWithoutProperties(params, _excluded);
+  return _objectSpread(_objectSpread({}, rest), {}, {
+    steps: stepsWithAttribution.map(function (_ref) {
+      var step = _ref.step;
+      return step;
+    }),
+    stepAttributions: stepsWithAttribution.map(function (_ref2) {
+      var stepAttribution = _ref2.stepAttribution;
+      return stepAttribution;
+    })
+  });
+};
+export var showDiffPlugin = function showDiffPlugin(_ref3) {
+  var api = _ref3.api,
+    config = _ref3.config;
   // Captured from the plugin's view lifecycle (see `createPlugin`) so read-only actions can access
   // the current state without exposing the plugin key to consumers.
   var editorView;
@@ -25,21 +46,21 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
     },
     commands: {
       showDiff: function showDiff(params) {
-        return function (_ref2) {
-          var tr = _ref2.tr;
+        return function (_ref4) {
+          var tr = _ref4.tr;
           if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
             var _api$userIntent;
             api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('viewingDiff')({
               tr: tr
             });
           }
-          return tr.setMeta(showDiffPluginKey, _objectSpread(_objectSpread({}, params), {}, {
+          return tr.setMeta(showDiffPluginKey, _objectSpread(_objectSpread({}, normalizeShowDiffParams(params)), {}, {
             action: 'SHOW_DIFF'
           }));
         };
       },
-      hideDiff: function hideDiff(_ref3) {
-        var tr = _ref3.tr;
+      hideDiff: function hideDiff(_ref5) {
+        var tr = _ref5.tr;
         if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
           var _api$userIntent2;
           api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent('default')({
@@ -48,17 +69,18 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
         }
         return tr.setMeta(showDiffPluginKey, {
           steps: [],
+          stepAttributions: [],
           action: 'HIDE_DIFF'
         });
       },
-      scrollToNext: function scrollToNext(_ref4) {
-        var tr = _ref4.tr;
+      scrollToNext: function scrollToNext(_ref6) {
+        var tr = _ref6.tr;
         return tr.setMeta(showDiffPluginKey, {
           action: 'SCROLL_TO_NEXT'
         });
       },
-      scrollToPrevious: function scrollToPrevious(_ref5) {
-        var tr = _ref5.tr;
+      scrollToPrevious: function scrollToPrevious(_ref7) {
+        var tr = _ref7.tr;
         return tr.setMeta(showDiffPluginKey, {
           action: 'SCROLL_TO_PREVIOUS'
         });
@@ -67,8 +89,8 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'showDiffPlugin',
-        plugin: function plugin(_ref6) {
-          var getIntl = _ref6.getIntl;
+        plugin: function plugin(_ref8) {
+          var getIntl = _ref8.getIntl;
           return createPlugin(config, getIntl, api, setEditorView);
         }
       }];

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

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

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

@@ -1,4 +1,5 @@
 import { type Change } from 'prosemirror-changeset';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform-override';
-export declare const diffBySteps: (originalDoc: PMNode, steps: Step[]) => Change[];
+import type { DiffStepAttribution } from '../../showDiffPluginType';
+export declare const diffBySteps: (originalDoc: PMNode, steps: Step[], stepAttributions?: Array<DiffStepAttribution | undefined>) => Change[];

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

@@ -0,0 +1,7 @@
+import { type Change } from 'prosemirror-changeset';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Simplifies and optimizes consecutive changes without crossing an attribution boundary.
+ * A change which already contains more than one identity is deliberately kept isolated.
+ */
+export declare const simplifyChangesWithAttribution: (changes: readonly Change[], doc: PMNode) => Change[];

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

@@ -1,3 +1,13 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
+import type { DiffStepAttribution, StepWithAttribution } from '../../showDiffPluginType';
+type ProseMirrorStepWithAttribution = StepWithAttribution<ProseMirrorStep>;
 export declare function simplifySteps(steps: ProseMirrorStep[], originalDoc: PMNode): ProseMirrorStep[];
+/**
+ * Attribution-preserving variant of `simplifySteps`.
+ *
+ * Steps may only merge when they have the same effective actor identity. Keeping the attribution
+ * coupled to the step also ensures filtering a no-op/analytics step cannot shift array indexes.
+ */
+export declare function simplifyStepsWithAttribution(steps: ProseMirrorStep[], stepAttributions: Array<DiffStepAttribution | undefined>, originalDoc: PMNode): ProseMirrorStepWithAttribution[];
+export {};

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

@@ -0,0 +1,12 @@
+import type { Change } from 'prosemirror-changeset';
+import type { ColorScheme as PublicColorScheme, DiffStepAttribution } from '../../../showDiffPluginType';
+import type { ColorScheme, DiffAccentColor } from './types';
+export type DiffAttributionSpanData = DiffStepAttribution & {
+    stepIndex: number;
+};
+/** `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared users. */
+export declare const getAttributionKey: (attribution: DiffStepAttribution | undefined) => string | undefined;
+export declare const areAttributionColorGatesEnabled: () => boolean;
+export declare const isAttributionColoringEnabled: (stepAttributions: Array<DiffStepAttribution | undefined> | undefined) => boolean;
+export declare const createAttributionColorMap: (stepAttributions: Array<DiffStepAttribution | undefined>) => Map<string, DiffAccentColor>;
+export declare const getColorSchemeForChange: (change: Change, attributedChanges: Change[], attributionColors: Map<string, DiffAccentColor>, fallback: PublicColorScheme | undefined) => ColorScheme | undefined;

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

@@ -1,8 +1,10 @@
-import type { ColorScheme } from '../../../showDiffPluginType';
-import type { DiffColorScheme } from './types';
+import type { ColorScheme as PublicColorScheme } from '../../../showDiffPluginType';
+import type { ColorScheme, DiffColorScheme } from './types';
 /** Green insertions, red deletions. */
 export declare const traditionalScheme: DiffColorScheme;
 /** Purple insertions, gray deletions (red on active). */
 export declare const standardScheme: DiffColorScheme;
-/** Maps the public ColorScheme string to its data object. Adding a scheme = one entry here. */
+/** Maps public schemes and attribution-only accents to their data objects. */
 export declare const colorSchemeRegistry: Record<ColorScheme, DiffColorScheme>;
+/** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
+export declare const getLegacyColorScheme: (colorScheme: ColorScheme | undefined) => PublicColorScheme | undefined;

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

@@ -1,8 +1,13 @@
+import type { ColorScheme as PublicColorScheme } from '../../../showDiffPluginType';
+/** Attribution-only accents selected by the plugin, never by consumers. */
+export type DiffAccentColor = 'blue' | 'green' | 'magenta' | 'orange' | 'purple' | 'teal';
+/** A public scheme or an attribution accent resolved internally for one change. */
+export type ColorScheme = PublicColorScheme | DiffAccentColor;
 /**
  * ADS accent colours for which every token path used by `factory.ts` exists. Closed set, so
  * interpolating a colour name into a token path is compile-time safe.
  */
-export type AdsAccentColor = 'green' | 'teal' | 'blue' | 'purple' | 'red' | 'orange' | 'yellow' | 'magenta' | 'gray';
+export type AdsAccentColor = DiffAccentColor | 'red' | 'yellow' | 'gray';
 /**
  * A show-diff colour scheme. Colour fields are accent names that `factory.ts` expands into token
  * paths; the rest encode structural differences no colour can express. Ring widths, padding,

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

@@ -1,6 +1,7 @@
 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 { ColorScheme } from './colorSchemes/types';
 /**
  * Node decoration used for block-level insertions. When isActive, uses emphasised (pressed) styling.
  *

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

@@ -1,8 +1,9 @@
 import type { Change } from 'prosemirror-changeset';
 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';
 type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations

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

@@ -1,6 +1,7 @@
 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 { ColorScheme } from './colorSchemes/types';
 import type { InlineAttrChangeNodeName } from './utils/getAttrChangeRanges';
 /**
  * Inline decoration used for insertions as the content already exists in the document

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

@@ -1,6 +1,16 @@
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
+import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 export type InlineAttrChangeNodeName = 'date' | 'emoji' | 'mention' | 'status';
+type AttrChangeStep = AttrStep | SetAttrsStep;
+export type AttrStepContext = {
+    afterNode: PMNode | null;
+    beforeNode: PMNode | null;
+    finalPos: number;
+    originalPos?: number;
+    step: AttrChangeStep;
+};
 type StepRange = {
     /**
      * Position of the original (before) node in the original doc.
@@ -16,7 +26,7 @@ type StepRange = {
     toA?: number;
     toB: number;
 };
-export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[], originalDoc: PMNode) => StepRange[];
+export declare const getAttrChangeRanges: (doc: PMNode, attrStepContexts: AttrStepContext[], originalDoc: PMNode) => StepRange[];
 /**
  * Check if the step was a valid attr change and affected the doc
  *
@@ -25,5 +35,5 @@ export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[]
  * @param afterDoc Doc after the step
  * @returns Boolean if the change should show a decoration
  */
-export declare const stepIsValidAttrChange: (step: ProseMirrorStep, beforeDoc: PMNode, afterDoc: PMNode) => boolean;
+export declare const stepIsValidAttrChange: (step: ProseMirrorStep, beforeDoc: PMNode, afterDoc: PMNode) => step is AttrChangeStep;
 export {};

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.1",
 	"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": "^57.1.0",
+		"@atlaskit/adf-schema": "^57.2.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^16.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^14.0.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^162.0.0",
+		"@atlaskit/tmp-editor-statsig": "^163.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -39,9 +39,9 @@
 	"devDependencies": {
 		"@atlaskit/adf-utils": "^20.7.0",
 		"@atlaskit/button": "^25.2.0",
-		"@atlaskit/css": "^1.0.0",
+		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^18.2.0",
-		"@atlaskit/editor-core": "^226.0.0",
+		"@atlaskit/editor-core": "^226.1.0",
 		"@atlaskit/editor-json-transformer": "^9.6.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
 		"@atlaskit/form": "^17.1.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": {
@@ -104,6 +104,9 @@
 		},
 		"confluence_ncs_step_diffing_version_history": {
 			"type": "boolean"
+		},
+		"platform_editor_reduce_diff_attr_sensitivity": {
+			"type": "boolean"
 		}
 	}
 }