@atlaskit/editor-plugin-show-diff 10.5.2 → 10.5.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 10.5.3
+
+### Patch Changes
+
+- [`154b76531a593`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/154b76531a593) -
+  Fix table diff cell overlays to use rounded corners for inserting row diffs when
+  platform_editor_table_diff_rounded_corners is enabled
+
 ## 10.5.2
 
 ### Patch Changes

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.editingStyleExtendedNoUnderline = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtendedNoUnderline = exports.editingStyleActiveExtended = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlockExtendedNoUnderline = exports.editingContentStyleInBlockExtended = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedInlineContentStyleExtended = exports.deletedDecorationMarkerVariable = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedCellOverlayRoundedStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = void 0;
+exports.standardDecorationMarkerVariable = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleExtendedNoUnderline = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtendedNoUnderline = exports.editingStyleActiveExtended = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlockExtendedNoUnderline = exports.editingContentStyleInBlockExtended = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedRowStyle = exports.deletedInlineContentStyleExtended = exports.deletedDecorationMarkerVariable = exports.deletedContentStyleUnbounded = exports.deletedContentStyleNew = exports.deletedContentStyleActive = exports.deletedContentStyle = exports.deletedCellOverlayStyle = exports.deletedCellOverlayRoundedStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = exports.addedCellOverlayRoundedStyle = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 // delete on platform_editor_diff_plugin_extended cleanup
 var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)({
@@ -176,6 +176,18 @@ var addedCellOverlayStyle = exports.addedCellOverlayStyle = (0, _lazyNodeView.co
   outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   pointerEvents: 'none'
 });
+var addedCellOverlayRoundedStyle = exports.addedCellOverlayRoundedStyle = (0, _lazyNodeView.convertToInlineCss)({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.5)"),
+  zIndex: 2,
+  outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
+  pointerEvents: 'none',
+  borderRadius: 'inherit'
+});
 var deletedCellOverlayStyle = exports.deletedCellOverlayStyle = (0, _lazyNodeView.convertToInlineCss)({
   position: 'absolute',
   top: 0,

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.deletedTraditionalStyleQuoteNodeActive = exports.deletedTraditionalStyleQuoteNode = exports.deletedTraditionalRowStyle = exports.deletedTraditionalContentStyleUnboundedActive = exports.deletedTraditionalContentStyleUnbounded = exports.deletedTraditionalCellOverlayStyle = exports.deletedTraditionalCellOverlayRoundedStyle = exports.deletedTraditionalBlockOutlineRoundedNew = exports.deletedTraditionalBlockOutlineRoundedActive = exports.deletedTraditionalBlockOutlineRounded = exports.deletedTraditionalBlockOutlineNew = exports.deletedTraditionalBlockOutlineActive = exports.deletedTraditionalBlockOutline = void 0;
 exports.getDeletedTraditionalInlineStyle = getDeletedTraditionalInlineStyle;
-exports.traditionalStyleRuleNodeNew = exports.traditionalStyleRuleNodeActive = exports.traditionalStyleRuleNode = exports.traditionalStyleQuoteNodeNew = exports.traditionalStyleQuoteNodeActive = exports.traditionalStyleQuoteNode = exports.traditionalStyleNodeNew = exports.traditionalStyleNodeActive = exports.traditionalStyleNode = exports.traditionalStyleCardBlockNodeNew = exports.traditionalStyleCardBlockNodeActive = exports.traditionalStyleCardBlockNode = exports.traditionalInsertStyleActive = exports.traditionalInsertStyle = exports.traditionalDeletedDecorationMarkerVariableNew = exports.traditionalDeletedDecorationMarkerVariableActive = exports.traditionalDeletedDecorationMarkerVariable = exports.traditionalDecorationMarkerVariableNew = exports.traditionalDecorationMarkerVariableActive = exports.traditionalDecorationMarkerVariable = exports.traditionalAddedCellOverlayStyleNew = exports.traditionalAddedCellOverlayStyle = void 0;
+exports.traditionalStyleRuleNodeNew = exports.traditionalStyleRuleNodeActive = exports.traditionalStyleRuleNode = exports.traditionalStyleQuoteNodeNew = exports.traditionalStyleQuoteNodeActive = exports.traditionalStyleQuoteNode = exports.traditionalStyleNodeNew = exports.traditionalStyleNodeActive = exports.traditionalStyleNode = exports.traditionalStyleCardBlockNodeNew = exports.traditionalStyleCardBlockNodeActive = exports.traditionalStyleCardBlockNode = exports.traditionalInsertStyleActive = exports.traditionalInsertStyle = exports.traditionalDeletedDecorationMarkerVariableNew = exports.traditionalDeletedDecorationMarkerVariableActive = exports.traditionalDeletedDecorationMarkerVariable = exports.traditionalDecorationMarkerVariableNew = exports.traditionalDecorationMarkerVariableActive = exports.traditionalDecorationMarkerVariable = exports.traditionalAddedCellOverlayStyleNew = exports.traditionalAddedCellOverlayStyle = exports.traditionalAddedCellOverlayRoundedStyle = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 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; }
@@ -193,6 +193,19 @@ var traditionalAddedCellOverlayStyle = exports.traditionalAddedCellOverlayStyle
   outline: "1px solid ".concat("var(--ds-border-accent-green, #22A06B)"),
   pointerEvents: 'none'
 });
+var traditionalAddedCellOverlayRoundedStyle = exports.traditionalAddedCellOverlayRoundedStyle = (0, _lazyNodeView.convertToInlineCss)({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: "rgba(from ".concat("var(--ds-background-accent-green-subtlest, #DCFFF1)", " r g b / 0.5)"),
+  zIndex: 2,
+  outline: "1px solid ".concat("var(--ds-border-accent-green, #22A06B)"),
+  pointerEvents: 'none',
+  border: 'inherit',
+  borderRadius: 'inherit'
+});
 var traditionalAddedCellOverlayStyleNew = exports.traditionalAddedCellOverlayStyleNew = (0, _lazyNodeView.convertToInlineCss)({
   position: 'absolute',
   top: 0,

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

@@ -11,6 +11,7 @@ var _document = require("@atlaskit/editor-common/utils/document");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _isExtendedEnabled = require("../isExtendedEnabled");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
@@ -21,14 +22,55 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
+/**
+ * Inserted table rows are rendered as decoration widgets, so their cells do not get the
+ * `data-reaches-*` attrs normally applied by the table cell node view. Mirror that boundary
+ * metadata here so the existing rounded-table CSS can round widget cells like real table cells.
+ */
+var getChangedRowCellEdgeAttrs = function getChangedRowCellEdgeAttrs(_ref) {
+  var rowNode = _ref.rowNode,
+    rowStart = _ref.rowStart,
+    tableMap = _ref.tableMap;
+  var cellEdgeAttrs = [];
+  rowNode.content.forEach(function (cellNode, cellOffset) {
+    if (cellNode.type.name !== 'tableCell' && cellNode.type.name !== 'tableHeader') {
+      return;
+    }
+    var cellRect = tableMap.findCell(rowStart + 1 + cellOffset);
+    cellEdgeAttrs.push({
+      reachesBottom: cellRect.bottom >= tableMap.height,
+      reachesLeft: cellRect.left === 0,
+      reachesRight: cellRect.right >= tableMap.width,
+      reachesTop: cellRect.top === 0
+    });
+  });
+  return cellEdgeAttrs;
+};
+var applyCellEdgeAttrs = function applyCellEdgeAttrs(cell, edgeAttrs) {
+  if (!edgeAttrs) {
+    return;
+  }
+  if (edgeAttrs.reachesTop) {
+    cell.setAttribute('data-reaches-top', 'true');
+  }
+  if (edgeAttrs.reachesBottom) {
+    cell.setAttribute('data-reaches-bottom', 'true');
+  }
+  if (edgeAttrs.reachesLeft) {
+    cell.setAttribute('data-reaches-left', 'true');
+  }
+  if (edgeAttrs.reachesRight) {
+    cell.setAttribute('data-reaches-right', 'true');
+  }
+};
 /**
  * Extracts information about deleted table rows from a change
  */
-var extractChangedRows = function extractChangedRows(_ref) {
-  var change = _ref.change,
-    originalDoc = _ref.originalDoc,
-    newDoc = _ref.newDoc,
-    diffType = _ref.diffType;
+var extractChangedRows = function extractChangedRows(_ref2) {
+  var change = _ref2.change,
+    originalDoc = _ref2.originalDoc,
+    newDoc = _ref2.newDoc,
+    diffType = _ref2.diffType;
   var changedRows = [];
 
   // Find the table in the original document
@@ -69,12 +111,18 @@ var extractChangedRows = function extractChangedRows(_ref) {
     // Check if this row overlaps with the deletion range
     var rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isEmptyRow(rowNode))) {
+      var cellEdgeAttrs = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && (0, _expValEquals.expValEquals)('platform_editor_table_diff_rounded_corners', 'isEnabled', true) ? getChangedRowCellEdgeAttrs({
+        rowNode: rowNode,
+        rowStart: rowStart,
+        tableMap: oldTableMap
+      }) : undefined;
       var startOfRow = newTableMap.mapByRow.slice().reverse().find(function (row) {
         return row[0] + tableNew.pos < change.fromB && change.fromB < row[row.length - 1] + tableNew.pos;
       });
       changedRows.push({
         rowIndex: rowIndex,
         rowNode: rowNode,
+        cellEdgeAttrs: cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
         fromB: startOfRow ? startOfRow[0] + tableNew.start : change.fromB
@@ -123,7 +171,7 @@ var isEmptyRow = function isEmptyRow(rowNode) {
 /**
  * Creates a DOM representation of a deleted table row
  */
-var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializer, colorScheme, isInserted, diffType) {
+var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType) {
   var tr = document.createElement('tr');
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
     if (!isInserted) {
@@ -135,15 +183,23 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
   // Serialize each cell in the row
+  var cellIndex = 0;
   rowNode.content.forEach(function (cellNode) {
     if (cellNode.type.name === 'tableCell' || cellNode.type.name === 'tableHeader') {
       var nodeView = nodeViewSerializer.tryCreateNodeView(cellNode);
       if (nodeView) {
-        if (nodeView instanceof HTMLElement && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-          var overlay = document.createElement('span');
-          var overlayStyle = colorScheme === 'traditional' ? isInserted ? _traditional.traditionalAddedCellOverlayStyle : _traditional.deletedTraditionalCellOverlayStyle : isInserted ? _standard.addedCellOverlayStyle : _standard.deletedCellOverlayStyle;
-          overlay.setAttribute('style', overlayStyle);
-          nodeView.appendChild(overlay);
+        if (nodeView instanceof HTMLElement) {
+          applyCellEdgeAttrs(nodeView, cellEdgeAttrs === null || cellEdgeAttrs === void 0 ? void 0 : cellEdgeAttrs[cellIndex]);
+          if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+            var overlay = document.createElement('span');
+            var isRoundedTable = (0, _expValEquals.expValEquals)('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
+            var isTraditional = colorScheme === 'traditional';
+            var deletedCellStyle = isTraditional ? _traditional.deletedTraditionalCellOverlayStyle : _standard.deletedCellOverlayStyle;
+            var addedCellStyle = isTraditional ? isRoundedTable ? _traditional.traditionalAddedCellOverlayRoundedStyle : _traditional.traditionalAddedCellOverlayStyle : isRoundedTable ? _standard.addedCellOverlayRoundedStyle : _standard.addedCellOverlayStyle;
+            var overlayStyle = isInserted ? addedCellStyle : deletedCellStyle;
+            overlay.setAttribute('style', overlayStyle);
+            nodeView.appendChild(overlay);
+          }
         }
         tr.appendChild(nodeView);
       } else {
@@ -153,6 +209,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
           tr.appendChild(serializedContent);
         }
       }
+      cellIndex++;
     }
   });
   return tr;
@@ -161,11 +218,11 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
 /**
  * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
-  var changes = _ref2.changes,
-    originalDoc = _ref2.originalDoc,
-    newDoc = _ref2.newDoc,
-    diffType = _ref2.diffType;
+var expandDiffForChangedRows = function expandDiffForChangedRows(_ref3) {
+  var changes = _ref3.changes,
+    originalDoc = _ref3.originalDoc,
+    newDoc = _ref3.newDoc,
+    diffType = _ref3.diffType;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -194,15 +251,15 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref3) {
-  var changes = _ref3.changes,
-    originalDoc = _ref3.originalDoc,
-    newDoc = _ref3.newDoc,
-    nodeViewSerializer = _ref3.nodeViewSerializer,
-    colorScheme = _ref3.colorScheme,
-    _ref3$isInserted = _ref3.isInserted,
-    isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType;
+var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref4) {
+  var changes = _ref4.changes,
+    originalDoc = _ref4.originalDoc,
+    newDoc = _ref4.newDoc,
+    nodeViewSerializer = _ref4.nodeViewSerializer,
+    colorScheme = _ref4.colorScheme,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? false : _ref4$isInserted,
+    diffType = _ref4.diffType;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -213,7 +270,7 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     diffType: diffType
   });
   return changedRows.map(function (changedRow) {
-    var rowDOM = createChangedRowDOM(changedRow.rowNode, nodeViewSerializer, colorScheme, isInserted, diffType);
+    var rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
     var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, changedRow.fromB - 1,

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

@@ -170,6 +170,18 @@ export const addedCellOverlayStyle = convertToInlineCss({
   outline: `1px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
   pointerEvents: 'none'
 });
+export const addedCellOverlayRoundedStyle = convertToInlineCss({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: `rgba(from ${"var(--ds-background-accent-purple-subtlest, #F8EEFE)"} r g b / 0.5)`,
+  zIndex: 2,
+  outline: `1px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
+  pointerEvents: 'none',
+  borderRadius: 'inherit'
+});
 export const deletedCellOverlayStyle = convertToInlineCss({
   position: 'absolute',
   top: 0,

package/dist/es2019/pm-plugins/decorations/colorSchemes/traditional.js

@@ -185,6 +185,19 @@ export const traditionalAddedCellOverlayStyle = convertToInlineCss({
   outline: `1px solid ${"var(--ds-border-accent-green, #22A06B)"}`,
   pointerEvents: 'none'
 });
+export const traditionalAddedCellOverlayRoundedStyle = convertToInlineCss({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: `rgba(from ${"var(--ds-background-accent-green-subtlest, #DCFFF1)"} r g b / 0.5)`,
+  zIndex: 2,
+  outline: `1px solid ${"var(--ds-border-accent-green, #22A06B)"}`,
+  pointerEvents: 'none',
+  border: 'inherit',
+  borderRadius: 'inherit'
+});
 export const traditionalAddedCellOverlayStyleNew = convertToInlineCss({
   position: 'absolute',
   top: 0,

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

@@ -2,11 +2,54 @@ import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { addedCellOverlayStyle, deletedRowStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
-import { deletedTraditionalRowStyle, deletedTraditionalCellOverlayStyle, traditionalAddedCellOverlayStyle } from './colorSchemes/traditional';
+import { addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedRowStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
+import { deletedTraditionalRowStyle, deletedTraditionalCellOverlayStyle, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle } from './colorSchemes/traditional';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
+/**
+ * Inserted table rows are rendered as decoration widgets, so their cells do not get the
+ * `data-reaches-*` attrs normally applied by the table cell node view. Mirror that boundary
+ * metadata here so the existing rounded-table CSS can round widget cells like real table cells.
+ */
+const getChangedRowCellEdgeAttrs = ({
+  rowNode,
+  rowStart,
+  tableMap
+}) => {
+  const cellEdgeAttrs = [];
+  rowNode.content.forEach((cellNode, cellOffset) => {
+    if (cellNode.type.name !== 'tableCell' && cellNode.type.name !== 'tableHeader') {
+      return;
+    }
+    const cellRect = tableMap.findCell(rowStart + 1 + cellOffset);
+    cellEdgeAttrs.push({
+      reachesBottom: cellRect.bottom >= tableMap.height,
+      reachesLeft: cellRect.left === 0,
+      reachesRight: cellRect.right >= tableMap.width,
+      reachesTop: cellRect.top === 0
+    });
+  });
+  return cellEdgeAttrs;
+};
+const applyCellEdgeAttrs = (cell, edgeAttrs) => {
+  if (!edgeAttrs) {
+    return;
+  }
+  if (edgeAttrs.reachesTop) {
+    cell.setAttribute('data-reaches-top', 'true');
+  }
+  if (edgeAttrs.reachesBottom) {
+    cell.setAttribute('data-reaches-bottom', 'true');
+  }
+  if (edgeAttrs.reachesLeft) {
+    cell.setAttribute('data-reaches-left', 'true');
+  }
+  if (edgeAttrs.reachesRight) {
+    cell.setAttribute('data-reaches-right', 'true');
+  }
+};
 /**
  * Extracts information about deleted table rows from a change
  */
@@ -52,10 +95,16 @@ const extractChangedRows = ({
     // Check if this row overlaps with the deletion range
     const rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && (isExtendedEnabled(diffType) || !isEmptyRow(rowNode))) {
+      const cellEdgeAttrs = isExtendedEnabled(diffType) && expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true) ? getChangedRowCellEdgeAttrs({
+        rowNode,
+        rowStart,
+        tableMap: oldTableMap
+      }) : undefined;
       const startOfRow = newTableMap.mapByRow.slice().reverse().find(row => row[0] + tableNew.pos < change.fromB && change.fromB < row[row.length - 1] + tableNew.pos);
       changedRows.push({
         rowIndex,
         rowNode,
+        cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
         fromB: startOfRow ? startOfRow[0] + tableNew.start : change.fromB
@@ -102,7 +151,7 @@ const isEmptyRow = rowNode => {
 /**
  * Creates a DOM representation of a deleted table row
  */
-const createChangedRowDOM = (rowNode, nodeViewSerializer, colorScheme, isInserted, diffType) => {
+const createChangedRowDOM = (rowNode, cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType) => {
   const tr = document.createElement('tr');
   if (isExtendedEnabled(diffType)) {
     if (!isInserted) {
@@ -114,15 +163,23 @@ const createChangedRowDOM = (rowNode, nodeViewSerializer, colorScheme, isInserte
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
   // Serialize each cell in the row
+  let cellIndex = 0;
   rowNode.content.forEach(cellNode => {
     if (cellNode.type.name === 'tableCell' || cellNode.type.name === 'tableHeader') {
       const nodeView = nodeViewSerializer.tryCreateNodeView(cellNode);
       if (nodeView) {
-        if (nodeView instanceof HTMLElement && isExtendedEnabled(diffType)) {
-          const overlay = document.createElement('span');
-          const overlayStyle = colorScheme === 'traditional' ? isInserted ? traditionalAddedCellOverlayStyle : deletedTraditionalCellOverlayStyle : isInserted ? addedCellOverlayStyle : deletedCellOverlayStyle;
-          overlay.setAttribute('style', overlayStyle);
-          nodeView.appendChild(overlay);
+        if (nodeView instanceof HTMLElement) {
+          applyCellEdgeAttrs(nodeView, cellEdgeAttrs === null || cellEdgeAttrs === void 0 ? void 0 : cellEdgeAttrs[cellIndex]);
+          if (isExtendedEnabled(diffType)) {
+            const overlay = document.createElement('span');
+            const isRoundedTable = expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
+            const isTraditional = colorScheme === 'traditional';
+            const deletedCellStyle = isTraditional ? deletedTraditionalCellOverlayStyle : deletedCellOverlayStyle;
+            const addedCellStyle = isTraditional ? isRoundedTable ? traditionalAddedCellOverlayRoundedStyle : traditionalAddedCellOverlayStyle : isRoundedTable ? addedCellOverlayRoundedStyle : addedCellOverlayStyle;
+            const overlayStyle = isInserted ? addedCellStyle : deletedCellStyle;
+            overlay.setAttribute('style', overlayStyle);
+            nodeView.appendChild(overlay);
+          }
         }
         tr.appendChild(nodeView);
       } else {
@@ -132,6 +189,7 @@ const createChangedRowDOM = (rowNode, nodeViewSerializer, colorScheme, isInserte
           tr.appendChild(serializedContent);
         }
       }
+      cellIndex++;
     }
   });
   return tr;
@@ -182,7 +240,7 @@ export const createChangedRowDecorationWidgets = ({
     diffType
   });
   return changedRows.map(changedRow => {
-    const rowDOM = createChangedRowDOM(changedRow.rowNode, nodeViewSerializer, colorScheme, isInserted, diffType);
+    const rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
     const safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,

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

@@ -170,6 +170,18 @@ export var addedCellOverlayStyle = convertToInlineCss({
   outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   pointerEvents: 'none'
 });
+export var addedCellOverlayRoundedStyle = convertToInlineCss({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: "rgba(from ".concat("var(--ds-background-accent-purple-subtlest, #F8EEFE)", " r g b / 0.5)"),
+  zIndex: 2,
+  outline: "1px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
+  pointerEvents: 'none',
+  borderRadius: 'inherit'
+});
 export var deletedCellOverlayStyle = convertToInlineCss({
   position: 'absolute',
   top: 0,

package/dist/esm/pm-plugins/decorations/colorSchemes/traditional.js

@@ -184,6 +184,19 @@ export var traditionalAddedCellOverlayStyle = convertToInlineCss({
   outline: "1px solid ".concat("var(--ds-border-accent-green, #22A06B)"),
   pointerEvents: 'none'
 });
+export var traditionalAddedCellOverlayRoundedStyle = convertToInlineCss({
+  position: 'absolute',
+  top: 0,
+  left: 0,
+  width: '100%',
+  height: '100%',
+  backgroundColor: "rgba(from ".concat("var(--ds-background-accent-green-subtlest, #DCFFF1)", " r g b / 0.5)"),
+  zIndex: 2,
+  outline: "1px solid ".concat("var(--ds-border-accent-green, #22A06B)"),
+  pointerEvents: 'none',
+  border: 'inherit',
+  borderRadius: 'inherit'
+});
 export var traditionalAddedCellOverlayStyleNew = convertToInlineCss({
   position: 'absolute',
   top: 0,

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

@@ -9,19 +9,61 @@ import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { addedCellOverlayStyle, deletedRowStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
-import { deletedTraditionalRowStyle, deletedTraditionalCellOverlayStyle, traditionalAddedCellOverlayStyle } from './colorSchemes/traditional';
+import { addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedRowStyle, deletedCellOverlayStyle } from './colorSchemes/standard';
+import { deletedTraditionalRowStyle, deletedTraditionalCellOverlayStyle, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle } from './colorSchemes/traditional';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
+/**
+ * Inserted table rows are rendered as decoration widgets, so their cells do not get the
+ * `data-reaches-*` attrs normally applied by the table cell node view. Mirror that boundary
+ * metadata here so the existing rounded-table CSS can round widget cells like real table cells.
+ */
+var getChangedRowCellEdgeAttrs = function getChangedRowCellEdgeAttrs(_ref) {
+  var rowNode = _ref.rowNode,
+    rowStart = _ref.rowStart,
+    tableMap = _ref.tableMap;
+  var cellEdgeAttrs = [];
+  rowNode.content.forEach(function (cellNode, cellOffset) {
+    if (cellNode.type.name !== 'tableCell' && cellNode.type.name !== 'tableHeader') {
+      return;
+    }
+    var cellRect = tableMap.findCell(rowStart + 1 + cellOffset);
+    cellEdgeAttrs.push({
+      reachesBottom: cellRect.bottom >= tableMap.height,
+      reachesLeft: cellRect.left === 0,
+      reachesRight: cellRect.right >= tableMap.width,
+      reachesTop: cellRect.top === 0
+    });
+  });
+  return cellEdgeAttrs;
+};
+var applyCellEdgeAttrs = function applyCellEdgeAttrs(cell, edgeAttrs) {
+  if (!edgeAttrs) {
+    return;
+  }
+  if (edgeAttrs.reachesTop) {
+    cell.setAttribute('data-reaches-top', 'true');
+  }
+  if (edgeAttrs.reachesBottom) {
+    cell.setAttribute('data-reaches-bottom', 'true');
+  }
+  if (edgeAttrs.reachesLeft) {
+    cell.setAttribute('data-reaches-left', 'true');
+  }
+  if (edgeAttrs.reachesRight) {
+    cell.setAttribute('data-reaches-right', 'true');
+  }
+};
 /**
  * Extracts information about deleted table rows from a change
  */
-var extractChangedRows = function extractChangedRows(_ref) {
-  var change = _ref.change,
-    originalDoc = _ref.originalDoc,
-    newDoc = _ref.newDoc,
-    diffType = _ref.diffType;
+var extractChangedRows = function extractChangedRows(_ref2) {
+  var change = _ref2.change,
+    originalDoc = _ref2.originalDoc,
+    newDoc = _ref2.newDoc,
+    diffType = _ref2.diffType;
   var changedRows = [];
 
   // Find the table in the original document
@@ -62,12 +104,18 @@ var extractChangedRows = function extractChangedRows(_ref) {
     // Check if this row overlaps with the deletion range
     var rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
     if (rowOverlapsChange && rowNode.type.name === 'tableRow' && (isExtendedEnabled(diffType) || !isEmptyRow(rowNode))) {
+      var cellEdgeAttrs = isExtendedEnabled(diffType) && expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true) ? getChangedRowCellEdgeAttrs({
+        rowNode: rowNode,
+        rowStart: rowStart,
+        tableMap: oldTableMap
+      }) : undefined;
       var startOfRow = newTableMap.mapByRow.slice().reverse().find(function (row) {
         return row[0] + tableNew.pos < change.fromB && change.fromB < row[row.length - 1] + tableNew.pos;
       });
       changedRows.push({
         rowIndex: rowIndex,
         rowNode: rowNode,
+        cellEdgeAttrs: cellEdgeAttrs,
         fromA: tableOld.pos + 1 + rowStart,
         toA: tableOld.pos + 1 + rowEnd,
         fromB: startOfRow ? startOfRow[0] + tableNew.start : change.fromB
@@ -116,7 +164,7 @@ var isEmptyRow = function isEmptyRow(rowNode) {
 /**
  * Creates a DOM representation of a deleted table row
  */
-var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializer, colorScheme, isInserted, diffType) {
+var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType) {
   var tr = document.createElement('tr');
   if (isExtendedEnabled(diffType)) {
     if (!isInserted) {
@@ -128,15 +176,23 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
   // Serialize each cell in the row
+  var cellIndex = 0;
   rowNode.content.forEach(function (cellNode) {
     if (cellNode.type.name === 'tableCell' || cellNode.type.name === 'tableHeader') {
       var nodeView = nodeViewSerializer.tryCreateNodeView(cellNode);
       if (nodeView) {
-        if (nodeView instanceof HTMLElement && isExtendedEnabled(diffType)) {
-          var overlay = document.createElement('span');
-          var overlayStyle = colorScheme === 'traditional' ? isInserted ? traditionalAddedCellOverlayStyle : deletedTraditionalCellOverlayStyle : isInserted ? addedCellOverlayStyle : deletedCellOverlayStyle;
-          overlay.setAttribute('style', overlayStyle);
-          nodeView.appendChild(overlay);
+        if (nodeView instanceof HTMLElement) {
+          applyCellEdgeAttrs(nodeView, cellEdgeAttrs === null || cellEdgeAttrs === void 0 ? void 0 : cellEdgeAttrs[cellIndex]);
+          if (isExtendedEnabled(diffType)) {
+            var overlay = document.createElement('span');
+            var isRoundedTable = expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
+            var isTraditional = colorScheme === 'traditional';
+            var deletedCellStyle = isTraditional ? deletedTraditionalCellOverlayStyle : deletedCellOverlayStyle;
+            var addedCellStyle = isTraditional ? isRoundedTable ? traditionalAddedCellOverlayRoundedStyle : traditionalAddedCellOverlayStyle : isRoundedTable ? addedCellOverlayRoundedStyle : addedCellOverlayStyle;
+            var overlayStyle = isInserted ? addedCellStyle : deletedCellStyle;
+            overlay.setAttribute('style', overlayStyle);
+            nodeView.appendChild(overlay);
+          }
         }
         tr.appendChild(nodeView);
       } else {
@@ -146,6 +202,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
           tr.appendChild(serializedContent);
         }
       }
+      cellIndex++;
     }
   });
   return tr;
@@ -154,11 +211,11 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, nodeViewSerializ
 /**
  * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
-  var changes = _ref2.changes,
-    originalDoc = _ref2.originalDoc,
-    newDoc = _ref2.newDoc,
-    diffType = _ref2.diffType;
+var expandDiffForChangedRows = function expandDiffForChangedRows(_ref3) {
+  var changes = _ref3.changes,
+    originalDoc = _ref3.originalDoc,
+    newDoc = _ref3.newDoc,
+    diffType = _ref3.diffType;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -187,15 +244,15 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref3) {
-  var changes = _ref3.changes,
-    originalDoc = _ref3.originalDoc,
-    newDoc = _ref3.newDoc,
-    nodeViewSerializer = _ref3.nodeViewSerializer,
-    colorScheme = _ref3.colorScheme,
-    _ref3$isInserted = _ref3.isInserted,
-    isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType;
+export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref4) {
+  var changes = _ref4.changes,
+    originalDoc = _ref4.originalDoc,
+    newDoc = _ref4.newDoc,
+    nodeViewSerializer = _ref4.nodeViewSerializer,
+    colorScheme = _ref4.colorScheme,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? false : _ref4$isInserted,
+    diffType = _ref4.diffType;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -206,7 +263,7 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     diffType: diffType
   });
   return changedRows.map(function (changedRow) {
-    var rowDOM = createChangedRowDOM(changedRow.rowNode, nodeViewSerializer, colorScheme, isInserted, diffType);
+    var rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
     var safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,

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

@@ -37,5 +37,6 @@ export declare const editingStyleCardBlockNode: string;
 export declare const standardDecorationMarkerVariable: string;
 export declare const deletedDecorationMarkerVariable: string;
 export declare const addedCellOverlayStyle: string;
+export declare const addedCellOverlayRoundedStyle: string;
 export declare const deletedCellOverlayStyle: string;
 export declare const deletedCellOverlayRoundedStyle: string;

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

@@ -35,6 +35,7 @@ export declare const traditionalDeletedDecorationMarkerVariable: string;
 export declare const traditionalDeletedDecorationMarkerVariableNew: string;
 export declare const traditionalDeletedDecorationMarkerVariableActive: string;
 export declare const traditionalAddedCellOverlayStyle: string;
+export declare const traditionalAddedCellOverlayRoundedStyle: string;
 export declare const traditionalAddedCellOverlayStyleNew: string;
 export declare const deletedTraditionalCellOverlayStyle: string;
 export declare const deletedTraditionalCellOverlayRoundedStyle: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "10.5.2",
+	"version": "10.5.3",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^132.0.0",
+		"@atlaskit/tmp-editor-statsig": "^132.1.0",
 		"@atlaskit/tokens": "^16.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.0",