@atlaskit/editor-plugin-show-diff 8.4.5 → 8.4.6

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

@@ -1,9 +1,8 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { standardDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, deletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
-import { traditionalDecorationMarkerVariable, traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariable, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNode, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNode, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNode, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNode, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, deletedTraditionalCellOverlayStyle } from './colorSchemes/traditional';
+import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, deletedTraditionalCellOverlayStyle } from './colorSchemes/traditional';
 const displayNoneStyle = convertToInlineCss({
   display: 'none'
 });
@@ -26,7 +25,7 @@ const getBlockNodeStyle = ({
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', ...(expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }
@@ -43,51 +42,51 @@ const getBlockNodeStyle = ({
   if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDecorationMarkerVariableNew : traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
+        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
       } else {
-        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDeletedDecorationMarkerVariableNew : traditionalDeletedDecorationMarkerVariable : deletedContentStyleNew;
+        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedContentStyleNew;
       }
     }
-    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDecorationMarkerVariableNew : traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
+    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
   }
   if (nodeName === 'blockquote') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleQuoteNodeNew : traditionalStyleQuoteNode : editingStyleQuoteNode;
+        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
       } else {
         return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleQuoteNodeNew : traditionalStyleQuoteNode : editingStyleQuoteNode;
+    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
   }
   if (nodeName === 'rule') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleRuleNodeNew : traditionalStyleRuleNode : editingStyleRuleNode;
+        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
       } else {
         return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleRuleNodeNew : traditionalStyleRuleNode : editingStyleRuleNode;
+    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
   }
   if (nodeName === 'blockCard') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleCardBlockNodeNew : traditionalStyleCardBlockNode : editingStyleCardBlockNode;
+        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
       } else {
         return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleCardBlockNodeNew : traditionalStyleCardBlockNode : editingStyleCardBlockNode;
+    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
   }
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     if (isInserted) {
-      return isTraditional ? isActive ? traditionalStyleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleNodeNew : traditionalStyleNode : editingStyleNode;
+      return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
     } else {
       return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
     }
   }
-  return isTraditional ? isActive ? traditionalStyleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleNodeNew : traditionalStyleNode : editingStyleNode;
+  return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
 };
 
 /**
@@ -140,20 +139,9 @@ export const createBlockChangedDecoration = ({
     });
   }
   const className = getNodeClass(change.name);
-  if (fg('platform_editor_show_diff_scroll_navigation')) {
-    if (style || className) {
-      decorations.push(Decoration.node(change.from, change.to, {
-        style: style,
-        'data-testid': 'show-diff-changed-decoration-node',
-        class: className
-      }, {
-        key: 'diff-block',
-        nodeName: change.name
-      }));
-    }
-  } else {
+  if (style || className) {
     decorations.push(Decoration.node(change.from, change.to, {
-      style,
+      style: style,
       'data-testid': 'show-diff-changed-decoration-node',
       class: className
     }, {

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

@@ -1,6 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editingStyle, editingStyleActive, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleUnbounded, deletedInlineContentBackground } from './colorSchemes/standard';
 import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive } from './colorSchemes/traditional';
@@ -42,21 +41,6 @@ const getDeletedContentStyle = (colorScheme, isActive = false) => {
   return expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? deletedContentStyleNew : deletedContentStyle;
 };
 
-/**
- * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
- */
-const createDeletedStyleWrapperWithoutOpacity = (colorScheme, isActive) => {
-  const wrapper = document.createElement('span');
-  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-    wrapper.setAttribute('style',
-    // Merge into existing styles when cleaning up
-    getDeletedContentStyle(colorScheme, isActive) + deletedInlineContentBackground);
-  } else {
-    wrapper.setAttribute('style', getDeletedContentStyle(colorScheme, isActive));
-  }
-  return wrapper;
-};
-
 /**
  * CSS backgrounds don't work when applied to a wrapper around a paragraph, so
  * the wrapper needs to be injected inside the node around the child content
@@ -117,7 +101,7 @@ export const createNodeChangedDecorationWidget = ({
 }) => {
   var _slice$content, _slice$content2, _slice$content2$first, _slice$content3, _slice$content3$first;
   const slice = doc.slice(change.fromA, change.toA);
-  const shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 ? void 0 : (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : (_slice$content2$first = _slice$content2.firstChild) === null || _slice$content2$first === void 0 ? void 0 : _slice$content2$first.type.name) === 'paragraph' && (slice === null || slice === void 0 ? void 0 : (_slice$content3 = slice.content) === null || _slice$content3 === void 0 ? void 0 : (_slice$content3$first = _slice$content3.firstChild) === null || _slice$content3$first === void 0 ? void 0 : _slice$content3$first.content.size) === 0 && fg('platform_editor_show_diff_scroll_navigation');
+  const shouldSkipDeletedEmptyParagraphDecoration = !isInserted && (slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.childCount) === 1 && (slice === null || slice === void 0 ? void 0 : (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : (_slice$content2$first = _slice$content2.firstChild) === null || _slice$content2$first === void 0 ? void 0 : _slice$content2$first.type.name) === 'paragraph' && (slice === null || slice === void 0 ? void 0 : (_slice$content3 = slice.content) === null || _slice$content3 === void 0 ? void 0 : (_slice$content3$first = _slice$content3.firstChild) === null || _slice$content3$first === void 0 ? void 0 : _slice$content3$first.content.size) === 0;
   // Widget decoration used for deletions as the content is not in the document
   // and we want to display the deleted content with a style.
   const safeInsertPos = findSafeInsertPos(newDoc, change.fromB, slice);
@@ -228,22 +212,16 @@ export const createNodeChangedDecorationWidget = ({
     } else {
       const fallbackNode = fallbackSerialization();
       if (fallbackNode) {
-        if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || fg('platform_editor_show_diff_scroll_navigation')) {
-          if (fallbackNode instanceof HTMLElement) {
-            const injectedNode = injectInnerWrapper({
-              node: fallbackNode,
-              colorScheme,
-              isActive,
-              isInserted
-            });
-            dom.append(injectedNode);
-          } else {
-            const wrapper = createContentWrapper(colorScheme, isActive, isInserted);
-            wrapper.append(fallbackNode);
-            dom.append(wrapper);
-          }
+        if (fallbackNode instanceof HTMLElement) {
+          const injectedNode = injectInnerWrapper({
+            node: fallbackNode,
+            colorScheme,
+            isActive,
+            isInserted
+          });
+          dom.append(injectedNode);
         } else {
-          const wrapper = createDeletedStyleWrapperWithoutOpacity(colorScheme, isActive);
+          const wrapper = createContentWrapper(colorScheme, isActive, isInserted);
           wrapper.append(fallbackNode);
           dom.append(wrapper);
         }

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

@@ -1,6 +1,5 @@
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const filterUndefined = x => !!x;
 
 // Attributes that indicate a change in media image
@@ -34,33 +33,32 @@ export const getAttrChangeRanges = (doc, steps) => {
     const stepAttrs = getStepAttrs(step);
     const $pos = doc.resolve(step.pos);
     const nodeAtPos = doc.nodeAt(step.pos);
-    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
-      // 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') {
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize,
-          isInline: true
-        };
-      }
 
-      // 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') {
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize
-        };
-      }
+    // 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') {
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize,
+        isInline: true
+      };
+    }
 
-      // extension nodes: any attribute change except localId — highlight the node
-      if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(v => !extensionExcludedAttrs.includes(v))) {
-        const isInline = nodeAtPos.type.name === 'inlineExtension';
-        return {
-          fromB: step.pos,
-          toB: step.pos + nodeAtPos.nodeSize,
-          isInline
-        };
-      }
+    // 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') {
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize
+      };
+    }
+
+    // extension nodes: any attribute change except localId — highlight the node
+    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(v => !extensionExcludedAttrs.includes(v))) {
+      const isInline = nodeAtPos.type.name === 'inlineExtension';
+      return {
+        fromB: step.pos,
+        toB: step.pos + nodeAtPos.nodeSize,
+        isInline
+      };
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent

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

@@ -1,9 +1,8 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { trackChangesMessages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlock, editingStyle, editingStyleActive, editingStyleNode, addedCellOverlayStyle, deletedCellOverlayStyle } from '../colorSchemes/standard';
-import { deletedTraditionalBlockOutline, deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRounded, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNode, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle } from '../colorSchemes/traditional';
+import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle } from '../colorSchemes/traditional';
 const lozengeStyle = convertToInlineCss({
   display: 'inline-flex',
   boxSizing: 'border-box',
@@ -77,10 +76,7 @@ const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive
       return undefined;
     }
     if (isTraditional) {
-      if (fg('platform_editor_show_diff_scroll_navigation')) {
-        return isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew;
-      }
-      return isActive ? traditionalStyleNodeActive : traditionalStyleNode;
+      return isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew;
     }
     return editingStyleNode;
   }
@@ -93,13 +89,13 @@ const getChangedNodeStyle = (nodeName, colorScheme, isInserted = false, isActive
     case 'expand':
     case 'decisionList':
       if (isTraditional) {
-        return isActive ? deletedTraditionalBlockOutlineActive : fg('platform_editor_show_diff_scroll_navigation') ? deletedTraditionalBlockOutlineNew : deletedTraditionalBlockOutline;
+        return isActive ? deletedTraditionalBlockOutlineActive : deletedTraditionalBlockOutlineNew;
       }
       return isActive ? deletedBlockOutlineActive : deletedBlockOutline;
     case 'panel':
     case 'codeBlock':
       if (isTraditional) {
-        return isActive ? deletedTraditionalBlockOutlineRoundedActive : fg('platform_editor_show_diff_scroll_navigation') ? deletedTraditionalBlockOutlineRoundedNew : deletedTraditionalBlockOutlineRounded;
+        return isActive ? deletedTraditionalBlockOutlineRoundedActive : deletedTraditionalBlockOutlineRoundedNew;
       }
       return isActive ? deletedBlockOutlineRoundedActive : deletedBlockOutlineRounded;
     default:
@@ -142,7 +138,7 @@ const maybeAddDeletedOutlineNewClass = ({
   if (name !== 'mediaSingle' && name !== 'embedCard') {
     return;
   }
-  if (colorScheme === 'traditional' && !isActive && fg('platform_editor_show_diff_scroll_navigation')) {
+  if (colorScheme === 'traditional' && !isActive) {
     nodeView.classList.add('show-diff-deleted-outline-new');
   }
 };
@@ -167,7 +163,7 @@ const applyCellOverlayStyles = ({
 }) => {
   element.querySelectorAll('td, th').forEach(cell => {
     const overlay = document.createElement('span');
-    const overlayStyle = colorScheme === 'traditional' ? isInserted ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalAddedCellOverlayStyleNew : traditionalAddedCellOverlayStyle : deletedTraditionalCellOverlayStyle : isInserted ? addedCellOverlayStyle : deletedCellOverlayStyle;
+    const overlayStyle = colorScheme === 'traditional' ? isInserted ? traditionalAddedCellOverlayStyleNew : deletedTraditionalCellOverlayStyle : isInserted ? addedCellOverlayStyle : deletedCellOverlayStyle;
     overlay.setAttribute('style', overlayStyle);
     cell.appendChild(overlay);
   });

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

@@ -3,7 +3,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
@@ -12,9 +11,7 @@ import { NodeViewSerializer } from './NodeViewSerializer';
 import { scrollToActiveDecoration, scrollToFirstDecoration } from './scrollToDiff';
 export const showDiffPluginKey = new PluginKey('showDiffPlugin');
 export const createPlugin = (config, getIntl, api) => {
-  if (fg('platform_editor_show_diff_equality_fallback')) {
-    enforceCustomStepRegisters();
-  }
+  enforceCustomStepRegisters();
   const nodeViewSerializer = new NodeViewSerializer({});
   const setNodeViewSerializer = editorView => {
     nodeViewSerializer.init({
@@ -58,7 +55,7 @@ export const createPlugin = (config, getIntl, api) => {
               nodeViewSerializer,
               colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
               intl: getIntl(),
-              activeIndexPos: fg('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined,
+              activeIndexPos: newPluginState.activeIndexPos,
               api,
               ...(expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
                 isInverted: (_newPluginState = newPluginState) === null || _newPluginState === void 0 ? void 0 : _newPluginState.isInverted,
@@ -85,7 +82,7 @@ export const createPlugin = (config, getIntl, api) => {
                 hideDeletedDiffs: false
               } : {})
             };
-          } else if (((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') && fg('platform_editor_show_diff_scroll_navigation')) {
+          } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') {
             // Update the active index in plugin state and recalculate decorations
             const decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc);
             if (decorations.length > 0) {
@@ -175,19 +172,17 @@ export const createPlugin = (config, getIntl, api) => {
           }
 
           // Check for any potential scroll side-effects
-          if (fg('platform_editor_show_diff_scroll_navigation')) {
-            const activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
-            previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
-            if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
-              var _cancelPendingScrollT2, _api$expand, _api$expand$commands;
-              (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 ? void 0 : _cancelPendingScrollT2();
-              const scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc);
-              const activeDecoration = scrollableDecorations[pluginState.activeIndex];
-              if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand$commands = _api$expand.commands) !== null && _api$expand$commands !== void 0 && _api$expand$commands.toggleExpandRange && fg('platform_editor_show_diff_scroll_navigation')) {
-                api === null || api === void 0 ? void 0 : api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
-              }
-              cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
+          const activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
+          previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
+          if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
+            var _cancelPendingScrollT2, _api$expand, _api$expand$commands;
+            (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 ? void 0 : _cancelPendingScrollT2();
+            const scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc);
+            const activeDecoration = scrollableDecorations[pluginState.activeIndex];
+            if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand$commands = _api$expand.commands) !== null && _api$expand$commands !== void 0 && _api$expand$commands.toggleExpandRange) {
+              api === null || api === void 0 ? void 0 : api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
             }
+            cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
           }
         },
         destroy() {

package/dist/es2019/showDiffPlugin.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getScrollableDecorations } from './pm-plugins/getScrollableDecorations';
 import { createPlugin, showDiffPluginKey } from './pm-plugins/main';
 export const showDiffPlugin = ({
@@ -47,7 +46,6 @@ export const showDiffPlugin = ({
     }];
   },
   getSharedState: editorState => {
-    var _pluginState$decorati;
     if (!editorState) {
       return {
         isDisplayingChanges: false,
@@ -55,7 +53,7 @@ export const showDiffPlugin = ({
       };
     }
     const pluginState = showDiffPluginKey.getState(editorState);
-    const decorationCount = fg('platform_editor_show_diff_scroll_navigation') ? getScrollableDecorations(pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations, editorState.doc) : (pluginState === null || pluginState === void 0 ? void 0 : (_pluginState$decorati = pluginState.decorations) === null || _pluginState$decorati === void 0 ? void 0 : _pluginState$decorati.find()) || [];
+    const decorationCount = getScrollableDecorations(pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations, editorState.doc);
     return {
       isDisplayingChanges: decorationCount.length > 0,
       activeIndex: pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex,

package/dist/esm/pm-plugins/areDocsEqualByBlockStructureAndText.js

@@ -1,5 +1,4 @@
 import { Transform } from '@atlaskit/editor-prosemirror/transform';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 
 /**
  * Returns a copy of the document with all marks removed from all text.
@@ -42,13 +41,10 @@ export function areDocsEqualByBlockStructureAndText(doc1, doc2) {
   if (doc1.textContent !== doc2.textContent) {
     return false;
   }
-  if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true)) {
-    // Strip marks before comparing so that mark-driven text fragmentation
-    // (e.g. annotation mark reordering producing different childCounts) does not
-    // cause false inequalities.
-    var stripped1 = stripMarks(doc1);
-    var stripped2 = stripMarks(doc2);
-    return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
-  }
-  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(doc1, doc2);
+  // Strip marks before comparing so that mark-driven text fragmentation
+  // (e.g. annotation mark reordering producing different childCounts) does not
+  // cause false inequalities.
+  var stripped1 = stripMarks(doc1);
+  var stripped2 = stripMarks(doc2);
+  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
 }

package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -12,7 +12,6 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
@@ -125,25 +124,19 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     _iterator.f();
   }
   if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
-    var recoveredViaContentEquality = fg('platform_editor_show_diff_equality_fallback') ? areDocsEqualByBlockStructureAndText(steppedDoc, tr.doc) : undefined;
-    if (expValEquals('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
-      var _api$analytics;
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
-        eventType: 'track',
-        action: 'nodesNotEqual',
-        actionSubject: 'showDiff',
-        attributes: {
-          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
-          colorScheme: colorScheme,
-          recoveredViaContentEquality: recoveredViaContentEquality
-        }
-      });
-    }
-    if (fg('platform_editor_show_diff_equality_fallback')) {
-      if (!recoveredViaContentEquality) {
-        return DecorationSet.empty;
+    var _api$analytics;
+    var recoveredViaContentEquality = areDocsEqualByBlockStructureAndText(steppedDoc, tr.doc);
+    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+      eventType: 'track',
+      action: 'nodesNotEqual',
+      actionSubject: 'showDiff',
+      attributes: {
+        docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+        colorScheme: colorScheme,
+        recoveredViaContentEquality: recoveredViaContentEquality
       }
-    } else {
+    });
+    if (!recoveredViaContentEquality) {
       return DecorationSet.empty;
     }
   }
@@ -215,7 +208,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     }));
   });
   getAttrChangeRanges(tr.doc, attrSteps).forEach(function (change) {
-    if (expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) && change.isInline) {
+    if (change.isInline) {
       // Inline nodes (e.g. date) need an inline decoration rather than a block decoration
       var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
       decorations.push(createInlineChangedDecoration({

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

@@ -1,10 +1,8 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { standardDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, deletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
-import { traditionalDecorationMarkerVariable, traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariable, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNode, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNode, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNode, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNode, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, deletedTraditionalCellOverlayStyle } from './colorSchemes/traditional';
+import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, deletedTraditionalCellOverlayStyle } from './colorSchemes/traditional';
 var displayNoneStyle = convertToInlineCss({
   display: 'none'
 });
@@ -28,7 +26,7 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   // Handle table separately to avoid border issues
   'tableRow', 'paragraph',
   // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList'].concat(_toConsumableArray(expValEquals('platform_editor_show_diff_improvements', 'isEnabled', true) ? [] : ['taskItem']), ['bulletList', 'orderedList', 'layoutSection']).includes(nodeName)) {
+  'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
     // Layout nodes do not need special styling
     return undefined;
   }
@@ -45,51 +43,51 @@ var getBlockNodeStyle = function getBlockNodeStyle(_ref) {
   if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDecorationMarkerVariableNew : traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
+        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
       } else {
-        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDeletedDecorationMarkerVariableNew : traditionalDeletedDecorationMarkerVariable : deletedContentStyleNew;
+        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedContentStyleNew;
       }
     }
-    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? fg('platform_editor_show_diff_scroll_navigation') ? traditionalDecorationMarkerVariableNew : traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
+    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
   }
   if (nodeName === 'blockquote') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleQuoteNodeNew : traditionalStyleQuoteNode : editingStyleQuoteNode;
+        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
       } else {
         return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleQuoteNodeNew : traditionalStyleQuoteNode : editingStyleQuoteNode;
+    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
   }
   if (nodeName === 'rule') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleRuleNodeNew : traditionalStyleRuleNode : editingStyleRuleNode;
+        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
       } else {
         return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleRuleNodeNew : traditionalStyleRuleNode : editingStyleRuleNode;
+    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
   }
   if (nodeName === 'blockCard') {
     if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
       if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleCardBlockNodeNew : traditionalStyleCardBlockNode : editingStyleCardBlockNode;
+        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
       } else {
         return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
       }
     }
-    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleCardBlockNodeNew : traditionalStyleCardBlockNode : editingStyleCardBlockNode;
+    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
   }
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     if (isInserted) {
-      return isTraditional ? isActive ? traditionalStyleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleNodeNew : traditionalStyleNode : editingStyleNode;
+      return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
     } else {
       return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedContentStyleNew;
     }
   }
-  return isTraditional ? isActive ? traditionalStyleNodeActive : fg('platform_editor_show_diff_scroll_navigation') ? traditionalStyleNodeNew : traditionalStyleNode : editingStyleNode;
+  return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
 };
 
 /**
@@ -144,18 +142,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     });
   }
   var className = getNodeClass(change.name);
-  if (fg('platform_editor_show_diff_scroll_navigation')) {
-    if (style || className) {
-      decorations.push(Decoration.node(change.from, change.to, {
-        style: style,
-        'data-testid': 'show-diff-changed-decoration-node',
-        class: className
-      }, {
-        key: 'diff-block',
-        nodeName: change.name
-      }));
-    }
-  } else {
+  if (style || className) {
     decorations.push(Decoration.node(change.from, change.to, {
       style: style,
       'data-testid': 'show-diff-changed-decoration-node',