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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @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

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/createNodeChangedDecorationWidget.js

@@ -657,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

@@ -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);
 };
 
 /**

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/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/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/createNodeChangedDecorationWidget.js

@@ -641,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({

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

@@ -33,7 +33,10 @@ const leadsReplacement = widget => fg('confluence_ncs_step_diffing_version_histo
  * block keeps the tag — one tag per block. Only when the block fully covers `inner`; a wider
  * inline/widget range that merely overlaps the block is a separate change (EDITOR-9473).
  */
-const isSameBlockChange = (inner, block) => inner.spec.attributionKey === block.spec.attributionKey && block.from <= inner.from && inner.to <= block.to;
+const isSameBlockChange = (inner, block) => 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);
 
 /**
  * Whether `outer` is the box `inner` sits in, for one contributor. Nested blocks they inserted read

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

@@ -0,0 +1,11 @@
+// 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.
+export const getWidgetElement = decoration => {
+  var _type;
+  const {
+    toDOM
+  } = (_type = decoration.type) !== null && _type !== void 0 ? _type : {};
+  return toDOM instanceof HTMLElement ? toDOM : undefined;
+};

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

@@ -1,18 +1,7 @@
 import { isDiffDecorationSpec } from './decorations/decorationKeys';
+import { getWidgetElement } from './decorations/utils/getWidgetElement';
 import { showDiffPluginKey } from './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.
-const getWidgetElement = decoration => {
-  var _type;
-  const {
-    toDOM
-  } = (_type = decoration.type) !== null && _type !== void 0 ? _type : {};
-  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

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

@@ -8,6 +8,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getActiveDiffAnnouncement } from '../ui/DiffNavigation/announceActiveDiff';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
+import { getWidgetElement } from './decorations/utils/getWidgetElement';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
 import { getDefaultDiffType } from './getDefaultDiffType';
 import { getScrollableDecorations } from './getScrollableDecorations';
@@ -305,6 +306,31 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
       };
     },
     props: {
+      handleDOMEvents: {
+        // Bypass ProseMirror's copy handler without preventing native browser copy
+        // when the selection is completely contained within an inverted diff widget
+        copy: view => {
+          if (!fg('platform_editor_ai_show_diff_patch_2')) {
+            return false;
+          }
+          const pluginState = showDiffPluginKey.getState(view.state);
+          if (!(pluginState !== null && pluginState !== void 0 && pluginState.isDisplayingChanges) || !pluginState.isInverted) {
+            return false;
+          }
+          const selection = view.dom.ownerDocument.getSelection();
+          if (!selection || selection.isCollapsed || selection.rangeCount !== 1) {
+            return false;
+          }
+          const range = selection.getRangeAt(0);
+          return pluginState.decorations.find().filter(isDiffDecoration).some(decoration => {
+            if (decoration.spec.decorationType !== 'widget') {
+              return false;
+            }
+            const dom = getWidgetElement(decoration);
+            return Boolean(dom && view.dom.contains(dom) && dom.contains(range.startContainer) && dom.contains(range.endContainer));
+          });
+        }
+      },
       decorations: state => {
         const pluginState = showDiffPluginKey.getState(state);
         return pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations;

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

@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 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';
@@ -27,13 +26,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 findParentNodeClosestToPos(doc.resolve(pos), function (node) {
-    return node.type.name === 'table';
-  }) !== undefined;
-};
-
 /**
  * Whether this block can host a contributor tag of its own.
  *
@@ -49,7 +41,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 && isTaggableBlockNode(nodeType) && !isInsideTable(doc, from);
+  return nodeType !== undefined && isTaggableBlockNode(nodeType);
 };
 
 /** Positioning context for the cell overlay widget decorations. */

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

@@ -651,12 +651,14 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       if (fg('platform_editor_ai_show_diff_patch_1')) {
         defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
       }
-      decorations.push(Decoration.widget(safeInsertPos, defaultSpacer, _objectSpread({}, buildDiffDecorationSpec({
+      decorations.push(Decoration.widget(safeInsertPos, defaultSpacer,
+      // Spacing only: a diff spec would make it an untagged navigation stop.
+      showContributorTags ? {} : buildDiffDecorationSpec({
         colorScheme: colorScheme,
         decorationType: 'widget',
         diffId: crypto.randomUUID(),
         isInserted: isInserted
-      }))));
+      })));
     }
   }
   return decorations;

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

@@ -2,6 +2,7 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
+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.
@@ -72,7 +73,7 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     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,
@@ -95,6 +96,13 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     nodeName: nodeName
   } : {}), side !== undefined ? {
     side: 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: function stopEvent() {
+      return true;
+    }
   } : {});
 };
 export function buildAnchorDecorationSpec(_ref4) {

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

@@ -48,7 +48,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);
 };
 
 /**

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

@@ -0,0 +1,10 @@
+// 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.
+export 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;
+};

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

@@ -1,17 +1,7 @@
 import { isDiffDecorationSpec } from './decorations/decorationKeys';
+import { getWidgetElement } from './decorations/utils/getWidgetElement';
 import { showDiffPluginKey } from './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

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

@@ -11,6 +11,7 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getActiveDiffAnnouncement } from '../ui/DiffNavigation/announceActiveDiff';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
+import { getWidgetElement } from './decorations/utils/getWidgetElement';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
 import { getDefaultDiffType } from './getDefaultDiffType';
 import { getScrollableDecorations } from './getScrollableDecorations';
@@ -299,6 +300,31 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
       };
     },
     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 (!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(isDiffDecoration).some(function (decoration) {
+            if (decoration.spec.decorationType !== 'widget') {
+              return false;
+            }
+            var dom = 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/types/pm-plugins/decorations/decorationKeys.d.ts

@@ -30,6 +30,7 @@ export type DiffDecorationSpec = BaseDecorationSpec<typeof DecorationFamily.diff
     colorScheme?: ColorScheme;
     decorationType: DiffDescriptor['type'];
     diffId: string;
+    ignoreSelection?: boolean;
     /**
      * The change currently stepped to. Needed on the spec because `activeIndex` indexes the filtered,
      * re-sorted scrollable decorations, not `diffDescriptors`.
@@ -50,6 +51,7 @@ export type DiffDecorationSpec = BaseDecorationSpec<typeof DecorationFamily.diff
      * consumed by `scrollToDiff`; never present on a decoration in the plugin's `DecorationSet`.
      */
     scrollTarget?: Decoration;
+    stopEvent?: (event: Event) => boolean;
 };
 export declare const AnchorTypeKey: {
     readonly from: 'from';

package/dist/types/pm-plugins/decorations/utils/getWidgetElement.d.ts

@@ -0,0 +1,2 @@
+import type { Decoration } from '@atlaskit/editor-prosemirror/view';
+export declare const getWidgetElement: (decoration: Decoration) => HTMLElement | undefined;

package/package.json

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