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

package/dist/es2019/pm-plugins/calculateDiff/simplifySteps.js

@@ -1,7 +1,7 @@
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-
+import { getAttributionKey } from '../decorations/colorSchemes/attributions';
 /**
  * Attempts to merge two consecutive ReplaceStep operations.
  * This merges steps where:
@@ -41,6 +41,69 @@ export function simplifySteps(steps, originalDoc) {
     return acc;
   }, []);
 }
+const mergeAttributions = (first, second) => {
+  var _second$wasOffline;
+  if (!first) {
+    return second;
+  }
+  if (!second) {
+    return first;
+  }
+  return {
+    ...first,
+    ...second,
+    wasOffline: first.wasOffline === true || second.wasOffline === true ? true : (_second$wasOffline = second.wasOffline) !== null && _second$wasOffline !== void 0 ? _second$wasOffline : first.wasOffline
+  };
+};
+
+/**
+ * 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 function simplifyStepsWithAttribution(steps, stepAttributions, originalDoc) {
+  const stepsToFilter = removeUnusedAttributedSteps(steps.map((step, index) => ({
+    step,
+    stepAttribution: stepAttributions[index]
+  })), originalDoc);
+  return stepsToFilter.filter(({
+    step
+  }) => !(step instanceof AnalyticsStep)).reduce((acc, current) => {
+    var _previous$step$merge, _previous$step$merge2, _previous$step;
+    const previous = acc[acc.length - 1];
+    const isSameIdentity = previous && getAttributionKey(previous.stepAttribution) === getAttributionKey(current.stepAttribution);
+    const merged = isSameIdentity ? (_previous$step$merge = (_previous$step$merge2 = (_previous$step = previous.step).merge) === null || _previous$step$merge2 === void 0 ? void 0 : _previous$step$merge2.call(_previous$step, current.step)) !== null && _previous$step$merge !== void 0 ? _previous$step$merge : mergeReplaceSteps(previous.step, current.step) : null;
+    if (merged) {
+      acc[acc.length - 1] = {
+        step: merged,
+        stepAttribution: mergeAttributions(previous.stepAttribution, current.stepAttribution)
+      };
+    } else {
+      acc.push(current);
+    }
+    return acc;
+  }, []);
+}
+
+/**
+ * Does a first pass to remove steps that don't impact the document
+ */
+function removeUnusedAttributedSteps(stepsWithAttribution, originalDoc) {
+  const finalSteps = [];
+  let firstPassDoc = originalDoc;
+  for (const stepWithAttribution of stepsWithAttribution) {
+    const {
+      step
+    } = stepWithAttribution;
+    const result = step.apply(firstPassDoc);
+    if (result.failed === null && result.doc && !areNodesEqualIgnoreAttrs(firstPassDoc, result.doc, ['localId'])) {
+      finalSteps.push(stepWithAttribution);
+      firstPassDoc = result.doc;
+    }
+  }
+  return finalSteps;
+}
 
 /**
  * Does a first pass to remove steps that don't impact the document

package/dist/es2019/pm-plugins/decorations/colorSchemes/attributions.js

@@ -0,0 +1,37 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+const ATTRIBUTION_COLOR_PALETTE = ['purple', 'blue', 'teal', 'magenta', 'orange', 'green'];
+
+/** `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared users. */
+export const getAttributionKey = attribution => {
+  var _attribution$userId, _attribution$agentId, _attribution$agentTyp;
+  const userId = attribution === null || attribution === void 0 ? void 0 : (_attribution$userId = attribution.userId) === null || _attribution$userId === void 0 ? void 0 : _attribution$userId.trim();
+  const agentId = attribution === null || attribution === void 0 ? void 0 : (_attribution$agentId = attribution.agentId) === null || _attribution$agentId === void 0 ? void 0 : _attribution$agentId.trim();
+  const agentType = attribution === null || attribution === void 0 ? void 0 : (_attribution$agentTyp = attribution.agentType) === null || _attribution$agentTyp === void 0 ? void 0 : _attribution$agentTyp.trim();
+  if (!userId && !agentId && !agentType) {
+    return undefined;
+  }
+  const agentIdentity = agentId || (agentType ? `type:${agentType}` : '');
+  return `user:${userId !== null && userId !== void 0 ? userId : ''}|agent:${agentIdentity}`;
+};
+export const areAttributionColorGatesEnabled = () => fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
+export const isAttributionColoringEnabled = stepAttributions => areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(attribution => getAttributionKey(attribution) !== undefined)) === true;
+export const createAttributionColorMap = stepAttributions => {
+  const keys = Array.from(new Set(stepAttributions.map(getAttributionKey).filter(key => key !== undefined))).sort();
+  return new Map(keys.map((key, index) => [key, ATTRIBUTION_COLOR_PALETTE[index % ATTRIBUTION_COLOR_PALETTE.length]]));
+};
+const getLatestAttribution = changes => {
+  const data = changes.flatMap(change => [...change.deleted, ...change.inserted]).map(span => span.data).filter(value => typeof value === 'object' && value !== null && 'stepIndex' in value && typeof value.stepIndex === 'number');
+  return data.reduce((latest, attribution) => !latest || attribution.stepIndex > latest.stepIndex ? attribution : latest, undefined);
+};
+const rangesOverlap = (fromA, toA, fromB, toB) => fromA < toB && fromB < toA;
+const changesOverlap = (change, attributedChange) => {
+  const insertedOverlap = change.inserted.length > 0 && attributedChange.inserted.length > 0 && rangesOverlap(change.fromB, change.toB, attributedChange.fromB, attributedChange.toB);
+  const deletedOverlap = change.deleted.length > 0 && attributedChange.deleted.length > 0 && rangesOverlap(change.fromA, change.toA, attributedChange.fromA, attributedChange.toA);
+  return insertedOverlap || deletedOverlap;
+};
+export const getColorSchemeForChange = (change, attributedChanges, attributionColors, fallback) => {
+  var _attributionColors$ge;
+  const key = getAttributionKey(getLatestAttribution(attributedChanges.filter(attributedChange => changesOverlap(change, attributedChange))));
+  return key ? (_attributionColors$ge = attributionColors.get(key)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : fallback : fallback;
+};

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

@@ -52,9 +52,26 @@ export const standardScheme = {
   deletedQuoteNodeActiveTone: 'borderAccent',
   strikesDeletedEmbedCard: false
 };
+const createAttributionScheme = color => ({
+  ...standardScheme,
+  insertColor: color,
+  insertActiveColor: color,
+  deleteColor: color,
+  deleteActiveColor: color,
+  deletedCellColor: color
+});
 
-/** 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 const colorSchemeRegistry = {
+  blue: createAttributionScheme('blue'),
+  green: createAttributionScheme('green'),
+  magenta: createAttributionScheme('magenta'),
+  orange: createAttributionScheme('orange'),
+  purple: createAttributionScheme('purple'),
+  teal: createAttributionScheme('teal'),
   traditional: traditionalScheme,
   standard: standardScheme
-};
+};
+
+/** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
+export const getLegacyColorScheme = colorScheme => colorScheme === 'standard' || colorScheme === 'traditional' ? colorScheme : undefined;

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

@@ -0,0 +1 @@
+export {};

package/dist/es2019/pm-plugins/decorations/createBlockChangedDecoration.js

@@ -4,7 +4,7 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createBlockIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
@@ -95,7 +95,10 @@ const getBlockNodeStyleNext = ({
  * OFF cohort of `platform_editor_show_diff_color_scheme_refactor`. Both are built to emit the
  * same style strings for both shipped schemes; see EDITOR-8281.
  */
-const getBlockNodeStyle = props => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy(props);
+const getBlockNodeStyle = props => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy({
+  ...props,
+  colorScheme: getLegacyColorScheme(props.colorScheme)
+});
 
 /**
  * A table cell is "empty" only when it has no content at all — no text AND no
@@ -165,7 +168,7 @@ export const createBlockChangedDecoration = ({
     const isEmptyCellBeingFilled = !isInserted && !!cellNode && isCellEmpty(cellNode);
     const useAddedStyle = isInserted || isEmptyCellBeingFilled;
     const cellOverlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? useAddedStyle ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-      colorScheme,
+      colorScheme: getLegacyColorScheme(colorScheme),
       isRoundedTable,
       useAddedStyle
     });

package/dist/es2019/pm-plugins/decorations/createChangedRowDecorationWidgets.js

@@ -6,7 +6,7 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedRowStyle } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
@@ -120,7 +120,7 @@ const createChangedRowDOM = (rowNode, cellEdgeAttrs, nodeViewSerializer, colorSc
 
   // Inserted rows keep their natural styling; the row strikethrough is deletions only.
   if (!isExtendedEnabled(diffType) || !isInserted) {
-    tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(colorScheme));
+    tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme)));
   }
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
@@ -136,7 +136,7 @@ const createChangedRowDOM = (rowNode, cellEdgeAttrs, nodeViewSerializer, colorSc
             const overlay = document.createElement('span');
             const isRoundedTable = expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
             const overlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? isInserted ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-              colorScheme,
+              colorScheme: getLegacyColorScheme(colorScheme),
               isInserted,
               isRoundedTable
             });

package/dist/es2019/pm-plugins/decorations/createInlineChangedDecoration.js

@@ -3,7 +3,7 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAtomicInlineChangedCSSVariables, buildDeletedInlineContentStyleExtended, buildDeletedInlineStyle, buildDeletedInlineStyleStandard, buildInsertStyle, buildInsertStyleActive, buildInsertStyleExtended, buildInsertStyleExtendedActive, buildInsertStyleExtendedNoUnderline, buildInsertStyleExtendedNoUnderlineActive } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { getAtomicInlineNodeClassNameLegacy, resolveInlineChangedStyleLegacy } from './createInlineChangedDecoration.styles.legacy';
 import { buildDiffDecorationSpec } from './decorationKeys';
@@ -64,7 +64,10 @@ const resolveInlineChangedStyleRefactored = ({
  * Single gate for the inline `style` string: registry + factory when the refactor is on, the
  * verbatim pre-refactor per-scheme constants when it is off.
  */
-const resolveInlineChangedStyle = args => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : resolveInlineChangedStyleLegacy(args);
+const resolveInlineChangedStyle = args => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : resolveInlineChangedStyleLegacy({
+  ...args,
+  colorScheme: getLegacyColorScheme(args.colorScheme)
+});
 
 /**
  * Single gate for the atomic-inline-node decoration attributes. The two cohorts differ in the DOM:
@@ -76,7 +79,7 @@ const resolveAtomicInlineAttrs = (inlineNodeName, colorScheme, colors) => isExpe
   className: getAtomicInlineNodeClassName(inlineNodeName),
   styleSuffix: buildAtomicInlineChangedCSSVariables(colors)
 } : {
-  className: getAtomicInlineNodeClassNameLegacy(inlineNodeName, colorScheme),
+  className: getAtomicInlineNodeClassNameLegacy(inlineNodeName, getLegacyColorScheme(colorScheme)),
   styleSuffix: ''
 };
 

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

@@ -1,7 +1,10 @@
+import isEqual from 'lodash/isEqual';
+import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 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';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 const filterUndefined = x => !!x;
@@ -27,29 +30,49 @@ const isInlineAttrChangeNodeName = nodeName => nodeName in inlineNodeAttrMap;
 // Extension node type names. Their "any attr except localId" exclude rule lives
 // in the shared `diffableAttrs` map and is applied via `isDiffableAttr` below.
 const extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+const transientExtensionAttrPaths = ['localId', 'parameters.macroParams._parentId'];
+
+/**
+ * Removes extension metadata that can change between document versions without changing the
+ * extension's user-visible configuration.
+ */
+const getComparableExtensionAttrs = node => omit(node.attrs, transientExtensionAttrPaths);
+const haveSameRelevantExtensionAttrs = (beforeNode, afterNode) => isEqual(getComparableExtensionAttrs(beforeNode), getComparableExtensionAttrs(afterNode));
 const getStepAttrs = step => {
   if (step instanceof AttrStep) {
     return [step.attr];
   }
-  if (step instanceof SetAttrsStep && step.attrs) {
+  if (step.attrs) {
     return Object.keys(step.attrs);
   }
   return [];
 };
-export const getAttrChangeRanges = (doc, steps, originalDoc) => {
-  return steps.map(step => {
+export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
+  return attrStepContexts.map(attrStepContext => {
+    const {
+      afterNode,
+      beforeNode,
+      finalPos,
+      originalPos,
+      step
+    } = attrStepContext;
     if (!(step instanceof AttrStep) && !(step instanceof SetAttrsStep)) {
       return undefined;
     }
     const stepAttrs = getStepAttrs(step);
-    const $pos = doc.resolve(step.pos);
-    const nodeAtPos = doc.nodeAt(step.pos);
+    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed.
+    // Keep the legacy payload-based checks until the rollout gate is enabled, and fall back
+    // to them if either step-time node is unavailable.
+    const attrsToCheck = fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(attrName => !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName])) : stepAttrs;
+    const $pos = doc.resolve(finalPos);
+    const nodeAtPos = doc.nodeAt(finalPos);
+    const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
 
     // date node: timestamp attribute change — highlight the date node itself (inline)
-    if (stepAttrs.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true))) {
+    if (attrsToCheck.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true))) {
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
         isInline: true,
         inlineNodeName: 'date'
       };
@@ -62,16 +85,15 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
       const nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         const watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (stepAttrs.some(v => watchedAttrs.includes(v))) {
-          const originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
+        if (attrsToCheck.some(v => watchedAttrs.includes(v))) {
           return {
-            fromB: step.pos,
-            toB: step.pos + nodeAtPos.nodeSize,
+            fromB: finalPos,
+            toB: finalPos + nodeAtPos.nodeSize,
             isInline: true,
             inlineNodeName: nodeName,
-            ...(originalNodeAtPos && {
-              fromA: step.pos,
-              toA: step.pos + originalNodeAtPos.nodeSize
+            ...(originalPos !== undefined && originalNodeAtPos && {
+              fromA: originalPos,
+              toA: originalPos + originalNodeAtPos.nodeSize
             })
           };
         }
@@ -79,10 +101,10 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     }
 
     // taskItem node: state attribute change — highlight the taskItem node
-    if (stepAttrs.some(v => taskItemAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
+    if (attrsToCheck.some(v => taskItemAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize
       };
     }
 
@@ -90,30 +112,33 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     // (e.g. note -> warning) — highlight the new panel and, when the original node
     // is resolvable, expose its range (fromA/toA) so the caller can render the old
     // panel as a "deleted" widget for a before/after comparison.
-    if (stepAttrs.some(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
-      const originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
+    if (attrsToCheck.some(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
-        ...(originalNodeAtPos && {
-          fromA: step.pos,
-          toA: step.pos + originalNodeAtPos.nodeSize
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
+        ...(originalPos !== undefined && originalNodeAtPos && {
+          fromA: originalPos,
+          toA: originalPos + originalNodeAtPos.nodeSize
         })
       };
     }
 
-    // extension nodes: highlight on any diffable attr change (exclude rule in shared map)
-    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(v => isDiffableAttr(nodeAtPos.type.name, v))) {
+    // Extension nodes: highlight changes to user-visible configuration. When enabled,
+    // transient extension metadata is ignored by the comparison below.
+    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && attrsToCheck.some(v => isDiffableAttr(nodeAtPos.type.name, v))) {
+      if (fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+        return undefined;
+      }
       const isInline = nodeAtPos.type.name === 'inlineExtension';
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
         isInline
       };
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent
-    if (stepAttrs.some(v => mediaAttrs.includes(v)) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+    if (attrsToCheck.some(v => mediaAttrs.includes(v)) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
       const startPos = $pos.pos + $pos.parentOffset;
       return {
         fromB: startPos,

package/dist/es2019/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js

@@ -14,7 +14,7 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildAddedCellOverlayStyleNew, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedInlineContentStyle, buildDeletedInlineContentStyleExtended, buildDeletedLozengeActiveStyle, buildDeletedLozengeStyle, buildDeletedNodeCSSVariables, buildDeletedQuoteNodeWithLozengeStyle, buildDeletedStrikethroughLine, buildDeletedWrappedBlockOutline, buildInsertedBlockNodeStyle, buildInsertedInlineStyle, buildInsertStyleInBlockExtended, buildInsertStyleInBlockExtendedNoUnderline, buildInsertStyleNode } from '../colorSchemes/factory';
-import { colorSchemeRegistry, standardScheme } from '../colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme, standardScheme } from '../colorSchemes/schemes';
 import { getChangedContentStyleLegacy, getChangedNodeStyleLegacy, getDeletedContentStyleLegacy, getDeletedContentStyleUnboundedLegacy, getInsertedContentStyleLegacy, hasRestingDeletedRingLegacy, resolveCellOverlayStyleLegacy, resolveNestedInsertedNodeStyleLegacy, resolveRemovedLozengeStyleLegacy } from './wrapBlockNodeViewStyles.legacy';
 const DEFAULT_COLOR_SCHEME = 'standard';
 const getColorScheme = colorScheme => colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
@@ -108,28 +108,31 @@ const resolveNestedInsertedNodeStyleNext = () => buildInsertStyleNode(nestedCont
 const hasRestingDeletedRingNext = colorScheme => getColorScheme(colorScheme).deletedNodeEmphasis === 'stateful';
 
 /** Inline content style for a changed (inserted or deleted) block node. */
-export const getChangedContentStyle = (colorScheme, isActive = false, isInserted = false, diffType, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : getChangedContentStyleLegacy(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+export const getChangedContentStyle = (colorScheme, isActive = false, isInserted = false, diffType, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : getChangedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, isInserted, diffType, hideAddedDiffsUnderline);
 
 /** Node-specific style for a changed block node, or `undefined` when the node type has none. */
-export const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive = false, diffType, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : getChangedNodeStyleLegacy(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
+export const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive = false, diffType, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : getChangedNodeStyleLegacy(nodeName, getLegacyColorScheme(colorScheme), isInserted, isActive, diffType, hideAddedDiffsUnderline);
 
 /** The positioned line drawn across deleted content spanning an unbounded range. */
-export const getDeletedContentStyleUnbounded = (colorScheme, isActive = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : getDeletedContentStyleUnboundedLegacy(colorScheme, isActive);
+export const getDeletedContentStyleUnbounded = (colorScheme, isActive = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : getDeletedContentStyleUnboundedLegacy(getLegacyColorScheme(colorScheme), isActive);
 
 /** Inline style for inserted content. */
-export const getInsertedContentStyle = (colorScheme, isActive = false, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : getInsertedContentStyleLegacy(colorScheme, isActive, hideAddedDiffsUnderline);
+export const getInsertedContentStyle = (colorScheme, isActive = false, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : getInsertedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, hideAddedDiffsUnderline);
 
 /** Inline style for deleted content. */
-export const getDeletedContentStyle = (colorScheme, isActive = false, diffType) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : getDeletedContentStyleLegacy(colorScheme, isActive, diffType);
+export const getDeletedContentStyle = (colorScheme, isActive = false, diffType) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : getDeletedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, diffType);
 
 /**
  * Overlay style for one added or deleted table cell. Invariant across the cells of a table, so the
  * `querySelectorAll('td, th')` loop in `wrapBlockNodeView.ts` resolves it once.
  */
-export const resolveCellOverlayStyle = args => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : resolveCellOverlayStyleLegacy(args);
+export const resolveCellOverlayStyle = args => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : resolveCellOverlayStyleLegacy({
+  ...args,
+  colorScheme: getLegacyColorScheme(args.colorScheme)
+});
 
 /** Inner style for the "Removed" lozenge on a deleted block node. */
-export const resolveRemovedLozengeStyle = (colorScheme, isActive) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : resolveRemovedLozengeStyleLegacy(colorScheme, isActive);
+export const resolveRemovedLozengeStyle = (colorScheme, isActive) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : resolveRemovedLozengeStyleLegacy(getLegacyColorScheme(colorScheme), isActive);
 
 /**
  * Style for inserted content nested inside a multi-container or list node — the `decisionList` and
@@ -142,7 +145,7 @@ export const resolveNestedInsertedNodeStyle = () => isExperimentEnabled('platfor
  * Whether the colour scheme draws a resting (non-active) ring on a deleted media/embed node, which
  * is what the `show-diff-deleted-outline-new` class styles in editor-core's smartCardStyles.
  */
-export const hasRestingDeletedRing = colorScheme => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : hasRestingDeletedRingLegacy(colorScheme);
+export const hasRestingDeletedRing = colorScheme => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : hasRestingDeletedRingLegacy(getLegacyColorScheme(colorScheme));
 
 /**
  * Custom properties consumed by the `show-diff-deleted-node-vars` selectors in editor-core.

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

@@ -27,6 +27,7 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
         const defaultDiffType = getDefaultDiffType();
         return {
           steps: [],
+          stepAttributions: [],
           originalDoc: undefined,
           decorations: DecorationSet.empty,
           isDisplayingChanges: false,

package/dist/es2019/showDiffPlugin.js

@@ -4,6 +4,27 @@ import { getDeletedWidgets } from './pm-plugins/getDeletedWidgets';
 import { getScrollableDecorations } from './pm-plugins/getScrollableDecorations';
 import { createPlugin, showDiffPluginKey } from './pm-plugins/main';
 import { IndicatorBarContentComponent } from './ui/IndicatorBar/IndicatorBarContentComponent';
+const normalizeShowDiffParams = params => {
+  if (!params || !('stepsWithAttribution' in params)) {
+    return params ? {
+      ...params,
+      stepAttributions: []
+    } : params;
+  }
+  const {
+    stepsWithAttribution,
+    ...rest
+  } = params;
+  return {
+    ...rest,
+    steps: stepsWithAttribution.map(({
+      step
+    }) => step),
+    stepAttributions: stepsWithAttribution.map(({
+      stepAttribution
+    }) => stepAttribution)
+  };
+};
 export const showDiffPlugin = ({
   api,
   config
@@ -30,7 +51,7 @@ export const showDiffPlugin = ({
           });
         }
         return tr.setMeta(showDiffPluginKey, {
-          ...params,
+          ...normalizeShowDiffParams(params),
           action: 'SHOW_DIFF'
         });
       },
@@ -45,6 +66,7 @@ export const showDiffPlugin = ({
         }
         return tr.setMeta(showDiffPluginKey, {
           steps: [],
+          stepAttributions: [],
           action: 'HIDE_DIFF'
         });
       },