@atlaskit/editor-plugin-paste-options-toolbar 9.0.0 → 9.0.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 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
+
+- [`52d4528d79431`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/52d4528d79431) -
+  [ux] EDITOR-5896 Minor paste menu cleanup. Reduce padding and remove separator from legacy paste
+  actions when there's no AI paste actions
+
 ## 9.0.0
 
 ### 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/pm-plugins/plugin-factory.js

@@ -13,45 +13,45 @@ var _constants = require("./constants");
 var _reducer = require("./reducer");
 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 _pluginFactory = (0, _utils.pluginFactory)(_types.pasteOptionsPluginKey, _reducer.reducer, {
-    mapping: function mapping(tr, pluginState) {
-      if (!tr.docChanged || !pluginState.showToolbar) {
-        return pluginState;
-      }
-      var oldPasteStartPos = pluginState.pasteStartPos;
-      var oldPasteEndPos = pluginState.pasteEndPos;
-      var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
-      var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
+var dest = (0, _utils.pluginFactory)(_types.pasteOptionsPluginKey, _reducer.reducer, {
+  mapping: function mapping(tr, pluginState) {
+    if (!tr.docChanged || !pluginState.showToolbar) {
+      return pluginState;
+    }
+    var oldPasteStartPos = pluginState.pasteStartPos;
+    var oldPasteEndPos = pluginState.pasteEndPos;
+    var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
+    var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
 
-      //this is true when user changes format from the toolbar.
-      //only change pasteEndPos in this case
-      if (changedFormatFromToolbar(tr)) {
-        return _objectSpread(_objectSpread({}, pluginState), {}, {
-          pasteEndPos: newPasteEndPos
-        });
-      }
-      if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
-        return pluginState;
-      }
+    //this is true when user changes format from the toolbar.
+    //only change pasteEndPos in this case
+    if (changedFormatFromToolbar(tr)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        pasteStartPos: newPasteStartPos,
         pasteEndPos: newPasteEndPos
       });
-    },
-    onSelectionChanged: function onSelectionChanged(tr, pluginState) {
-      // Detect click outside the editor
-      if (tr.getMeta('outsideProsemirrorEditorClicked')) {
-        return _objectSpread(_objectSpread({}, pluginState), {}, {
-          showToolbar: false,
-          highlightContent: false
-        });
-      }
+    }
+    if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
       return pluginState;
     }
-  }),
-  createPluginState = exports.createPluginState = _pluginFactory.createPluginState,
-  createCommand = exports.createCommand = _pluginFactory.createCommand,
-  getPluginState = exports.getPluginState = _pluginFactory.getPluginState;
+    return _objectSpread(_objectSpread({}, pluginState), {}, {
+      pasteStartPos: newPasteStartPos,
+      pasteEndPos: newPasteEndPos
+    });
+  },
+  onSelectionChanged: function onSelectionChanged(tr, pluginState) {
+    // Detect click outside the editor
+    if (tr.getMeta('outsideProsemirrorEditorClicked')) {
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        showToolbar: false,
+        highlightContent: false
+      });
+    }
+    return pluginState;
+  }
+});
+var createPluginState = exports.createPluginState = dest.createPluginState;
+var createCommand = exports.createCommand = dest.createCommand;
+var getPluginState = exports.getPluginState = dest.getPluginState;
 var changedFormatFromToolbar = function changedFormatFromToolbar(tr) {
   var meta = tr.getMeta(_constants.PASTE_OPTIONS_META_ID);
   if (meta && meta.type === _actions.PastePluginActionTypes.CHANGE_FORMAT) {

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/PasteActionsMenuContent.compiled.css

@@ -1,4 +1,3 @@
 
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko12b0{border-radius:var(--ds-radius-small,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}

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

@@ -17,7 +17,7 @@ var _editorUiControlModel = require("@atlaskit/editor-ui-control-model");
 var _compiled = require("@atlaskit/primitives/compiled");
 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); }
 var styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
+  container: "_2rko12b0 _bfhk1bhr _16qs130s"
 };
 var PasteActionsMenuContent = exports.PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
   var onMouseDown = _ref.onMouseDown,

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

@@ -21,6 +21,7 @@ var _clipboard = _interopRequireDefault(require("@atlaskit/icon/core/clipboard")
 var _compiled = require("@atlaskit/primitives/compiled");
 var _commands = require("../../editor-commands/commands");
 var _types = require("../../types/types");
+var _hasVisibleButton = require("./hasVisibleButton");
 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); }
 var nestedMenuStyles = {
   narrowSection: "_10gv1lit"
@@ -133,8 +134,17 @@ var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteM
       return !((_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false);
     },
     component: function component(props) {
+      var _api$uiControlRegistr, _api$uiControlRegistr2;
+      var allComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+      var aiMenuItems = allComponents.filter(function (c) {
+        var _c$parents;
+        return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
+          return p.key === _toolbar.AI_PASTE_MENU_SECTION.key;
+        }));
+      });
+      var hasVisibleAiActions = (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']).length > 0;
       return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-        hasSeparator: true
+        hasSeparator: hasVisibleAiActions
       }, props.children);
     }
   }, {

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/pm-plugins/plugin-factory.js

@@ -3,11 +3,7 @@ import { PastePluginActionTypes } from '../editor-actions/actions';
 import { pasteOptionsPluginKey } from '../types/types';
 import { PASTE_OPTIONS_META_ID } from './constants';
 import { reducer } from './reducer';
-export const {
-  createPluginState,
-  createCommand,
-  getPluginState
-} = pluginFactory(pasteOptionsPluginKey, reducer, {
+const dest = pluginFactory(pasteOptionsPluginKey, reducer, {
   mapping: (tr, pluginState) => {
     if (!tr.docChanged || !pluginState.showToolbar) {
       return pluginState;
@@ -46,6 +42,9 @@ export const {
     return pluginState;
   }
 });
+export const createPluginState = dest.createPluginState;
+export const createCommand = dest.createCommand;
+export const getPluginState = dest.getPluginState;
 const changedFormatFromToolbar = tr => {
   const meta = tr.getMeta(PASTE_OPTIONS_META_ID);
   if (meta && meta.type === PastePluginActionTypes.CHANGE_FORMAT) {

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/PasteActionsMenuContent.compiled.css

@@ -1,4 +1,3 @@
 
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko12b0{border-radius:var(--ds-radius-small,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}

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

@@ -9,7 +9,7 @@ import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { Box } from '@atlaskit/primitives/compiled';
 const styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
+  container: "_2rko12b0 _bfhk1bhr _16qs130s"
 };
 export const PasteActionsMenuContent = ({
   onMouseDown,

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

@@ -6,13 +6,14 @@ import { cx } from '@compiled/react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar, PASTE_MENU, PASTE_MENU_SECTION, PASTE_NESTED_MENU, PASTE_MENU_NESTED_SECTION, PASTE_RICH_TEXT_MENU_ITEM, PASTE_MARKDOWN_MENU_ITEM, PASTE_PLAIN_TEXT_MENU_ITEM, PASTE_MENU_RANK, PASTE_MENU_SECTION_RANK, PASTE_NESTED_MENU_RANK, PASTE_MENU_NESTED_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { useEditorToolbar, PASTE_MENU, PASTE_MENU_SECTION, PASTE_NESTED_MENU, PASTE_MENU_NESTED_SECTION, PASTE_RICH_TEXT_MENU_ITEM, PASTE_MARKDOWN_MENU_ITEM, PASTE_PLAIN_TEXT_MENU_ITEM, PASTE_MENU_RANK, PASTE_MENU_SECTION_RANK, PASTE_NESTED_MENU_RANK, PASTE_MENU_NESTED_SECTION_RANK, AI_PASTE_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import ClipboardIcon from '@atlaskit/icon/core/clipboard';
 import { Box } from '@atlaskit/primitives/compiled';
 import { changeToMarkdownWithAnalytics, changeToPlainTextWithAnalytics, changeToRichTextWithAnalytics } from '../../editor-commands/commands';
 import { ToolbarDropdownOption } from '../../types/types';
+import { getVisibleKeys } from './hasVisibleButton';
 const nestedMenuStyles = {
   narrowSection: "_10gv1lit"
 };
@@ -127,9 +128,18 @@ export const getPasteMenuComponents = ({
     const pluginState = api === null || api === void 0 ? void 0 : (_api$pasteOptionsTool = api.pasteOptionsToolbarPlugin) === null || _api$pasteOptionsTool === void 0 ? void 0 : _api$pasteOptionsTool.sharedState.currentState();
     return !((_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false);
   },
-  component: props => /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    hasSeparator: true
-  }, props.children)
+  component: props => {
+    var _api$uiControlRegistr, _api$uiControlRegistr2;
+    const allComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+    const aiMenuItems = allComponents.filter(c => {
+      var _c$parents;
+      return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(p => p.key === AI_PASTE_MENU_SECTION.key));
+    });
+    const hasVisibleAiActions = getVisibleKeys(aiMenuItems, ['menu-item']).length > 0;
+    return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+      hasSeparator: hasVisibleAiActions
+    }, props.children);
+  }
 }, {
   type: PASTE_NESTED_MENU.type,
   key: PASTE_NESTED_MENU.key,

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/pm-plugins/plugin-factory.js

@@ -6,46 +6,45 @@ import { PastePluginActionTypes } from '../editor-actions/actions';
 import { pasteOptionsPluginKey } from '../types/types';
 import { PASTE_OPTIONS_META_ID } from './constants';
 import { reducer } from './reducer';
-var _pluginFactory = pluginFactory(pasteOptionsPluginKey, reducer, {
-    mapping: function mapping(tr, pluginState) {
-      if (!tr.docChanged || !pluginState.showToolbar) {
-        return pluginState;
-      }
-      var oldPasteStartPos = pluginState.pasteStartPos;
-      var oldPasteEndPos = pluginState.pasteEndPos;
-      var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
-      var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
+var dest = pluginFactory(pasteOptionsPluginKey, reducer, {
+  mapping: function mapping(tr, pluginState) {
+    if (!tr.docChanged || !pluginState.showToolbar) {
+      return pluginState;
+    }
+    var oldPasteStartPos = pluginState.pasteStartPos;
+    var oldPasteEndPos = pluginState.pasteEndPos;
+    var newPasteStartPos = tr.mapping.map(oldPasteStartPos);
+    var newPasteEndPos = tr.mapping.map(oldPasteEndPos);
 
-      //this is true when user changes format from the toolbar.
-      //only change pasteEndPos in this case
-      if (changedFormatFromToolbar(tr)) {
-        return _objectSpread(_objectSpread({}, pluginState), {}, {
-          pasteEndPos: newPasteEndPos
-        });
-      }
-      if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
-        return pluginState;
-      }
+    //this is true when user changes format from the toolbar.
+    //only change pasteEndPos in this case
+    if (changedFormatFromToolbar(tr)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        pasteStartPos: newPasteStartPos,
         pasteEndPos: newPasteEndPos
       });
-    },
-    onSelectionChanged: function onSelectionChanged(tr, pluginState) {
-      // Detect click outside the editor
-      if (tr.getMeta('outsideProsemirrorEditorClicked')) {
-        return _objectSpread(_objectSpread({}, pluginState), {}, {
-          showToolbar: false,
-          highlightContent: false
-        });
-      }
+    }
+    if (oldPasteStartPos === newPasteStartPos && oldPasteEndPos === newPasteEndPos) {
       return pluginState;
     }
-  }),
-  createPluginState = _pluginFactory.createPluginState,
-  createCommand = _pluginFactory.createCommand,
-  getPluginState = _pluginFactory.getPluginState;
-export { createPluginState, createCommand, getPluginState };
+    return _objectSpread(_objectSpread({}, pluginState), {}, {
+      pasteStartPos: newPasteStartPos,
+      pasteEndPos: newPasteEndPos
+    });
+  },
+  onSelectionChanged: function onSelectionChanged(tr, pluginState) {
+    // Detect click outside the editor
+    if (tr.getMeta('outsideProsemirrorEditorClicked')) {
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        showToolbar: false,
+        highlightContent: false
+      });
+    }
+    return pluginState;
+  }
+});
+export var createPluginState = dest.createPluginState;
+export var createCommand = dest.createCommand;
+export var getPluginState = dest.getPluginState;
 var changedFormatFromToolbar = function changedFormatFromToolbar(tr) {
   var meta = tr.getMeta(PASTE_OPTIONS_META_ID);
   if (meta && meta.type === PastePluginActionTypes.CHANGE_FORMAT) {

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/PasteActionsMenuContent.compiled.css

@@ -1,4 +1,3 @@
 
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
+._2rko12b0{border-radius:var(--ds-radius-small,4px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
 ._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}

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

@@ -9,7 +9,7 @@ import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { Box } from '@atlaskit/primitives/compiled';
 var styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
+  container: "_2rko12b0 _bfhk1bhr _16qs130s"
 };
 export var PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
   var onMouseDown = _ref.onMouseDown,

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

@@ -6,13 +6,14 @@ import { cx } from '@compiled/react';
 import { useIntl } from 'react-intl-next';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar, PASTE_MENU, PASTE_MENU_SECTION, PASTE_NESTED_MENU, PASTE_MENU_NESTED_SECTION, PASTE_RICH_TEXT_MENU_ITEM, PASTE_MARKDOWN_MENU_ITEM, PASTE_PLAIN_TEXT_MENU_ITEM, PASTE_MENU_RANK, PASTE_MENU_SECTION_RANK, PASTE_NESTED_MENU_RANK, PASTE_MENU_NESTED_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { useEditorToolbar, PASTE_MENU, PASTE_MENU_SECTION, PASTE_NESTED_MENU, PASTE_MENU_NESTED_SECTION, PASTE_RICH_TEXT_MENU_ITEM, PASTE_MARKDOWN_MENU_ITEM, PASTE_PLAIN_TEXT_MENU_ITEM, PASTE_MENU_RANK, PASTE_MENU_SECTION_RANK, PASTE_NESTED_MENU_RANK, PASTE_MENU_NESTED_SECTION_RANK, AI_PASTE_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import ChevronRightIcon from '@atlaskit/icon/core/chevron-right';
 import ClipboardIcon from '@atlaskit/icon/core/clipboard';
 import { Box } from '@atlaskit/primitives/compiled';
 import { changeToMarkdownWithAnalytics, changeToPlainTextWithAnalytics, changeToRichTextWithAnalytics } from '../../editor-commands/commands';
 import { ToolbarDropdownOption } from '../../types/types';
+import { getVisibleKeys } from './hasVisibleButton';
 var nestedMenuStyles = {
   narrowSection: "_10gv1lit"
 };
@@ -124,8 +125,17 @@ export var getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
       return !((_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false);
     },
     component: function component(props) {
+      var _api$uiControlRegistr, _api$uiControlRegistr2;
+      var allComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+      var aiMenuItems = allComponents.filter(function (c) {
+        var _c$parents;
+        return c.type === 'menu-item' && ((_c$parents = c.parents) === null || _c$parents === void 0 ? void 0 : _c$parents.some(function (p) {
+          return p.key === AI_PASTE_MENU_SECTION.key;
+        }));
+      });
+      var hasVisibleAiActions = getVisibleKeys(aiMenuItems, ['menu-item']).length > 0;
       return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-        hasSeparator: true
+        hasSeparator: hasVisibleAiActions
       }, props.children);
     }
   }, {

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/pm-plugins/main.d.ts

@@ -1,5 +1,6 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { type PasteOptionsPluginState } from '../types/types';
 export declare function createPlugin(dispatch: Dispatch, options?: {
     useNewPasteMenu?: boolean;
-}): SafePlugin<import("../types/types").PasteOptionsPluginState>;
+}): SafePlugin<PasteOptionsPluginState>;

package/dist/types/pm-plugins/plugin-factory.d.ts

@@ -1,2 +1,8 @@
+import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
+import type { Command } from '@atlaskit/editor-common/types';
+import type { EditorState, SafeStateField, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type PastePluginAction } from '../editor-actions/actions';
 import type { PasteOptionsPluginState } from '../types/types';
-export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: PasteOptionsPluginState | ((state: import("prosemirror-state").EditorState) => PasteOptionsPluginState)) => import("prosemirror-state").SafeStateField<PasteOptionsPluginState>, createCommand: <A = import("../editor-actions/actions").PastePluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: (tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => PasteOptionsPluginState;
+export declare const createPluginState: (dispatch: Dispatch, initialState: PasteOptionsPluginState | ((state: EditorState) => PasteOptionsPluginState)) => SafeStateField<PasteOptionsPluginState>;
+export declare const createCommand: <A = PastePluginAction>(action: A | ((state: Readonly<EditorState>) => false | A), transform?: (tr: Transaction, state: EditorState) => Transaction) => Command;
+export declare const getPluginState: (state: EditorState) => PasteOptionsPluginState;

package/dist/types/types/types.d.ts

@@ -1,7 +1,7 @@
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-export declare const pasteOptionsPluginKey: PluginKey<any>;
+export declare const pasteOptionsPluginKey: PluginKey;
 export declare enum ToolbarDropdownOption {
     Markdown = 0,
     RichText = 1,

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/pm-plugins/main.d.ts

@@ -1,5 +1,6 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { type PasteOptionsPluginState } from '../types/types';
 export declare function createPlugin(dispatch: Dispatch, options?: {
     useNewPasteMenu?: boolean;
-}): SafePlugin<import("../types/types").PasteOptionsPluginState>;
+}): SafePlugin<PasteOptionsPluginState>;

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

@@ -1,2 +1,8 @@
+import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
+import type { Command } from '@atlaskit/editor-common/types';
+import type { EditorState, SafeStateField, Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type PastePluginAction } from '../editor-actions/actions';
 import type { PasteOptionsPluginState } from '../types/types';
-export declare const createPluginState: (dispatch: import("@atlaskit/editor-common/event-dispatcher").Dispatch, initialState: PasteOptionsPluginState | ((state: import("prosemirror-state").EditorState) => PasteOptionsPluginState)) => import("prosemirror-state").SafeStateField<PasteOptionsPluginState>, createCommand: <A = import("../editor-actions/actions").PastePluginAction>(action: A | ((state: Readonly<import("prosemirror-state").EditorState>) => false | A), transform?: (tr: import("prosemirror-state").Transaction, state: import("prosemirror-state").EditorState) => import("prosemirror-state").Transaction) => import("@atlaskit/editor-common/types").Command, getPluginState: (state: import("prosemirror-state").EditorState) => PasteOptionsPluginState;
+export declare const createPluginState: (dispatch: Dispatch, initialState: PasteOptionsPluginState | ((state: EditorState) => PasteOptionsPluginState)) => SafeStateField<PasteOptionsPluginState>;
+export declare const createCommand: <A = PastePluginAction>(action: A | ((state: Readonly<EditorState>) => false | A), transform?: (tr: Transaction, state: EditorState) => Transaction) => Command;
+export declare const getPluginState: (state: EditorState) => PasteOptionsPluginState;

package/dist/types-ts4.5/types/types.d.ts

@@ -1,7 +1,7 @@
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-export declare const pasteOptionsPluginKey: PluginKey<any>;
+export declare const pasteOptionsPluginKey: PluginKey;
 export declare enum ToolbarDropdownOption {
     Markdown = 0,
     RichText = 1,

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.0",
+	"version": "9.0.2",
 	"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.0.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",