@atlaskit/editor-plugin-show-diff 3.2.3 → 3.2.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 3.2.4
+
+### Patch Changes
+
+- [`0b00861d972cd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b00861d972cd) -
+  [EDITOR-2668] refactored deleted mediaSingle decorations to maintain alignment/wrap on diff view
+- Updated dependencies
+
 ## 3.2.3
 
 ### Patch Changes

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

@@ -3,19 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createInlineChangedDecoration = exports.createDeletedContentDecoration = exports.createBlockChangedDecoration = void 0;
+exports.getDeletedContentStyleUnbounded = exports.getDeletedContentStyle = exports.createInlineChangedDecoration = exports.createDeletedContentDecoration = exports.createBlockChangedDecoration = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
-var _messages = require("@atlaskit/editor-common/messages");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _deletedBlocksHandler = require("./deletedBlocksHandler");
 var _deletedRowsHandler = require("./deletedRowsHandler");
 var _findSafeInsertPos = require("./findSafeInsertPos");
 var editingStyle = (0, _lazyNodeView.convertToInlineCss)({
-  background: "var(--ds-background-accent-purple-subtlest, #F3F0FF)",
+  background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
   textDecoration: 'underline',
   textDecorationStyle: 'dotted',
   textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #8270DB)"
+  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
 });
 var traditionalInsertStyle = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-green-subtlest, #DCFFF1)",
@@ -51,7 +51,7 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
     // Handle table separately to avoid border issues
     case 'embedCard':
       return (0, _lazyNodeView.convertToInlineCss)({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
+        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
       });
     case 'paragraph':
     case 'heading':
@@ -66,7 +66,7 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
       return undefined;
     case 'listItem':
       return (0, _lazyNodeView.convertToInlineCss)({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #8270DB)"
+        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
       });
     case 'layoutSection':
       return undefined;
@@ -79,73 +79,20 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
       return colourScheme === 'traditional' ? traditionalStyleNode : editingStyleNode;
   }
 };
-var getDeletedStyleNode = function getDeletedStyleNode(nodeName) {
-  switch (nodeName) {
-    case 'blockquote':
-      return deletedStyleQuoteNode;
-    case 'expand':
-    case 'decisionList':
-      return deletedBlockOutline;
-    case 'panel':
-    case 'codeBlock':
-      return deletedBlockOutlineRounded;
-    default:
-      return undefined;
-  }
-};
-var shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
-  switch (nodeName) {
-    case 'expand':
-    case 'codeBlock':
-    case 'mediaSingle':
-    case 'panel':
-    case 'decisionList':
-      return true;
-    default:
-      return false;
-  }
-};
-var shouldFitContentWidth = function shouldFitContentWidth(nodeName) {
-  switch (nodeName) {
-    case 'mediaSingle':
-    case 'embedCard':
-    case 'blockCard':
-      return true;
-    default:
-      return false;
-  }
-};
-var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeClass(nodeName) {
-  switch (nodeName) {
-    case 'mediaSingle':
-    case 'embedCard':
-      return true;
-    default:
-      return false;
-  }
-};
-
-/**
- * Checks if a node should apply deleted styles directly without wrapper
- * to preserve natural block-level margins
- */
-var shouldApplyDeletedStylesDirectly = function shouldApplyDeletedStylesDirectly(nodeName) {
-  return nodeName === 'blockquote' || nodeName === 'heading';
-};
 var editingStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
-  borderLeft: "2px solid ".concat("var(--ds-border-accent-purple, #8270DB)")
+  borderLeft: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)")
 });
 var traditionalStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
   borderLeft: "2px solid ".concat("var(--ds-border-accent-green, #22A06B)")
 });
 var editingStyleRuleNode = (0, _lazyNodeView.convertToInlineCss)({
-  backgroundColor: "var(--ds-border-accent-purple, #8270DB)"
+  backgroundColor: "var(--ds-border-accent-purple, #AF59E1)"
 });
 var traditionalStyleRuleNode = (0, _lazyNodeView.convertToInlineCss)({
   backgroundColor: "var(--ds-border-accent-green, #22A06B)"
 });
 var editingStyleNode = (0, _lazyNodeView.convertToInlineCss)({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)"),
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   borderRadius: "var(--ds-radius-small, 4px)"
 });
 var traditionalStyleNode = (0, _lazyNodeView.convertToInlineCss)({
@@ -153,39 +100,15 @@ var traditionalStyleNode = (0, _lazyNodeView.convertToInlineCss)({
   borderRadius: "var(--ds-radius-small, 4px)"
 });
 var editingStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #8270DB)"),
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   borderRadius: "var(--ds-radius-medium, 6px)"
 });
 var traditionalStyleCardBlockNode = (0, _lazyNodeView.convertToInlineCss)({
   boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-green, #22A06B)"),
   borderRadius: "var(--ds-radius-medium, 6px)"
 });
-var deletedStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
-  borderLeft: "2px solid ".concat("var(--ds-border-accent-gray, #758195)")
-});
-var deletedBlockOutline = (0, _lazyNodeView.convertToInlineCss)({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #758195)"),
-  borderRadius: "var(--ds-radius-small, 4px)"
-});
-var deletedBlockOutlineRounded = (0, _lazyNodeView.convertToInlineCss)({
-  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #758195)"),
-  borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)")
-});
-
-/**
- * Inline decoration used for insertions as the content already exists in the document
- *
- * @param change Changeset "change" containing information about the change content + range
- * @returns Prosemirror inline decoration
- */
-var createBlockChangedDecoration = exports.createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
-  return _view.Decoration.node(change.from, change.to, {
-    style: getEditorStyleNode(change.name, colourScheme),
-    'data-testid': 'show-diff-changed-decoration-node'
-  }, {});
-};
 var deletedContentStyle = (0, _lazyNodeView.convertToInlineCss)({
-  color: "var(--ds-text-accent-gray, #44546F)",
+  color: "var(--ds-text-accent-gray, #505258)",
   textDecoration: 'line-through',
   position: 'relative',
   opacity: 0.6
@@ -195,7 +118,7 @@ var deletedContentStyleUnbounded = (0, _lazyNodeView.convertToInlineCss)({
   top: '50%',
   width: '100%',
   display: 'inline-block',
-  borderTop: "1px solid ".concat("var(--ds-text-accent-gray, #44546F)"),
+  borderTop: "1px solid ".concat("var(--ds-text-accent-gray, #505258)"),
   pointerEvents: 'none',
   zIndex: 1
 });
@@ -214,141 +137,24 @@ var deletedTraditionalContentStyleUnbounded = (0, _lazyNodeView.convertToInlineC
   pointerEvents: 'none',
   zIndex: 1
 });
-var lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
-  display: 'inline-flex',
-  boxSizing: 'border-box',
-  position: 'static',
-  blockSize: 'min-content',
-  borderRadius: "var(--ds-radius-small, 4px)",
-  overflow: 'hidden',
-  paddingInlineStart: "var(--ds-space-050, 4px)",
-  paddingInlineEnd: "var(--ds-space-050, 4px)",
-  backgroundColor: "var(--ds-background-accent-gray-subtler, #DCDFE4)",
-  font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-  fontWeight: "var(--ds-font-weight-bold, 700)",
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap',
-  color: "var(--ds-text-warning-inverse, #172B4D)"
-});
-var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colourScheme) {
+var getDeletedContentStyleUnbounded = exports.getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
 };
-var getDeletedContentStyle = function getDeletedContentStyle(colourScheme) {
+var getDeletedContentStyle = exports.getDeletedContentStyle = function getDeletedContentStyle(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyle : deletedContentStyle;
 };
 
 /**
- * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
- */
-var createRemovedLozenge = function createRemovedLozenge(intl, nodeName) {
-  var container = document.createElement('span');
-  var borderTopRightRadius;
-  var borderTopLeftRadius;
-  if (['expand', 'decisionList'].includes(nodeName || '')) {
-    borderTopRightRadius = "var(--ds-radius-small, 4px)";
-  } else if (['panel', 'codeBlock'].includes(nodeName || '')) {
-    borderTopRightRadius = "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)");
-  } else if (nodeName === 'mediaSingle') {
-    borderTopLeftRadius = "var(--ds-radius-small, 4px)";
-  }
-  var containerStyle = (0, _lazyNodeView.convertToInlineCss)({
-    position: 'absolute',
-    top: nodeName === 'mediaSingle' ? "var(--ds-space-300, 24px)" : "var(--ds-space-0, 0px)",
-    right: nodeName === 'mediaSingle' ? undefined : "var(--ds-space-0, 0px)",
-    left: nodeName === 'mediaSingle' ? "var(--ds-space-0, 0px)" : undefined,
-    zIndex: 2,
-    pointerEvents: 'none',
-    display: 'flex',
-    overflow: 'hidden',
-    borderTopRightRadius: borderTopRightRadius,
-    borderTopLeftRadius: borderTopLeftRadius
-  });
-  container.setAttribute('style', containerStyle);
-  container.setAttribute('data-testid', 'show-diff-removed-lozenge');
-
-  // Create vanilla HTML lozenge element with Atlaskit Lozenge styling (visual refresh)
-  var lozengeElement = document.createElement('span');
-  lozengeElement.setAttribute('style', lozengeStyle);
-  lozengeElement.textContent = intl.formatMessage(_messages.trackChangesMessages.removed).toUpperCase();
-  container.appendChild(lozengeElement);
-  return container;
-};
-
-/**
- * Wraps a block node in a container with relative positioning to support absolute positioned lozenge
- */
-var createBlockNodeWrapper = function createBlockNodeWrapper(nodeName) {
-  var wrapper = document.createElement('div');
-  var fitContent = shouldFitContentWidth(nodeName);
-  var baseStyle = (0, _lazyNodeView.convertToInlineCss)({
-    position: 'relative',
-    display: fitContent ? 'inline-block' : 'block',
-    width: fitContent ? 'fit-content' : undefined,
-    height: fitContent ? 'fit-content' : undefined,
-    opacity: 1
-  });
-  wrapper.setAttribute('style', baseStyle);
-  return wrapper;
-};
-
-/**
- * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
- */
-var createDeletedStyleWrapperWithoutOpacity = function createDeletedStyleWrapperWithoutOpacity(colourScheme) {
-  var wrapper = document.createElement('span');
-  wrapper.setAttribute('style', getDeletedContentStyle(colourScheme));
-  return wrapper;
-};
-
-/**
- * Applies deleted styles directly to an HTML element by merging with existing styles
- */
-var applyDeletedStylesToElement = function applyDeletedStylesToElement(element, targetNode, colourScheme) {
-  var currentStyle = element.getAttribute('style') || '';
-  var deletedContentStyle = getDeletedContentStyle(colourScheme);
-  var nodeSpecificStyle = getDeletedStyleNode(targetNode.type.name) || '';
-  element.setAttribute('style', "".concat(currentStyle).concat(deletedContentStyle).concat(nodeSpecificStyle));
-};
-
-/**
- * Appends a block node with wrapper, lozenge, and appropriate styling
- */
-var appendBlockNodeWithWrapper = function appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl) {
-  var blockWrapper = createBlockNodeWrapper(targetNode.type.name);
-  if (shouldShowRemovedLozenge(targetNode.type.name)) {
-    var lozenge = createRemovedLozenge(intl, targetNode.type.name);
-    blockWrapper.append(lozenge);
-  }
-
-  // Wrap the nodeView in a content wrapper that has the opacity style AND the box-shadow
-  // This keeps the lozenge at full opacity while the content AND border are faded
-  var contentWrapper = document.createElement('div');
-  var nodeStyle = getDeletedStyleNode(targetNode.type.name);
-  contentWrapper.setAttribute('style', "".concat(getDeletedContentStyle(colourScheme)).concat(nodeStyle || ''));
-  contentWrapper.append(nodeView);
-  blockWrapper.append(contentWrapper);
-  if (nodeView instanceof HTMLElement) {
-    if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-      nodeView.classList.add('show-diff-deleted-node');
-    }
-  }
-  dom.append(blockWrapper);
-};
-
-/**
- * Handles all block node rendering with appropriate deleted styling.
- * For blockquote and heading nodes, applies styles directly to preserve natural margins.
- * For other block nodes, uses wrapper approach with optional lozenge.
+ * Inline decoration used for insertions as the content already exists in the document
+ *
+ * @param change Changeset "change" containing information about the change content + range
+ * @returns Prosemirror inline decoration
  */
-var handleBlockNodeView = function handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl) {
-  if (shouldApplyDeletedStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
-    // Apply deleted styles directly to preserve natural block-level margins
-    applyDeletedStylesToElement(nodeView, targetNode, colourScheme);
-    dom.append(nodeView);
-  } else {
-    // Use wrapper approach for other block nodes
-    appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl);
-  }
+var createBlockChangedDecoration = exports.createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
+  return _view.Decoration.node(change.from, change.to, {
+    style: getEditorStyleNode(change.name, colourScheme),
+    'data-testid': 'show-diff-changed-decoration-node'
+  }, {});
 };
 var createDeletedContentDecoration = exports.createDeletedContentDecoration = function createDeletedContentDecoration(_ref) {
   var change = _ref.change,
@@ -491,7 +297,7 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
         dom.append(wrapper);
       } else if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
         // Handle all block nodes with unified function
-        handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl);
+        (0, _deletedBlocksHandler.handleBlockNodeView)(dom, nodeView, targetNode, colourScheme, intl);
       } else {
         dom.append(nodeView);
       }
@@ -502,7 +308,7 @@ var createDeletedContentDecoration = exports.createDeletedContentDecoration = fu
       var fallbackNode = fallbackSerialization();
       if (fallbackNode) {
         if ((0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_beta_2')) {
-          var _wrapper2 = createDeletedStyleWrapperWithoutOpacity(colourScheme);
+          var _wrapper2 = (0, _deletedBlocksHandler.createDeletedStyleWrapperWithoutOpacity)(colourScheme);
           _wrapper2.append(fallbackNode);
           dom.append(_wrapper2);
         } else {

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

@@ -0,0 +1,220 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldShowRemovedLozenge = exports.shouldApplyDeletedStylesDirectly = exports.shouldAddShowDiffDeletedNodeClass = exports.handleMediaSingleWithLozenge = exports.handleBlockNodeView = exports.getDeletedStyleNode = exports.deletedStyleQuoteNode = exports.deletedBlockOutlineRounded = exports.deletedBlockOutline = exports.createRemovedLozenge = exports.createDeletedStyleWrapperWithoutOpacity = exports.createBlockNodeWrapper = exports.createBlockNodeContentWrapper = exports.applyDeletedStylesToElement = exports.appendBlockNodeWithWrapper = void 0;
+var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
+var _messages = require("@atlaskit/editor-common/messages");
+var _decorations = require("./decorations");
+var deletedStyleQuoteNode = exports.deletedStyleQuoteNode = (0, _lazyNodeView.convertToInlineCss)({
+  borderLeft: "2px solid ".concat("var(--ds-border-accent-gray, #7D818A)")
+});
+var deletedBlockOutline = exports.deletedBlockOutline = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
+  borderRadius: "var(--ds-radius-small, 4px)"
+});
+var deletedBlockOutlineRounded = exports.deletedBlockOutlineRounded = (0, _lazyNodeView.convertToInlineCss)({
+  boxShadow: "0 0 0 1px ".concat("var(--ds-border-accent-gray, #7D818A)"),
+  borderRadius: "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)")
+});
+var lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
+  display: 'inline-flex',
+  boxSizing: 'border-box',
+  position: 'static',
+  blockSize: 'min-content',
+  borderRadius: "var(--ds-radius-small, 4px)",
+  overflow: 'hidden',
+  paddingInlineStart: "var(--ds-space-050, 4px)",
+  paddingInlineEnd: "var(--ds-space-050, 4px)",
+  backgroundColor: "var(--ds-background-accent-gray-subtler, #DDDEE1)",
+  font: "var(--ds-font-body-small, normal 400 11px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+  fontWeight: "var(--ds-font-weight-bold, 700)",
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap',
+  color: "var(--ds-text-warning-inverse, #292A2E)"
+});
+var getDeletedStyleNode = exports.getDeletedStyleNode = function getDeletedStyleNode(nodeName) {
+  switch (nodeName) {
+    case 'blockquote':
+      return deletedStyleQuoteNode;
+    case 'expand':
+    case 'decisionList':
+      return deletedBlockOutline;
+    case 'panel':
+    case 'codeBlock':
+      return deletedBlockOutlineRounded;
+    default:
+      return undefined;
+  }
+};
+var shouldShowRemovedLozenge = exports.shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
+  switch (nodeName) {
+    case 'expand':
+    case 'codeBlock':
+    case 'mediaSingle':
+    case 'panel':
+    case 'decisionList':
+      return true;
+    default:
+      return false;
+  }
+};
+var shouldAddShowDiffDeletedNodeClass = exports.shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeClass(nodeName) {
+  switch (nodeName) {
+    case 'mediaSingle':
+    case 'embedCard':
+      return true;
+    default:
+      return false;
+  }
+};
+
+/**
+ * Checks if a node should apply deleted styles directly without wrapper
+ * to preserve natural block-level margins
+ */
+var shouldApplyDeletedStylesDirectly = exports.shouldApplyDeletedStylesDirectly = function shouldApplyDeletedStylesDirectly(nodeName) {
+  return nodeName === 'blockquote' || nodeName === 'heading';
+};
+
+/**
+ * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
+ */
+var createRemovedLozenge = exports.createRemovedLozenge = function createRemovedLozenge(intl, nodeName) {
+  var container = document.createElement('span');
+  var borderTopRightRadius;
+  if (['expand', 'decisionList'].includes(nodeName || '')) {
+    borderTopRightRadius = "var(--ds-radius-small, 4px)";
+  } else if (['panel', 'codeBlock', 'mediaSingle'].includes(nodeName || '')) {
+    borderTopRightRadius = "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)");
+  }
+  var containerStyle = (0, _lazyNodeView.convertToInlineCss)({
+    position: 'absolute',
+    top: "var(--ds-space-0, 0px)",
+    right: "var(--ds-space-0, 0px)",
+    zIndex: 2,
+    pointerEvents: 'none',
+    display: 'flex',
+    overflow: 'hidden',
+    borderTopRightRadius: borderTopRightRadius
+  });
+  container.setAttribute('style', containerStyle);
+  container.setAttribute('data-testid', 'show-diff-removed-lozenge');
+
+  // Create vanilla HTML lozenge element with Atlaskit Lozenge styling (visual refresh)
+  var lozengeElement = document.createElement('span');
+  lozengeElement.setAttribute('style', lozengeStyle);
+  lozengeElement.textContent = intl.formatMessage(_messages.trackChangesMessages.removed).toUpperCase();
+  container.appendChild(lozengeElement);
+  return container;
+};
+
+/**
+ * Wraps a block node in a container with relative positioning to support absolute positioned lozenge
+ */
+var createBlockNodeWrapper = exports.createBlockNodeWrapper = function createBlockNodeWrapper(nodeName) {
+  var wrapper = document.createElement('div');
+  var baseStyle = (0, _lazyNodeView.convertToInlineCss)({
+    position: 'relative',
+    display: 'block',
+    opacity: 1
+  });
+  wrapper.setAttribute('style', baseStyle);
+  return wrapper;
+};
+
+/**
+ * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
+ */
+var createDeletedStyleWrapperWithoutOpacity = exports.createDeletedStyleWrapperWithoutOpacity = function createDeletedStyleWrapperWithoutOpacity(colourScheme) {
+  var wrapper = document.createElement('span');
+  wrapper.setAttribute('style', (0, _decorations.getDeletedContentStyle)(colourScheme));
+  return wrapper;
+};
+
+/**
+ * Applies deleted styles directly to an HTML element by merging with existing styles
+ */
+var applyDeletedStylesToElement = exports.applyDeletedStylesToElement = function applyDeletedStylesToElement(element, targetNode, colourScheme) {
+  var currentStyle = element.getAttribute('style') || '';
+  var deletedContentStyle = (0, _decorations.getDeletedContentStyle)(colourScheme);
+  var nodeSpecificStyle = getDeletedStyleNode(targetNode.type.name) || '';
+  element.setAttribute('style', "".concat(currentStyle).concat(deletedContentStyle).concat(nodeSpecificStyle));
+};
+
+/**
+ * Creates a content wrapper with deleted styles for a block node
+ */
+var createBlockNodeContentWrapper = exports.createBlockNodeContentWrapper = function createBlockNodeContentWrapper(nodeView, targetNode, colourScheme) {
+  var contentWrapper = document.createElement('div');
+  var nodeStyle = getDeletedStyleNode(targetNode.type.name);
+  contentWrapper.setAttribute('style', "".concat((0, _decorations.getDeletedContentStyle)(colourScheme)).concat(nodeStyle || ''));
+  contentWrapper.append(nodeView);
+  return contentWrapper;
+};
+
+/**
+ * Handles special mediaSingle node rendering with lozenge on child media element
+ * @returns true if mediaSingle was handled, false otherwise
+ */
+var handleMediaSingleWithLozenge = exports.handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(dom, nodeView, targetNode, lozenge) {
+  if (targetNode.type.name !== 'mediaSingle' || !(nodeView instanceof HTMLElement)) {
+    return false;
+  }
+  var mediaNode = nodeView.querySelector('[data-prosemirror-node-name="media"]');
+  if (!mediaNode || !(mediaNode instanceof HTMLElement)) {
+    return false;
+  }
+
+  // Add relative positioning to media node to anchor lozenge
+  var currentStyle = mediaNode.getAttribute('style') || '';
+  var relativePositionStyle = (0, _lazyNodeView.convertToInlineCss)({
+    position: 'relative'
+  });
+  mediaNode.setAttribute('style', "".concat(currentStyle).concat(relativePositionStyle));
+  mediaNode.append(lozenge);
+
+  // Add deleted node class if needed
+  if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
+    nodeView.classList.add('show-diff-deleted-node');
+  }
+  dom.append(nodeView);
+  return true;
+};
+
+/**
+ * Appends a block node with wrapper, lozenge, and appropriate styling
+ */
+var appendBlockNodeWithWrapper = exports.appendBlockNodeWithWrapper = function appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl) {
+  var blockWrapper = createBlockNodeWrapper(targetNode.type.name);
+  if (shouldShowRemovedLozenge(targetNode.type.name)) {
+    var lozenge = createRemovedLozenge(intl, targetNode.type.name);
+    if (handleMediaSingleWithLozenge(dom, nodeView, targetNode, lozenge)) {
+      return;
+    }
+    blockWrapper.append(lozenge);
+  }
+  var contentWrapper = createBlockNodeContentWrapper(nodeView, targetNode, colourScheme);
+  blockWrapper.append(contentWrapper);
+  if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
+    nodeView.classList.add('show-diff-deleted-node');
+  }
+  dom.append(blockWrapper);
+};
+
+/**
+ * Handles all block node rendering with appropriate deleted styling.
+ * For blockquote and heading nodes, applies styles directly to preserve natural margins.
+ * For other block nodes, uses wrapper approach with optional lozenge.
+ */
+var handleBlockNodeView = exports.handleBlockNodeView = function handleBlockNodeView(dom, nodeView, targetNode, colourScheme, intl) {
+  if (shouldApplyDeletedStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
+    // Apply deleted styles directly to preserve natural block-level margins
+    applyDeletedStylesToElement(nodeView, targetNode, colourScheme);
+    dom.append(nodeView);
+  } else {
+    // Use wrapper approach for other block nodes
+    appendBlockNodeWithWrapper(dom, nodeView, targetNode, colourScheme, intl);
+  }
+};

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

@@ -16,7 +16,7 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var deletedRowStyle = (0, _lazyNodeView.convertToInlineCss)({
-  color: "var(--ds-text-accent-gray, #44546F)",
+  color: "var(--ds-text-accent-gray, #505258)",
   textDecoration: 'line-through',
   opacity: 0.6,
   display: 'table-row'