@atlaskit/editor-plugin-show-diff 24.0.0 → 24.0.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 24.0.2
+
+### Patch Changes
+
+- [`646c02ae8de28`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/646c02ae8de28) -
+  Fix contributor tag and step mismatch in show diff: the spacer widget no longer becomes an
+  untagged navigation stop when contributor tags are shown, and block cards inside a table now carry
+  attribution.
+- [`7b18b1db6b6d3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7b18b1db6b6d3) -
+  EDITOR-9415 Allow native browser selection and copying within diff widgets behind
+  platform_editor_ai_show_diff_patch_2
+
+## 24.0.1
+
+### Patch Changes
+
+- [`37fc21aa0e358`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/37fc21aa0e358) -
+  Show contributor tags for layout changes in version history when
+  `confluence_ncs_step_diffing_version_history` is enabled
+- Updated dependencies
+
 ## 24.0.0
 
 ### Patch Changes

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

@@ -8,7 +8,6 @@ exports.createBlockChangedDecoration = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -34,13 +33,6 @@ var UNSTYLED_NODES = ['mediaSingle', 'mediaGroup', 'table',
 'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'];
 var CELL_NODES = ['tableCell', 'tableHeader'];
 
-/** Panels, rules and media can also sit in a table cell, which is out of scope for block tags. */
-var isInsideTable = function isInsideTable(doc, pos) {
-  return (0, _utils.findParentNodeClosestToPos)(doc.resolve(pos), function (node) {
-    return node.type.name === 'table';
-  }) !== undefined;
-};
-
 /**
  * Whether this block can host a contributor tag of its own.
  *
@@ -56,7 +48,7 @@ var canTagBlock = function canTagBlock(_ref) {
     return false;
   }
   var nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
-  return nodeType !== undefined && (0, _taggableBlockNodes.isTaggableBlockNode)(nodeType) && !isInsideTable(doc, from);
+  return nodeType !== undefined && (0, _taggableBlockNodes.isTaggableBlockNode)(nodeType);
 };
 
 /** Positioning context for the cell overlay widget decorations. */

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

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _contributorTagController = require("../../ui/ContributorTag/contributorTagController");
+var _baseNodeName = require("../utils/baseNodeName");
 var _charsByOffset = require("../utils/charsByOffset");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _decorationKeys = require("./decorationKeys");
@@ -219,6 +220,16 @@ var resolveHoistedCodeBlockAnchor = exports.resolveHoistedCodeBlockAnchor = func
   };
 };
 
+/** Find the position before a layout for a tag anchored to one of its columns. */
+var resolveLayoutSectionStart = function resolveLayoutSectionStart(doc, pos) {
+  var _doc$nodeAt$type$name, _doc$nodeAt;
+  if ((0, _baseNodeName.resolveBaseNodeName)((_doc$nodeAt$type$name = (_doc$nodeAt = doc.nodeAt(pos)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) !== null && _doc$nodeAt$type$name !== void 0 ? _doc$nodeAt$type$name : '') !== 'layoutColumn') {
+    return undefined;
+  }
+  var $pos = doc.resolve(pos);
+  return (0, _baseNodeName.resolveBaseNodeName)($pos.parent.type.name) === 'layoutSection' ? $pos.before($pos.depth) : undefined;
+};
+
 /**
  * The contributor tag widget for one diff range, placed on the first visible character the range
  * highlights — or, with `anchorAtRangeStart`, at `from` itself. A host inside a code block is
@@ -231,7 +242,7 @@ var resolveHoistedCodeBlockAnchor = exports.resolveHoistedCodeBlockAnchor = func
  * element ProseMirror drew it into — see `mountContributorTag`.
  */
 var createContributorTagWidget = exports.createContributorTagWidget = function createContributorTagWidget(_ref4) {
-  var _hoisted$codeBlockSta, _ref5, _hoisted$anchorName;
+  var _ref5, _hoisted$anchorName, _hoisted$codeBlockSta;
   var _ref4$anchorAtRangeSt = _ref4.anchorAtRangeStart,
     anchorAtRangeStart = _ref4$anchorAtRangeSt === void 0 ? false : _ref4$anchorAtRangeSt,
     anchorName = _ref4.anchorName,
@@ -251,8 +262,6 @@ var createContributorTagWidget = exports.createContributorTagWidget = function c
   // A change inside a code block is hoisted out of it, anchored to its own marker; anything else
   // keeps its own anchor.
   var hoisted = resolveHoistedCodeBlockAnchor(doc, anchorPos, diffId);
-  // Keep the host out of the table row's grid (EDITOR-8442).
-  var hostPos = (0, _createAnchorDecorationWidgets.clampAnchorPosIntoCell)(doc, (_hoisted$codeBlockSta = hoisted === null || hoisted === void 0 ? void 0 : hoisted.codeBlockStart) !== null && _hoisted$codeBlockSta !== void 0 ? _hoisted$codeBlockSta : anchorPos, 1);
 
   // Inline diffs pass no anchorName. Give them their own point anchor instead of the
   // `position: relative` fallback, which drifts left once the range wraps a line (EDITOR-9286).
@@ -262,6 +271,10 @@ var createContributorTagWidget = exports.createContributorTagWidget = function c
   });
   var effectiveAnchorName = (_ref5 = (_hoisted$anchorName = hoisted === null || hoisted === void 0 ? void 0 : hoisted.anchorName) !== null && _hoisted$anchorName !== void 0 ? _hoisted$anchorName : anchorName) !== null && _ref5 !== void 0 ? _ref5 : ownAnchorName;
   var tagAnchorName = effectiveAnchorName && supportsAnchorPositioning() ? effectiveAnchorName : undefined;
+  var layoutSectionStart = tagAnchorName ? resolveLayoutSectionStart(doc, anchorPos) : undefined;
+  // Keep the host out of the table row's grid (EDITOR-8442). Layout-column tags are hoisted before
+  // their layout so the advanced layout widget-flattening rule cannot put them behind nearby text.
+  var hostPos = layoutSectionStart !== null && layoutSectionStart !== void 0 ? layoutSectionStart : (0, _createAnchorDecorationWidgets.clampAnchorPosIntoCell)(doc, (_hoisted$codeBlockSta = hoisted === null || hoisted === void 0 ? void 0 : hoisted.codeBlockStart) !== null && _hoisted$codeBlockSta !== void 0 ? _hoisted$codeBlockSta : anchorPos, 1);
   var decorations = [];
   if (hoisted) {
     decorations.push(hoisted.marker);

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

@@ -8,6 +8,7 @@ exports.createNodeChangedDecorationWidget = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _baseNodeName = require("../utils/baseNodeName");
 var _emptyTextBlocks = require("../utils/emptyTextBlocks");
 var _isEmptyParagraphSlice = require("../utils/isEmptyParagraphSlice");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
@@ -124,7 +125,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
  * that is not in the current document.
  */
 var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidget = function createNodeChangedDecorationWidget(_ref2) {
-  var _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _slice$content$firstC2;
+  var _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _hoistedCodeBlockAnch, _slice$content$firstC2;
   var attributionKey = _ref2.attributionKey,
     change = _ref2.change,
     doc = _ref2.doc,
@@ -280,6 +281,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   // Match the rendering predicate above: an empty paragraph has no widget to tag, while whitespace
   // text in a rendered widget remains eligible.
   var canTagWidget = showContributorTags && !shouldSkipDeletedEmptyParagraphDecoration;
+  var contributorTagAnchorName;
   var decorations = [];
   var replacementNode = newDoc.nodeAt(change.fromB);
   var firstReplacedNode = slice.content.firstChild;
@@ -380,6 +382,14 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     var $sourcePos = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? getSourcePos(doc, $changeFromA, slice.openStart, index) : null;
     var nodeView = serializer.tryCreateNodeView(node, 0, $sourcePos !== null && $sourcePos !== void 0 ? $sourcePos : undefined, isInserted, colorScheme);
     if (nodeView) {
+      if (canTagWidget && contributorTagAnchorName === undefined && (0, _baseNodeName.resolveBaseNodeName)(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && (0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+        // The deleted column is rendered inside this widget; anchor to its box.
+        contributorTagAnchorName = (0, _decorationKeys.buildAnchorDecorationKey)({
+          diffId: diffId,
+          anchorType: _decorationKeys.AnchorTypeKey.tag
+        });
+        nodeView.style.setProperty('anchor-name', "--".concat(contributorTagAnchorName));
+      }
       if (node.isInline) {
         var wrapper = (0, _wrapBlockNodeView.createContentWrapper)(colorScheme, isActive, isInserted, reveal);
         wrapper.append(nodeView);
@@ -427,7 +437,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   if (hoistedCodeBlockAnchor) {
     decorations.push(hoistedCodeBlockAnchor.marker);
   }
-  var contributorTagAnchorName = hoistedCodeBlockAnchor === null || hoistedCodeBlockAnchor === void 0 ? void 0 : hoistedCodeBlockAnchor.anchorName;
+  contributorTagAnchorName = (_hoistedCodeBlockAnch = hoistedCodeBlockAnchor === null || hoistedCodeBlockAnchor === void 0 ? void 0 : hoistedCodeBlockAnchor.anchorName) !== null && _hoistedCodeBlockAnch !== void 0 ? _hoistedCodeBlockAnch : contributorTagAnchorName;
   if (!isInserted && deletedColumns !== null && deletedColumns !== void 0 && deletedColumns.length) {
     var table = dom.querySelector('table');
     var firstRow = table === null || table === void 0 ? void 0 : table.rows[0];
@@ -647,12 +657,14 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
         defaultSpacer.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
       }
-      decorations.push(_view.Decoration.widget(safeInsertPos, defaultSpacer, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
+      decorations.push(_view.Decoration.widget(safeInsertPos, defaultSpacer,
+      // Spacing only: a diff spec would make it an untagged navigation stop.
+      showContributorTags ? {} : (0, _decorationKeys.buildDiffDecorationSpec)({
         colorScheme: colorScheme,
         decorationType: 'widget',
         diffId: crypto.randomUUID(),
         isInserted: isInserted
-      }))));
+      })));
     }
   }
   return decorations;

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

@@ -9,6 +9,7 @@ exports.buildAnchorDecorationSpec = buildAnchorDecorationSpec;
 exports.scrollMarginTopValue = exports.scrollMarginTopStyle = exports.isDiffDecorationSpec = exports.isDiffDecoration = exports.isAnchorDecorationSpec = exports.extractDiffDescriptors = exports.buildDiffDecorationSpec = exports.buildDiffDecorationKey = exports.buildContributorTagDecorationSpec = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 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; }
 /**
@@ -81,7 +82,7 @@ var buildDiffDecorationSpec = exports.buildDiffDecorationSpec = function buildDi
     leftAnchorId = _ref3.leftAnchorId,
     nodeName = _ref3.nodeName,
     side = _ref3.side;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     decorationFamily: DecorationFamily.diff,
     decorationType: decorationType,
     diffId: diffId,
@@ -104,6 +105,13 @@ var buildDiffDecorationSpec = exports.buildDiffDecorationSpec = function buildDi
     nodeName: nodeName
   } : {}), side !== undefined ? {
     side: side
+  } : {}), decorationType === 'widget' && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? {
+    // Widget content is outside the document. Keep its native DOM selection
+    // and let the browser handle events within it.
+    ignoreSelection: true,
+    stopEvent: function stopEvent() {
+      return true;
+    }
   } : {});
 };
 function buildAnchorDecorationSpec(_ref4) {

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

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractContributorTags = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _baseNodeName = require("../utils/baseNodeName");
 var _decorationKeys = require("./decorationKeys");
 var _excluded = ["connectedToKey"];
 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; }
@@ -54,7 +54,10 @@ var leadsReplacement = function leadsReplacement(widget) {
  * inline/widget range that merely overlaps the block is a separate change (EDITOR-9473).
  */
 var isSameBlockChange = function isSameBlockChange(inner, block) {
-  return inner.spec.attributionKey === block.spec.attributionKey && block.from <= inner.from && inner.to <= block.to;
+  return inner.spec.attributionKey === block.spec.attributionKey && (inner.spec.decorationType === 'widget' ?
+  // Deleted content is zero-width and sits at the start of what replaced it, so a widget at the
+  // block's edge is beside the block rather than within it and keeps its own tag.
+  block.from < inner.from && inner.to < block.to : block.from <= inner.from && inner.to <= block.to);
 };
 
 /**
@@ -75,12 +78,27 @@ var byLeadingPosition = function byLeadingPosition(a, b) {
   return a.decoration.from - b.decoration.from || ((_a$decoration$spec$si = a.decoration.spec.side) !== null && _a$decoration$spec$si !== void 0 ? _a$decoration$spec$si : 0) - ((_b$decoration$spec$si = b.decoration.spec.side) !== null && _b$decoration$spec$si !== void 0 ? _b$decoration$spec$si : 0) || a.decoration.to - a.decoration.from - (b.decoration.to - b.decoration.from);
 };
 
-/** The targets a navigation range wholly covers, leader first. */
-var containedBy = function containedBy(targets, _ref2) {
-  var from = _ref2.from,
-    to = _ref2.to;
-  return targets.filter(function (_ref3) {
+/** Select the first layout column only when the inline layout range starts immediately before it. */
+var navigationLeader = function navigationLeader(members) {
+  var ordered = (0, _toConsumableArray2.default)(members).sort(byLeadingPosition);
+  var layoutColumn = (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? ordered.find(function (_ref2) {
+    var _decoration$spec$node;
+    var decoration = _ref2.decoration;
+    return decoration.spec.decorationType === 'block' && (0, _baseNodeName.resolveBaseNodeName)((_decoration$spec$node = decoration.spec.nodeName) !== null && _decoration$spec$node !== void 0 ? _decoration$spec$node : '') === 'layoutColumn';
+  }) : undefined;
+  var startsWholeLayout = layoutColumn !== undefined && members.some(function (_ref3) {
     var decoration = _ref3.decoration;
+    return decoration.spec.decorationType === 'inline' && decoration.from === layoutColumn.decoration.from - 1;
+  });
+  return startsWholeLayout ? layoutColumn : ordered[0];
+};
+
+/** The targets a navigation range wholly covers, leader first. */
+var containedBy = function containedBy(targets, _ref4) {
+  var from = _ref4.from,
+    to = _ref4.to;
+  return targets.filter(function (_ref5) {
+    var decoration = _ref5.decoration;
     return from <= decoration.from && decoration.to <= to;
   }).sort(byLeadingPosition);
 };
@@ -154,16 +172,16 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
   } finally {
     _iterator.f();
   }
-  var inlineTargets = targets.filter(function (_ref4) {
-    var decoration = _ref4.decoration;
+  var inlineTargets = targets.filter(function (_ref6) {
+    var decoration = _ref6.decoration;
     return decoration.spec.decorationType === 'inline';
   });
-  var blockTargets = targets.filter(function (_ref5) {
-    var decoration = _ref5.decoration;
+  var blockTargets = targets.filter(function (_ref7) {
+    var decoration = _ref7.decoration;
     return decoration.spec.decorationType === 'block';
   });
-  var widgetTargets = targets.filter(function (_ref6) {
-    var decoration = _ref6.decoration;
+  var widgetTargets = targets.filter(function (_ref8) {
+    var decoration = _ref8.decoration;
     return decoration.spec.decorationType === 'widget';
   });
   var linkedDiffIds = new Map();
@@ -191,8 +209,8 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
       }
 
       // A block outranks both other kinds, so it is tried first.
-      var block = blockTargets.find(function (_ref7) {
-        var decoration = _ref7.decoration;
+      var block = blockTargets.find(function (_ref9) {
+        var decoration = _ref9.decoration;
         return isSameBlockChange(target.decoration, decoration);
       });
       if (block) {
@@ -201,8 +219,8 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
       }
       if (decorationType === 'inline') {
         // The deleted half renders in front of this one, so that half captions the change.
-        var leadingWidget = widgetTargets.find(function (_ref8) {
-          var decoration = _ref8.decoration;
+        var leadingWidget = widgetTargets.find(function (_ref0) {
+          var decoration = _ref0.decoration;
           return leadsReplacement(decoration) && isSameChange(decoration, target.decoration);
         });
         if (leadingWidget) {
@@ -215,8 +233,8 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
       if (leadsReplacement(target.decoration)) {
         return 0; // continue
       }
-      var host = inlineTargets.find(function (_ref9) {
-        var decoration = _ref9.decoration;
+      var host = inlineTargets.find(function (_ref1) {
+        var decoration = _ref1.decoration;
         return isSameChange(target.decoration, decoration);
       });
       if (host) {
@@ -320,10 +338,10 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
     try {
       var _loop2 = function _loop2() {
         var members = _step6.value;
-        var _sort = (0, _toConsumableArray2.default)(members).sort(byLeadingPosition),
-          _sort2 = (0, _toArray2.default)(_sort),
-          leader = _sort2[0],
-          trailing = _arrayLikeToArray(_sort2).slice(1);
+        var leader = navigationLeader(members);
+        var trailing = members.filter(function (target) {
+          return target !== leader;
+        });
         trailing.forEach(function (target) {
           return fold(leader, target);
         });

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

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWidgetElement = void 0;
+// prosemirror-view does not type `Decoration.type`; a widget's `type.toDOM` is the node passed to
+// `Decoration.widget()` (an element or a factory — the `WidgetConstructor` union).
+
+// The element a widget renders, or undefined if it renders via a factory.
+var getWidgetElement = exports.getWidgetElement = function getWidgetElement(decoration) {
+  var _type;
+  var _ref = (_type = decoration.type) !== null && _type !== void 0 ? _type : {},
+    toDOM = _ref.toDOM;
+  return toDOM instanceof HTMLElement ? toDOM : undefined;
+};

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

@@ -12,6 +12,7 @@ var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _baseNodeName = require("../../utils/baseNodeName");
 var _createInlineChangedDecoration = require("../createInlineChangedDecoration");
 var _revealStyles = require("../revealStyles");
 var _getAttrChangeRanges = require("./getAttrChangeRanges");
@@ -353,6 +354,15 @@ var createBlockNodeContentWrapper = function createBlockNodeContentWrapper(_ref9
   // should not also get the inline content style (borderBottom underline) on their container.
   var shouldSkipContentStyle = isInserted && nodeStyle !== undefined;
   var contentStyle = shouldSkipContentStyle ? '' : (0, _wrapBlockNodeViewStyles.getChangedContentStyle)(colorScheme, isActive, isInserted, hideAddedDiffsUnderline);
+  var isEmptyDeletedLayoutColumn = !isInserted && (0, _baseNodeName.resolveBaseNodeName)(targetNode.type.name) === 'layoutColumn' && targetNode.textContent.length === 0 && (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
+  if (isEmptyDeletedLayoutColumn && nodeView instanceof HTMLElement) {
+    var _nodeView$querySelect;
+    // Give an empty deleted column height so its diff box doesn't collapse
+    var placeholderTarget = (_nodeView$querySelect = nodeView.querySelector('[data-layout-content]')) !== null && _nodeView$querySelect !== void 0 ? _nodeView$querySelect : nodeView;
+    appendStyleToElement(placeholderTarget, (0, _lazyNodeView.convertToInlineCss)({
+      minHeight: "var(--ds-space-300, 24px)"
+    }));
+  }
 
   // A `breakout` node renders wider than the editor column while the wrapper divs
   // stay at column width, so paint the outline on the node element that spans that width.

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

@@ -5,18 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDeletedWidgets = void 0;
 var _decorationKeys = require("./decorations/decorationKeys");
+var _getWidgetElement = require("./decorations/utils/getWidgetElement");
 var _main = require("./main");
-// prosemirror-view does not type `Decoration.type`; a widget's `type.toDOM` is the node passed to
-// `Decoration.widget()` (an element or a factory — the `WidgetConstructor` union).
-
-// The element a deleted-content widget renders, or undefined if it renders via a factory.
-var getWidgetElement = function getWidgetElement(decoration) {
-  var _type;
-  var _ref = (_type = decoration.type) !== null && _type !== void 0 ? _type : {},
-    toDOM = _ref.toDOM;
-  return toDOM instanceof HTMLElement ? toDOM : undefined;
-};
-
 /**
  * The rendered deleted-content widgets in `editorState`, optionally restricted to `[from, to]`,
  * ordered by position. Deleted content is rendered as widget decorations rather than document
@@ -34,7 +24,7 @@ var getDeletedWidgets = exports.getDeletedWidgets = function getDeletedWidgets(e
   return decorations.find(range === null || range === void 0 ? void 0 : range.from, range === null || range === void 0 ? void 0 : range.to, function (spec) {
     return (0, _decorationKeys.isDiffDecorationSpec)(spec) && spec.decorationType === 'widget';
   }).reduce(function (widgets, decoration) {
-    var element = getWidgetElement(decoration);
+    var element = (0, _getWidgetElement.getWidgetElement)(decoration);
     if (element) {
       widgets.push({
         element: element,

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

@@ -16,6 +16,7 @@ var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _announceActiveDiff = require("../ui/DiffNavigation/announceActiveDiff");
 var _calculateDiffDecorations = require("./calculateDiff/calculateDiffDecorations");
 var _decorationKeys = require("./decorations/decorationKeys");
+var _getWidgetElement = require("./decorations/utils/getWidgetElement");
 var _enforceCustomStepRegisters = require("./enforceCustomStepRegisters");
 var _getDefaultDiffType = require("./getDefaultDiffType");
 var _getScrollableDecorations = require("./getScrollableDecorations");
@@ -306,6 +307,31 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
       };
     },
     props: {
+      handleDOMEvents: {
+        // Bypass ProseMirror's copy handler without preventing native browser copy
+        // when the selection is completely contained within an inverted diff widget
+        copy: function copy(view) {
+          if (!(0, _fg.fg)('platform_editor_ai_show_diff_patch_2')) {
+            return false;
+          }
+          var pluginState = showDiffPluginKey.getState(view.state);
+          if (!(pluginState !== null && pluginState !== void 0 && pluginState.isDisplayingChanges) || !pluginState.isInverted) {
+            return false;
+          }
+          var selection = view.dom.ownerDocument.getSelection();
+          if (!selection || selection.isCollapsed || selection.rangeCount !== 1) {
+            return false;
+          }
+          var range = selection.getRangeAt(0);
+          return pluginState.decorations.find().filter(_decorationKeys.isDiffDecoration).some(function (decoration) {
+            if (decoration.spec.decorationType !== 'widget') {
+              return false;
+            }
+            var dom = (0, _getWidgetElement.getWidgetElement)(decoration);
+            return Boolean(dom && view.dom.contains(dom) && dom.contains(range.startContainer) && dom.contains(range.endContainer));
+          });
+        }
+      },
       decorations: function decorations(state) {
         var pluginState = showDiffPluginKey.getState(state);
         return pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations;

package/dist/cjs/pm-plugins/utils/taggableBlockNodes.js

@@ -15,7 +15,7 @@ var _baseNodeName = require("./baseNodeName");
  *
  * Base names only — match with the predicates below, never against `type.name` directly.
  */
-var TAGGABLE_BLOCK_NODES = new Set(['blockCard', 'blockquote', 'bodiedExtension', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'extension', 'media', 'multiBodiedExtension', 'panel', 'rule', 'taskList']);
+var TAGGABLE_BLOCK_NODES = new Set(['blockCard', 'blockquote', 'bodiedExtension', 'codeBlock', 'decisionList', 'embedCard', 'expand', 'extension', 'layoutColumn', 'media', 'multiBodiedExtension', 'panel', 'rule', 'taskList']);
 
 /**
  * Whether this node hosts a contributor tag of its own. Navigation grouping does not consult this:

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

@@ -1,5 +1,4 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
-import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
@@ -23,9 +22,6 @@ const UNSTYLED_NODES = ['mediaSingle', 'mediaGroup', 'table',
 'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'];
 const CELL_NODES = ['tableCell', 'tableHeader'];
 
-/** Panels, rules and media can also sit in a table cell, which is out of scope for block tags. */
-const isInsideTable = (doc, pos) => findParentNodeClosestToPos(doc.resolve(pos), node => node.type.name === 'table') !== undefined;
-
 /**
  * Whether this block can host a contributor tag of its own.
  *
@@ -42,7 +38,7 @@ const canTagBlock = ({
     return false;
   }
   const nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
-  return nodeType !== undefined && isTaggableBlockNode(nodeType) && !isInsideTable(doc, from);
+  return nodeType !== undefined && isTaggableBlockNode(nodeType);
 };
 
 /** Positioning context for the cell overlay widget decorations. */

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

@@ -1,6 +1,7 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { ContributorTagController } from '../../ui/ContributorTag/contributorTagController';
+import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { buildCharsByOffset, isWhitespaceChar } from '../utils/charsByOffset';
 import { clampAnchorPosIntoCell, createAnchorNameSpan } from './createAnchorDecorationWidgets';
 import { AnchorTypeKey, buildAnchorDecorationKey, buildAnchorDecorationSpec, buildContributorTagDecorationSpec } from './decorationKeys';
@@ -207,6 +208,16 @@ export const resolveHoistedCodeBlockAnchor = (doc, pos, diffId) => {
   };
 };
 
+/** Find the position before a layout for a tag anchored to one of its columns. */
+const resolveLayoutSectionStart = (doc, pos) => {
+  var _doc$nodeAt$type$name, _doc$nodeAt;
+  if (resolveBaseNodeName((_doc$nodeAt$type$name = (_doc$nodeAt = doc.nodeAt(pos)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) !== null && _doc$nodeAt$type$name !== void 0 ? _doc$nodeAt$type$name : '') !== 'layoutColumn') {
+    return undefined;
+  }
+  const $pos = doc.resolve(pos);
+  return resolveBaseNodeName($pos.parent.type.name) === 'layoutSection' ? $pos.before($pos.depth) : undefined;
+};
+
 /**
  * The contributor tag widget for one diff range, placed on the first visible character the range
  * highlights — or, with `anchorAtRangeStart`, at `from` itself. A host inside a code block is
@@ -227,7 +238,7 @@ export const createContributorTagWidget = ({
   diffId,
   mountContext
 }) => {
-  var _hoisted$codeBlockSta, _ref2, _hoisted$anchorName;
+  var _ref2, _hoisted$anchorName, _hoisted$codeBlockSta;
   if (!isContributorTagWidgetEnabled()) {
     return undefined;
   }
@@ -239,8 +250,6 @@ export const createContributorTagWidget = ({
   // A change inside a code block is hoisted out of it, anchored to its own marker; anything else
   // keeps its own anchor.
   const hoisted = resolveHoistedCodeBlockAnchor(doc, anchorPos, diffId);
-  // Keep the host out of the table row's grid (EDITOR-8442).
-  const hostPos = clampAnchorPosIntoCell(doc, (_hoisted$codeBlockSta = hoisted === null || hoisted === void 0 ? void 0 : hoisted.codeBlockStart) !== null && _hoisted$codeBlockSta !== void 0 ? _hoisted$codeBlockSta : anchorPos, 1);
 
   // Inline diffs pass no anchorName. Give them their own point anchor instead of the
   // `position: relative` fallback, which drifts left once the range wraps a line (EDITOR-9286).
@@ -250,6 +259,10 @@ export const createContributorTagWidget = ({
   });
   const effectiveAnchorName = (_ref2 = (_hoisted$anchorName = hoisted === null || hoisted === void 0 ? void 0 : hoisted.anchorName) !== null && _hoisted$anchorName !== void 0 ? _hoisted$anchorName : anchorName) !== null && _ref2 !== void 0 ? _ref2 : ownAnchorName;
   const tagAnchorName = effectiveAnchorName && supportsAnchorPositioning() ? effectiveAnchorName : undefined;
+  const layoutSectionStart = tagAnchorName ? resolveLayoutSectionStart(doc, anchorPos) : undefined;
+  // Keep the host out of the table row's grid (EDITOR-8442). Layout-column tags are hoisted before
+  // their layout so the advanced layout widget-flattening rule cannot put them behind nearby text.
+  const hostPos = layoutSectionStart !== null && layoutSectionStart !== void 0 ? layoutSectionStart : clampAnchorPosIntoCell(doc, (_hoisted$codeBlockSta = hoisted === null || hoisted === void 0 ? void 0 : hoisted.codeBlockStart) !== null && _hoisted$codeBlockSta !== void 0 ? _hoisted$codeBlockSta : anchorPos, 1);
   const decorations = [];
   if (hoisted) {
     decorations.push(hoisted.marker);

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

@@ -1,5 +1,6 @@
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { resolveBaseNodeName } from '../utils/baseNodeName';
 import { countEmptyTextBlockOnlySlice } from '../utils/emptyTextBlocks';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { clampAnchorPosIntoCell, createAnchorNameSpan, createLeftAnchorWidget } from './createAnchorDecorationWidgets';
@@ -138,7 +139,7 @@ export const createNodeChangedDecorationWidget = ({
   tagMountContext,
   deletedColumns
 }) => {
-  var _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _slice$content$firstC2;
+  var _$safeInsertPos$nodeB, _slice$content$firstC, _newDoc$firstChild, _hoistedCodeBlockAnch, _slice$content$firstC2;
   const slice = doc.slice(change.fromA, change.toA);
   const shouldSkipDeletedEmptyParagraphDecoration = !isInserted && isEmptyParagraphSlice(slice);
   // How many blank lines the deletion took, when it took nothing else. Blank means an empty
@@ -272,6 +273,7 @@ export const createNodeChangedDecorationWidget = ({
   // Match the rendering predicate above: an empty paragraph has no widget to tag, while whitespace
   // text in a rendered widget remains eligible.
   const canTagWidget = showContributorTags && !shouldSkipDeletedEmptyParagraphDecoration;
+  let contributorTagAnchorName;
   const decorations = [];
   const replacementNode = newDoc.nodeAt(change.fromB);
   const firstReplacedNode = slice.content.firstChild;
@@ -366,6 +368,14 @@ export const createNodeChangedDecorationWidget = ({
     const $sourcePos = fg('platform_editor_ai_show_diff_patch_2') ? getSourcePos(doc, $changeFromA, slice.openStart, index) : null;
     const nodeView = serializer.tryCreateNodeView(node, 0, $sourcePos !== null && $sourcePos !== void 0 ? $sourcePos : undefined, isInserted, colorScheme);
     if (nodeView) {
+      if (canTagWidget && contributorTagAnchorName === undefined && resolveBaseNodeName(node.type.name) === 'layoutColumn' && nodeView instanceof HTMLElement && fg('confluence_ncs_step_diffing_version_history')) {
+        // The deleted column is rendered inside this widget; anchor to its box.
+        contributorTagAnchorName = buildAnchorDecorationKey({
+          diffId,
+          anchorType: AnchorTypeKey.tag
+        });
+        nodeView.style.setProperty('anchor-name', `--${contributorTagAnchorName}`);
+      }
       if (node.isInline) {
         const wrapper = createContentWrapper(colorScheme, isActive, isInserted, reveal);
         wrapper.append(nodeView);
@@ -413,7 +423,7 @@ export const createNodeChangedDecorationWidget = ({
   if (hoistedCodeBlockAnchor) {
     decorations.push(hoistedCodeBlockAnchor.marker);
   }
-  let contributorTagAnchorName = hoistedCodeBlockAnchor === null || hoistedCodeBlockAnchor === void 0 ? void 0 : hoistedCodeBlockAnchor.anchorName;
+  contributorTagAnchorName = (_hoistedCodeBlockAnch = hoistedCodeBlockAnchor === null || hoistedCodeBlockAnchor === void 0 ? void 0 : hoistedCodeBlockAnchor.anchorName) !== null && _hoistedCodeBlockAnch !== void 0 ? _hoistedCodeBlockAnch : contributorTagAnchorName;
   if (!isInserted && deletedColumns !== null && deletedColumns !== void 0 && deletedColumns.length) {
     const table = dom.querySelector('table');
     const firstRow = table === null || table === void 0 ? void 0 : table.rows[0];
@@ -631,14 +641,14 @@ export const createNodeChangedDecorationWidget = ({
       if (fg('platform_editor_ai_show_diff_patch_1')) {
         defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
       }
-      decorations.push(Decoration.widget(safeInsertPos, defaultSpacer, {
-        ...buildDiffDecorationSpec({
-          colorScheme,
-          decorationType: 'widget',
-          diffId: crypto.randomUUID(),
-          isInserted
-        })
-      }));
+      decorations.push(Decoration.widget(safeInsertPos, defaultSpacer,
+      // Spacing only: a diff spec would make it an untagged navigation stop.
+      showContributorTags ? {} : buildDiffDecorationSpec({
+        colorScheme,
+        decorationType: 'widget',
+        diffId: crypto.randomUUID(),
+        isInserted
+      })));
     }
   }
   return decorations;

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

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 /**
  * Decoration families produced by the show-diff plugin.
  * Each family owns its own key space and spec shape.
@@ -98,6 +99,12 @@ export const buildDiffDecorationSpec = ({
   } : {}),
   ...(side !== undefined ? {
     side
+  } : {}),
+  ...(decorationType === 'widget' && fg('platform_editor_ai_show_diff_patch_2') ? {
+    // Widget content is outside the document. Keep its native DOM selection
+    // and let the browser handle events within it.
+    ignoreSelection: true,
+    stopEvent: () => true
   } : {})
 });
 export function buildAnchorDecorationSpec({