@atlaskit/editor-plugin-show-diff 14.2.10 → 14.3.0

package/dist/esm/pm-plugins/decorations/colorSchemes/schemes.js

@@ -65,14 +65,26 @@ var createAttributionScheme = function createAttributionScheme(color) {
   });
 };
 
-/** Maps public schemes and attribution-only accents to their data objects. */
+/** Maps public schemes and attribution-only participant slots to their data objects. */
 export var colorSchemeRegistry = {
-  blue: createAttributionScheme('blue'),
-  green: createAttributionScheme('green'),
-  magenta: createAttributionScheme('magenta'),
-  orange: createAttributionScheme('orange'),
-  purple: createAttributionScheme('purple'),
-  teal: createAttributionScheme('teal'),
+  'red-bolder': createAttributionScheme('red-bolder'),
+  'blue-bolder': createAttributionScheme('blue-bolder'),
+  'green-bolder': createAttributionScheme('green-bolder'),
+  'yellow-bolder': createAttributionScheme('yellow-bolder'),
+  'purple-bolder': createAttributionScheme('purple-bolder'),
+  'magenta-bolder': createAttributionScheme('magenta-bolder'),
+  'teal-bolder': createAttributionScheme('teal-bolder'),
+  'orange-bolder': createAttributionScheme('orange-bolder'),
+  'lime-bolder': createAttributionScheme('lime-bolder'),
+  'gray-bolder': createAttributionScheme('gray-bolder'),
+  'blue-subtle': createAttributionScheme('blue-subtle'),
+  'red-subtle': createAttributionScheme('red-subtle'),
+  'orange-subtle': createAttributionScheme('orange-subtle'),
+  'yellow-subtle': createAttributionScheme('yellow-subtle'),
+  'green-subtle': createAttributionScheme('green-subtle'),
+  'teal-subtle': createAttributionScheme('teal-subtle'),
+  'purple-subtle': createAttributionScheme('purple-subtle'),
+  'magenta-subtle': createAttributionScheme('magenta-subtle'),
   traditional: traditionalScheme,
   standard: standardScheme
 };

package/dist/esm/pm-plugins/decorations/colorSchemes/types.js

@@ -1 +1,14 @@
-export {};
+/** Attribution-only participant slots selected by the plugin, never by consumers. */
+export var PARTICIPANT_COLOR_SCHEMES = ['red-bolder', 'blue-bolder', 'green-bolder', 'yellow-bolder', 'purple-bolder', 'magenta-bolder', 'teal-bolder', 'orange-bolder', 'lime-bolder', 'gray-bolder', 'blue-subtle', 'red-subtle', 'orange-subtle', 'yellow-subtle', 'green-subtle', 'teal-subtle', 'purple-subtle', 'magenta-subtle'];
+
+/** ADS accent hues used by the public and participant colour schemes. */
+
+/** A public scheme or an attribution participant slot resolved internally for one change. */
+
+/** A colour value that the factory expands into a complete set of diff-safe ADS tokens. */
+
+/**
+ * A show-diff colour scheme. Colour fields are ADS hues or shared participant slots that
+ * `factory.ts` expands into token paths; the rest encode structural differences no colour can
+ * express. Ring widths, padding, radius and pointer-events are fixed in the factory, not per scheme.
+ */

package/dist/esm/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -340,7 +340,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
     decorationType: 'widget',
     diffId: diffId,
     isActive: isActive,
@@ -349,7 +349,9 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), {}, {
+  }))), fg('platform_editor_diff_inline_mark_changes') && {
+    marks: []
+  }), {}, {
     destroy: function destroy() {
       var _constrainMediaObserv2;
       return (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 ? void 0 : _constrainMediaObserv2.disconnect();

package/dist/esm/pm-plugins/decorations/utils/getAttrChangeRanges.js

@@ -3,7 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';

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

@@ -0,0 +1,9 @@
+import type { Mark } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Folds a character's marks into its `prosemirror-changeset` token. The library default returns
+ * only the char code, so marked and unmarked text tokenise identically and a formatting-only edit
+ * is invisible to the changeset.
+ *
+ * Marks and attrs are sorted so the token is order-independent.
+ */
+export declare const encodeCharacterWithMarks: (char: number, marks: readonly Mark[]) => number | string;

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

@@ -0,0 +1,15 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Whether a change differs only in marks, with identical structure and text on both sides. Only
+ * produced when a mark-aware token encoder is in use.
+ */
+export declare const isMarkOnlyChange: ({ change, newDoc, originalDoc, }: {
+    change: {
+        fromA: number;
+        fromB: number;
+        toA: number;
+        toB: number;
+    };
+    newDoc: PMNode;
+    originalDoc: PMNode;
+}) => boolean;

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

@@ -0,0 +1,9 @@
+import type { TokenEncoder } from 'prosemirror-changeset';
+/**
+ * The library default encoder plus mark folding on text characters.
+ *
+ * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
+ * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
+ * diff type.
+ */
+export declare const markAwareTokenEncoder: TokenEncoder<string | number>;

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

@@ -0,0 +1,17 @@
+import type { TokenEncoder } from 'prosemirror-changeset';
+export type TokenEncoderSelection = {
+    /** Non-smart mark-aware path only; lets callers suppress a duplicate deleted side. */
+    shouldHideMarkOnlyDeletions: boolean;
+    /** Encoder to hand to `ChangeSet.create`. `undefined` means the library default. */
+    tokenEncoder: TokenEncoder<string | number> | undefined;
+};
+/**
+ * Single place `platform_editor_diff_inline_mark_changes` is read, shared by
+ * `calculateDiffDecorations` and `computeDiffChanges` so the two cannot drift.
+ *
+ * With the gate off this returns what both callers computed before it existed.
+ *
+ * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
+ * into the token.
+ */
+export declare const selectTokenEncoder: (useAttrAwareEncoder: boolean) => TokenEncoderSelection;

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

@@ -1,6 +1,6 @@
 import type { Change } from 'prosemirror-changeset';
 import type { ColorScheme as PublicColorScheme, DiffStepAttribution } from '../../../showDiffPluginType';
-import type { ColorScheme, DiffAccentColor } from './types';
+import { type ColorScheme, type DiffParticipantColorScheme } from './types';
 export type DiffAttributionSpanData = DiffStepAttribution & {
     stepIndex: number;
 };
@@ -8,5 +8,5 @@ export type DiffAttributionSpanData = DiffStepAttribution & {
 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;
+export declare const createAttributionColorMap: (stepAttributions: Array<DiffStepAttribution | undefined>) => Map<string, DiffParticipantColorScheme>;
+export declare const getColorSchemeForChange: (change: Change, attributedChanges: Change[], attributionColors: Map<string, DiffParticipantColorScheme>, fallback: PublicColorScheme | undefined) => ColorScheme | undefined;

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

@@ -1,4 +1,4 @@
-import type { DiffColorScheme } from './types';
+import { type DiffColorScheme } from './types';
 /** Inline inserted content — default state. */
 export declare function buildInsertStyle(colors: DiffColorScheme): string;
 /** Inline insert style for content within a block node (no background, underline only). */

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

@@ -4,7 +4,7 @@ import type { ColorScheme, DiffColorScheme } from './types';
 export declare const traditionalScheme: DiffColorScheme;
 /** Purple insertions, gray deletions (red on active). */
 export declare const standardScheme: DiffColorScheme;
-/** Maps public schemes and attribution-only accents to their data objects. */
+/** Maps public schemes and attribution-only participant slots 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,37 +1,37 @@
 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;
+/** Attribution-only participant slots selected by the plugin, never by consumers. */
+export declare const PARTICIPANT_COLOR_SCHEMES: readonly ['red-bolder', 'blue-bolder', 'green-bolder', 'yellow-bolder', 'purple-bolder', 'magenta-bolder', 'teal-bolder', 'orange-bolder', 'lime-bolder', 'gray-bolder', 'blue-subtle', 'red-subtle', 'orange-subtle', 'yellow-subtle', 'green-subtle', 'teal-subtle', 'purple-subtle', 'magenta-subtle'];
+export type DiffParticipantColorScheme = (typeof PARTICIPANT_COLOR_SCHEMES)[number];
+/** ADS accent hues used by the public and participant colour schemes. */
+export type AdsAccentColor = 'blue' | 'gray' | 'green' | 'lime' | 'magenta' | 'orange' | 'purple' | 'red' | 'teal' | 'yellow';
+/** A public scheme or an attribution participant slot resolved internally for one change. */
+export type ColorScheme = PublicColorScheme | DiffParticipantColorScheme;
+/** A colour value that the factory expands into a complete set of diff-safe ADS tokens. */
+export type DiffSchemeColor = AdsAccentColor | DiffParticipantColorScheme;
 /**
- * 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 = 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,
- * radius and pointer-events are fixed in the factory, not per scheme.
+ * A show-diff colour scheme. Colour fields are ADS hues or shared participant slots that
+ * `factory.ts` expands into token paths; the rest encode structural differences no colour can
+ * express. Ring widths, padding, radius and pointer-events are fixed in the factory, not per scheme.
  */
 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: DiffSchemeColor;
     /** Deleted inline content. */
-    deleteColor: AdsAccentColor;
+    deleteColor: DiffSchemeColor;
     /** 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: DiffSchemeColor;
     /** Opacity of the deleted cell overlay background. Counterpart to `insertedCellOpacity`. */
     deletedCellOpacity: number;
     /** Deleted inline content: tint the strikethrough, or tint and dim the glyph itself. */
     deletedInlineTreatment: 'strikethrough' | 'glyphTint';
     /** Resting "REMOVED" lozenge tint. Gray in both current schemes; the active state uses `deleteActiveColor`. */
-    deletedLozengeColor: AdsAccentColor;
+    deletedLozengeColor: DiffSchemeColor;
     /**
      * "REMOVED" lozenge label, in both states: a fixed inverse tone that reads on any tint, or the
      * accent text colour matching `deletedLozengeColor`.
@@ -41,7 +41,7 @@ export type DiffColorScheme = {
      * Resting ring colour for a deleted media/embed card under the a11y-fixes treatment. Its own role
      * rather than a derivation of `deleteColor`: that treatment rings red even for gray deletes.
      */
-    deletedMediaRingColor: AdsAccentColor;
+    deletedMediaRingColor: DiffSchemeColor;
     /** Deleted block ring: 4px stateful ring plus marker variables, or one resting treatment. */
     deletedNodeEmphasis: 'stateful' | 'static';
     /** Active deleted-blockquote ring tone, for the nodeview-wrapped case only. */
@@ -51,9 +51,9 @@ export type DiffColorScheme = {
     /** Deleted row de-emphasis: tint the line-through, or tint the row text. Both read `deleteColor`. */
     deletedRowTreatment: 'strikeColor' | 'textTint';
     /** Inserted content, active/focused state. */
-    insertActiveColor: AdsAccentColor;
+    insertActiveColor: DiffSchemeColor;
     /** Inserted content, default state. */
-    insertColor: AdsAccentColor;
+    insertColor: DiffSchemeColor;
     /** Opacity of the inserted cell overlay background. */
     insertedCellOpacity: number;
     /** Inserted content under the extended experience: underline, or a border-bottom rule with padding. */

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

@@ -1,4 +1,4 @@
-import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps/set-attrs';
 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';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.2.10",
+	"version": "14.3.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -25,10 +25,11 @@
 		"@atlaskit/editor-plugin-analytics": "^16.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^14.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
+		"@atlaskit/editor-shared-styles": "^4.1.0",
 		"@atlaskit/editor-tables": "^3.1.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^171.0.0",
+		"@atlaskit/tmp-editor-statsig": "^172.0.0",
 		"@atlaskit/tokens": "^16.11.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -59,45 +60,9 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.10.0",
+		"@atlaskit/editor-common": "^120.11.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
-	"techstack": {
-		"@atlassian/frontend": {
-			"code-structure": [
-				"editor-plugin"
-			],
-			"import-structure": [
-				"atlassian-conventions"
-			],
-			"circular-dependencies": [
-				"file-and-folder-level"
-			]
-		},
-		"@repo/internal": {
-			"dom-events": "use-bind-event-listener",
-			"analytics": [
-				"analytics-next"
-			],
-			"design-tokens": [
-				"color"
-			],
-			"theming": [
-				"react-context"
-			],
-			"ui-components": [
-				"lite-mode"
-			],
-			"deprecation": "no-deprecated-imports",
-			"styling": [
-				"emotion",
-				"emotion"
-			],
-			"imports": [
-				"import-no-extraneous-disable-for-examples-and-docs"
-			]
-		}
-	},
 	"platform-feature-flags": {
 		"platform_editor_ai_show_diff_patch_1": {
 			"type": "boolean"
@@ -110,6 +75,9 @@
 		},
 		"platform_editor_reduce_diff_attr_sensitivity": {
 			"type": "boolean"
+		},
+		"platform_editor_diff_inline_mark_changes": {
+			"type": "boolean"
 		}
 	}
 }