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

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 6.4.1
+
+### Patch Changes
+
+- [`d1d3089a12aff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d1d3089a12aff) -
+  EDITOR-6431: Improve diff styles to support text-like diffs better when inverted.
+- Updated dependencies
+
+## 6.4.0
+
+### Minor Changes
+
+- [`7739efec523bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7739efec523bc) -
+  EDITOR-6371: Add toggle for showing / hiding deleted changes in the diff.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.3.2
 
 ### Patch Changes

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

@@ -44,7 +44,8 @@ var getChanges = function getChanges(_ref) {
     if (diffType === 'block') {
       return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
     }
-    return (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
+    var _changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
+    return (0, _optimizeChanges.optimizeChanges)(_changes);
   }
   var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
   return (0, _optimizeChanges.optimizeChanges)(changes);
@@ -56,7 +57,9 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
     colorScheme = _ref2.colorScheme,
     _ref2$isInserted = _ref2.isInserted,
     isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
-    activeIndexPos = _ref2.activeIndexPos;
+    activeIndexPos = _ref2.activeIndexPos,
+    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
+    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet;
   var decorations = [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, function (node, pos) {
@@ -71,7 +74,8 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         },
         colorScheme: colorScheme,
         isInserted: isInserted,
-        isActive: isActive
+        isActive: isActive,
+        shouldHideDeleted: shouldHideDeleted
       });
       if (blockChangedDecorations.length) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)(blockChangedDecorations));
@@ -91,7 +95,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     _ref3$isInverted = _ref3.isInverted,
     isInverted = _ref3$isInverted === void 0 ? false : _ref3$isInverted,
     _ref3$diffType = _ref3.diffType,
-    diffType = _ref3$diffType === void 0 ? 'inline' : _ref3$diffType;
+    diffType = _ref3$diffType === void 0 ? 'inline' : _ref3$diffType,
+    _ref3$hideDeletedDiff = _ref3.hideDeletedDiffs,
+    hideDeletedDiffs = _ref3$hideDeletedDiff === void 0 ? false : _ref3$hideDeletedDiff;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
@@ -162,12 +168,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
     // Our default operations are insertions, so it should match the opposite of isInverted.
     var isInserted = !isInverted;
     if (change.inserted.length > 0) {
+      var shouldHideDeleted = (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) ? isInverted && hideDeletedDiffs : false;
       decorations.push((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
         change: change,
         colorScheme: colorScheme,
         isActive: isActive
       }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
-        isInserted: isInserted
+        isInserted: isInserted,
+        shouldHideDeleted: shouldHideDeleted
       })));
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
         doc: tr.doc,
@@ -175,27 +183,31 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref3
         to: change.toB,
         colorScheme: colorScheme
       }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
-        isInserted: isInserted
+        isInserted: isInserted,
+        shouldHideDeleted: shouldHideDeleted
       }), {}, {
         activeIndexPos: activeIndexPos,
         intl: intl
       }))));
     }
     if (change.deleted.length > 0) {
-      var decoration = (0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread({
-        change: change,
-        doc: originalDoc,
-        nodeViewSerializer: nodeViewSerializer,
-        colorScheme: colorScheme,
-        newDoc: tr.doc,
-        intl: intl,
-        activeIndexPos: activeIndexPos
-      }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
-        isInserted: !isInserted,
-        diffType: diffType
-      }));
-      if (decoration) {
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)(decoration));
+      var _shouldHideDeleted = (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) ? !isInverted && hideDeletedDiffs : false;
+      if (!_shouldHideDeleted) {
+        var decoration = (0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread({
+          change: change,
+          doc: originalDoc,
+          nodeViewSerializer: nodeViewSerializer,
+          colorScheme: colorScheme,
+          newDoc: tr.doc,
+          intl: intl,
+          activeIndexPos: activeIndexPos
+        }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
+          isInserted: !isInserted,
+          diffType: diffType
+        }));
+        if (decoration) {
+          decorations.push.apply(decorations, (0, _toConsumableArray2.default)(decoration));
+        }
       }
     }
   });
@@ -233,7 +245,8 @@ function (_ref4, _ref5) {
     intl = _ref6$.intl,
     activeIndexPos = _ref6$.activeIndexPos,
     isInverted = _ref6$.isInverted,
-    diffType = _ref6$.diffType;
+    diffType = _ref6$.diffType,
+    hideDeletedDiffs = _ref6$.hideDeletedDiffs;
   var _ref7 = (0, _slicedToArray2.default)(_ref5, 1),
     _ref7$ = _ref7[0],
     lastPluginState = _ref7$.pluginState,
@@ -242,11 +255,12 @@ function (_ref4, _ref5) {
     lastIntl = _ref7$.intl,
     lastActiveIndexPos = _ref7$.activeIndexPos,
     lastIsInverted = _ref7$.isInverted,
-    lastDiffType = _ref7$.diffType;
+    lastDiffType = _ref7$.diffType,
+    lastHideDeletedDiffs = _ref7$.hideDeletedDiffs;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     var _ref8;
-    return (_ref8 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc)) !== null && _ref8 !== void 0 ? _ref8 : false;
+    return (_ref8 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref8 !== void 0 ? _ref8 : false;
   }
-  return (_ref9 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos)) !== null && _ref9 !== void 0 ? _ref9 : false;
+  return (_ref9 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref9 !== void 0 ? _ref9 : false;
 });

package/dist/cjs/pm-plugins/decorations/colorSchemes/standard.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleCardBlockNode = exports.editingStyleActive = exports.editingStyle = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = void 0;
+exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleCardBlockNode = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
@@ -12,6 +12,12 @@ var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)(
   textDecorationThickness: "var(--ds-space-025, 2px)",
   textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
 });
+var editingContentStyleInBlock = exports.editingContentStyleInBlock = (0, _lazyNodeView.convertToInlineCss)({
+  textDecoration: 'underline',
+  textDecorationStyle: 'dotted',
+  textDecorationThickness: "var(--ds-space-025, 2px)",
+  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
+});
 var editingStyleActive = exports.editingStyleActive = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
   textDecoration: 'underline',

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

@@ -10,6 +10,9 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
+var displayNoneStyle = (0, _lazyNodeView.convertToInlineCss)({
+  display: 'none'
+});
 var getNodeClass = function getNodeClass(name) {
   switch (name) {
     case 'extension':
@@ -108,8 +111,19 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     _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 [_view.Decoration.node(change.from, change.to, {
+      style: displayNoneStyle
+    }, {
+      key: 'diff-block',
+      nodeName: change.name
+    })];
+  }
+  var style;
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && ['tableCell', 'tableHeader'].includes(change.name)) {
     var cellOverlay = document.createElement('div');
     var cellOverlayStyle = isInserted ? colorScheme === 'traditional' ? _traditional.traditionalAddedCellOverlayStyle : _standard.addedCellOverlayStyle : colorScheme === 'traditional' ? _traditional.deletedTraditionalCellOverlayStyle : _standard.deletedCellOverlayStyle;
@@ -120,11 +134,6 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       key: "diff-widget-cell-overlay-".concat(change.to)
     }));
   }
-  var style = getBlockNodeStyle({
-    nodeName: change.name,
-    colorScheme: colorScheme,
-    isActive: isActive
-  });
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     style = getBlockNodeStyle({
       nodeName: change.name,
@@ -132,6 +141,12 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       isInserted: isInserted,
       isActive: isActive
     });
+  } else {
+    style = getBlockNodeStyle({
+      nodeName: change.name,
+      colorScheme: colorScheme,
+      isActive: isActive
+    });
   }
   var className = getNodeClass(change.name);
   if ((0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {

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

@@ -4,10 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createInlineChangedDecoration = void 0;
+var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
+var displayNoneStyle = (0, _lazyNodeView.convertToInlineCss)({
+  display: 'none'
+});
 /**
  * Inline decoration used for insertions as the content already exists in the document
  *
@@ -21,7 +25,16 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
     _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 _view.Decoration.inline(change.fromB, change.toB, {
+      style: displayNoneStyle
+    }, {
+      key: 'diff-inline'
+    });
+  }
   var style;
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
     if (isInserted) {

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createNodeChangedDecorationWidget = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
@@ -15,6 +16,8 @@ var _traditional = require("./colorSchemes/traditional");
 var _createChangedRowDecorationWidgets = require("./createChangedRowDecorationWidgets");
 var _findSafeInsertPos = require("./utils/findSafeInsertPos");
 var _wrapBlockNodeView = require("./utils/wrapBlockNodeView");
+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) { (0, _defineProperty2.default)(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; }
 var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (colorScheme === 'traditional' && isActive) {
@@ -262,8 +265,10 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   });
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
   var decorations = [];
-  decorations.push(_view.Decoration.widget(safeInsertPos, dom, {
+  decorations.push(_view.Decoration.widget(safeInsertPos, dom, _objectSpread({
     key: "diff-widget-".concat(isActive ? 'active' : 'inactive')
-  }));
+  }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && {
+    side: -1
+  })));
   return decorations;
 };

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

@@ -80,7 +80,10 @@ var getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorScheme) {
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var isTraditional = colorScheme === 'traditional';
   if ((0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) && isInserted) {
-    if (shouldApplyStylesDirectly(nodeName)) {
+    if (isMultiContainerBlockNode(nodeName)) {
+      return _standard.editingContentStyleInBlock;
+    }
+    if (isTextLikeBlockNode(nodeName)) {
       return undefined;
     }
     if (isTraditional) {
@@ -161,6 +164,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,
@@ -228,16 +237,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(_standard.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(_standard.editingStyleNode));
+    });
+  } else if (targetNode.type.name === 'taskList') {
+    element.querySelectorAll('li').forEach(function (listItem) {
+      var currentListItemStyle = listItem.getAttribute('style') || '';
+      listItem.setAttribute('style', "".concat(currentListItemStyle).concat(_standard.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 || ''));
@@ -251,14 +310,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;
   }
@@ -299,14 +358,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;
   }
@@ -344,16 +403,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) && (!(0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) || !isInserted)) {
     var lozenge = createRemovedLozenge(intl, isActive, colorScheme);
@@ -408,35 +467,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.
  */
-var wrapBlockNodeView = exports.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 && (0, _expValEquals.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
+var wrapBlockNodeView = exports.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 ((0, _expValEquals.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,
@@ -446,5 +520,28 @@ var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_
       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/cjs/pm-plugins/main.js

@@ -43,7 +43,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
           isDisplayingChanges: false
         }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
           isInverted: false,
-          diffType: 'inline'
+          diffType: 'inline',
+          hideDeletedDiffs: false
         } : {});
       },
       apply: function apply(tr, currentPluginState, oldState, newState) {
@@ -51,7 +52,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
         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,
@@ -68,7 +69,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               api: api
             }, (0, _expValEquals.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;
@@ -79,7 +81,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               activeIndex: undefined
             }, (0, _expValEquals.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') && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
             // Update the active index in plugin state and recalculate decorations
@@ -118,7 +121,9 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
                 activeIndexPos: newPluginState.activeIndexPos,
                 api: api
               }, (0, _expValEquals.expValEquals)('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
-                isInverted: newPluginState.isInverted
+                isInverted: newPluginState.isInverted,
+                diffType: newPluginState.diffType,
+                hideDeletedDiffs: newPluginState.hideDeletedDiffs
               } : {}));
               newPluginState.decorations = updatedDecorations;
             }