@atlaskit/editor-plugin-show-diff 5.0.5 → 5.0.7

package/dist/cjs/pm-plugins/{deletedBlocksHandler.js → decorations/utils/wrapBlockNodeView.js}

@@ -4,14 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleMediaSingleWithLozenge = exports.handleBlockNodeView = exports.getDeletedStyleNode = void 0;
+exports.wrapBlockNodeView = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _standard = require("./colorSchemes/standard");
-var _traditional = require("./colorSchemes/traditional");
-var _decorations = require("./decorations");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _standard = require("../colorSchemes/standard");
+var _traditional = require("../colorSchemes/traditional");
 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 lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
@@ -30,7 +30,17 @@ var lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
   whiteSpace: 'nowrap',
   color: "var(--ds-text-warning-inverse, #292A2E)"
 });
-var getDeletedStyleNode = exports.getDeletedStyleNode = function getDeletedStyleNode(nodeName, colorScheme) {
+var getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
+  var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  if (colorScheme === 'traditional') {
+    return _traditional.deletedTraditionalContentStyle;
+  }
+  if (isActive) {
+    return (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? _standard.deletedContentStyleNewActive : _standard.deletedContentStyleActive;
+  }
+  return (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? _standard.deletedContentStyleNew : _standard.deletedContentStyle;
+};
+var getDeletedStyleNode = function getDeletedStyleNode(nodeName, colorScheme) {
   var isTraditional = colorScheme === 'traditional';
   switch (nodeName) {
     case 'blockquote':
@@ -76,7 +86,7 @@ var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeCla
  * Checks if a node should apply deleted styles directly without wrapper
  * to preserve natural block-level margins
  */
-var shouldApplyDeletedStylesDirectly = function shouldApplyDeletedStylesDirectly(nodeName) {
+var shouldApplyStylesDirectly = function shouldApplyStylesDirectly(nodeName) {
   return nodeName === 'heading' || nodeName === 'blockquote' && !(0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers');
 };
 
@@ -128,11 +138,14 @@ var createBlockNodeWrapper = function createBlockNodeWrapper() {
 };
 
 /**
- * Applies deleted styles directly to an HTML element by merging with existing styles
+ * Applies styles directly to an HTML element by merging with existing styles
  */
-var applyDeletedStylesToElement = function applyDeletedStylesToElement(element, targetNode, colorScheme) {
+var applyStylesToElement = function applyStylesToElement(_ref) {
+  var element = _ref.element,
+    targetNode = _ref.targetNode,
+    colorScheme = _ref.colorScheme;
   var currentStyle = element.getAttribute('style') || '';
-  var deletedContentStyle = (0, _decorations.getDeletedContentStyle)(colorScheme);
+  var deletedContentStyle = getDeletedContentStyle(colorScheme);
   var nodeSpecificStyle = getDeletedStyleNode(targetNode.type.name, colorScheme) || '';
   element.setAttribute('style', "".concat(currentStyle).concat(deletedContentStyle).concat(nodeSpecificStyle));
 };
@@ -140,10 +153,13 @@ var applyDeletedStylesToElement = function applyDeletedStylesToElement(element,
 /**
  * Creates a content wrapper with deleted styles for a block node
  */
-var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(nodeView, targetNode, colorScheme) {
+var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref2) {
+  var nodeView = _ref2.nodeView,
+    targetNode = _ref2.targetNode,
+    colorScheme = _ref2.colorScheme;
   var contentWrapper = document.createElement('div');
   var nodeStyle = getDeletedStyleNode(targetNode.type.name, colorScheme);
-  contentWrapper.setAttribute('style', "".concat((0, _decorations.getDeletedContentStyle)(colorScheme)).concat(nodeStyle || ''));
+  contentWrapper.setAttribute('style', "".concat(getDeletedContentStyle(colorScheme)).concat(nodeStyle || ''));
   contentWrapper.append(nodeView);
   return contentWrapper;
 };
@@ -154,7 +170,12 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(nodeV
  * to wait for the rich-media-item to appear before attaching the lozenge.
  * @returns true if embedCard was handled
  */
-var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(dom, nodeView, targetNode, lozenge, colorScheme) {
+var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(_ref3) {
+  var dom = _ref3.dom,
+    nodeView = _ref3.nodeView,
+    targetNode = _ref3.targetNode,
+    lozenge = _ref3.lozenge,
+    colorScheme = _ref3.colorScheme;
   if (targetNode.type.name !== 'embedCard' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -186,7 +207,12 @@ var handleEmbedCardWithLozenge = function handleEmbedCardWithLozenge(dom, nodeVi
  * 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, colorScheme) {
+var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref4) {
+  var dom = _ref4.dom,
+    nodeView = _ref4.nodeView,
+    targetNode = _ref4.targetNode,
+    lozenge = _ref4.lozenge,
+    colorScheme = _ref4.colorScheme;
   if (targetNode.type.name !== 'mediaSingle' || !(nodeView instanceof HTMLElement)) {
     return false;
   }
@@ -215,19 +241,40 @@ var handleMediaSingleWithLozenge = exports.handleMediaSingleWithLozenge = functi
 /**
  * Appends a block node with wrapper, lozenge, and appropriate styling
  */
-var appendBlockNodeWithWrapper = function appendBlockNodeWithWrapper(dom, nodeView, targetNode, colorScheme, intl) {
+var wrapBlockNode = function wrapBlockNode(_ref5) {
+  var dom = _ref5.dom,
+    nodeView = _ref5.nodeView,
+    targetNode = _ref5.targetNode,
+    colorScheme = _ref5.colorScheme,
+    intl = _ref5.intl;
   var blockWrapper = createBlockNodeWrapper();
   if (shouldShowRemovedLozenge(targetNode.type.name)) {
     var lozenge = createRemovedLozenge(intl);
-    if (handleEmbedCardWithLozenge(dom, nodeView, targetNode, lozenge, colorScheme) && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers')) {
+    if (handleEmbedCardWithLozenge({
+      dom: dom,
+      nodeView: nodeView,
+      targetNode: targetNode,
+      lozenge: lozenge,
+      colorScheme: colorScheme
+    }) && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers')) {
       return;
     }
-    if (handleMediaSingleWithLozenge(dom, nodeView, targetNode, lozenge, colorScheme)) {
+    if (handleMediaSingleWithLozenge({
+      dom: dom,
+      nodeView: nodeView,
+      targetNode: targetNode,
+      lozenge: lozenge,
+      colorScheme: colorScheme
+    })) {
       return;
     }
     blockWrapper.append(lozenge);
   }
-  var contentWrapper = createBlockNodeContentWrapper(nodeView, targetNode, colorScheme);
+  var contentWrapper = createBlockNodeContentWrapper({
+    nodeView: nodeView,
+    targetNode: targetNode,
+    colorScheme: colorScheme
+  });
   blockWrapper.append(contentWrapper);
   if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
     var showDiffDeletedNodeClass = colorScheme === 'traditional' && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
@@ -241,13 +288,28 @@ var appendBlockNodeWithWrapper = function appendBlockNodeWithWrapper(dom, nodeVi
  * For 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, colorScheme, intl) {
-  if (shouldApplyDeletedStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
+var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_ref6) {
+  var dom = _ref6.dom,
+    nodeView = _ref6.nodeView,
+    targetNode = _ref6.targetNode,
+    colorScheme = _ref6.colorScheme,
+    intl = _ref6.intl;
+  if (shouldApplyStylesDirectly(targetNode.type.name) && nodeView instanceof HTMLElement) {
     // Apply deleted styles directly to preserve natural block-level margins
-    applyDeletedStylesToElement(nodeView, targetNode, colorScheme);
+    applyStylesToElement({
+      element: nodeView,
+      targetNode: targetNode,
+      colorScheme: colorScheme
+    });
     dom.append(nodeView);
   } else {
     // Use wrapper approach for other block nodes
-    appendBlockNodeWithWrapper(dom, nodeView, targetNode, colorScheme, intl);
+    wrapBlockNode({
+      dom: dom,
+      nodeView: nodeView,
+      targetNode: targetNode,
+      colorScheme: colorScheme,
+      intl: intl
+    });
   }
 };

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

@@ -7,7 +7,6 @@ exports.simplifySteps = simplifySteps;
 var _steps = require("@atlaskit/adf-schema/steps");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 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; }
@@ -33,7 +32,7 @@ function mergeReplaceSteps(step1, step2) {
 
 // Simplifies the steps to improve performance and reduce fragmentation in diffs
 function simplifySteps(steps, originalDoc) {
-  var stepsToFilter = (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga') ? removeUnusedSteps(steps, originalDoc) : steps;
+  var stepsToFilter = removeUnusedSteps(steps, originalDoc);
   return stepsToFilter
   // Remove steps that don't affect document structure or content
   .filter(function (step) {
@@ -41,9 +40,9 @@ function simplifySteps(steps, originalDoc) {
   })
   // Merge consecutive steps where possible
   .reduce(function (acc, step) {
-    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    var _lastStep$merge, _lastStep$merge2;
     var lastStep = acc[acc.length - 1];
-    var merged = (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga') ? (_lastStep$merge = lastStep === null || lastStep === void 0 || (_lastStep$merge2 = lastStep.merge) === null || _lastStep$merge2 === void 0 ? void 0 : _lastStep$merge2.call(lastStep, step)) !== null && _lastStep$merge !== void 0 ? _lastStep$merge : mergeReplaceSteps(lastStep, step) : lastStep === null || lastStep === void 0 || (_lastStep$merge3 = lastStep.merge) === null || _lastStep$merge3 === void 0 ? void 0 : _lastStep$merge3.call(lastStep, step);
+    var merged = (_lastStep$merge = lastStep === null || lastStep === void 0 || (_lastStep$merge2 = lastStep.merge) === null || _lastStep$merge2 === void 0 ? void 0 : _lastStep$merge2.call(lastStep, step)) !== null && _lastStep$merge !== void 0 ? _lastStep$merge : mergeReplaceSteps(lastStep, step);
     if (merged) {
       acc[acc.length - 1] = merged;
     } else {

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

@@ -4,9 +4,11 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getAttrChangeRanges, stepIsValidAttrChange } from './attributeDecorations';
-import { createInlineChangedDecoration, createDeletedContentDecoration, createBlockChangedDecoration } from './decorations';
-import { getMarkChangeRanges } from './markDecorations';
+import { createBlockChangedDecoration } from './decorations/createBlockChangedDecoration';
+import { createInlineChangedDecoration } from './decorations/createInlineChangedDecoration';
+import { createNodeChangedDecorationWidget } from './decorations/createNodeChangedDecorationWidget';
+import { getAttrChangeRanges, stepIsValidAttrChange } from './decorations/utils/getAttrChangeRanges';
+import { getMarkChangeRanges } from './decorations/utils/getMarkChangeRanges';
 import { simplifySteps } from './simplifyChanges';
 const calculateNodesForBlockDecoration = ({
   doc,
@@ -129,7 +131,7 @@ const calculateDiffDecorationsInner = ({
     }
     if (change.deleted.length > 0) {
       const isActive = activeIndexPos && change.fromB >= activeIndexPos.from && change.toB <= activeIndexPos.to;
-      const decoration = createDeletedContentDecoration({
+      const decoration = createNodeChangedDecorationWidget({
         change,
         doc: originalDoc,
         nodeViewSerializer,

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

@@ -0,0 +1,70 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { standardDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode } from './colorSchemes/standard';
+import { traditionalDecorationMarkerVariable, traditionalStyleQuoteNode, traditionalStyleRuleNode, traditionalStyleCardBlockNode, traditionalStyleNode } from './colorSchemes/traditional';
+const getNodeClass = name => {
+  switch (name) {
+    case 'extension':
+      return 'show-diff-changed-decoration-node';
+    default:
+      return undefined;
+  }
+};
+const getBlockNodeStyle = (nodeName, colorScheme) => {
+  const isTraditional = colorScheme === 'traditional';
+  if (['mediaSingle', 'mediaGroup', 'table',
+  // Handle table separately to avoid border issues
+  'tableRow', 'tableCell', 'tableHeader', 'paragraph',
+  // Paragraph and heading nodes do not need special styling
+  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
+    // Layout nodes do not need special styling
+    return undefined;
+  }
+  if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
+    return isTraditional ? traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
+  }
+  if (nodeName === 'blockquote') {
+    return isTraditional ? traditionalStyleQuoteNode : editingStyleQuoteNode;
+  }
+  if (nodeName === 'rule') {
+    return isTraditional ? traditionalStyleRuleNode : editingStyleRuleNode;
+  }
+  if (nodeName === 'blockCard') {
+    return isTraditional ? traditionalStyleCardBlockNode : editingStyleCardBlockNode;
+  }
+  return isTraditional ? traditionalStyleNode : editingStyleNode;
+};
+
+/**
+ * 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
+ */
+export const createBlockChangedDecoration = ({
+  change,
+  colorScheme
+}) => {
+  if (fg('platform_editor_show_diff_scroll_navigation')) {
+    const style = getBlockNodeStyle(change.name, colorScheme);
+    const className = getNodeClass(change.name);
+    if (style || className) {
+      return Decoration.node(change.from, change.to, {
+        style: style,
+        'data-testid': 'show-diff-changed-decoration-node',
+        class: className
+      }, {
+        key: 'diff-block'
+      });
+    }
+    return undefined;
+  } else {
+    return Decoration.node(change.from, change.to, {
+      style: getBlockNodeStyle(change.name, colorScheme),
+      'data-testid': 'show-diff-changed-decoration-node',
+      class: getNodeClass(change.name)
+    }, {
+      key: 'diff-block'
+    });
+  }
+};

package/dist/es2019/pm-plugins/{deletedRowsHandler.js → decorations/createChangedRowDecorationWidgets.js}

@@ -4,18 +4,18 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { deletedRowStyle } from './colorSchemes/standard';
 import { deletedTraditionalRowStyle } from './colorSchemes/traditional';
-import { findSafeInsertPos } from './findSafeInsertPos';
+import { findSafeInsertPos } from './utils/findSafeInsertPos';
 /**
  * Extracts information about deleted table rows from a change
  */
-const extractDeletedRows = (change, originalDoc, newDoc) => {
-  const deletedRows = [];
+const extractChangedRows = (change, originalDoc, newDoc) => {
+  const changedRows = [];
 
   // Find the table in the original document
   const $fromPos = originalDoc.resolve(change.fromA);
   const tableOld = findParentNodeClosestToPos($fromPos, node => node.type.name === 'table');
   if (!tableOld) {
-    return deletedRows;
+    return changedRows;
   }
   const oldTableMap = TableMap.get(tableOld.node);
 
@@ -23,18 +23,18 @@ const extractDeletedRows = (change, originalDoc, newDoc) => {
   const $newPos = newDoc.resolve(change.fromB);
   const tableNew = findParentNodeClosestToPos($newPos, node => node.type.name === 'table');
   if (!tableNew) {
-    return deletedRows;
+    return changedRows;
   }
   const newTableMap = TableMap.get(tableNew.node);
 
-  // If no rows were deleted, return empty
+  // If no rows were changed, return empty
   if (oldTableMap.height <= newTableMap.height ||
   // For now ignore if there are column deletions as well
   oldTableMap.width !== newTableMap.width) {
-    return deletedRows;
+    return changedRows;
   }
 
-  // Find which rows were deleted by analyzing the change range
+  // Find which rows were changed by analyzing the change range
   const changeStartInTable = change.fromA - tableOld.pos - 1;
   const changeEndInTable = change.toA - tableOld.pos - 1;
   let currentOffset = 0;
@@ -47,7 +47,7 @@ const extractDeletedRows = (change, originalDoc, newDoc) => {
     const rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && !isEmptyRow(rowNode)) {
       const startOfRow = newTableMap.mapByRow.slice().reverse().find(row => row[0] + tableNew.pos < change.fromB && change.fromB < row[row.length - 1] + tableNew.pos);
-      deletedRows.push({
+      changedRows.push({
         rowIndex,
         rowNode,
         fromA: tableOld.pos + 1 + rowStart,
@@ -62,8 +62,8 @@ const extractDeletedRows = (change, originalDoc, newDoc) => {
   });
 
   // Filter changes that never truly got deleted
-  return deletedRows.filter(deletedRow => {
-    return !tableNew.node.children.some(newRow => areNodesEqualIgnoreAttrs(newRow, deletedRow.rowNode));
+  return changedRows.filter(changedRow => {
+    return !tableNew.node.children.some(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode));
   });
 };
 
@@ -96,7 +96,7 @@ const isEmptyRow = rowNode => {
 /**
  * Creates a DOM representation of a deleted table row
  */
-const createDeletedRowDOM = (rowNode, nodeViewSerializer, colorScheme) => {
+const createChangedRowDOM = (rowNode, nodeViewSerializer, colorScheme) => {
   const tr = document.createElement('tr');
   tr.setAttribute('style', colorScheme === 'traditional' ? deletedTraditionalRowStyle : deletedRowStyle);
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
@@ -120,61 +120,39 @@ const createDeletedRowDOM = (rowNode, nodeViewSerializer, colorScheme) => {
 };
 
 /**
- * Expands a diff to include whole deleted rows when table rows are affected
+ * Expands a diff to include whole changed rows when table rows are affected
  */
-const expandDiffForDeletedRows = (changes, originalDoc, newDoc) => {
-  const deletedRowInfo = [];
+const expandDiffForChangedRows = (changes, originalDoc, newDoc) => {
+  const rowInfo = [];
   for (const change of changes) {
     // Check if this change affects table content
-    const deletedRows = extractDeletedRows(change, originalDoc, newDoc);
-    if (deletedRows.length > 0) {
-      deletedRowInfo.push(...deletedRows);
+    const changedRows = extractChangedRows(change, originalDoc, newDoc);
+    if (changedRows.length > 0) {
+      rowInfo.push(...changedRows);
     }
   }
-  return deletedRowInfo;
+  return rowInfo;
 };
 
 /**
- * Creates decorations for deleted table rows
+ * Main function to handle deleted rows - computes diff and creates decorations
  */
-export const createDeletedRowsDecorations = ({
-  deletedRows,
+export const createChangedRowDecorationWidgets = ({
+  changes,
   originalDoc,
   newDoc,
   nodeViewSerializer,
   colorScheme
 }) => {
-  return deletedRows.map(deletedRow => {
-    const rowDOM = createDeletedRowDOM(deletedRow.rowNode, nodeViewSerializer, colorScheme);
+  // First, expand the changes to include complete deleted rows
+  const changedRows = expandDiffForChangedRows(changes.filter(change => change.deleted.length > 0), originalDoc, newDoc);
+  return changedRows.map(changedRow => {
+    const rowDOM = createChangedRowDOM(changedRow.rowNode, nodeViewSerializer, colorScheme);
 
     // Find safe insertion position for the deleted row
-    const safeInsertPos = findSafeInsertPos(newDoc, deletedRow.fromB - 1,
+    const safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
-    originalDoc.slice(deletedRow.fromA, deletedRow.toA));
+    originalDoc.slice(changedRow.fromA, changedRow.toA));
     return Decoration.widget(safeInsertPos, rowDOM, {});
   });
-};
-
-/**
- * Main function to handle deleted rows - computes diff and creates decorations
- */
-export const handleDeletedRows = ({
-  changes,
-  originalDoc,
-  newDoc,
-  nodeViewSerializer,
-  colorScheme
-}) => {
-  // First, expand the changes to include complete deleted rows
-  const deletedRows = expandDiffForDeletedRows(changes.filter(change => change.deleted.length > 0), originalDoc, newDoc);
-  const allDecorations = createDeletedRowsDecorations({
-    deletedRows,
-    originalDoc,
-    newDoc,
-    nodeViewSerializer,
-    colorScheme
-  });
-  return {
-    decorations: allDecorations
-  };
 };

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

@@ -0,0 +1,28 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { editingStyle, editingStyleActive } from './colorSchemes/standard';
+import { traditionalInsertStyle, traditionalInsertStyleActive } from './colorSchemes/traditional';
+
+/**
+ * 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
+ */
+export const createInlineChangedDecoration = ({
+  change,
+  colorScheme,
+  isActive = false
+}) => {
+  let style;
+  if (colorScheme === 'traditional') {
+    style = isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
+  } else {
+    style = isActive ? editingStyleActive : editingStyle;
+  }
+  return Decoration.inline(change.fromB, change.toB, {
+    style,
+    'data-testid': 'show-diff-changed-decoration'
+  }, {
+    key: 'diff-inline'
+  });
+};

package/dist/es2019/pm-plugins/{decorations.js → decorations/createNodeChangedDecorationWidget.js}

@@ -1,38 +1,13 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, editingStyle, editingStyleActive, deletedContentStyleUnbounded, standardDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode } from './colorSchemes/standard';
-import { deletedTraditionalContentStyle, deletedTraditionalContentStyleUnbounded, traditionalInsertStyle, traditionalInsertStyleActive, traditionalDecorationMarkerVariable, traditionalStyleQuoteNode, traditionalStyleRuleNode, traditionalStyleCardBlockNode, traditionalStyleNode } from './colorSchemes/traditional';
-import { handleBlockNodeView } from './deletedBlocksHandler';
-import { handleDeletedRows } from './deletedRowsHandler';
-import { findSafeInsertPos } from './findSafeInsertPos';
-/**
- * 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
- */
-export const createInlineChangedDecoration = ({
-  change,
-  colorScheme,
-  isActive = false
-}) => {
-  let style;
-  if (colorScheme === 'traditional') {
-    style = isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
-  } else {
-    style = isActive ? editingStyleActive : editingStyle;
-  }
-  return Decoration.inline(change.fromB, change.toB, {
-    style,
-    'data-testid': 'show-diff-changed-decoration'
-  }, {
-    key: 'diff-inline'
-  });
-};
-export const getDeletedContentStyleUnbounded = colorScheme => colorScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
-export const getDeletedContentStyle = (colorScheme, isActive = false) => {
+import { deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, deletedContentStyleUnbounded } from './colorSchemes/standard';
+import { deletedTraditionalContentStyle, deletedTraditionalContentStyleUnbounded } from './colorSchemes/traditional';
+import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
+import { findSafeInsertPos } from './utils/findSafeInsertPos';
+import { wrapBlockNodeView } from './utils/wrapBlockNodeView';
+const getDeletedContentStyleUnbounded = colorScheme => colorScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
+const getDeletedContentStyle = (colorScheme, isActive = false) => {
   if (colorScheme === 'traditional') {
     return deletedTraditionalContentStyle;
   }
@@ -41,38 +16,6 @@ export const getDeletedContentStyle = (colorScheme, isActive = false) => {
   }
   return expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? deletedContentStyleNew : deletedContentStyle;
 };
-const getNodeClass = name => {
-  switch (name) {
-    case 'extension':
-      return 'show-diff-changed-decoration-node';
-    default:
-      return undefined;
-  }
-};
-const getBlockNodeStyle = (nodeName, colorScheme) => {
-  const isTraditional = colorScheme === 'traditional';
-  if (['mediaSingle', 'mediaGroup', 'table',
-  // Handle table separately to avoid border issues
-  'tableRow', 'tableCell', 'tableHeader', 'paragraph',
-  // Paragraph and heading nodes do not need special styling
-  'heading', 'hardBreak', 'decisionList', 'taskList', 'taskItem', 'bulletList', 'orderedList', 'layoutSection'].includes(nodeName)) {
-    // Layout nodes do not need special styling
-    return undefined;
-  }
-  if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
-    return isTraditional ? traditionalDecorationMarkerVariable : standardDecorationMarkerVariable;
-  }
-  if (nodeName === 'blockquote') {
-    return isTraditional ? traditionalStyleQuoteNode : editingStyleQuoteNode;
-  }
-  if (nodeName === 'rule') {
-    return isTraditional ? traditionalStyleRuleNode : editingStyleRuleNode;
-  }
-  if (nodeName === 'blockCard') {
-    return isTraditional ? traditionalStyleCardBlockNode : editingStyleCardBlockNode;
-  }
-  return isTraditional ? traditionalStyleNode : editingStyleNode;
-};
 
 /**
  * Wraps content with deleted styling without opacity (for use when content is a direct child of dom)
@@ -82,40 +25,6 @@ const createDeletedStyleWrapperWithoutOpacity = (colorScheme, isActive) => {
   wrapper.setAttribute('style', getDeletedContentStyle(colorScheme, isActive));
   return wrapper;
 };
-
-/**
- * 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
- */
-export const createBlockChangedDecoration = ({
-  change,
-  colorScheme
-}) => {
-  if (fg('platform_editor_show_diff_scroll_navigation')) {
-    const style = getBlockNodeStyle(change.name, colorScheme);
-    const className = getNodeClass(change.name);
-    if (style || className) {
-      return Decoration.node(change.from, change.to, {
-        style: style,
-        'data-testid': 'show-diff-changed-decoration-node',
-        class: className
-      }, {
-        key: 'diff-block'
-      });
-    }
-    return undefined;
-  } else {
-    return Decoration.node(change.from, change.to, {
-      style: getBlockNodeStyle(change.name, colorScheme),
-      'data-testid': 'show-diff-changed-decoration-node',
-      class: getNodeClass(change.name)
-    }, {
-      key: 'diff-block'
-    });
-  }
-};
 const createContentWrapper = (colorScheme, isActive = false) => {
   const wrapper = document.createElement('span');
   const baseStyle = convertToInlineCss({
@@ -128,7 +37,7 @@ const createContentWrapper = (colorScheme, isActive = false) => {
   wrapper.append(strikethrough);
   return wrapper;
 };
-export const createDeletedContentDecoration = ({
+export const createNodeChangedDecorationWidget = ({
   change,
   doc,
   nodeViewSerializer,
@@ -147,19 +56,13 @@ export const createDeletedContentDecoration = ({
     return;
   }
   if (isTableRowContent) {
-    if (!fg('platform_editor_ai_aifc_patch_ga')) {
-      return;
-    }
-    const {
-      decorations
-    } = handleDeletedRows({
+    return createChangedRowDecorationWidgets({
       changes: [change],
       originalDoc: doc,
       newDoc,
       nodeViewSerializer,
       colorScheme
     });
-    return decorations;
   }
   const serializer = nodeViewSerializer;
 
@@ -233,7 +136,13 @@ export const createDeletedContentDecoration = ({
         dom.append(wrapper);
       } else {
         // Handle all block nodes with unified function
-        handleBlockNodeView(dom, nodeView, node, colorScheme, intl);
+        wrapBlockNodeView({
+          dom,
+          nodeView,
+          targetNode: node,
+          colorScheme,
+          intl
+        });
       }
     } else if (nodeViewSerializer.getFilteredNodeViewBlocklist(['paragraph', 'tableRow']).has(node.type.name)) {
       // Skip the case where the node is a paragraph or table row that way it can still be rendered and delete the entire table