@atlaskit/editor-plugin-show-diff 19.0.2 → 19.0.4

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

@@ -1,5 +1,4 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildDiffDecorationSpec, scrollMarginTopValue } from '../decorationKeys';
 import { createContentWrapper } from './wrapBlockNodeView';
 
@@ -27,7 +26,6 @@ export const RETURN_GLYPH = '⤶';
 export const createDeletedLineBreakWidget = ({
   colorScheme,
   count = 1,
-  diffType,
   isActive = false,
   reveal
 }) => {
@@ -45,7 +43,7 @@ export const createDeletedLineBreakWidget = ({
       // deleted-content wrapper is styled as an inline run.
       dom.append(dom.ownerDocument.createElement('br'));
     }
-    const wrapper = createContentWrapper(colorScheme, isActive, false, diffType, reveal);
+    const wrapper = createContentWrapper(colorScheme, isActive, false, reveal);
     wrapper.append(dom.ownerDocument.createTextNode(RETURN_GLYPH));
     dom.append(wrapper);
   }
@@ -65,7 +63,6 @@ export const createDeletedLineBreakDecoration = ({
   attributionKey,
   colorScheme,
   count,
-  diffType,
   isActive = false,
   pos,
   reveal,
@@ -73,7 +70,6 @@ export const createDeletedLineBreakDecoration = ({
 }) => Decoration.widget(pos, createDeletedLineBreakWidget({
   colorScheme,
   count,
-  diffType,
   isActive,
   reveal
 }), {
@@ -86,8 +82,7 @@ export const createDeletedLineBreakDecoration = ({
     // The glyph always stands in for removed content, whichever side of the changeset the
     // change itself landed on.
     isInserted: false,
-    diffType,
-    ...(isExtendedEnabled(diffType) && side !== undefined && {
+    ...(side !== undefined && {
       side
     })
   }),

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

@@ -4,7 +4,6 @@ import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-uti
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { getAtomicInlineChangedAttrs } from '../createInlineChangedDecoration';
 import { applyRevealToElement } from '../revealStyles';
 import { isInlineAttrChangeNodeName } from './getAttrChangeRanges';
@@ -110,14 +109,6 @@ const applyDeletedNodeMarkupNext = ({
 
 /** Single gate for the deleted-node classes and custom properties. */
 const applyDeletedNodeMarkup = args => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? applyDeletedNodeMarkupNext(args) : applyDeletedNodeMarkupLegacy(args);
-
-/**
- * Checks if a node should apply deleted styles directly without wrapper
- * to preserve natural block-level margins
- */
-const shouldApplyStylesDirectly = nodeName => {
-  return nodeName === 'heading';
-};
 const applyCellOverlayStyles = ({
   element,
   colorScheme,
@@ -184,37 +175,17 @@ const createBlockNodeWrapper = () => {
   wrapper.setAttribute('style', baseStyle);
   return wrapper;
 };
-
-/**
- * Applies styles directly to an HTML element by merging with existing styles
- */
-const applyStylesToElement = ({
-  element,
-  targetNode,
-  colorScheme,
-  isActive,
-  isInserted,
-  diffType,
-  hideAddedDiffsUnderline = false
-}) => {
-  const currentStyle = element.getAttribute('style') || '';
-  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
-  const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
-  element.setAttribute('style', `${currentStyle}${contentStyle}${nodeSpecificStyle}`);
-};
 const applyMultiContainerLikeStyles = ({
   element,
   targetNode,
   colorScheme,
   isActive,
   isInserted,
-  diffType,
   hideAddedDiffsUnderline = false
 }) => {
   const currentStyle = element.getAttribute('style') || '';
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
+  const nodeSpecificStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) || '';
   if (targetNode.type.name === 'decisionList') {
     const nestedInsertedNodeStyle = resolveNestedInsertedNodeStyle(colorScheme);
     element.querySelectorAll('li').forEach(listItem => {
@@ -303,16 +274,15 @@ const applyTextLikeBlockNodeStyles = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType,
   hideAddedDiffsUnderline = false,
   highlightInlineLeafNodes = false
 }) => {
   const currentStyle = element.getAttribute('style') || '';
-  const nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
+  const nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) || '';
   if (nodeSpecificStyle) {
     element.setAttribute('style', `${currentStyle}${nodeSpecificStyle}`);
   }
-  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  const contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
   const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
   const textNodesToWrap = [];
   let currentNode = walker.nextNode();
@@ -347,18 +317,17 @@ const createBlockNodeContentWrapper = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType,
   hideAddedDiffsUnderline = false
 }) => {
   const contentWrapper = document.createElement('div');
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  const nodeStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
+  const nodeStyle = getChangedNodeStyle(targetNodeName, colorScheme, isInserted, isActive, hideAddedDiffsUnderline);
 
   // When the extended experiment is enabled and the content is inserted,
   // block widget nodes that already have dedicated node-level styling (e.g. boxShadow outline)
   // should not also get the inline content style (borderBottom underline) on their container.
-  const shouldSkipContentStyle = isExtendedEnabled(diffType) && isInserted && nodeStyle !== undefined;
-  const contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  const shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
+  const contentStyle = shouldSkipContentStyle ? '' : getChangedContentStyle(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
   contentWrapper.setAttribute('style', `${contentStyle}${nodeStyle || ''}`);
   contentWrapper.append(nodeView);
   return contentWrapper;
@@ -461,12 +430,11 @@ const wrapBlockNode = ({
   intl,
   isActive = false,
   isInserted = false,
-  diffType,
   hideAddedDiffsUnderline = false
 }) => {
   const blockWrapper = createBlockNodeWrapper();
   const targetNodeName = expValEquals('platform_editor_nest_table_in_panel', 'isEnabled', true) ? getBaseNodeTypeName(targetNode.type) : targetNode.type.name;
-  if (shouldShowRemovedLozenge(targetNodeName) && (!isExtendedEnabled(diffType) || !isInserted)) {
+  if (shouldShowRemovedLozenge(targetNodeName) && !isInserted) {
     const lozenge = createRemovedLozenge(intl, isActive, colorScheme);
     if (handleEmbedCardWithLozenge({
       dom,
@@ -496,7 +464,6 @@ const wrapBlockNode = ({
     colorScheme,
     isActive,
     isInserted,
-    diffType,
     hideAddedDiffsUnderline
   });
   blockWrapper.append(contentWrapper);
@@ -524,95 +491,64 @@ export const wrapBlockNodeView = ({
   intl,
   isActive = false,
   isInserted = false,
-  diffType,
   hideAddedDiffsUnderline = false,
   highlightInlineLeafNodes = false
 }) => {
-  if (isExtendedEnabled(diffType)) {
-    if (nodeView instanceof HTMLElement) {
-      if (isInserted && isMultiContainerBlockNode(targetNode.type.name)) {
-        applyMultiContainerLikeStyles({
-          element: nodeView,
-          targetNode,
-          colorScheme,
-          isActive,
-          isInserted,
-          diffType,
-          hideAddedDiffsUnderline
-        });
-        dom.append(nodeView);
-        return;
-      }
-      if (isTextLikeBlockNode(targetNode.type.name)) {
-        applyTextLikeBlockNodeStyles({
-          element: nodeView,
-          targetNode,
-          colorScheme,
-          isActive,
-          isInserted,
-          diffType,
-          hideAddedDiffsUnderline,
-          highlightInlineLeafNodes
-        });
-        if (targetNode.type.name === 'blockquote' && fg('platform_editor_ai_show_diff_patch_1')) {
-          appendStyleToElement(nodeView, quoteBlockLevelStyle);
-        }
-        dom.append(nodeView);
-        return;
-      }
-      if (targetNode.type.name === 'table') {
-        if (expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_diff_rounded_corners')) {
-          applyTableCellEdgeAttrs({
-            element: nodeView,
-            tableNode: targetNode
-          });
-        }
-        applyCellOverlayStyles({
-          element: nodeView,
-          colorScheme,
-          isInserted
-        });
-        dom.append(nodeView);
-        return;
-      }
-    }
-    wrapBlockNode({
-      dom,
-      nodeView,
-      targetNode,
-      colorScheme,
-      intl,
-      isActive,
-      isInserted,
-      diffType,
-      hideAddedDiffsUnderline
-    });
-    return;
-  } else {
-    if (shouldApplyStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
-      // Apply deleted styles directly to preserve natural block-level margins
-      applyStylesToElement({
+  if (nodeView instanceof HTMLElement) {
+    if (isInserted && isMultiContainerBlockNode(targetNode.type.name)) {
+      applyMultiContainerLikeStyles({
         element: nodeView,
         targetNode,
         colorScheme,
         isActive,
         isInserted,
-        diffType
+        hideAddedDiffsUnderline
       });
       dom.append(nodeView);
-    } else {
-      wrapBlockNode({
-        dom,
-        nodeView,
+      return;
+    }
+    if (isTextLikeBlockNode(targetNode.type.name)) {
+      applyTextLikeBlockNodeStyles({
+        element: nodeView,
         targetNode,
         colorScheme,
-        intl,
         isActive,
         isInserted,
-        diffType
+        hideAddedDiffsUnderline,
+        highlightInlineLeafNodes
+      });
+      if (targetNode.type.name === 'blockquote' && fg('platform_editor_ai_show_diff_patch_1')) {
+        appendStyleToElement(nodeView, quoteBlockLevelStyle);
+      }
+      dom.append(nodeView);
+      return;
+    }
+    if (targetNode.type.name === 'table') {
+      if (expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_diff_rounded_corners')) {
+        applyTableCellEdgeAttrs({
+          element: nodeView,
+          tableNode: targetNode
+        });
+      }
+      applyCellOverlayStyles({
+        element: nodeView,
+        colorScheme,
+        isInserted
       });
+      dom.append(nodeView);
+      return;
     }
   }
+  wrapBlockNode({
+    dom,
+    nodeView,
+    targetNode,
+    colorScheme,
+    intl,
+    isActive,
+    isInserted,
+    hideAddedDiffsUnderline
+  });
 };
 
 /**
@@ -625,7 +561,6 @@ export const injectInnerWrapper = ({
   colorScheme,
   isActive,
   isInserted,
-  diffType,
   reveal
 }) => {
   const wrapper = document.createElement('span');
@@ -636,7 +571,7 @@ export const injectInnerWrapper = ({
     isInserted: isInserted !== null && isInserted !== void 0 ? isInserted : false,
     reveal
   });
-  wrapper.setAttribute('style', (isInserted ? getInsertedContentStyle(colorScheme, isActive) : getDeletedContentStyle(colorScheme, isActive, diffType, Boolean(revealStyle))) + revealStyle);
+  wrapper.setAttribute('style', (isInserted ? getInsertedContentStyle(colorScheme, isActive) : getDeletedContentStyle(colorScheme, isActive, Boolean(revealStyle))) + revealStyle);
   [...node.childNodes].forEach(child => {
     const removedChild = node.removeChild(child);
     wrapper.append(removedChild);
@@ -648,7 +583,7 @@ export const injectInnerWrapper = ({
 /**
  * Creates a styled span wrapper for inline content within a change decoration.
  */
-export const createContentWrapper = (colorScheme, isActive = false, isInserted = false, diffType, reveal) => {
+export const createContentWrapper = (colorScheme, isActive = false, isInserted = false, reveal) => {
   const wrapper = document.createElement('span');
   const baseStyle = convertToInlineCss({
     position: 'relative',
@@ -663,16 +598,9 @@ export const createContentWrapper = (colorScheme, isActive = false, isInserted =
     isInserted,
     reveal
   });
-  const deletedStyle = getDeletedContentStyle(colorScheme, isActive, diffType, Boolean(revealStyle));
-  if (isExtendedEnabled(diffType)) {
-    if (isInserted) {
-      wrapper.setAttribute('style', `${baseStyle}${getInsertedContentStyle(colorScheme, isActive)}${revealStyle}`);
-    } else {
-      wrapper.setAttribute('style', `${baseStyle}${deletedStyle}${revealStyle}`);
-      const strikethrough = document.createElement('span');
-      strikethrough.setAttribute('style', getDeletedContentStyleUnbounded(colorScheme, isActive));
-      wrapper.append(strikethrough);
-    }
+  const deletedStyle = getDeletedContentStyle(colorScheme, isActive, Boolean(revealStyle));
+  if (isInserted) {
+    wrapper.setAttribute('style', `${baseStyle}${getInsertedContentStyle(colorScheme, isActive)}${revealStyle}`);
   } else {
     wrapper.setAttribute('style', `${baseStyle}${deletedStyle}${revealStyle}`);
     const strikethrough = document.createElement('span');

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

@@ -12,7 +12,6 @@
  */
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-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, getLegacyColorScheme, standardScheme } from '../colorSchemes/schemes';
 import { getChangedContentStyleLegacy, getChangedNodeStyleLegacy, getDeletedContentStyleLegacy, getDeletedContentStyleUnboundedLegacy, getInsertedContentStyleLegacy, hasRestingDeletedRingLegacy, resolveCellOverlayStyleLegacy, resolveNestedInsertedNodeStyleLegacy, resolveRemovedLozengeStyleLegacy } from './wrapBlockNodeViewStyles.legacy';
@@ -33,9 +32,9 @@ export const isMultiContainerBlockNode = nodeName => {
 export const isTextLikeBlockNode = nodeName => {
   return ['heading', 'bulletList', 'orderedList', 'listItem', 'taskList', 'blockquote'].includes(nodeName);
 };
-const getChangedContentStyleNext = (colorScheme, isActive = false, isInserted = false, diffType, hideAddedDiffsUnderline = false) => {
+const getChangedContentStyleNext = (colorScheme, isActive = false, isInserted = false, hideAddedDiffsUnderline = false) => {
   const colors = getColorScheme(colorScheme);
-  if (isExtendedEnabled(diffType) && isInserted) {
+  if (isInserted) {
     return buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline);
   }
   const base = buildDeletedInlineContentStyle(colors, isActive ? 'active' : 'new');
@@ -43,14 +42,14 @@ const getChangedContentStyleNext = (colorScheme, isActive = false, isInserted =
   // Text-like blocks (heading, lists, blockquote) render their deleted content through this
   // getter rather than `getDeletedContentStyle`, so without this they never receive the
   // glyphTint background + underline that plain deleted text already gets.
-  if (fg('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint' && isExtendedEnabled(diffType)) {
+  if (fg('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
     return base + buildDeletedInlineContentStyleExtended(colors, isActive);
   }
   return base;
 };
-const getChangedNodeStyleNext = (nodeName, colorScheme, isInserted = false, isActive = false, diffType, hideAddedDiffsUnderline = false) => {
+const getChangedNodeStyleNext = (nodeName, colorScheme, isInserted = false, isActive = false, hideAddedDiffsUnderline = false) => {
   const colors = getColorScheme(colorScheme);
-  if (isExtendedEnabled(diffType) && isInserted) {
+  if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
       return hideAddedDiffsUnderline || fg('platform_editor_ai_show_diff_patch_1') ? buildInsertStyleInBlockExtendedNoUnderline(nestedContentScheme) : buildInsertStyleInBlockExtended(nestedContentScheme);
     }
@@ -80,12 +79,12 @@ const getChangedNodeStyleNext = (nodeName, colorScheme, isInserted = false, isAc
 };
 const getDeletedContentStyleUnboundedNext = (colorScheme, isActive = false) => buildDeletedStrikethroughLine(getColorScheme(colorScheme), isActive);
 const getInsertedContentStyleNext = (colorScheme, isActive = false, hideAddedDiffsUnderline = false) => buildInsertedInlineStyle(getColorScheme(colorScheme), isActive, hideAddedDiffsUnderline);
-const getDeletedContentStyleNext = (colorScheme, isActive = false, diffType, omitHighlight = false) => {
+const getDeletedContentStyleNext = (colorScheme, isActive = false, omitHighlight = false) => {
   const colors = getColorScheme(colorScheme);
   const base = buildDeletedInlineContentStyle(colors, isActive ? 'active' : 'new');
 
   // glyphTint adds a background highlight and border-bottom over the tint; strikethrough does not.
-  const needsExtendedHighlight = colors.deletedInlineTreatment === 'glyphTint' && isExtendedEnabled(diffType) && !omitHighlight;
+  const needsExtendedHighlight = colors.deletedInlineTreatment === 'glyphTint' && !omitHighlight;
   return needsExtendedHighlight ? base + buildDeletedInlineContentStyleExtended(colors, isActive) : base;
 };
 const resolveCellOverlayStyleNext = ({
@@ -110,10 +109,10 @@ const resolveNestedInsertedNodeStyleNext = colorScheme => buildInsertStyleNode(f
 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(getLegacyColorScheme(colorScheme), isActive, isInserted, diffType, hideAddedDiffsUnderline);
+export const getChangedContentStyle = (colorScheme, isActive = false, isInserted = false, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, hideAddedDiffsUnderline) : getChangedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, isInserted, 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, getLegacyColorScheme(colorScheme), isInserted, isActive, diffType, hideAddedDiffsUnderline);
+export const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive = false, hideAddedDiffsUnderline = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) : getChangedNodeStyleLegacy(nodeName, getLegacyColorScheme(colorScheme), isInserted, isActive, 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(getLegacyColorScheme(colorScheme), isActive);
@@ -122,10 +121,10 @@ export const getDeletedContentStyleUnbounded = (colorScheme, isActive = false) =
 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,
+export const getDeletedContentStyle = (colorScheme, isActive = false,
 // Set while the reveal animation is running: it paints the highlight itself so it can wipe it in
 // left-to-right, and a static background here would leave nothing to reveal.
-omitHighlight = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType, omitHighlight) : getDeletedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, diffType, omitHighlight);
+omitHighlight = false) => isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, omitHighlight) : getDeletedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, omitHighlight);
 
 /**
  * Overlay style for one added or deleted table cell. Invariant across the cells of a table, so the

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

@@ -10,7 +10,6 @@
  */
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
 import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
 const lozengeStyle = convertToInlineCss({
@@ -76,8 +75,8 @@ const isTextLikeBlockNode = nodeName => {
 };
 
 /** Pre-refactor inline content style for a changed (inserted or deleted) block node. */
-export const getChangedContentStyleLegacy = (colorScheme, isActive = false, isInserted = false, diffType, hideAddedDiffsUnderline = false) => {
-  if (isExtendedEnabled(diffType) && isInserted) {
+export const getChangedContentStyleLegacy = (colorScheme, isActive = false, isInserted = false, hideAddedDiffsUnderline = false) => {
+  if (isInserted) {
     if (colorScheme === 'traditional') {
       return isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
     }
@@ -93,9 +92,9 @@ export const getChangedContentStyleLegacy = (colorScheme, isActive = false, isIn
 };
 
 /** Pre-refactor node-specific style for a changed block node. */
-export const getChangedNodeStyleLegacy = (nodeName, colorScheme, isInserted = false, isActive = false, diffType, hideAddedDiffsUnderline = false) => {
+export const getChangedNodeStyleLegacy = (nodeName, colorScheme, isInserted = false, isActive = false, hideAddedDiffsUnderline = false) => {
   const isTraditional = colorScheme === 'traditional';
-  if (isExtendedEnabled(diffType) && isInserted) {
+  if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
       return hideAddedDiffsUnderline || fg('platform_editor_ai_show_diff_patch_1') ? editingContentStyleInBlockExtendedNoUnderline : editingContentStyleInBlockExtended;
     }
@@ -150,14 +149,14 @@ export const getInsertedContentStyleLegacy = (colorScheme, isActive = false, hid
 };
 
 /** Pre-refactor inline style for deleted content. */
-export const getDeletedContentStyleLegacy = (colorScheme, isActive = false, diffType,
+export const getDeletedContentStyleLegacy = (colorScheme, isActive = false,
 // The reveal animation paints the highlight itself so it can wipe it in; a static one here would
 // cover the whole span and leave nothing to reveal. Mirrors the same option on the Next variant.
 omitHighlight = false) => {
   if (colorScheme === 'traditional') {
     return getDeletedTraditionalInlineStyle(isActive);
   }
-  if (isExtendedEnabled(diffType) && !omitHighlight) {
+  if (!omitHighlight) {
     return (isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyleNew()) + deletedInlineContentStyleExtended;
   }
   return isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyleNew();

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

@@ -0,0 +1,2 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+export const getDefaultDiffType = () => fg('platform_editor_ai_smart_diff') ? 'smart' : 'inline';

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

@@ -1,7 +1,6 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { DiffDecorationKey, isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
-import { isExtendedEnabled } from './isExtendedEnabled';
+import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 
 /**
  * True if `fragment` contains at least one inline node (text, hardBreak, emoji, mention, etc.).
@@ -36,9 +35,6 @@ export function isInlineDiffDecorationRenderableInDoc(doc, from, to) {
 function isRangeFullyInside(range1Start, range1End, range2Start, range2End) {
   return range2Start <= range1Start && range1End <= range2End;
 }
-function specHasDiffKeyPrefix(spec, keyPrefix) {
-  return Boolean(spec && typeof spec === 'object' && 'key' in spec && typeof spec.key === 'string' && spec.key.startsWith(keyPrefix));
-}
 
 /**
  * Where a decoration paints relative to others at the same position: negative before the node at
@@ -164,24 +160,15 @@ function groupTouchingDecorations(decorations, isInlineDecoration) {
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc
  * @returns Array of scrollable decorations, sorted and deduplicated
  */
-export const getScrollableDecorations = (set, doc, diffType) => {
+export const getScrollableDecorations = (set, doc) => {
   if (!set) {
     return [];
   }
-  const isBlockDecoration = decoration => {
-    var _decoration$spec$key$, _decoration$spec, _decoration$spec$key;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'block' : (_decoration$spec$key$ = (_decoration$spec = decoration.spec) === null || _decoration$spec === void 0 ? void 0 : (_decoration$spec$key = _decoration$spec.key) === null || _decoration$spec$key === void 0 ? void 0 : _decoration$spec$key.startsWith(DiffDecorationKey.block)) !== null && _decoration$spec$key$ !== void 0 ? _decoration$spec$key$ : false;
-  };
-  const isInlineDecoration = decoration => {
-    var _decoration$spec$key$2, _decoration$spec2, _decoration$spec2$key;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'inline' : (_decoration$spec$key$2 = (_decoration$spec2 = decoration.spec) === null || _decoration$spec2 === void 0 ? void 0 : (_decoration$spec2$key = _decoration$spec2.key) === null || _decoration$spec2$key === void 0 ? void 0 : _decoration$spec2$key.startsWith(DiffDecorationKey.inline)) !== null && _decoration$spec$key$2 !== void 0 ? _decoration$spec$key$2 : false;
-  };
-  const isWidgetDecoration = decoration => {
-    var _decoration$spec$key$3, _decoration$spec3, _decoration$spec3$key;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget' : (_decoration$spec$key$3 = (_decoration$spec3 = decoration.spec) === null || _decoration$spec3 === void 0 ? void 0 : (_decoration$spec3$key = _decoration$spec3.key) === null || _decoration$spec3$key === void 0 ? void 0 : _decoration$spec3$key.startsWith(DiffDecorationKey.widget)) !== null && _decoration$spec$key$3 !== void 0 ? _decoration$spec$key$3 : false;
-  };
+  const isBlockDecoration = decoration => isDiffDecoration(decoration) && decoration.spec.decorationType === 'block';
+  const isInlineDecoration = decoration => isDiffDecoration(decoration) && decoration.spec.decorationType === 'inline';
+  const isWidgetDecoration = decoration => isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget';
   const seenBlockKeys = new Set();
-  const allDecorations = isExtendedEnabled(diffType) ? set.find(undefined, undefined, isDiffDecorationSpec) : set.find(undefined, undefined, spec => specHasDiffKeyPrefix(spec, DiffDecorationKey.inline) || specHasDiffKeyPrefix(spec, DiffDecorationKey.widget) || specHasDiffKeyPrefix(spec, DiffDecorationKey.block));
+  const allDecorations = set.find(undefined, undefined, isDiffDecorationSpec);
 
   // First pass: filter out listItem blocks and deduplicates blocks
   const filtered = allDecorations.filter(dec => {