@atlaskit/editor-plugin-show-diff 6.3.2 → 6.4.1

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

@@ -4,6 +4,9 @@ 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';
+var displayNoneStyle = convertToInlineCss({
+  display: 'none'
+});
 var getNodeClass = function getNodeClass(name) {
   switch (name) {
     case 'extension':
@@ -102,8 +105,19 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     _ref2$isInserted = _ref2.isInserted,
     isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
     _ref2$isActive = _ref2.isActive,
-    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive;
+    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
+    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
+    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet;
   var decorations = [];
+  if (shouldHideDeleted) {
+    return [Decoration.node(change.from, change.to, {
+      style: displayNoneStyle
+    }, {
+      key: 'diff-block',
+      nodeName: change.name
+    })];
+  }
+  var style;
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) && ['tableCell', 'tableHeader'].includes(change.name)) {
     var cellOverlay = document.createElement('div');
     var cellOverlayStyle = isInserted ? colorScheme === 'traditional' ? traditionalAddedCellOverlayStyle : addedCellOverlayStyle : colorScheme === 'traditional' ? deletedTraditionalCellOverlayStyle : deletedCellOverlayStyle;
@@ -114,11 +128,6 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       key: "diff-widget-cell-overlay-".concat(change.to)
     }));
   }
-  var style = getBlockNodeStyle({
-    nodeName: change.name,
-    colorScheme: colorScheme,
-    isActive: isActive
-  });
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     style = getBlockNodeStyle({
       nodeName: change.name,
@@ -126,6 +135,12 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       isInserted: isInserted,
       isActive: isActive
     });
+  } else {
+    style = getBlockNodeStyle({
+      nodeName: change.name,
+      colorScheme: colorScheme,
+      isActive: isActive
+    });
   }
   var className = getNodeClass(change.name);
   if (fg('platform_editor_show_diff_scroll_navigation')) {

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

@@ -1,8 +1,11 @@
+import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editingStyle, editingStyleActive, deletedContentStyle, deletedContentStyleActive } from './colorSchemes/standard';
 import { traditionalInsertStyle, traditionalInsertStyleActive, getDeletedTraditionalInlineStyle } from './colorSchemes/traditional';
-
+var displayNoneStyle = convertToInlineCss({
+  display: 'none'
+});
 /**
  * Inline decoration used for insertions as the content already exists in the document
  *
@@ -16,7 +19,16 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     _ref$isActive = _ref.isActive,
     isActive = _ref$isActive === void 0 ? false : _ref$isActive,
     _ref$isInserted = _ref.isInserted,
-    isInserted = _ref$isInserted === void 0 ? true : _ref$isInserted;
+    isInserted = _ref$isInserted === void 0 ? true : _ref$isInserted,
+    _ref$shouldHideDelete = _ref.shouldHideDeleted,
+    shouldHideDeleted = _ref$shouldHideDelete === void 0 ? false : _ref$shouldHideDelete;
+  if (shouldHideDeleted) {
+    return Decoration.inline(change.fromB, change.toB, {
+      style: displayNoneStyle
+    }, {
+      key: 'diff-inline'
+    });
+  }
   var style;
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     if (isInserted) {

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

@@ -1,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -255,8 +258,10 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   });
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
   var decorations = [];
-  decorations.push(Decoration.widget(safeInsertPos, dom, {
+  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread({
     key: "diff-widget-".concat(isActive ? 'active' : 'inactive')
-  }));
+  }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
+    side: -1
+  })));
   return decorations;
 };

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

@@ -2,7 +2,7 @@ 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, editingStyle, editingStyleActive, editingStyleNode, addedCellOverlayStyle, deletedCellOverlayStyle } from '../colorSchemes/standard';
+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';
 var lozengeStyle = convertToInlineCss({
   display: 'inline-flex',
@@ -74,7 +74,10 @@ var getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorScheme) {
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var isTraditional = colorScheme === 'traditional';
   if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) && isInserted) {
-    if (shouldApplyStylesDirectly(nodeName)) {
+    if (isMultiContainerBlockNode(nodeName)) {
+      return editingContentStyleInBlock;
+    }
+    if (isTextLikeBlockNode(nodeName)) {
       return undefined;
     }
     if (isTraditional) {
@@ -155,6 +158,12 @@ var maybeAddDeletedOutlineNewClass = function maybeAddDeletedOutlineNewClass(_re
 var shouldApplyStylesDirectly = function shouldApplyStylesDirectly(nodeName) {
   return nodeName === 'heading';
 };
+var isMultiContainerBlockNode = function isMultiContainerBlockNode(nodeName) {
+  return ['decisionList', 'layoutSection'].includes(nodeName);
+};
+var isTextLikeBlockNode = function isTextLikeBlockNode(nodeName) {
+  return ['heading', 'bulletList', 'orderedList', 'listItem', 'taskList', 'blockquote'].includes(nodeName);
+};
 var applyCellOverlayStyles = function applyCellOverlayStyles(_ref2) {
   var element = _ref2.element,
     colorScheme = _ref2.colorScheme,
@@ -222,16 +231,66 @@ var applyStylesToElement = function applyStylesToElement(_ref3) {
   var nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive) || '';
   element.setAttribute('style', "".concat(currentStyle).concat(contentStyle).concat(nodeSpecificStyle));
 };
-
-/**
- * Creates a content wrapper with deleted styles for a block node
- */
-var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref4) {
-  var nodeView = _ref4.nodeView,
+var applyMultiContainerLikeStyles = function applyMultiContainerLikeStyles(_ref4) {
+  var element = _ref4.element,
     targetNode = _ref4.targetNode,
     colorScheme = _ref4.colorScheme,
     isActive = _ref4.isActive,
     isInserted = _ref4.isInserted;
+  var currentStyle = element.getAttribute('style') || '';
+  var nodeSpecificStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive) || '';
+  if (targetNode.type.name === 'decisionList') {
+    element.querySelectorAll('li').forEach(function (listItem) {
+      var currentListItemStyle = listItem.getAttribute('style') || '';
+      listItem.setAttribute('style', "".concat(currentListItemStyle).concat(editingStyleNode));
+    });
+  } else if (targetNode.type.name === 'layoutSection') {
+    element.querySelectorAll('[data-layout-column="true"]').forEach(function (section) {
+      var currentSectionStyle = section.getAttribute('style') || '';
+      section.setAttribute('style', "".concat(currentSectionStyle).concat(editingStyleNode));
+    });
+  } else if (targetNode.type.name === 'taskList') {
+    element.querySelectorAll('li').forEach(function (listItem) {
+      var currentListItemStyle = listItem.getAttribute('style') || '';
+      listItem.setAttribute('style', "".concat(currentListItemStyle).concat(editingStyleNode));
+    });
+  }
+  element.setAttribute('style', "".concat(currentStyle, ";").concat(nodeSpecificStyle));
+};
+var applyTextLikeBlockNodeStyles = function applyTextLikeBlockNodeStyles(_ref5) {
+  var element = _ref5.element,
+    targetNode = _ref5.targetNode,
+    colorScheme = _ref5.colorScheme,
+    isActive = _ref5.isActive,
+    isInserted = _ref5.isInserted;
+  getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive) || '';
+  var contentStyle = getChangedContentStyle(colorScheme, isActive, isInserted);
+  var walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
+  var textNodesToWrap = [];
+  var currentNode = walker.nextNode();
+  while (currentNode) {
+    if (currentNode instanceof Text && currentNode.textContent !== '' && currentNode.parentElement) {
+      textNodesToWrap.push(currentNode);
+    }
+    currentNode = walker.nextNode();
+  }
+  textNodesToWrap.forEach(function (textNode) {
+    var contentWrapper = document.createElement('span');
+    contentWrapper.setAttribute('style', contentStyle);
+    textNode.replaceWith(contentWrapper);
+    contentWrapper.append(textNode);
+  });
+};
+
+/**
+ * Creates a content wrapper with deleted styles for a block node
+ */
+var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref6) {
+  var nodeView = _ref6.nodeView,
+    targetNode = _ref6.targetNode,
+    colorScheme = _ref6.colorScheme,
+    isActive = _ref6.isActive,
+    isInserted = _ref6.isInserted;
   var contentWrapper = document.createElement('div');
   var nodeStyle = getChangedNodeStyle(targetNode.type.name, colorScheme, isInserted, isActive);
   contentWrapper.setAttribute('style', "".concat(getChangedContentStyle(colorScheme, isActive, isInserted)).concat(nodeStyle || ''));
@@ -245,14 +304,14 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref4
  * to wait for the rich-media-item to appear before attaching the lozenge.
  * @returns true if embedCard was handled
  */
-var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref5) {
-  var dom = _ref5.dom,
-    nodeView = _ref5.nodeView,
-    targetNode = _ref5.targetNode,
-    lozenge = _ref5.lozenge,
-    colorScheme = _ref5.colorScheme,
-    _ref5$isActive = _ref5.isActive,
-    isActive = _ref5$isActive === void 0 ? false : _ref5$isActive;
+var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref7) {
+  var dom = _ref7.dom,
+    nodeView = _ref7.nodeView,
+    targetNode = _ref7.targetNode,
+    lozenge = _ref7.lozenge,
+    colorScheme = _ref7.colorScheme,
+    _ref7$isActive = _ref7.isActive,
+    isActive = _ref7$isActive === void 0 ? false : _ref7$isActive;
   if (targetNode.type.name !== 'embedCard' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -293,14 +352,14 @@ var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref5) {
  * Handles special mediaSingle node rendering with lozenge on child media element
  * @returns true if mediaSingle was handled, false otherwise
  */
-var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref6) {
-  var dom = _ref6.dom,
-    nodeView = _ref6.nodeView,
-    targetNode = _ref6.targetNode,
-    lozenge = _ref6.lozenge,
-    colorScheme = _ref6.colorScheme,
-    _ref6$isActive = _ref6.isActive,
-    isActive = _ref6$isActive === void 0 ? false : _ref6$isActive;
+var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref8) {
+  var dom = _ref8.dom,
+    nodeView = _ref8.nodeView,
+    targetNode = _ref8.targetNode,
+    lozenge = _ref8.lozenge,
+    colorScheme = _ref8.colorScheme,
+    _ref8$isActive = _ref8.isActive,
+    isActive = _ref8$isActive === void 0 ? false : _ref8$isActive;
   if (targetNode.type.name !== 'mediaSingle' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -338,16 +397,16 @@ var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref6)
 /**
  * Appends a block node with wrapper, lozenge, and appropriate styling
  */
-var wrapBlockNode = function wrapBlockNode(_ref7) {
-  var dom = _ref7.dom,
-    nodeView = _ref7.nodeView,
-    targetNode = _ref7.targetNode,
-    colorScheme = _ref7.colorScheme,
-    intl = _ref7.intl,
-    _ref7$isActive = _ref7.isActive,
-    isActive = _ref7$isActive === void 0 ? false : _ref7$isActive,
-    _ref7$isInserted = _ref7.isInserted,
-    isInserted = _ref7$isInserted === void 0 ? false : _ref7$isInserted;
+var wrapBlockNode = function wrapBlockNode(_ref9) {
+  var dom = _ref9.dom,
+    nodeView = _ref9.nodeView,
+    targetNode = _ref9.targetNode,
+    colorScheme = _ref9.colorScheme,
+    intl = _ref9.intl,
+    _ref9$isActive = _ref9.isActive,
+    isActive = _ref9$isActive === void 0 ? false : _ref9$isActive,
+    _ref9$isInserted = _ref9.isInserted,
+    isInserted = _ref9$isInserted === void 0 ? false : _ref9$isInserted;
   var blockWrapper = createBlockNodeWrapper();
   if (shouldShowRemovedLozenge(targetNode.type.name) && (!expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) || !isInserted)) {
     var lozenge = createRemovedLozenge(intl, isActive, colorScheme);
@@ -402,35 +461,50 @@ var wrapBlockNode = function wrapBlockNode(_ref7) {
  * For heading nodes, applies styles directly to preserve natural margins.
  * For other block nodes, uses wrapper approach with optional lozenge.
  */
-export var wrapBlockNodeView = function wrapBlockNodeView(_ref8) {
-  var dom = _ref8.dom,
-    nodeView = _ref8.nodeView,
-    targetNode = _ref8.targetNode,
-    colorScheme = _ref8.colorScheme,
-    intl = _ref8.intl,
-    _ref8$isActive = _ref8.isActive,
-    isActive = _ref8$isActive === void 0 ? false : _ref8$isActive,
-    _ref8$isInserted = _ref8.isInserted,
-    isInserted = _ref8$isInserted === void 0 ? false : _ref8$isInserted;
-  if (shouldApplyStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
-    // Apply deleted styles directly to preserve natural block-level margins
-    applyStylesToElement({
-      element: nodeView,
-      targetNode: targetNode,
-      colorScheme: colorScheme,
-      isActive: isActive,
-      isInserted: isInserted
-    });
-    dom.append(nodeView);
-  } else if (targetNode.type.name === 'table' && nodeView instanceof HTMLElement && expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-    applyCellOverlayStyles({
-      element: nodeView,
-      colorScheme: colorScheme,
-      isInserted: isInserted
-    });
-    dom.append(nodeView);
-  } else {
-    // Use wrapper approach for other block nodes
+export var wrapBlockNodeView = function wrapBlockNodeView(_ref0) {
+  var dom = _ref0.dom,
+    nodeView = _ref0.nodeView,
+    targetNode = _ref0.targetNode,
+    colorScheme = _ref0.colorScheme,
+    intl = _ref0.intl,
+    _ref0$isActive = _ref0.isActive,
+    isActive = _ref0$isActive === void 0 ? false : _ref0$isActive,
+    _ref0$isInserted = _ref0.isInserted,
+    isInserted = _ref0$isInserted === void 0 ? false : _ref0$isInserted;
+  if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
+    if (nodeView instanceof HTMLElement) {
+      if (isInserted && isMultiContainerBlockNode(targetNode.type.name)) {
+        applyMultiContainerLikeStyles({
+          element: nodeView,
+          targetNode: targetNode,
+          colorScheme: colorScheme,
+          isActive: isActive,
+          isInserted: isInserted
+        });
+        dom.append(nodeView);
+        return;
+      }
+      if (isTextLikeBlockNode(targetNode.type.name)) {
+        applyTextLikeBlockNodeStyles({
+          element: nodeView,
+          targetNode: targetNode,
+          colorScheme: colorScheme,
+          isActive: isActive,
+          isInserted: isInserted
+        });
+        dom.append(nodeView);
+        return;
+      }
+      if (targetNode.type.name === 'table') {
+        applyCellOverlayStyles({
+          element: nodeView,
+          colorScheme: colorScheme,
+          isInserted: isInserted
+        });
+        dom.append(nodeView);
+        return;
+      }
+    }
     wrapBlockNode({
       dom: dom,
       nodeView: nodeView,
@@ -440,5 +514,28 @@ export var wrapBlockNodeView = function wrapBlockNodeView(_ref8) {
       isActive: isActive,
       isInserted: isInserted
     });
+    return;
+  } else {
+    if (shouldApplyStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
+      // Apply deleted styles directly to preserve natural block-level margins
+      applyStylesToElement({
+        element: nodeView,
+        targetNode: targetNode,
+        colorScheme: colorScheme,
+        isActive: isActive,
+        isInserted: isInserted
+      });
+      dom.append(nodeView);
+    } else {
+      wrapBlockNode({
+        dom: dom,
+        nodeView: nodeView,
+        targetNode: targetNode,
+        colorScheme: colorScheme,
+        intl: intl,
+        isActive: isActive,
+        isInserted: isInserted
+      });
+    }
   }
 };

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

@@ -36,7 +36,8 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
           isDisplayingChanges: false
         }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
           isInverted: false,
-          diffType: 'inline'
+          diffType: 'inline',
+          hideDeletedDiffs: false
         } : {});
       },
       apply: function apply(tr, currentPluginState, oldState, newState) {
@@ -44,7 +45,7 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
         var newPluginState = currentPluginState;
         if (meta) {
           if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SHOW_DIFF') {
-            var _newPluginState, _newPluginState2;
+            var _newPluginState, _newPluginState2, _newPluginState3;
             // Update the plugin state with the new metadata
             newPluginState = _objectSpread(_objectSpread(_objectSpread({}, currentPluginState), meta), {}, {
               isDisplayingChanges: true,
@@ -61,7 +62,8 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
               api: api
             }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
               isInverted: (_newPluginState = newPluginState) === null || _newPluginState === void 0 ? void 0 : _newPluginState.isInverted,
-              diffType: (_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.diffType
+              diffType: (_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.diffType,
+              hideDeletedDiffs: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.hideDeletedDiffs
             } : {}));
             // Update the decorations
             newPluginState.decorations = decorations;
@@ -72,7 +74,8 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
               activeIndex: undefined
             }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
               isInverted: false,
-              diffType: 'inline'
+              diffType: 'inline',
+              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')) {
             // Update the active index in plugin state and recalculate decorations
@@ -111,7 +114,9 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
                 activeIndexPos: newPluginState.activeIndexPos,
                 api: api
               }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
-                isInverted: newPluginState.isInverted
+                isInverted: newPluginState.isInverted,
+                diffType: newPluginState.diffType,
+                hideDeletedDiffs: newPluginState.hideDeletedDiffs
               } : {}));
               newPluginState.decorations = updatedDecorations;
             }

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

@@ -6,13 +6,14 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ColorScheme, ShowDiffPlugin } from '../../showDiffPluginType';
 import type { ShowDiffPluginState } from '../main';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
-export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, }: {
+export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, hideDeletedDiffs, }: {
     activeIndexPos?: {
         from: number;
         to: number;
     };
     api: ExtractInjectionAPI<ShowDiffPlugin> | undefined;
     colorScheme?: ColorScheme;
+    hideDeletedDiffs?: boolean;
     intl: IntlShape;
     nodeViewSerializer: NodeViewSerializer;
     pluginState: Omit<ShowDiffPluginState, 'decorations'>;

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

@@ -1,4 +1,5 @@
 export declare const editingStyle: string;
+export declare const editingContentStyleInBlock: string;
 export declare const editingStyleActive: string;
 export declare const deletedContentStyle: string;
 export declare const deletedContentStyleActive: string;

package/dist/types/pm-plugins/decorations/createBlockChangedDecoration.d.ts

@@ -8,7 +8,7 @@ import type { ColorScheme } from '../../showDiffPluginType';
  * @param isActive Whether this node is part of the currently active/focused change
  * @returns Prosemirror node decoration or undefined
  */
-export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, isActive, }: {
+export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, isActive, shouldHideDeleted, }: {
     change: {
         from: number;
         name: string;
@@ -17,4 +17,5 @@ export declare const createBlockChangedDecoration: ({ change, colorScheme, isIns
     colorScheme?: ColorScheme;
     isActive?: boolean;
     isInserted?: boolean;
+    shouldHideDeleted?: boolean;
 }) => Decoration[];

package/dist/types/pm-plugins/decorations/createInlineChangedDecoration.d.ts

@@ -6,7 +6,7 @@ import type { ColorScheme } from '../../showDiffPluginType';
  * @param change Changeset "change" containing information about the change content + range
  * @returns Prosemirror inline decoration
  */
-export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, }: {
+export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, shouldHideDeleted, }: {
     change: {
         fromB: number;
         toB: number;
@@ -14,4 +14,5 @@ export declare const createInlineChangedDecoration: ({ change, colorScheme, isAc
     colorScheme?: ColorScheme;
     isActive?: boolean;
     isInserted?: boolean;
+    shouldHideDeleted?: boolean;
 }) => Decoration;

package/dist/types/pm-plugins/main.d.ts

@@ -15,6 +15,7 @@ export type ShowDiffPluginState = {
     };
     decorations: DecorationSet;
     diffType?: DiffType;
+    hideDeletedDiffs?: boolean;
     isDisplayingChanges: boolean;
     isInverted?: boolean;
     originalDoc: PMNode | undefined;

package/dist/types/showDiffPluginType.d.ts

@@ -21,6 +21,7 @@ export type DiffParams = {
 };
 export type PMDiffParams = {
     diffType?: DiffType;
+    hideDeletedDiffs?: boolean;
     isInverted?: boolean;
     originalDoc: Node;
     /**

package/dist/types-ts4.5/pm-plugins/calculateDiff/calculateDiffDecorations.d.ts

@@ -6,13 +6,14 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ColorScheme, ShowDiffPlugin } from '../../showDiffPluginType';
 import type { ShowDiffPluginState } from '../main';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
-export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, }: {
+export declare const calculateDiffDecorations: MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, hideDeletedDiffs, }: {
     activeIndexPos?: {
         from: number;
         to: number;
     };
     api: ExtractInjectionAPI<ShowDiffPlugin> | undefined;
     colorScheme?: ColorScheme;
+    hideDeletedDiffs?: boolean;
     intl: IntlShape;
     nodeViewSerializer: NodeViewSerializer;
     pluginState: Omit<ShowDiffPluginState, 'decorations'>;

package/dist/types-ts4.5/pm-plugins/decorations/colorSchemes/standard.d.ts

@@ -1,4 +1,5 @@
 export declare const editingStyle: string;
+export declare const editingContentStyleInBlock: string;
 export declare const editingStyleActive: string;
 export declare const deletedContentStyle: string;
 export declare const deletedContentStyleActive: string;

package/dist/types-ts4.5/pm-plugins/decorations/createBlockChangedDecoration.d.ts

@@ -8,7 +8,7 @@ import type { ColorScheme } from '../../showDiffPluginType';
  * @param isActive Whether this node is part of the currently active/focused change
  * @returns Prosemirror node decoration or undefined
  */
-export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, isActive, }: {
+export declare const createBlockChangedDecoration: ({ change, colorScheme, isInserted, isActive, shouldHideDeleted, }: {
     change: {
         from: number;
         name: string;
@@ -17,4 +17,5 @@ export declare const createBlockChangedDecoration: ({ change, colorScheme, isIns
     colorScheme?: ColorScheme;
     isActive?: boolean;
     isInserted?: boolean;
+    shouldHideDeleted?: boolean;
 }) => Decoration[];

package/dist/types-ts4.5/pm-plugins/decorations/createInlineChangedDecoration.d.ts

@@ -6,7 +6,7 @@ import type { ColorScheme } from '../../showDiffPluginType';
  * @param change Changeset "change" containing information about the change content + range
  * @returns Prosemirror inline decoration
  */
-export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, }: {
+export declare const createInlineChangedDecoration: ({ change, colorScheme, isActive, isInserted, shouldHideDeleted, }: {
     change: {
         fromB: number;
         toB: number;
@@ -14,4 +14,5 @@ export declare const createInlineChangedDecoration: ({ change, colorScheme, isAc
     colorScheme?: ColorScheme;
     isActive?: boolean;
     isInserted?: boolean;
+    shouldHideDeleted?: boolean;
 }) => Decoration;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -15,6 +15,7 @@ export type ShowDiffPluginState = {
     };
     decorations: DecorationSet;
     diffType?: DiffType;
+    hideDeletedDiffs?: boolean;
     isDisplayingChanges: boolean;
     isInverted?: boolean;
     originalDoc: PMNode | undefined;

package/dist/types-ts4.5/showDiffPluginType.d.ts

@@ -21,6 +21,7 @@ export type DiffParams = {
 };
 export type PMDiffParams = {
     diffType?: DiffType;
+    hideDeletedDiffs?: boolean;
     isInverted?: boolean;
     originalDoc: Node;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "6.3.2",
+	"version": "6.4.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,13 +28,13 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.4.0",
+		"@atlaskit/adf-schema": "^52.5.0",
 		"@atlaskit/custom-steps": "^0.16.0",
 		"@atlaskit/editor-plugin-analytics": "^8.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^62.0.0",
+		"@atlaskit/tmp-editor-statsig": "^62.4.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -56,7 +56,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.21.0",
+		"@atlaskit/editor-common": "^112.22.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {