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

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

@@ -12,7 +12,6 @@ var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _createInlineChangedDecoration = require("../createInlineChangedDecoration");
 var _revealStyles = require("../revealStyles");
 var _getAttrChangeRanges = require("./getAttrChangeRanges");
@@ -120,14 +119,6 @@ var applyDeletedNodeMarkupNext = function applyDeletedNodeMarkupNext(_ref3) {
 var applyDeletedNodeMarkup = function applyDeletedNodeMarkup(args) {
   return (0, _isExperimentEnabled.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
- */
-var shouldApplyStylesDirectly = function shouldApplyStylesDirectly(nodeName) {
-  return nodeName === 'heading';
-};
 var applyCellOverlayStyles = function applyCellOverlayStyles(_ref4) {
   var element = _ref4.element,
     colorScheme = _ref4.colorScheme,
@@ -196,37 +187,17 @@ var createBlockNodeWrapper = function createBlockNodeWrapper() {
   wrapper.setAttribute('style', baseStyle);
   return wrapper;
 };
-
-/**
- * Applies styles directly to an HTML element by merging with existing styles
- */
-var applyStylesToElement = function applyStylesToElement(_ref5) {
+var applyMultiContainerLikeStyles = function applyMultiContainerLikeStyles(_ref5) {
   var element = _ref5.element,
     targetNode = _ref5.targetNode,
     colorScheme = _ref5.colorScheme,
     isActive = _ref5.isActive,
     isInserted = _ref5.isInserted,
-    diffType = _ref5.diffType,
     _ref5$hideAddedDiffsU = _ref5.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref5$hideAddedDiffsU === void 0 ? false : _ref5$hideAddedDiffsU;
   var currentStyle = element.getAttribute('style') || '';
-  var contentStyle = (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
   var targetNodeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _nodeTypeUtils.getBaseNodeTypeName)(targetNode.type) : targetNode.type.name;
-  var nodeSpecificStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
-  element.setAttribute('style', "".concat(currentStyle).concat(contentStyle).concat(nodeSpecificStyle));
-};
-var applyMultiContainerLikeStyles = function applyMultiContainerLikeStyles(_ref6) {
-  var element = _ref6.element,
-    targetNode = _ref6.targetNode,
-    colorScheme = _ref6.colorScheme,
-    isActive = _ref6.isActive,
-    isInserted = _ref6.isInserted,
-    diffType = _ref6.diffType,
-    _ref6$hideAddedDiffsU = _ref6.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderline = _ref6$hideAddedDiffsU === void 0 ? false : _ref6$hideAddedDiffsU;
-  var currentStyle = element.getAttribute('style') || '';
-  var targetNodeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _nodeTypeUtils.getBaseNodeTypeName)(targetNode.type) : targetNode.type.name;
-  var nodeSpecificStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
+  var nodeSpecificStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNodeName, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) || '';
   if (targetNode.type.name === 'decisionList') {
     var nestedInsertedNodeStyle = (0, _wrapBlockNodeViewStyles.resolveNestedInsertedNodeStyle)(colorScheme);
     element.querySelectorAll('li').forEach(function (listItem) {
@@ -256,21 +227,21 @@ var appendStyleToElement = function appendStyleToElement(element, style) {
   var currentStyle = element.getAttribute('style') || '';
   element.setAttribute('style', combineStyles(currentStyle, style));
 };
-var wrapAtomicInlineNode = function wrapAtomicInlineNode(_ref7) {
-  var element = _ref7.element,
-    className = _ref7.className,
-    style = _ref7.style;
+var wrapAtomicInlineNode = function wrapAtomicInlineNode(_ref6) {
+  var element = _ref6.element,
+    className = _ref6.className,
+    style = _ref6.style;
   var wrapper = document.createElement('span');
   wrapper.className = className;
   wrapper.setAttribute('style', style);
   element.replaceWith(wrapper);
   wrapper.append(element);
 };
-var applyInlineLeafNodeStyles = function applyInlineLeafNodeStyles(_ref8) {
-  var element = _ref8.element,
-    targetNode = _ref8.targetNode,
-    contentStyle = _ref8.contentStyle,
-    colorScheme = _ref8.colorScheme;
+var applyInlineLeafNodeStyles = function applyInlineLeafNodeStyles(_ref7) {
+  var element = _ref7.element,
+    targetNode = _ref7.targetNode,
+    contentStyle = _ref7.contentStyle,
+    colorScheme = _ref7.colorScheme;
   // NodeViewSerializer appends one DOM node per direct ProseMirror child, preserving order.
   var childDomNodes = (0, _toConsumableArray2.default)(element.childNodes);
   targetNode.content.forEach(function (childNode, _offset, index) {
@@ -306,23 +277,22 @@ var applyInlineLeafNodeStyles = function applyInlineLeafNodeStyles(_ref8) {
 var quoteBlockLevelStyle = (0, _lazyNodeView.convertToInlineCss)({
   display: 'flow-root'
 });
-var applyTextLikeBlockNodeStyles = function applyTextLikeBlockNodeStyles(_ref9) {
-  var element = _ref9.element,
-    targetNode = _ref9.targetNode,
-    colorScheme = _ref9.colorScheme,
-    isActive = _ref9.isActive,
-    isInserted = _ref9.isInserted,
-    diffType = _ref9.diffType,
-    _ref9$hideAddedDiffsU = _ref9.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderline = _ref9$hideAddedDiffsU === void 0 ? false : _ref9$hideAddedDiffsU,
-    _ref9$highlightInline = _ref9.highlightInlineLeafNodes,
-    highlightInlineLeafNodes = _ref9$highlightInline === void 0 ? false : _ref9$highlightInline;
+var applyTextLikeBlockNodeStyles = function applyTextLikeBlockNodeStyles(_ref8) {
+  var element = _ref8.element,
+    targetNode = _ref8.targetNode,
+    colorScheme = _ref8.colorScheme,
+    isActive = _ref8.isActive,
+    isInserted = _ref8.isInserted,
+    _ref8$hideAddedDiffsU = _ref8.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderline = _ref8$hideAddedDiffsU === void 0 ? false : _ref8$hideAddedDiffsU,
+    _ref8$highlightInline = _ref8.highlightInlineLeafNodes,
+    highlightInlineLeafNodes = _ref8$highlightInline === void 0 ? false : _ref8$highlightInline;
   var currentStyle = element.getAttribute('style') || '';
-  var nodeSpecificStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNode.type.name, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) || '';
+  var nodeSpecificStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNode.type.name, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) || '';
   if (nodeSpecificStyle) {
     element.setAttribute('style', "".concat(currentStyle).concat(nodeSpecificStyle));
   }
-  var contentStyle = (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  var contentStyle = (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
   var walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
   var textNodesToWrap = [];
   var currentNode = walker.nextNode();
@@ -351,24 +321,23 @@ var applyTextLikeBlockNodeStyles = function applyTextLikeBlockNodeStyles(_ref9)
 /**
  * Creates a content wrapper with deleted styles for a block node
  */
-var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref0) {
-  var nodeView = _ref0.nodeView,
-    targetNode = _ref0.targetNode,
-    colorScheme = _ref0.colorScheme,
-    isActive = _ref0.isActive,
-    isInserted = _ref0.isInserted,
-    diffType = _ref0.diffType,
-    _ref0$hideAddedDiffsU = _ref0.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderline = _ref0$hideAddedDiffsU === void 0 ? false : _ref0$hideAddedDiffsU;
+var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref9) {
+  var nodeView = _ref9.nodeView,
+    targetNode = _ref9.targetNode,
+    colorScheme = _ref9.colorScheme,
+    isActive = _ref9.isActive,
+    isInserted = _ref9.isInserted,
+    _ref9$hideAddedDiffsU = _ref9.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderline = _ref9$hideAddedDiffsU === void 0 ? false : _ref9$hideAddedDiffsU;
   var contentWrapper = document.createElement('div');
   var targetNodeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _nodeTypeUtils.getBaseNodeTypeName)(targetNode.type) : targetNode.type.name;
-  var nodeStyle = (0, _wrapBlockNodeViewStyles.getChangedNodeStyle)(targetNodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
+  var nodeStyle = (0, _wrapBlockNodeViewStyles.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.
-  var shouldSkipContentStyle = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted && nodeStyle !== undefined;
-  var contentStyle = shouldSkipContentStyle ? '' : (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  var shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
+  var contentStyle = shouldSkipContentStyle ? '' : (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
   contentWrapper.setAttribute('style', "".concat(contentStyle).concat(nodeStyle || ''));
   contentWrapper.append(nodeView);
   return contentWrapper;
@@ -380,14 +349,14 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref0
  * to wait for the rich-media-item to appear before attaching the lozenge.
  * @returns true if embedCard was handled
  */
-var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref1) {
-  var dom = _ref1.dom,
-    nodeView = _ref1.nodeView,
-    targetNode = _ref1.targetNode,
-    lozenge = _ref1.lozenge,
-    colorScheme = _ref1.colorScheme,
-    _ref1$isActive = _ref1.isActive,
-    isActive = _ref1$isActive === void 0 ? false : _ref1$isActive;
+var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref0) {
+  var dom = _ref0.dom,
+    nodeView = _ref0.nodeView,
+    targetNode = _ref0.targetNode,
+    lozenge = _ref0.lozenge,
+    colorScheme = _ref0.colorScheme,
+    _ref0$isActive = _ref0.isActive,
+    isActive = _ref0$isActive === void 0 ? false : _ref0$isActive;
   if (targetNode.type.name !== 'embedCard' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -423,14 +392,14 @@ var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref1) {
  * Handles special mediaSingle node rendering with lozenge on child media element
  * @returns true if mediaSingle was handled, false otherwise
  */
-var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref10) {
-  var dom = _ref10.dom,
-    nodeView = _ref10.nodeView,
-    targetNode = _ref10.targetNode,
-    lozenge = _ref10.lozenge,
-    colorScheme = _ref10.colorScheme,
-    _ref10$isActive = _ref10.isActive,
-    isActive = _ref10$isActive === void 0 ? false : _ref10$isActive;
+var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref1) {
+  var dom = _ref1.dom,
+    nodeView = _ref1.nodeView,
+    targetNode = _ref1.targetNode,
+    lozenge = _ref1.lozenge,
+    colorScheme = _ref1.colorScheme,
+    _ref1$isActive = _ref1.isActive,
+    isActive = _ref1$isActive === void 0 ? false : _ref1$isActive;
   if (targetNode.type.name !== 'mediaSingle' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -463,22 +432,21 @@ var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref10)
 /**
  * Appends a block node with wrapper, lozenge, and appropriate styling
  */
-var wrapBlockNode = function wrapBlockNode(_ref11) {
-  var dom = _ref11.dom,
-    nodeView = _ref11.nodeView,
-    targetNode = _ref11.targetNode,
-    colorScheme = _ref11.colorScheme,
-    intl = _ref11.intl,
-    _ref11$isActive = _ref11.isActive,
-    isActive = _ref11$isActive === void 0 ? false : _ref11$isActive,
-    _ref11$isInserted = _ref11.isInserted,
-    isInserted = _ref11$isInserted === void 0 ? false : _ref11$isInserted,
-    diffType = _ref11.diffType,
-    _ref11$hideAddedDiffs = _ref11.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderline = _ref11$hideAddedDiffs === void 0 ? false : _ref11$hideAddedDiffs;
+var wrapBlockNode = function wrapBlockNode(_ref10) {
+  var dom = _ref10.dom,
+    nodeView = _ref10.nodeView,
+    targetNode = _ref10.targetNode,
+    colorScheme = _ref10.colorScheme,
+    intl = _ref10.intl,
+    _ref10$isActive = _ref10.isActive,
+    isActive = _ref10$isActive === void 0 ? false : _ref10$isActive,
+    _ref10$isInserted = _ref10.isInserted,
+    isInserted = _ref10$isInserted === void 0 ? false : _ref10$isInserted,
+    _ref10$hideAddedDiffs = _ref10.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderline = _ref10$hideAddedDiffs === void 0 ? false : _ref10$hideAddedDiffs;
   var blockWrapper = createBlockNodeWrapper();
   var targetNodeName = (0, _expValEquals.expValEquals)('platform_editor_nest_table_in_panel', 'isEnabled', true) ? (0, _nodeTypeUtils.getBaseNodeTypeName)(targetNode.type) : targetNode.type.name;
-  if (shouldShowRemovedLozenge(targetNodeName) && (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isInserted)) {
+  if (shouldShowRemovedLozenge(targetNodeName) && !isInserted) {
     var lozenge = createRemovedLozenge(intl, isActive, colorScheme);
     if (handleEmbedCardWithLozenge({
       dom: dom,
@@ -508,7 +476,6 @@ var wrapBlockNode = function wrapBlockNode(_ref11) {
     colorScheme: colorScheme,
     isActive: isActive,
     isInserted: isInserted,
-    diffType: diffType,
     hideAddedDiffsUnderline: hideAddedDiffsUnderline
   });
   blockWrapper.append(contentWrapper);
@@ -528,106 +495,75 @@ var wrapBlockNode = function wrapBlockNode(_ref11) {
  * For heading nodes, applies styles directly to preserve natural margins.
  * For other block nodes, uses wrapper approach with optional lozenge.
  */
-var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_ref12) {
-  var dom = _ref12.dom,
-    nodeView = _ref12.nodeView,
-    targetNode = _ref12.targetNode,
-    colorScheme = _ref12.colorScheme,
-    intl = _ref12.intl,
-    _ref12$isActive = _ref12.isActive,
-    isActive = _ref12$isActive === void 0 ? false : _ref12$isActive,
-    _ref12$isInserted = _ref12.isInserted,
-    isInserted = _ref12$isInserted === void 0 ? false : _ref12$isInserted,
-    diffType = _ref12.diffType,
-    _ref12$hideAddedDiffs = _ref12.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderline = _ref12$hideAddedDiffs === void 0 ? false : _ref12$hideAddedDiffs,
-    _ref12$highlightInlin = _ref12.highlightInlineLeafNodes,
-    highlightInlineLeafNodes = _ref12$highlightInlin === void 0 ? false : _ref12$highlightInlin;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    if (nodeView instanceof HTMLElement) {
-      if (isInserted && (0, _wrapBlockNodeViewStyles.isMultiContainerBlockNode)(targetNode.type.name)) {
-        applyMultiContainerLikeStyles({
-          element: nodeView,
-          targetNode: targetNode,
-          colorScheme: colorScheme,
-          isActive: isActive,
-          isInserted: isInserted,
-          diffType: diffType,
-          hideAddedDiffsUnderline: hideAddedDiffsUnderline
-        });
-        dom.append(nodeView);
-        return;
-      }
-      if ((0, _wrapBlockNodeViewStyles.isTextLikeBlockNode)(targetNode.type.name)) {
-        applyTextLikeBlockNodeStyles({
-          element: nodeView,
-          targetNode: targetNode,
-          colorScheme: colorScheme,
-          isActive: isActive,
-          isInserted: isInserted,
-          diffType: diffType,
-          hideAddedDiffsUnderline: hideAddedDiffsUnderline,
-          highlightInlineLeafNodes: highlightInlineLeafNodes
-        });
-        if (targetNode.type.name === 'blockquote' && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-          appendStyleToElement(nodeView, quoteBlockLevelStyle);
-        }
-        dom.append(nodeView);
-        return;
-      }
-      if (targetNode.type.name === 'table') {
-        if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_diff_rounded_corners')) {
-          (0, _tableCellEdgeAttrs.applyTableCellEdgeAttrs)({
-            element: nodeView,
-            tableNode: targetNode
-          });
-        }
-        applyCellOverlayStyles({
-          element: nodeView,
-          colorScheme: colorScheme,
-          isInserted: isInserted
-        });
-        dom.append(nodeView);
-        return;
-      }
-    }
-    wrapBlockNode({
-      dom: dom,
-      nodeView: nodeView,
-      targetNode: targetNode,
-      colorScheme: colorScheme,
-      intl: intl,
-      isActive: isActive,
-      isInserted: isInserted,
-      diffType: diffType,
-      hideAddedDiffsUnderline: hideAddedDiffsUnderline
-    });
-    return;
-  } else {
-    if (shouldApplyStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
-      // Apply deleted styles directly to preserve natural block-level margins
-      applyStylesToElement({
+var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_ref11) {
+  var dom = _ref11.dom,
+    nodeView = _ref11.nodeView,
+    targetNode = _ref11.targetNode,
+    colorScheme = _ref11.colorScheme,
+    intl = _ref11.intl,
+    _ref11$isActive = _ref11.isActive,
+    isActive = _ref11$isActive === void 0 ? false : _ref11$isActive,
+    _ref11$isInserted = _ref11.isInserted,
+    isInserted = _ref11$isInserted === void 0 ? false : _ref11$isInserted,
+    _ref11$hideAddedDiffs = _ref11.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderline = _ref11$hideAddedDiffs === void 0 ? false : _ref11$hideAddedDiffs,
+    _ref11$highlightInlin = _ref11.highlightInlineLeafNodes,
+    highlightInlineLeafNodes = _ref11$highlightInlin === void 0 ? false : _ref11$highlightInlin;
+  if (nodeView instanceof HTMLElement) {
+    if (isInserted && (0, _wrapBlockNodeViewStyles.isMultiContainerBlockNode)(targetNode.type.name)) {
+      applyMultiContainerLikeStyles({
         element: nodeView,
         targetNode: targetNode,
         colorScheme: colorScheme,
         isActive: isActive,
         isInserted: isInserted,
-        diffType: diffType
+        hideAddedDiffsUnderline: hideAddedDiffsUnderline
       });
       dom.append(nodeView);
-    } else {
-      wrapBlockNode({
-        dom: dom,
-        nodeView: nodeView,
+      return;
+    }
+    if ((0, _wrapBlockNodeViewStyles.isTextLikeBlockNode)(targetNode.type.name)) {
+      applyTextLikeBlockNodeStyles({
+        element: nodeView,
         targetNode: targetNode,
         colorScheme: colorScheme,
-        intl: intl,
         isActive: isActive,
         isInserted: isInserted,
-        diffType: diffType
+        hideAddedDiffsUnderline: hideAddedDiffsUnderline,
+        highlightInlineLeafNodes: highlightInlineLeafNodes
       });
+      if (targetNode.type.name === 'blockquote' && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+        appendStyleToElement(nodeView, quoteBlockLevelStyle);
+      }
+      dom.append(nodeView);
+      return;
+    }
+    if (targetNode.type.name === 'table') {
+      if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_loveability', 'isEnabled', true) && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_diff_rounded_corners')) {
+        (0, _tableCellEdgeAttrs.applyTableCellEdgeAttrs)({
+          element: nodeView,
+          tableNode: targetNode
+        });
+      }
+      applyCellOverlayStyles({
+        element: nodeView,
+        colorScheme: colorScheme,
+        isInserted: isInserted
+      });
+      dom.append(nodeView);
+      return;
     }
   }
+  wrapBlockNode({
+    dom: dom,
+    nodeView: nodeView,
+    targetNode: targetNode,
+    colorScheme: colorScheme,
+    intl: intl,
+    isActive: isActive,
+    isInserted: isInserted,
+    hideAddedDiffsUnderline: hideAddedDiffsUnderline
+  });
 };
 
 /**
@@ -635,13 +571,12 @@ var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_
  * 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.
  */
-var injectInnerWrapper = exports.injectInnerWrapper = function injectInnerWrapper(_ref13) {
-  var node = _ref13.node,
-    colorScheme = _ref13.colorScheme,
-    isActive = _ref13.isActive,
-    isInserted = _ref13.isInserted,
-    diffType = _ref13.diffType,
-    reveal = _ref13.reveal;
+var injectInnerWrapper = exports.injectInnerWrapper = function injectInnerWrapper(_ref12) {
+  var node = _ref12.node,
+    colorScheme = _ref12.colorScheme,
+    isActive = _ref12.isActive,
+    isInserted = _ref12.isInserted,
+    reveal = _ref12.reveal;
   var wrapper = document.createElement('span');
   var revealStyle = (0, _revealStyles.applyRevealToElement)({
     colorScheme: colorScheme,
@@ -650,7 +585,7 @@ var injectInnerWrapper = exports.injectInnerWrapper = function injectInnerWrappe
     isInserted: isInserted !== null && isInserted !== void 0 ? isInserted : false,
     reveal: reveal
   });
-  wrapper.setAttribute('style', (isInserted ? (0, _wrapBlockNodeViewStyles.getInsertedContentStyle)(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyle)(colorScheme, isActive, diffType, Boolean(revealStyle))) + revealStyle);
+  wrapper.setAttribute('style', (isInserted ? (0, _wrapBlockNodeViewStyles.getInsertedContentStyle)(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyle)(colorScheme, isActive, Boolean(revealStyle))) + revealStyle);
   (0, _toConsumableArray2.default)(node.childNodes).forEach(function (child) {
     var removedChild = node.removeChild(child);
     wrapper.append(removedChild);
@@ -665,8 +600,7 @@ var injectInnerWrapper = exports.injectInnerWrapper = function injectInnerWrappe
 var createContentWrapper = exports.createContentWrapper = function createContentWrapper(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var diffType = arguments.length > 3 ? arguments[3] : undefined;
-  var reveal = arguments.length > 4 ? arguments[4] : undefined;
+  var reveal = arguments.length > 3 ? arguments[3] : undefined;
   var wrapper = document.createElement('span');
   var baseStyle = (0, _lazyNodeView.convertToInlineCss)({
     position: 'relative',
@@ -681,21 +615,14 @@ var createContentWrapper = exports.createContentWrapper = function createContent
     isInserted: isInserted,
     reveal: reveal
   });
-  var deletedStyle = (0, _wrapBlockNodeViewStyles.getDeletedContentStyle)(colorScheme, isActive, diffType, Boolean(revealStyle));
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    if (isInserted) {
-      wrapper.setAttribute('style', "".concat(baseStyle).concat((0, _wrapBlockNodeViewStyles.getInsertedContentStyle)(colorScheme, isActive)).concat(revealStyle));
-    } else {
-      wrapper.setAttribute('style', "".concat(baseStyle).concat(deletedStyle).concat(revealStyle));
-      var strikethrough = document.createElement('span');
-      strikethrough.setAttribute('style', (0, _wrapBlockNodeViewStyles.getDeletedContentStyleUnbounded)(colorScheme, isActive));
-      wrapper.append(strikethrough);
-    }
+  var deletedStyle = (0, _wrapBlockNodeViewStyles.getDeletedContentStyle)(colorScheme, isActive, Boolean(revealStyle));
+  if (isInserted) {
+    wrapper.setAttribute('style', "".concat(baseStyle).concat((0, _wrapBlockNodeViewStyles.getInsertedContentStyle)(colorScheme, isActive)).concat(revealStyle));
   } else {
     wrapper.setAttribute('style', "".concat(baseStyle).concat(deletedStyle).concat(revealStyle));
-    var _strikethrough = document.createElement('span');
-    _strikethrough.setAttribute('style', (0, _wrapBlockNodeViewStyles.getDeletedContentStyleUnbounded)(colorScheme, isActive));
-    wrapper.append(_strikethrough);
+    var strikethrough = document.createElement('span');
+    strikethrough.setAttribute('style', (0, _wrapBlockNodeViewStyles.getDeletedContentStyleUnbounded)(colorScheme, isActive));
+    wrapper.append(strikethrough);
   }
   return wrapper;
 };

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

@@ -8,7 +8,6 @@ exports.resolveRemovedLozengeStyle = exports.resolveNestedInsertedNodeStyle = ex
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _factory = require("../colorSchemes/factory");
 var _schemes = require("../colorSchemes/schemes");
 var _wrapBlockNodeViewStyles = require("./wrapBlockNodeViewStyles.legacy");
@@ -47,10 +46,9 @@ var isTextLikeBlockNode = exports.isTextLikeBlockNode = function isTextLikeBlock
 var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var diffType = arguments.length > 3 ? arguments[3] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  var hideAddedDiffsUnderline = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var colors = getColorScheme(colorScheme);
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted) {
+  if (isInserted) {
     return (0, _factory.buildInsertedInlineStyle)(colors, isActive, hideAddedDiffsUnderline);
   }
   var base = (0, _factory.buildDeletedInlineContentStyle)(colors, isActive ? 'active' : 'new');
@@ -58,7 +56,7 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
   // 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 ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint' && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint') {
     return base + (0, _factory.buildDeletedInlineContentStyleExtended)(colors, isActive);
   }
   return base;
@@ -66,10 +64,9 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
 var getChangedNodeStyleNext = function getChangedNodeStyleNext(nodeName, colorScheme) {
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var diffType = arguments.length > 4 ? arguments[4] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var colors = getColorScheme(colorScheme);
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted) {
+  if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
       return hideAddedDiffsUnderline || (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? (0, _factory.buildInsertStyleInBlockExtendedNoUnderline)(nestedContentScheme) : (0, _factory.buildInsertStyleInBlockExtended)(nestedContentScheme);
     }
@@ -108,13 +105,12 @@ var getInsertedContentStyleNext = function getInsertedContentStyleNext(colorSche
 };
 var getDeletedContentStyleNext = function getDeletedContentStyleNext(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  var omitHighlight = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var omitHighlight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var colors = getColorScheme(colorScheme);
   var base = (0, _factory.buildDeletedInlineContentStyle)(colors, isActive ? 'active' : 'new');
 
   // glyphTint adds a background highlight and border-bottom over the tint; strikethrough does not.
-  var needsExtendedHighlight = colors.deletedInlineTreatment === 'glyphTint' && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !omitHighlight;
+  var needsExtendedHighlight = colors.deletedInlineTreatment === 'glyphTint' && !omitHighlight;
   return needsExtendedHighlight ? base + (0, _factory.buildDeletedInlineContentStyleExtended)(colors, isActive) : base;
 };
 var resolveCellOverlayStyleNext = function resolveCellOverlayStyleNext(_ref) {
@@ -145,18 +141,16 @@ var hasRestingDeletedRingNext = function hasRestingDeletedRingNext(colorScheme)
 var getChangedContentStyle = exports.getChangedContentStyle = function getChangedContentStyle(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var diffType = arguments.length > 3 ? arguments[3] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  var hideAddedDiffsUnderline = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, isInserted, hideAddedDiffsUnderline);
 };
 
 /** Node-specific style for a changed block node, or `undefined` when the node type has none. */
 var getChangedNodeStyle = exports.getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorScheme) {
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var diffType = arguments.length > 4 ? arguments[4] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedNodeStyleLegacy)(nodeName, (0, _schemes.getLegacyColorScheme)(colorScheme), isInserted, isActive, diffType, hideAddedDiffsUnderline);
+  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedNodeStyleLegacy)(nodeName, (0, _schemes.getLegacyColorScheme)(colorScheme), isInserted, isActive, hideAddedDiffsUnderline);
 };
 
 /** The positioned line drawn across deleted content spanning an unbounded range. */
@@ -175,9 +169,8 @@ var getInsertedContentStyle = exports.getInsertedContentStyle = function getInse
 /** Inline style for deleted content. */
 var getDeletedContentStyle = exports.getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  var omitHighlight = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType, omitHighlight) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, diffType, omitHighlight);
+  var omitHighlight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, omitHighlight) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, omitHighlight);
 };
 
 /**

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.resolveRemovedLozengeStyleLegacy = exports.resolveNestedInsertedNodeStyleLegacy = exports.resolveCellOverlayStyleLegacy = exports.hasRestingDeletedRingLegacy = exports.getInsertedContentStyleLegacy = exports.getDeletedContentStyleUnboundedLegacy = exports.getDeletedContentStyleLegacy = exports.getChangedNodeStyleLegacy = exports.getChangedContentStyleLegacy = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _standard = require("../colorSchemes/standard");
 var _traditional = require("../colorSchemes/traditional");
 /**
@@ -86,9 +85,8 @@ var isTextLikeBlockNode = function isTextLikeBlockNode(nodeName) {
 var getChangedContentStyleLegacy = exports.getChangedContentStyleLegacy = function getChangedContentStyleLegacy(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var diffType = arguments.length > 3 ? arguments[3] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted) {
+  var hideAddedDiffsUnderline = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  if (isInserted) {
     if (colorScheme === 'traditional') {
       return isActive ? _traditional.traditionalInsertStyleActive : _traditional.traditionalInsertStyle;
     }
@@ -107,10 +105,9 @@ var getChangedContentStyleLegacy = exports.getChangedContentStyleLegacy = functi
 var getChangedNodeStyleLegacy = exports.getChangedNodeStyleLegacy = function getChangedNodeStyleLegacy(nodeName, colorScheme) {
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var diffType = arguments.length > 4 ? arguments[4] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var isTraditional = colorScheme === 'traditional';
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted) {
+  if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
       return hideAddedDiffsUnderline || (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _standard.editingContentStyleInBlockExtendedNoUnderline : _standard.editingContentStyleInBlockExtended;
     }
@@ -170,12 +167,11 @@ var getInsertedContentStyleLegacy = exports.getInsertedContentStyleLegacy = func
 /** Pre-refactor inline style for deleted content. */
 var getDeletedContentStyleLegacy = exports.getDeletedContentStyleLegacy = function getDeletedContentStyleLegacy(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  var omitHighlight = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var omitHighlight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (colorScheme === 'traditional') {
     return (0, _traditional.getDeletedTraditionalInlineStyle)(isActive);
   }
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !omitHighlight) {
+  if (!omitHighlight) {
     return (isActive ? (0, _standard.getStandardDeletedContentStyleActive)() : (0, _standard.getStandardDeletedContentStyleNew)()) + _standard.deletedInlineContentStyleExtended;
   }
   return isActive ? (0, _standard.getStandardDeletedContentStyleActive)() : (0, _standard.getStandardDeletedContentStyleNew)();

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

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultDiffType = void 0;
+var _fg = require("@atlaskit/platform-feature-flags/fg");
+var getDefaultDiffType = exports.getDefaultDiffType = function getDefaultDiffType() {
+  return (0, _fg.fg)('platform_editor_ai_smart_diff') ? 'smart' : 'inline';
+};