@atlaskit/editor-plugin-paste-options-toolbar 9.1.4 → 9.1.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 9.1.6
+
+### Patch Changes
+
+- [`fc5915138b437`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fc5915138b437) -
+  EDITOR-6110 Ensure that paste actions menu appears in the correct position when the first item of
+  the paste is an inline node or mark
+- Updated dependencies
+
+## 9.1.5
+
+### Patch Changes
+
+- [`2e030e319c013`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e030e319c013) -
+  [EDITOR-5982] Fix AI paste menu not appearing when pasting heading + text
+- [`e7032ec0e9287`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e7032ec0e9287) -
+  [ux] EDITOR-5983 Ensure paste menu is in correct position when first pasted node is empty
+
 ## 9.1.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/util/format-handlers.js

@@ -157,7 +157,7 @@ function getMarkdownSlice(text, schema, selection) {
     for (var i = 0; i < textSplitByCodeBlock.length; i++) {
       if (i % 2 === 0) {
         // Ignored via go/ees005
-        // eslint-disable-next-line require-unicode-regexp
+        // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
         textSplitByCodeBlock[i] = textSplitByCodeBlock[i].replace(/\\/g, '\\\\');
       }
     }

package/dist/cjs/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PasteActionsMenu = void 0;
+exports.findBlockAncestorDOM = findBlockAncestorDOM;
+exports.getTargetElement = getTargetElement;
 exports.getVisualEndBottom = getVisualEndBottom;
 exports.onPositionCalculated = onPositionCalculated;
 exports.resolveTableAfterPos = resolveTableAfterPos;
@@ -29,10 +31,21 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
 function getTargetElement(editorView, pos) {
   try {
     var domRef = (0, _utils.findDomRefAtPos)(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -70,10 +83,47 @@ function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
 }
 
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+function findBlockAncestorDOM(editorView, pos) {
+  try {
+    var $pos = editorView.state.doc.resolve(pos);
+    // Walk up the document tree from the resolved position's innermost
+    // node towards the root. $pos.node(depth) gives the ancestor at each
+    // depth; $pos.start(depth) gives the position just inside that ancestor,
+    // so `$pos.start(depth) - 1` is the position of the ancestor node itself
+    // (which is what nodeDOM expects).
+    for (var depth = $pos.depth; depth >= 0; depth--) {
+      var node = $pos.node(depth);
+      if (node.isBlock) {
+        var domNode = editorView.nodeDOM($pos.start(depth) - 1);
+        if (domNode instanceof HTMLElement) {
+          return domNode;
+        }
+        // depth 0 is the doc node — nodeDOM(–1) won't work, so try
+        // the editor's own DOM element as a fallback.
+        if (depth === 0 && editorView.dom instanceof HTMLElement) {
+          return editorView.dom;
+        }
+      }
+    }
+  } catch (_unused2) {
+    // Position may be out of range after a concurrent edit — fall through.
+  }
+  return null;
+}
+
+/**
+ * Adjusts the position of the paste menu so that:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -84,16 +134,26 @@ function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElement, scrollableElement) {
   // Pre-compute once per render to avoid doc.resolve() on every scroll frame.
   var tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
+  var blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return function (position) {
     var _position$top;
     var startCoords = editorView.coordsAtPos(pasteStartPos);
     var endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     var targetRect = targetElement.getBoundingClientRect();
 
+    // ── Vertical adjustment ──────────────────────────────────────────
     // The Popup places the menu at the target's bottom edge by default.
     // We shift it up so it aligns with the paste start position.
     // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
@@ -109,8 +169,28 @@ function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElem
         adjustedTop += scrollContainerTop - startCoords.top + _constants.PASTE_MENU_GAP_TOP;
       }
     }
+
+    // ── Horizontal adjustment ────────────────────────────────────────
+    // When pasted content starts with a mark (bold, italic, link …) or
+    // an inline node (emoji, smart link, inline image …),
+    // findDomRefAtPos returns the narrow inline wrapper element. The
+    // Popup's alignX="end" then places the menu at that element's right
+    // edge instead of the content area's right edge. We correct this by
+    // resolving the nearest block-level ProseMirror ancestor and
+    // re-anchoring to its right edge.
+    var adjustedLeft = position.left;
+    if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
+      var _position$left;
+      var blockRect = blockAncestorDOM.getBoundingClientRect();
+      // Shift left by the difference between the block's right edge and
+      // the inline target's right edge. This mirrors what alignX="end"
+      // would have computed if the target were the block element.
+      var leftDelta = blockRect.right - targetRect.right;
+      adjustedLeft = ((_position$left = position.left) !== null && _position$left !== void 0 ? _position$left : 0) + leftDelta;
+    }
     return _objectSpread(_objectSpread({}, position), {}, {
-      top: adjustedTop
+      top: adjustedTop,
+      left: adjustedLeft
     });
   };
 }
@@ -147,7 +227,12 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     var $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     var pasteAncestorNodeNames = [];
     for (var depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     var legacyVisible = (0, _toolbar2.isToolbarVisible)(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     (0, _commands.showToolbar)(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
@@ -231,7 +316,8 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     minPopupMargin: _constants.PASTE_MENU_GAP_HORIZONTAL,
     zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex,
     alignX: "end",
-    alignY: "bottom",
+    alignY: "bottom"
+    /* eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) */,
     offset: [_constants.PASTE_MENU_GAP_HORIZONTAL, 0],
     onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, pasteEndPos, target, effectiveScrollableElement),
     handleClickOutside: handleClickOutside,

package/dist/es2019/pm-plugins/util/format-handlers.js

@@ -152,7 +152,7 @@ export function getMarkdownSlice(text, schema, selection) {
     for (let i = 0; i < textSplitByCodeBlock.length; i++) {
       if (i % 2 === 0) {
         // Ignored via go/ees005
-        // eslint-disable-next-line require-unicode-regexp
+        // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
         textSplitByCodeBlock[i] = textSplitByCodeBlock[i].replace(/\\/g, '\\\\');
       }
     }

package/dist/es2019/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -14,10 +14,21 @@ import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView, pos) {
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export function getTargetElement(editorView, pos) {
   try {
     const domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -55,10 +66,47 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
 }
 
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+export function findBlockAncestorDOM(editorView, pos) {
+  try {
+    const $pos = editorView.state.doc.resolve(pos);
+    // Walk up the document tree from the resolved position's innermost
+    // node towards the root. $pos.node(depth) gives the ancestor at each
+    // depth; $pos.start(depth) gives the position just inside that ancestor,
+    // so `$pos.start(depth) - 1` is the position of the ancestor node itself
+    // (which is what nodeDOM expects).
+    for (let depth = $pos.depth; depth >= 0; depth--) {
+      const node = $pos.node(depth);
+      if (node.isBlock) {
+        const domNode = editorView.nodeDOM($pos.start(depth) - 1);
+        if (domNode instanceof HTMLElement) {
+          return domNode;
+        }
+        // depth 0 is the doc node — nodeDOM(–1) won't work, so try
+        // the editor's own DOM element as a fallback.
+        if (depth === 0 && editorView.dom instanceof HTMLElement) {
+          return editorView.dom;
+        }
+      }
+    }
+  } catch {
+    // Position may be out of range after a concurrent edit — fall through.
+  }
+  return null;
+}
+
+/**
+ * Adjusts the position of the paste menu so that:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -69,16 +117,26 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElement, scrollableElement) {
   // Pre-compute once per render to avoid doc.resolve() on every scroll frame.
   const tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
+  const blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return position => {
     var _position$top;
     const startCoords = editorView.coordsAtPos(pasteStartPos);
     const endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     const targetRect = targetElement.getBoundingClientRect();
 
+    // ── Vertical adjustment ──────────────────────────────────────────
     // The Popup places the menu at the target's bottom edge by default.
     // We shift it up so it aligns with the paste start position.
     // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
@@ -94,9 +152,29 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
         adjustedTop += scrollContainerTop - startCoords.top + PASTE_MENU_GAP_TOP;
       }
     }
+
+    // ── Horizontal adjustment ────────────────────────────────────────
+    // When pasted content starts with a mark (bold, italic, link …) or
+    // an inline node (emoji, smart link, inline image …),
+    // findDomRefAtPos returns the narrow inline wrapper element. The
+    // Popup's alignX="end" then places the menu at that element's right
+    // edge instead of the content area's right edge. We correct this by
+    // resolving the nearest block-level ProseMirror ancestor and
+    // re-anchoring to its right edge.
+    let adjustedLeft = position.left;
+    if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
+      var _position$left;
+      const blockRect = blockAncestorDOM.getBoundingClientRect();
+      // Shift left by the difference between the block's right edge and
+      // the inline target's right edge. This mirrors what alignX="end"
+      // would have computed if the target were the block element.
+      const leftDelta = blockRect.right - targetRect.right;
+      adjustedLeft = ((_position$left = position.left) !== null && _position$left !== void 0 ? _position$left : 0) + leftDelta;
+    }
     return {
       ...position,
-      top: adjustedTop
+      top: adjustedTop,
+      left: adjustedLeft
     };
   };
 }
@@ -135,7 +213,12 @@ export const PasteActionsMenu = ({
     const $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     const pasteAncestorNodeNames = [];
     for (let depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     const legacyVisible = isToolbarVisible(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
@@ -220,7 +303,8 @@ export const PasteActionsMenu = ({
     minPopupMargin: PASTE_MENU_GAP_HORIZONTAL,
     zIndex: akEditorFloatingPanelZIndex,
     alignX: "end",
-    alignY: "bottom",
+    alignY: "bottom"
+    /* eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) */,
     offset: [PASTE_MENU_GAP_HORIZONTAL, 0],
     onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, pasteEndPos, target, effectiveScrollableElement),
     handleClickOutside: handleClickOutside,

package/dist/esm/pm-plugins/util/format-handlers.js

@@ -150,7 +150,7 @@ export function getMarkdownSlice(text, schema, selection) {
     for (var i = 0; i < textSplitByCodeBlock.length; i++) {
       if (i % 2 === 0) {
         // Ignored via go/ees005
-        // eslint-disable-next-line require-unicode-regexp
+        // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
         textSplitByCodeBlock[i] = textSplitByCodeBlock[i].replace(/\\/g, '\\\\');
       }
     }

package/dist/esm/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -17,10 +17,21 @@ import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView, pos) {
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export function getTargetElement(editorView, pos) {
   try {
     var domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
+      // Empty blocks render a <br> placeholder whose bounding rect has no
+      // meaningful dimensions (height ≈ 0). Using it as the Popup anchor
+      // causes the menu to appear at an unexpected position. Walk up to the
+      // parent block element so the Popup anchors correctly.
+      if (domRef.nodeName === 'BR' && domRef.parentElement) {
+        return domRef.parentElement;
+      }
       return domRef;
     }
     return null;
@@ -58,10 +69,47 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
 }
 
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+export function findBlockAncestorDOM(editorView, pos) {
+  try {
+    var $pos = editorView.state.doc.resolve(pos);
+    // Walk up the document tree from the resolved position's innermost
+    // node towards the root. $pos.node(depth) gives the ancestor at each
+    // depth; $pos.start(depth) gives the position just inside that ancestor,
+    // so `$pos.start(depth) - 1` is the position of the ancestor node itself
+    // (which is what nodeDOM expects).
+    for (var depth = $pos.depth; depth >= 0; depth--) {
+      var node = $pos.node(depth);
+      if (node.isBlock) {
+        var domNode = editorView.nodeDOM($pos.start(depth) - 1);
+        if (domNode instanceof HTMLElement) {
+          return domNode;
+        }
+        // depth 0 is the doc node — nodeDOM(–1) won't work, so try
+        // the editor's own DOM element as a fallback.
+        if (depth === 0 && editorView.dom instanceof HTMLElement) {
+          return editorView.dom;
+        }
+      }
+    }
+  } catch (_unused2) {
+    // Position may be out of range after a concurrent edit — fall through.
+  }
+  return null;
+}
+
+/**
+ * Adjusts the position of the paste menu so that:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -72,16 +120,26 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElement, scrollableElement) {
   // Pre-compute once per render to avoid doc.resolve() on every scroll frame.
   var tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
+  var blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return function (position) {
     var _position$top;
     var startCoords = editorView.coordsAtPos(pasteStartPos);
     var endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     var targetRect = targetElement.getBoundingClientRect();
 
+    // ── Vertical adjustment ──────────────────────────────────────────
     // The Popup places the menu at the target's bottom edge by default.
     // We shift it up so it aligns with the paste start position.
     // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
@@ -97,8 +155,28 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
         adjustedTop += scrollContainerTop - startCoords.top + PASTE_MENU_GAP_TOP;
       }
     }
+
+    // ── Horizontal adjustment ────────────────────────────────────────
+    // When pasted content starts with a mark (bold, italic, link …) or
+    // an inline node (emoji, smart link, inline image …),
+    // findDomRefAtPos returns the narrow inline wrapper element. The
+    // Popup's alignX="end" then places the menu at that element's right
+    // edge instead of the content area's right edge. We correct this by
+    // resolving the nearest block-level ProseMirror ancestor and
+    // re-anchoring to its right edge.
+    var adjustedLeft = position.left;
+    if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
+      var _position$left;
+      var blockRect = blockAncestorDOM.getBoundingClientRect();
+      // Shift left by the difference between the block's right edge and
+      // the inline target's right edge. This mirrors what alignX="end"
+      // would have computed if the target were the block element.
+      var leftDelta = blockRect.right - targetRect.right;
+      adjustedLeft = ((_position$left = position.left) !== null && _position$left !== void 0 ? _position$left : 0) + leftDelta;
+    }
     return _objectSpread(_objectSpread({}, position), {}, {
-      top: adjustedTop
+      top: adjustedTop,
+      left: adjustedLeft
     });
   };
 }
@@ -135,7 +213,12 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     var $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
     var pasteAncestorNodeNames = [];
     for (var depth = $pos.depth; depth > 0; depth--) {
-      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      // Only include an ancestor if the entire pasted range is contained within it.
+      // This prevents nodes like 'heading' from being flagged as ancestors when the
+      // pasted content starts in a heading but extends beyond it (e.g. heading + paragraph).
+      if (lastContentPasted.pasteEndPos <= $pos.end(depth)) {
+        pasteAncestorNodeNames.push($pos.node(depth).type.name);
+      }
     }
     var legacyVisible = isToolbarVisible(editorView.state, lastContentPasted) && ((_lastContentPasted$te = (_lastContentPasted$te2 = lastContentPasted.text) === null || _lastContentPasted$te2 === void 0 ? void 0 : _lastContentPasted$te2.length) !== null && _lastContentPasted$te !== void 0 ? _lastContentPasted$te : 0) >= 100;
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
@@ -219,7 +302,8 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     minPopupMargin: PASTE_MENU_GAP_HORIZONTAL,
     zIndex: akEditorFloatingPanelZIndex,
     alignX: "end",
-    alignY: "bottom",
+    alignY: "bottom"
+    /* eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed) */,
     offset: [PASTE_MENU_GAP_HORIZONTAL, 0],
     onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, pasteEndPos, target, effectiveScrollableElement),
     handleClickOutside: handleClickOutside,

package/dist/types/ui/on-paste-actions-menu/PasteActionsMenu.d.ts

@@ -9,6 +9,11 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export declare function getTargetElement(editorView: EditorView, pos: number): HTMLElement | null;
 /**
  * Returns the position immediately after a table ancestor of `pos`, or
  * `undefined` if not inside a table. Safe to cache per document version.
@@ -20,10 +25,20 @@ export declare function resolveTableAfterPos(editorView: EditorView, pos: number
  */
 export declare function getVisualEndBottom(editorView: EditorView, pasteEndPos: number, tableAfterPos?: number): number;
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+export declare function findBlockAncestorDOM(editorView: EditorView, pos: number): HTMLElement | null;
+/**
+ * Adjusts the position of the paste menu so that:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -34,6 +49,14 @@ export declare function getVisualEndBottom(editorView: EditorView, pasteEndPos:
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 export declare function onPositionCalculated(editorView: EditorView, pasteStartPos: number, pasteEndPos: number, targetElement: HTMLElement, scrollableElement?: HTMLElement | false): (position: {
     bottom?: number;

package/dist/types-ts4.5/ui/on-paste-actions-menu/PasteActionsMenu.d.ts

@@ -9,6 +9,11 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * Returns the DOM element at the given document position for use as a Popup anchor.
+ * For empty blocks (BR elements), returns the parent element to ensure correct positioning.
+ */
+export declare function getTargetElement(editorView: EditorView, pos: number): HTMLElement | null;
 /**
  * Returns the position immediately after a table ancestor of `pos`, or
  * `undefined` if not inside a table. Safe to cache per document version.
@@ -20,10 +25,20 @@ export declare function resolveTableAfterPos(editorView: EditorView, pos: number
  */
 export declare function getVisualEndBottom(editorView: EditorView, pasteEndPos: number, tableAfterPos?: number): number;
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+export declare function findBlockAncestorDOM(editorView: EditorView, pos: number): HTMLElement | null;
+/**
+ * Adjusts the position of the paste menu so that:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -34,6 +49,14 @@ export declare function getVisualEndBottom(editorView: EditorView, pasteEndPos:
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 export declare function onPositionCalculated(editorView: EditorView, pasteStartPos: number, pasteEndPos: number, targetElement: HTMLElement, scrollableElement?: HTMLElement | false): (position: {
     bottom?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "9.1.4",
+	"version": "9.1.6",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.5.0",
+		"@atlaskit/editor-common": "^112.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},