@atlaskit/editor-plugin-show-diff 14.0.3 → 14.0.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.0.4
+
+### Patch Changes
+
+- [`62c3227f6a3ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/62c3227f6a3ac) -
+  [CCI-19031] Fix large-table diffs suppressing decorations on adjacent inserted content. When a
+  paragraph (or other block) is inserted next to a large table, the smart classifier coalesces them
+  into a single node-level change. The coarse large-table decoration path now scopes cell-only
+  suppression to the table subtree, so adjacent inserted content keeps its highlight and indicator
+  instead of being dropped.
+- Updated dependencies
+
 ## 14.0.3
 
 ### Patch Changes

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isDeletedContentPlacedBelow = exports.calculateDiffDecorations = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
@@ -115,27 +115,51 @@ var isLargeInsertedTableRange = function isLargeInsertedTableRange(doc, from, to
   });
   return containsTable && leafCount > LARGE_TABLE_LEAF_THRESHOLD;
 };
-var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref2) {
-  var doc = _ref2.doc,
-    from = _ref2.from,
-    to = _ref2.to,
-    colorScheme = _ref2.colorScheme,
-    _ref2$isInserted = _ref2.isInserted,
-    isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
-    activeIndexPos = _ref2.activeIndexPos,
-    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
-    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet,
-    _ref2$showIndicators = _ref2.showIndicators,
-    showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
-    diffType = _ref2.diffType,
-    _ref2$coarseTableCell = _ref2.coarseTableCellsOnly,
-    coarseTableCellsOnly = _ref2$coarseTableCell === void 0 ? false : _ref2$coarseTableCell;
+
+// Collect the [from, to) ranges of every `table` node overlapping `[from, to)`. The coarse
+// large-table path must only suppress decorations inside these ranges
+var tableRanges = function tableRanges(doc, from, to) {
+  var ranges = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (node.type.name === 'table') {
+      ranges.push([pos, pos + node.nodeSize]);
+      return false;
+    }
+    return true;
+  });
+  return ranges;
+};
+var isInsideTable = function isInsideTable(tables, pos) {
+  return tables.some(function (_ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+      tFrom = _ref3[0],
+      tTo = _ref3[1];
+    return pos >= tFrom && pos < tTo;
+  });
+};
+var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref4) {
+  var doc = _ref4.doc,
+    from = _ref4.from,
+    to = _ref4.to,
+    colorScheme = _ref4.colorScheme,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? true : _ref4$isInserted,
+    activeIndexPos = _ref4.activeIndexPos,
+    _ref4$shouldHideDelet = _ref4.shouldHideDeleted,
+    shouldHideDeleted = _ref4$shouldHideDelet === void 0 ? false : _ref4$shouldHideDelet,
+    _ref4$showIndicators = _ref4.showIndicators,
+    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
+    diffType = _ref4.diffType,
+    _ref4$coarseTableCell = _ref4.coarseTableCellsOnly,
+    coarseTableCellsOnly = _ref4$coarseTableCell === void 0 ? false : _ref4$coarseTableCell;
   var decorations = [];
+  // Coarse path: inside the large table, only cell/header overlays are kept — the
+  // table/row/paragraph decorations there are redundant and cause expensive per-cell
+  // re-render. Blocks outside the table keep their normal decorations.
+  var coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, function (node, pos) {
-    // Coarse path: only cell/header overlays are visible; table/row/paragraph
-    // decorations are redundant and cause expensive per-cell re-render.
-    if (coarseTableCellsOnly) {
+    if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
       var name = node.type.name;
       if (name !== 'tableCell' && name !== 'tableHeader') {
         return;
@@ -173,10 +197,10 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
  *
  * Callers are responsible for the `smart` diffType and gate checks.
  */
-var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref3) {
-  var change = _ref3.change,
-    deletedDiffPlacement = _ref3.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref3.inlineDeletedDiffPlacement;
+var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref5) {
+  var change = _ref5.change,
+    deletedDiffPlacement = _ref5.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref5.inlineDeletedDiffPlacement;
   var level = (0, _helpers.smartChangeLevel)(change);
   if (level === 'node' || level === 'paragraph') {
     return deletedDiffPlacement === 'bottom';
@@ -185,29 +209,29 @@ var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function
   // Inline-level (undefined) and sentence-level changes.
   return inlineDeletedDiffPlacement === 'after';
 };
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4) {
-  var state = _ref4.state,
-    pluginState = _ref4.pluginState,
-    nodeViewSerializer = _ref4.nodeViewSerializer,
-    colorScheme = _ref4.colorScheme,
-    intl = _ref4.intl,
-    activeIndexPos = _ref4.activeIndexPos,
-    api = _ref4.api,
-    _ref4$isInverted = _ref4.isInverted,
-    isInverted = _ref4$isInverted === void 0 ? false : _ref4$isInverted,
-    _ref4$diffType = _ref4.diffType,
-    diffType = _ref4$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref4$diffType,
-    _ref4$hideDeletedDiff = _ref4.hideDeletedDiffs,
-    hideDeletedDiffs = _ref4$hideDeletedDiff === void 0 ? false : _ref4$hideDeletedDiff,
-    _ref4$hideAddedDiffsU = _ref4.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderlineParam = _ref4$hideAddedDiffsU === void 0 ? false : _ref4$hideAddedDiffsU,
-    _ref4$showIndicators = _ref4.showIndicators,
-    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
-    smartThresholds = _ref4.smartThresholds,
-    _ref4$deletedDiffPlac = _ref4.deletedDiffPlacement,
-    deletedDiffPlacement = _ref4$deletedDiffPlac === void 0 ? 'top' : _ref4$deletedDiffPlac,
-    _ref4$inlineDeletedDi = _ref4.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref4$inlineDeletedDi === void 0 ? 'before' : _ref4$inlineDeletedDi;
+var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6) {
+  var state = _ref6.state,
+    pluginState = _ref6.pluginState,
+    nodeViewSerializer = _ref6.nodeViewSerializer,
+    colorScheme = _ref6.colorScheme,
+    intl = _ref6.intl,
+    activeIndexPos = _ref6.activeIndexPos,
+    api = _ref6.api,
+    _ref6$isInverted = _ref6.isInverted,
+    isInverted = _ref6$isInverted === void 0 ? false : _ref6$isInverted,
+    _ref6$diffType = _ref6.diffType,
+    diffType = _ref6$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref6$diffType,
+    _ref6$hideDeletedDiff = _ref6.hideDeletedDiffs,
+    hideDeletedDiffs = _ref6$hideDeletedDiff === void 0 ? false : _ref6$hideDeletedDiff,
+    _ref6$hideAddedDiffsU = _ref6.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderlineParam = _ref6$hideAddedDiffsU === void 0 ? false : _ref6$hideAddedDiffsU,
+    _ref6$showIndicators = _ref6.showIndicators,
+    showIndicators = _ref6$showIndicators === void 0 ? false : _ref6$showIndicators,
+    smartThresholds = _ref6.smartThresholds,
+    _ref6$deletedDiffPlac = _ref6.deletedDiffPlacement,
+    deletedDiffPlacement = _ref6$deletedDiffPlac === void 0 ? 'top' : _ref6$deletedDiffPlac,
+    _ref6$inlineDeletedDi = _ref6.inlineDeletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref6$inlineDeletedDi === void 0 ? 'before' : _ref6$inlineDeletedDi;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps,
     isDisplayingChanges = pluginState.isDisplayingChanges;
@@ -328,10 +352,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
       var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
-      if (useCoarseTableDecoration) {
-        // Skip the O(cells) inline decorations; the cell overlays (added below)
-        // provide the highlight without the expensive content re-render.
-      } else if (isSmartNodeLevel) {
+      if (isSmartNodeLevel) {
+        // For a large inserted table, skip the O(cells) inline decorations inside the
+        // table (the cell overlays added below provide the highlight without the
+        // expensive content re-render); leaf blocks outside the table still get theirs.
+        var coarseTables = useCoarseTableDecoration ? tableRanges(tr.doc, change.fromB, change.toB) : [];
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
         try {
@@ -339,6 +364,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
             var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
               from = _step2$value[0],
               to = _step2$value[1];
+            if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
+              continue;
+            }
             decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
               change: {
                 fromB: from,
@@ -518,42 +546,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref5, _ref6) {
-  var _ref0;
-  var _ref7 = (0, _slicedToArray2.default)(_ref5, 1),
-    _ref7$ = _ref7[0],
-    pluginState = _ref7$.pluginState,
-    state = _ref7$.state,
-    colorScheme = _ref7$.colorScheme,
-    intl = _ref7$.intl,
-    activeIndexPos = _ref7$.activeIndexPos,
-    isInverted = _ref7$.isInverted,
-    diffType = _ref7$.diffType,
-    hideDeletedDiffs = _ref7$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
-    showIndicators = _ref7$.showIndicators,
-    smartThresholds = _ref7$.smartThresholds,
-    deletedDiffPlacement = _ref7$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref7$.inlineDeletedDiffPlacement;
-  var _ref8 = (0, _slicedToArray2.default)(_ref6, 1),
-    _ref8$ = _ref8[0],
-    lastPluginState = _ref8$.pluginState,
-    lastState = _ref8$.state,
-    lastColorScheme = _ref8$.colorScheme,
-    lastIntl = _ref8$.intl,
-    lastActiveIndexPos = _ref8$.activeIndexPos,
-    lastIsInverted = _ref8$.isInverted,
-    lastDiffType = _ref8$.diffType,
-    lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref8$.showIndicators,
-    lastSmartThresholds = _ref8$.smartThresholds,
-    lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
+function (_ref7, _ref8) {
+  var _ref10;
+  var _ref9 = (0, _slicedToArray2.default)(_ref7, 1),
+    _ref9$ = _ref9[0],
+    pluginState = _ref9$.pluginState,
+    state = _ref9$.state,
+    colorScheme = _ref9$.colorScheme,
+    intl = _ref9$.intl,
+    activeIndexPos = _ref9$.activeIndexPos,
+    isInverted = _ref9$.isInverted,
+    diffType = _ref9$.diffType,
+    hideDeletedDiffs = _ref9$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref9$.hideAddedDiffsUnderline,
+    showIndicators = _ref9$.showIndicators,
+    smartThresholds = _ref9$.smartThresholds,
+    deletedDiffPlacement = _ref9$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref9$.inlineDeletedDiffPlacement;
+  var _ref0 = (0, _slicedToArray2.default)(_ref8, 1),
+    _ref0$ = _ref0[0],
+    lastPluginState = _ref0$.pluginState,
+    lastState = _ref0$.state,
+    lastColorScheme = _ref0$.colorScheme,
+    lastIntl = _ref0$.intl,
+    lastActiveIndexPos = _ref0$.activeIndexPos,
+    lastIsInverted = _ref0$.isInverted,
+    lastDiffType = _ref0$.diffType,
+    lastHideDeletedDiffs = _ref0$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref0$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref0$.showIndicators,
+    lastSmartThresholds = _ref0$.smartThresholds,
+    lastDeletedDiffPlacement = _ref0$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref0$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref9;
-    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
+    var _ref1;
+    return (_ref1 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref1 !== void 0 ? _ref1 : false;
   }
-  return (_ref0 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
+  return (_ref10 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref10 !== void 0 ? _ref10 : false;
 });

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

@@ -101,6 +101,21 @@ const isLargeInsertedTableRange = (doc, from, to) => {
   });
   return containsTable && leafCount > LARGE_TABLE_LEAF_THRESHOLD;
 };
+
+// Collect the [from, to) ranges of every `table` node overlapping `[from, to)`. The coarse
+// large-table path must only suppress decorations inside these ranges
+const tableRanges = (doc, from, to) => {
+  const ranges = [];
+  doc.nodesBetween(from, to, (node, pos) => {
+    if (node.type.name === 'table') {
+      ranges.push([pos, pos + node.nodeSize]);
+      return false;
+    }
+    return true;
+  });
+  return ranges;
+};
+const isInsideTable = (tables, pos) => tables.some(([tFrom, tTo]) => pos >= tFrom && pos < tTo);
 const calculateNodesForBlockDecoration = ({
   doc,
   from,
@@ -114,11 +129,13 @@ const calculateNodesForBlockDecoration = ({
   coarseTableCellsOnly = false
 }) => {
   const decorations = [];
+  // Coarse path: inside the large table, only cell/header overlays are kept — the
+  // table/row/paragraph decorations there are redundant and cause expensive per-cell
+  // re-render. Blocks outside the table keep their normal decorations.
+  const coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, (node, pos) => {
-    // Coarse path: only cell/header overlays are visible; table/row/paragraph
-    // decorations are redundant and cause expensive per-cell re-render.
-    if (coarseTableCellsOnly) {
+    if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
       const name = node.type.name;
       if (name !== 'tableCell' && name !== 'tableHeader') {
         return;
@@ -301,11 +318,15 @@ const calculateDiffDecorationsInner = ({
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
       const willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
-      if (useCoarseTableDecoration) {
-        // Skip the O(cells) inline decorations; the cell overlays (added below)
-        // provide the highlight without the expensive content re-render.
-      } else if (isSmartNodeLevel) {
+      if (isSmartNodeLevel) {
+        // For a large inserted table, skip the O(cells) inline decorations inside the
+        // table (the cell overlays added below provide the highlight without the
+        // expensive content re-render); leaf blocks outside the table still get theirs.
+        const coarseTables = useCoarseTableDecoration ? tableRanges(tr.doc, change.fromB, change.toB) : [];
         for (const [from, to] of leafTextblockRanges(tr.doc, change.fromB, change.toB)) {
+          if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
+            continue;
+          }
           decorations.push(...createInlineChangedDecoration({
             change: {
               fromB: from,

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; } } }; }
@@ -108,27 +108,51 @@ var isLargeInsertedTableRange = function isLargeInsertedTableRange(doc, from, to
   });
   return containsTable && leafCount > LARGE_TABLE_LEAF_THRESHOLD;
 };
-var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref2) {
-  var doc = _ref2.doc,
-    from = _ref2.from,
-    to = _ref2.to,
-    colorScheme = _ref2.colorScheme,
-    _ref2$isInserted = _ref2.isInserted,
-    isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
-    activeIndexPos = _ref2.activeIndexPos,
-    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
-    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet,
-    _ref2$showIndicators = _ref2.showIndicators,
-    showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
-    diffType = _ref2.diffType,
-    _ref2$coarseTableCell = _ref2.coarseTableCellsOnly,
-    coarseTableCellsOnly = _ref2$coarseTableCell === void 0 ? false : _ref2$coarseTableCell;
+
+// Collect the [from, to) ranges of every `table` node overlapping `[from, to)`. The coarse
+// large-table path must only suppress decorations inside these ranges
+var tableRanges = function tableRanges(doc, from, to) {
+  var ranges = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (node.type.name === 'table') {
+      ranges.push([pos, pos + node.nodeSize]);
+      return false;
+    }
+    return true;
+  });
+  return ranges;
+};
+var isInsideTable = function isInsideTable(tables, pos) {
+  return tables.some(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      tFrom = _ref3[0],
+      tTo = _ref3[1];
+    return pos >= tFrom && pos < tTo;
+  });
+};
+var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref4) {
+  var doc = _ref4.doc,
+    from = _ref4.from,
+    to = _ref4.to,
+    colorScheme = _ref4.colorScheme,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? true : _ref4$isInserted,
+    activeIndexPos = _ref4.activeIndexPos,
+    _ref4$shouldHideDelet = _ref4.shouldHideDeleted,
+    shouldHideDeleted = _ref4$shouldHideDelet === void 0 ? false : _ref4$shouldHideDelet,
+    _ref4$showIndicators = _ref4.showIndicators,
+    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
+    diffType = _ref4.diffType,
+    _ref4$coarseTableCell = _ref4.coarseTableCellsOnly,
+    coarseTableCellsOnly = _ref4$coarseTableCell === void 0 ? false : _ref4$coarseTableCell;
   var decorations = [];
+  // Coarse path: inside the large table, only cell/header overlays are kept — the
+  // table/row/paragraph decorations there are redundant and cause expensive per-cell
+  // re-render. Blocks outside the table keep their normal decorations.
+  var coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, function (node, pos) {
-    // Coarse path: only cell/header overlays are visible; table/row/paragraph
-    // decorations are redundant and cause expensive per-cell re-render.
-    if (coarseTableCellsOnly) {
+    if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
       var name = node.type.name;
       if (name !== 'tableCell' && name !== 'tableHeader') {
         return;
@@ -166,10 +190,10 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
  *
  * Callers are responsible for the `smart` diffType and gate checks.
  */
-export var isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref3) {
-  var change = _ref3.change,
-    deletedDiffPlacement = _ref3.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref3.inlineDeletedDiffPlacement;
+export var isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref5) {
+  var change = _ref5.change,
+    deletedDiffPlacement = _ref5.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref5.inlineDeletedDiffPlacement;
   var level = smartChangeLevel(change);
   if (level === 'node' || level === 'paragraph') {
     return deletedDiffPlacement === 'bottom';
@@ -178,29 +202,29 @@ export var isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_r
   // Inline-level (undefined) and sentence-level changes.
   return inlineDeletedDiffPlacement === 'after';
 };
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4) {
-  var state = _ref4.state,
-    pluginState = _ref4.pluginState,
-    nodeViewSerializer = _ref4.nodeViewSerializer,
-    colorScheme = _ref4.colorScheme,
-    intl = _ref4.intl,
-    activeIndexPos = _ref4.activeIndexPos,
-    api = _ref4.api,
-    _ref4$isInverted = _ref4.isInverted,
-    isInverted = _ref4$isInverted === void 0 ? false : _ref4$isInverted,
-    _ref4$diffType = _ref4.diffType,
-    diffType = _ref4$diffType === void 0 ? getDefaultDiffType() : _ref4$diffType,
-    _ref4$hideDeletedDiff = _ref4.hideDeletedDiffs,
-    hideDeletedDiffs = _ref4$hideDeletedDiff === void 0 ? false : _ref4$hideDeletedDiff,
-    _ref4$hideAddedDiffsU = _ref4.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderlineParam = _ref4$hideAddedDiffsU === void 0 ? false : _ref4$hideAddedDiffsU,
-    _ref4$showIndicators = _ref4.showIndicators,
-    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
-    smartThresholds = _ref4.smartThresholds,
-    _ref4$deletedDiffPlac = _ref4.deletedDiffPlacement,
-    deletedDiffPlacement = _ref4$deletedDiffPlac === void 0 ? 'top' : _ref4$deletedDiffPlac,
-    _ref4$inlineDeletedDi = _ref4.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref4$inlineDeletedDi === void 0 ? 'before' : _ref4$inlineDeletedDi;
+var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6) {
+  var state = _ref6.state,
+    pluginState = _ref6.pluginState,
+    nodeViewSerializer = _ref6.nodeViewSerializer,
+    colorScheme = _ref6.colorScheme,
+    intl = _ref6.intl,
+    activeIndexPos = _ref6.activeIndexPos,
+    api = _ref6.api,
+    _ref6$isInverted = _ref6.isInverted,
+    isInverted = _ref6$isInverted === void 0 ? false : _ref6$isInverted,
+    _ref6$diffType = _ref6.diffType,
+    diffType = _ref6$diffType === void 0 ? getDefaultDiffType() : _ref6$diffType,
+    _ref6$hideDeletedDiff = _ref6.hideDeletedDiffs,
+    hideDeletedDiffs = _ref6$hideDeletedDiff === void 0 ? false : _ref6$hideDeletedDiff,
+    _ref6$hideAddedDiffsU = _ref6.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderlineParam = _ref6$hideAddedDiffsU === void 0 ? false : _ref6$hideAddedDiffsU,
+    _ref6$showIndicators = _ref6.showIndicators,
+    showIndicators = _ref6$showIndicators === void 0 ? false : _ref6$showIndicators,
+    smartThresholds = _ref6.smartThresholds,
+    _ref6$deletedDiffPlac = _ref6.deletedDiffPlacement,
+    deletedDiffPlacement = _ref6$deletedDiffPlac === void 0 ? 'top' : _ref6$deletedDiffPlac,
+    _ref6$inlineDeletedDi = _ref6.inlineDeletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref6$inlineDeletedDi === void 0 ? 'before' : _ref6$inlineDeletedDi;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps,
     isDisplayingChanges = pluginState.isDisplayingChanges;
@@ -321,10 +345,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
       var willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
-      if (useCoarseTableDecoration) {
-        // Skip the O(cells) inline decorations; the cell overlays (added below)
-        // provide the highlight without the expensive content re-render.
-      } else if (isSmartNodeLevel) {
+      if (isSmartNodeLevel) {
+        // For a large inserted table, skip the O(cells) inline decorations inside the
+        // table (the cell overlays added below provide the highlight without the
+        // expensive content re-render); leaf blocks outside the table still get theirs.
+        var coarseTables = useCoarseTableDecoration ? tableRanges(tr.doc, change.fromB, change.toB) : [];
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
         try {
@@ -332,6 +357,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
             var _step2$value = _slicedToArray(_step2.value, 2),
               from = _step2$value[0],
               to = _step2$value[1];
+            if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
+              continue;
+            }
             decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration(_objectSpread({
               change: {
                 fromB: from,
@@ -511,42 +539,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 };
 export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref5, _ref6) {
-  var _ref0;
-  var _ref7 = _slicedToArray(_ref5, 1),
-    _ref7$ = _ref7[0],
-    pluginState = _ref7$.pluginState,
-    state = _ref7$.state,
-    colorScheme = _ref7$.colorScheme,
-    intl = _ref7$.intl,
-    activeIndexPos = _ref7$.activeIndexPos,
-    isInverted = _ref7$.isInverted,
-    diffType = _ref7$.diffType,
-    hideDeletedDiffs = _ref7$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
-    showIndicators = _ref7$.showIndicators,
-    smartThresholds = _ref7$.smartThresholds,
-    deletedDiffPlacement = _ref7$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref7$.inlineDeletedDiffPlacement;
-  var _ref8 = _slicedToArray(_ref6, 1),
-    _ref8$ = _ref8[0],
-    lastPluginState = _ref8$.pluginState,
-    lastState = _ref8$.state,
-    lastColorScheme = _ref8$.colorScheme,
-    lastIntl = _ref8$.intl,
-    lastActiveIndexPos = _ref8$.activeIndexPos,
-    lastIsInverted = _ref8$.isInverted,
-    lastDiffType = _ref8$.diffType,
-    lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref8$.showIndicators,
-    lastSmartThresholds = _ref8$.smartThresholds,
-    lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
+function (_ref7, _ref8) {
+  var _ref10;
+  var _ref9 = _slicedToArray(_ref7, 1),
+    _ref9$ = _ref9[0],
+    pluginState = _ref9$.pluginState,
+    state = _ref9$.state,
+    colorScheme = _ref9$.colorScheme,
+    intl = _ref9$.intl,
+    activeIndexPos = _ref9$.activeIndexPos,
+    isInverted = _ref9$.isInverted,
+    diffType = _ref9$.diffType,
+    hideDeletedDiffs = _ref9$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref9$.hideAddedDiffsUnderline,
+    showIndicators = _ref9$.showIndicators,
+    smartThresholds = _ref9$.smartThresholds,
+    deletedDiffPlacement = _ref9$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref9$.inlineDeletedDiffPlacement;
+  var _ref0 = _slicedToArray(_ref8, 1),
+    _ref0$ = _ref0[0],
+    lastPluginState = _ref0$.pluginState,
+    lastState = _ref0$.state,
+    lastColorScheme = _ref0$.colorScheme,
+    lastIntl = _ref0$.intl,
+    lastActiveIndexPos = _ref0$.activeIndexPos,
+    lastIsInverted = _ref0$.isInverted,
+    lastDiffType = _ref0$.diffType,
+    lastHideDeletedDiffs = _ref0$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref0$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref0$.showIndicators,
+    lastSmartThresholds = _ref0$.smartThresholds,
+    lastDeletedDiffPlacement = _ref0$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref0$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
-    var _ref9;
-    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
+    var _ref1;
+    return (_ref1 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref1 !== void 0 ? _ref1 : false;
   }
-  return (_ref0 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
+  return (_ref10 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref10 !== void 0 ? _ref10 : false;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.0.3",
+	"version": "14.0.4",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",