@atlaskit/editor-plugin-paste-options-toolbar 9.0.1 → 9.0.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 9.0.3
+
+### Patch Changes
+
+- [`bba4ad9eec00a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bba4ad9eec00a) -
+  Ensure `invokedFrom` is passed to on-paste actions legacy paste events
+- Updated dependencies
+
+## 9.0.2
+
+### Patch Changes
+
+- [`6ebc53b2b151d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ebc53b2b151d) -
+  [ux] [EDITOR-5821] updated paste menu position so that its the same as the inline comment editor'
+- Updated dependencies
+
 ## 9.0.1
 
 ### Patch Changes

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TEXT_HIGHLIGHT_CLASS = exports.PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_CLASS = exports.PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_META_ID = exports.PASTE_HIGHLIGHT_DECORATION_KEY = exports.EDITOR_WRAPPER_CLASS = void 0;
+exports.TEXT_HIGHLIGHT_CLASS = exports.PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_CLASS = exports.PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_META_ID = exports.PASTE_MENU_GAP = exports.PASTE_HIGHLIGHT_DECORATION_KEY = exports.EDITOR_WRAPPER_CLASS = void 0;
 var PASTE_TOOLBAR_CLASS = exports.PASTE_TOOLBAR_CLASS = 'ak-editor-paste-toolbar';
 var PASTE_TOOLBAR_MENU_ID = exports.PASTE_TOOLBAR_MENU_ID = 'ak-editor-paste-toolbar-item-dropdownList';
 var TEXT_HIGHLIGHT_CLASS = exports.TEXT_HIGHLIGHT_CLASS = 'text-highlight';
@@ -11,4 +11,7 @@ var PASTE_HIGHLIGHT_DECORATION_KEY = exports.PASTE_HIGHLIGHT_DECORATION_KEY = 'p
 var PASTE_TOOLBAR_ITEM_CLASS = exports.PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 var EDITOR_WRAPPER_CLASS = exports.EDITOR_WRAPPER_CLASS = 'akEditor';
 var PASTE_OPTIONS_TEST_ID = exports.PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
-var PASTE_OPTIONS_META_ID = exports.PASTE_OPTIONS_META_ID = 'paste-options$';
+var PASTE_OPTIONS_META_ID = exports.PASTE_OPTIONS_META_ID = 'paste-options$';
+
+// Gap (in px) between the right edge of the pasted content and the left edge of the paste menu.
+var PASTE_MENU_GAP = exports.PASTE_MENU_GAP = 12;

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

@@ -1,10 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PasteActionsMenu = void 0;
+exports.onPositionCalculated = onPositionCalculated;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -15,16 +18,18 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _commands = require("../../editor-commands/commands");
+var _constants = require("../../pm-plugins/constants");
 var _types = require("../../types/types");
 var _toolbar2 = require("../toolbar");
 var _hasVisibleButton = require("./hasVisibleButton");
 var _PasteActionsMenuContent = require("./PasteActionsMenuContent");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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);
-function getTargetElement(editorView) {
-  var from = editorView.state.selection.from;
+function getTargetElement(editorView, pos) {
   try {
-    var domRef = (0, _utils.findDomRefAtPos)(from, editorView.domAtPos.bind(editorView));
+    var domRef = (0, _utils.findDomRefAtPos)(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
       return domRef;
     }
@@ -33,12 +38,31 @@ function getTargetElement(editorView) {
     return null;
   }
 }
-function getPopupOffset(dom) {
-  if (!dom) {
-    return [0, 20];
-  }
-  var rightEdge = dom.getBoundingClientRect().right;
-  return [-(window.innerWidth - rightEdge - 50), 20];
+
+/**
+ * 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.
+ *
+ * The Popup's vertical placement may place the popup below the target element
+ * (alignY="bottom"). This override computes the correct top position using
+ * coordsAtPos for the paste start, then converts to the Popup's coordinate
+ * system by calculating the delta from the target element's bottom (where the
+ * Popup positions by default) to the paste start coordinates.
+ */
+function onPositionCalculated(editorView, pasteStartPos, targetElement) {
+  return function (position) {
+    var _position$top;
+    var startCoords = editorView.coordsAtPos(pasteStartPos);
+    var targetRect = targetElement.getBoundingClientRect();
+
+    // The Popup places the menu at the target's bottom edge by default.
+    // We need to shift it up so it aligns with the paste start position.
+    // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
+    var topDelta = startCoords.top - (targetRect.top + targetRect.height);
+    return _objectSpread(_objectSpread({}, position), {}, {
+      top: ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta
+    });
+  };
 }
 var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref) {
   var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
@@ -78,13 +102,15 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     (0, _commands.showToolbar)(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['pasteOptionsToolbarPlugin'], function (states) {
-      var _pluginState$showTool;
+      var _pluginState$showTool, _pluginState$pasteSta;
       var pluginState = states.pasteOptionsToolbarPluginState;
       return {
-        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
+        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false,
+        pasteStartPos: (_pluginState$pasteSta = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteStartPos) !== null && _pluginState$pasteSta !== void 0 ? _pluginState$pasteSta : 0
       };
     }),
-    isToolbarShown = _useSharedPluginState2.showToolbar;
+    isToolbarShown = _useSharedPluginState2.showToolbar,
+    pasteStartPos = _useSharedPluginState2.pasteStartPos;
   var aiSurfaceComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents('ai-paste-menu')) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var visibleAiActionKeys = (0, _hasVisibleButton.getVisibleKeys)(aiSurfaceComponents, ['button', 'menu-item']);
   (0, _react.useEffect)(function () {
@@ -132,7 +158,7 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   if (!anyComponentVisible) {
     return null;
   }
-  var target = getTargetElement(editorView);
+  var target = getTargetElement(editorView, pasteStartPos);
   if (!target) {
     return null;
   }
@@ -141,10 +167,11 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    offset: getPopupOffset(target),
     zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex,
-    alignX: "right",
+    alignX: "end",
     alignY: "bottom",
+    offset: [_constants.PASTE_MENU_GAP, 0],
+    onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, target),
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {

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

@@ -77,13 +77,13 @@ var PasteMenuItem = function PasteMenuItem(_ref) {
     }
     switch (pasteType) {
       case 'rich-text':
-        (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
+        (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
-        (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
   }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);

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

@@ -5,4 +5,7 @@ export const PASTE_HIGHLIGHT_DECORATION_KEY = 'paste-highlight-decoration-key';
 export const PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 export const EDITOR_WRAPPER_CLASS = 'akEditor';
 export const PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
-export const PASTE_OPTIONS_META_ID = 'paste-options$';
+export const PASTE_OPTIONS_META_ID = 'paste-options$';
+
+// Gap (in px) between the right edge of the pasted content and the left edge of the paste menu.
+export const PASTE_MENU_GAP = 12;

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

@@ -8,17 +8,15 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
+import { PASTE_MENU_GAP } from '../../pm-plugins/constants';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView) {
-  const {
-    from
-  } = editorView.state.selection;
+function getTargetElement(editorView, pos) {
   try {
-    const domRef = findDomRefAtPos(from, editorView.domAtPos.bind(editorView));
+    const domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
       return domRef;
     }
@@ -27,12 +25,32 @@ function getTargetElement(editorView) {
     return null;
   }
 }
-function getPopupOffset(dom) {
-  if (!dom) {
-    return [0, 20];
-  }
-  const rightEdge = dom.getBoundingClientRect().right;
-  return [-(window.innerWidth - rightEdge - 50), 20];
+
+/**
+ * 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.
+ *
+ * The Popup's vertical placement may place the popup below the target element
+ * (alignY="bottom"). This override computes the correct top position using
+ * coordsAtPos for the paste start, then converts to the Popup's coordinate
+ * system by calculating the delta from the target element's bottom (where the
+ * Popup positions by default) to the paste start coordinates.
+ */
+export function onPositionCalculated(editorView, pasteStartPos, targetElement) {
+  return position => {
+    var _position$top;
+    const startCoords = editorView.coordsAtPos(pasteStartPos);
+    const targetRect = targetElement.getBoundingClientRect();
+
+    // The Popup places the menu at the target's bottom edge by default.
+    // We need to shift it up so it aligns with the paste start position.
+    // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
+    const topDelta = startCoords.top - (targetRect.top + targetRect.height);
+    return {
+      ...position,
+      top: ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta
+    };
+  };
 }
 export const PasteActionsMenu = ({
   api,
@@ -74,12 +92,14 @@ export const PasteActionsMenu = ({
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   const {
-    showToolbar: isToolbarShown
+    showToolbar: isToolbarShown,
+    pasteStartPos
   } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
-    var _pluginState$showTool;
+    var _pluginState$showTool, _pluginState$pasteSta;
     const pluginState = states.pasteOptionsToolbarPluginState;
     return {
-      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
+      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false,
+      pasteStartPos: (_pluginState$pasteSta = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteStartPos) !== null && _pluginState$pasteSta !== void 0 ? _pluginState$pasteSta : 0
     };
   });
   const aiSurfaceComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents('ai-paste-menu')) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
@@ -129,7 +149,7 @@ export const PasteActionsMenu = ({
   if (!anyComponentVisible) {
     return null;
   }
-  const target = getTargetElement(editorView);
+  const target = getTargetElement(editorView, pasteStartPos);
   if (!target) {
     return null;
   }
@@ -138,10 +158,11 @@ export const PasteActionsMenu = ({
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    offset: getPopupOffset(target),
     zIndex: akEditorFloatingPanelZIndex,
-    alignX: "right",
+    alignX: "end",
     alignY: "bottom",
+    offset: [PASTE_MENU_GAP, 0],
+    onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, target),
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {

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

@@ -71,13 +71,13 @@ const PasteMenuItem = ({
     }
     switch (pasteType) {
       case 'rich-text':
-        changeToRichTextWithAnalytics(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
+        changeToRichTextWithAnalytics(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
-        changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
   }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);

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

@@ -5,4 +5,7 @@ export var PASTE_HIGHLIGHT_DECORATION_KEY = 'paste-highlight-decoration-key';
 export var PASTE_TOOLBAR_ITEM_CLASS = 'ak-editor-paste-toolbar-item';
 export var EDITOR_WRAPPER_CLASS = 'akEditor';
 export var PASTE_OPTIONS_TEST_ID = 'paste-options-testid';
-export var PASTE_OPTIONS_META_ID = 'paste-options$';
+export var PASTE_OPTIONS_META_ID = 'paste-options$';
+
+// Gap (in px) between the right edge of the pasted content and the left edge of the paste menu.
+export var PASTE_MENU_GAP = 12;

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

@@ -1,3 +1,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 React, { useCallback, useEffect, useRef } from 'react';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
@@ -8,15 +11,15 @@ import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
+import { PASTE_MENU_GAP } from '../../pm-plugins/constants';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
 import { getVisibleKeys, hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-function getTargetElement(editorView) {
-  var from = editorView.state.selection.from;
+function getTargetElement(editorView, pos) {
   try {
-    var domRef = findDomRefAtPos(from, editorView.domAtPos.bind(editorView));
+    var domRef = findDomRefAtPos(pos, editorView.domAtPos.bind(editorView));
     if (domRef instanceof HTMLElement) {
       return domRef;
     }
@@ -25,12 +28,31 @@ function getTargetElement(editorView) {
     return null;
   }
 }
-function getPopupOffset(dom) {
-  if (!dom) {
-    return [0, 20];
-  }
-  var rightEdge = dom.getBoundingClientRect().right;
-  return [-(window.innerWidth - rightEdge - 50), 20];
+
+/**
+ * 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.
+ *
+ * The Popup's vertical placement may place the popup below the target element
+ * (alignY="bottom"). This override computes the correct top position using
+ * coordsAtPos for the paste start, then converts to the Popup's coordinate
+ * system by calculating the delta from the target element's bottom (where the
+ * Popup positions by default) to the paste start coordinates.
+ */
+export function onPositionCalculated(editorView, pasteStartPos, targetElement) {
+  return function (position) {
+    var _position$top;
+    var startCoords = editorView.coordsAtPos(pasteStartPos);
+    var targetRect = targetElement.getBoundingClientRect();
+
+    // The Popup places the menu at the target's bottom edge by default.
+    // We need to shift it up so it aligns with the paste start position.
+    // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
+    var topDelta = startCoords.top - (targetRect.top + targetRect.height);
+    return _objectSpread(_objectSpread({}, position), {}, {
+      top: ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta
+    });
+  };
 }
 export var PasteActionsMenu = function PasteActionsMenu(_ref) {
   var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
@@ -70,13 +92,15 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   var _useSharedPluginState2 = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], function (states) {
-      var _pluginState$showTool;
+      var _pluginState$showTool, _pluginState$pasteSta;
       var pluginState = states.pasteOptionsToolbarPluginState;
       return {
-        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
+        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false,
+        pasteStartPos: (_pluginState$pasteSta = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteStartPos) !== null && _pluginState$pasteSta !== void 0 ? _pluginState$pasteSta : 0
       };
     }),
-    isToolbarShown = _useSharedPluginState2.showToolbar;
+    isToolbarShown = _useSharedPluginState2.showToolbar,
+    pasteStartPos = _useSharedPluginState2.pasteStartPos;
   var aiSurfaceComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents('ai-paste-menu')) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var visibleAiActionKeys = getVisibleKeys(aiSurfaceComponents, ['button', 'menu-item']);
   useEffect(function () {
@@ -124,7 +148,7 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
   if (!anyComponentVisible) {
     return null;
   }
-  var target = getTargetElement(editorView);
+  var target = getTargetElement(editorView, pasteStartPos);
   if (!target) {
     return null;
   }
@@ -133,10 +157,11 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
-    offset: getPopupOffset(target),
     zIndex: akEditorFloatingPanelZIndex,
-    alignX: "right",
+    alignX: "end",
     alignY: "bottom",
+    offset: [PASTE_MENU_GAP, 0],
+    onPositionCalculated: onPositionCalculated(editorView, pasteStartPos, target),
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {

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

@@ -68,13 +68,13 @@ var PasteMenuItem = function PasteMenuItem(_ref) {
     }
     switch (pasteType) {
       case 'rich-text':
-        changeToRichTextWithAnalytics(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
+        changeToRichTextWithAnalytics(editorAnalyticsAPI, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'markdown':
-        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
       case 'plain-text':
-        changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength, 'pasteMenu')()(editorView.state, editorView.dispatch);
         break;
     }
   }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);

package/dist/types/pm-plugins/constants.d.ts

@@ -6,3 +6,4 @@ export declare const PASTE_TOOLBAR_ITEM_CLASS = "ak-editor-paste-toolbar-item";
 export declare const EDITOR_WRAPPER_CLASS = "akEditor";
 export declare const PASTE_OPTIONS_TEST_ID = "paste-options-testid";
 export declare const PASTE_OPTIONS_META_ID = "paste-options$";
+export declare const PASTE_MENU_GAP = 12;

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

@@ -9,5 +9,26 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * 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.
+ *
+ * The Popup's vertical placement may place the popup below the target element
+ * (alignY="bottom"). This override computes the correct top position using
+ * coordsAtPos for the paste start, then converts to the Popup's coordinate
+ * system by calculating the delta from the target element's bottom (where the
+ * Popup positions by default) to the paste start coordinates.
+ */
+export declare function onPositionCalculated(editorView: EditorView, pasteStartPos: number, targetElement: HTMLElement): (position: {
+    bottom?: number;
+    left?: number;
+    right?: number;
+    top?: number;
+}) => {
+    bottom?: number;
+    left?: number;
+    right?: number;
+    top: number;
+};
 export declare const PasteActionsMenu: ({ api, editorView, mountTo, boundariesElement, scrollableElement, }: PasteActionsMenuProps) => React.JSX.Element | null;
 export {};

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

@@ -6,5 +6,5 @@ export declare const isPasteOptionSelected: (pasteType: PasteType, selectedOptio
 interface PasteMenuComponentsConfig {
     api: ExtractInjectionAPI<PasteOptionsToolbarPlugin> | undefined;
 }
-export declare const getPasteMenuComponents: ({ api, }: PasteMenuComponentsConfig) => RegisterComponent[];
+export declare const getPasteMenuComponents: ({ api }: PasteMenuComponentsConfig) => RegisterComponent[];
 export {};

package/dist/types-ts4.5/pm-plugins/constants.d.ts

@@ -6,3 +6,4 @@ export declare const PASTE_TOOLBAR_ITEM_CLASS = "ak-editor-paste-toolbar-item";
 export declare const EDITOR_WRAPPER_CLASS = "akEditor";
 export declare const PASTE_OPTIONS_TEST_ID = "paste-options-testid";
 export declare const PASTE_OPTIONS_META_ID = "paste-options$";
+export declare const PASTE_MENU_GAP = 12;

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

@@ -9,5 +9,26 @@ interface PasteActionsMenuProps {
     mountTo?: HTMLElement;
     scrollableElement?: HTMLElement;
 }
+/**
+ * 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.
+ *
+ * The Popup's vertical placement may place the popup below the target element
+ * (alignY="bottom"). This override computes the correct top position using
+ * coordsAtPos for the paste start, then converts to the Popup's coordinate
+ * system by calculating the delta from the target element's bottom (where the
+ * Popup positions by default) to the paste start coordinates.
+ */
+export declare function onPositionCalculated(editorView: EditorView, pasteStartPos: number, targetElement: HTMLElement): (position: {
+    bottom?: number;
+    left?: number;
+    right?: number;
+    top?: number;
+}) => {
+    bottom?: number;
+    left?: number;
+    right?: number;
+    top: number;
+};
 export declare const PasteActionsMenu: ({ api, editorView, mountTo, boundariesElement, scrollableElement, }: PasteActionsMenuProps) => React.JSX.Element | null;
 export {};

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

@@ -6,5 +6,5 @@ export declare const isPasteOptionSelected: (pasteType: PasteType, selectedOptio
 interface PasteMenuComponentsConfig {
     api: ExtractInjectionAPI<PasteOptionsToolbarPlugin> | undefined;
 }
-export declare const getPasteMenuComponents: ({ api, }: PasteMenuComponentsConfig) => RegisterComponent[];
+export declare const getPasteMenuComponents: ({ api }: PasteMenuComponentsConfig) => RegisterComponent[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "9.0.1",
+	"version": "9.0.3",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,7 +41,7 @@
 		"@atlaskit/icon": "^32.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^35.10.0",
+		"@atlaskit/tmp-editor-statsig": "^36.1.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
@@ -49,7 +49,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.0.0",
+		"@atlaskit/editor-common": "^112.2.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},