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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 9.1.8
+
+### Patch Changes
+
+- [`fb9bbd5719238`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fb9bbd5719238) -
+  EDITOR-6193 Correcting `visibleAiActions` attribute of paste actions menu which was not being
+  populated.
+
+## 9.1.7
+
+### Patch Changes
+
+- [`3b007c601e102`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3b007c601e102) -
+  EDITOR-6092 Remove 100 character limit on legacy paste actions for new editor AI paste actions
+  menu. Also redesigns the legacy paste actions to more closely resemble the legacy paste floating
+  toolbar when there are no AI actions present.
+- Updated dependencies
+
 ## 9.1.6
 
 ### Patch Changes

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

@@ -9,6 +9,7 @@ exports.PasteActionsMenu = void 0;
 exports.findBlockAncestorDOM = findBlockAncestorDOM;
 exports.getTargetElement = getTargetElement;
 exports.getVisualEndBottom = getVisualEndBottom;
+exports.onInlinePositionCalculated = onInlinePositionCalculated;
 exports.onPositionCalculated = onPositionCalculated;
 exports.resolveTableAfterPos = resolveTableAfterPos;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -118,6 +119,35 @@ function findBlockAncestorDOM(editorView, pos) {
   return null;
 }
 
+/**
+ * Positions the paste menu inline, immediately to the right of the cursor
+ * at the paste end position, vertically centered with the line.
+ * Used for short pastes without AI actions.
+ */
+function onInlinePositionCalculated(editorView, pasteEndPos, targetElement, popupContentRef) {
+  return function (position) {
+    var _popupContentRef$curr, _popupContentRef$curr2, _position$top, _position$left;
+    var endCoords = editorView.coordsAtPos(pasteEndPos);
+    var targetRect = targetElement.getBoundingClientRect();
+
+    // Vertical: center the menu with the line at the paste end position.
+    var lineHeight = endCoords.bottom - endCoords.top;
+    var lineMidpoint = endCoords.top + lineHeight / 2;
+    var menuHeight = (_popupContentRef$curr = (_popupContentRef$curr2 = popupContentRef.current) === null || _popupContentRef$curr2 === void 0 ? void 0 : _popupContentRef$curr2.getBoundingClientRect().height) !== null && _popupContentRef$curr !== void 0 ? _popupContentRef$curr : lineHeight;
+    var menuTop = lineMidpoint - menuHeight / 2;
+    var topDelta = menuTop - (targetRect.top + targetRect.height);
+    var adjustedTop = ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta;
+
+    // Horizontal: position to the right of the cursor
+    var leftDelta = endCoords.right - targetRect.right;
+    var adjustedLeft = ((_position$left = position.left) !== null && _position$left !== void 0 ? _position$left : 0) + leftDelta;
+    return _objectSpread(_objectSpread({}, position), {}, {
+      top: adjustedTop,
+      left: adjustedLeft
+    });
+  };
+}
+
 /**
  * Adjusts the position of the paste menu so that:
  *
@@ -148,7 +178,7 @@ function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElem
   var tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
   var blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return function (position) {
-    var _position$top;
+    var _position$top2;
     var startCoords = editorView.coordsAtPos(pasteStartPos);
     var endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     var targetRect = targetElement.getBoundingClientRect();
@@ -158,7 +188,7 @@ function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElem
     // 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.
     var topDelta = startCoords.top - (targetRect.top + targetRect.height);
-    var adjustedTop = ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta;
+    var adjustedTop = ((_position$top2 = position.top) !== null && _position$top2 !== void 0 ? _position$top2 : 0) + topDelta;
 
     // Sticky-top: clamp to the scroll container's top edge when the paste
     // start has scrolled above the visible area, but only while some pasted
@@ -180,13 +210,13 @@ function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElem
     // re-anchoring to its right edge.
     var adjustedLeft = position.left;
     if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
-      var _position$left;
+      var _position$left2;
       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;
+      adjustedLeft = ((_position$left2 = position.left) !== null && _position$left2 !== void 0 ? _position$left2 : 0) + leftDelta;
     }
     return _objectSpread(_objectSpread({}, position), {}, {
       top: adjustedTop,
@@ -195,7 +225,7 @@ function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElem
   };
 }
 var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref) {
-  var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2;
   var api = _ref.api,
     editorView = _ref.editorView,
     mountTo = _ref.mountTo,
@@ -210,8 +240,8 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     }),
     lastContentPasted = _useSharedPluginState.lastContentPasted;
   var prevShowToolbarRef = (0, _react.useRef)(false);
+  var popupContentRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
-    var _lastContentPasted$te, _lastContentPasted$te2;
     if (!lastContentPasted) {
       (0, _commands.hideToolbar)()(editorView.state, editorView.dispatch);
       return;
@@ -234,7 +264,7 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
         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;
+    var legacyVisible = (0, _toolbar2.isToolbarVisible)(editorView.state, lastContentPasted);
     (0, _commands.showToolbar)(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['pasteOptionsToolbarPlugin'], function (states) {
@@ -249,22 +279,6 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     isToolbarShown = _useSharedPluginState2.showToolbar,
     pasteStartPos = _useSharedPluginState2.pasteStartPos,
     pasteEndPos = _useSharedPluginState2.pasteEndPos;
-  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 () {
-    if (!prevShowToolbarRef.current && isToolbarShown) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({
-        action: _analytics.ACTION.OPENED,
-        actionSubject: _analytics.ACTION_SUBJECT.PASTE_ACTIONS_MENU,
-        eventType: _analytics.EVENT_TYPE.UI,
-        attributes: {
-          visibleAiActions: visibleAiActionKeys
-        }
-      });
-    }
-    prevShowToolbarRef.current = isToolbarShown;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isToolbarShown, editorAnalyticsAPI]);
   var preventEditorFocusLoss = (0, _react.useCallback)(function (e) {
     e.preventDefault();
   }, []);
@@ -296,18 +310,54 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   // onPositionCalculated with fresh viewport coordinates.
   var overflowScrollParent = isToolbarShown ? (0, _ui.findOverflowScrollParent)(editorView.dom) : false;
   var effectiveScrollableElement = overflowScrollParent || scrollableElement;
-  var pasteMenuComponents = (_api$uiControlRegistr3 = api === null || api === void 0 || (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
+  var pasteMenuComponents = (_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 anyComponentVisible = (0, _hasVisibleButton.hasVisibleButton)(pasteMenuComponents);
+
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  var aiMenuItems = pasteMenuComponents.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 visibleAiActionKeys = (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']);
+
+  // Two positioning modes:
+  // 1. Inline: no AI actions visible — menu appears to the right of the cursor,
+  //    vertically centered with the text line.
+  // 2. Block-anchored: AI actions are visible — menu appears at the right edge
+  //    of the content block, aligned with paste start.
+  var hasVisibleAiActions = visibleAiActionKeys.length > 0;
+  (0, _react.useEffect)(function () {
+    if (!prevShowToolbarRef.current && isToolbarShown) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.fireAnalyticsEvent({
+        action: _analytics.ACTION.OPENED,
+        actionSubject: _analytics.ACTION_SUBJECT.PASTE_ACTIONS_MENU,
+        eventType: _analytics.EVENT_TYPE.UI,
+        attributes: {
+          visibleAiActions: visibleAiActionKeys
+        }
+      });
+    }
+    prevShowToolbarRef.current = isToolbarShown;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isToolbarShown, editorAnalyticsAPI]);
+  var useInlinePosition = !hasVisibleAiActions;
   if (!isToolbarShown) {
     return null;
   }
   if (!anyComponentVisible) {
     return null;
   }
-  var target = getTargetElement(editorView, pasteStartPos);
+  var target = getTargetElement(editorView, useInlinePosition ? pasteEndPos : pasteStartPos);
   if (!target) {
     return null;
   }
+
+  // Choose positioning strategy based on whether the menu appears inline
+  // (right of cursor for short pastes) or anchored to the block ancestor
+  // (right side of content area for longer pastes / AI actions).
+  var positionCalculator = useInlinePosition ? onInlinePositionCalculated(editorView, pasteEndPos, target, popupContentRef) : onPositionCalculated(editorView, pasteStartPos, pasteEndPos, target, effectiveScrollableElement);
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -316,10 +366,10 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     minPopupMargin: _constants.PASTE_MENU_GAP_HORIZONTAL,
     zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex,
     alignX: "end",
-    alignY: "bottom"
+    alignY: useInlinePosition ? 'top' : '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),
+    onPositionCalculated: positionCalculator,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
@@ -330,6 +380,7 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   }, /*#__PURE__*/_react.default.createElement(_PasteActionsMenuContent.PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    components: pasteMenuComponents
+    components: pasteMenuComponents,
+    contentRef: popupContentRef
   }))));
 };

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

@@ -9,34 +9,37 @@ exports.PasteActionsMenuContent = void 0;
 require("./PasteActionsMenuContent.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
-var _reactIntlNext = require("react-intl-next");
-var _messages = require("@atlaskit/editor-common/messages");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
 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 _bfhk1bhr _16qs130s"
 };
+var pasteMenuSurface = {
+  type: _toolbar.PASTE_MENU.type,
+  key: _toolbar.PASTE_MENU.key
+};
 var PasteActionsMenuContent = exports.PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
   var onMouseDown = _ref.onMouseDown,
     onMouseEnter = _ref.onMouseEnter,
-    components = _ref.components;
+    components = _ref.components,
+    contentRef = _ref.contentRef;
   var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
-  var intl = (0, _reactIntlNext.useIntl)();
+  var mergedRef = (0, _react.useCallback)(function (node) {
+    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(node);
+    if (contentRef) {
+      contentRef.current = node;
+    }
+  }, [setOutsideClickTargetRef, contentRef]);
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
-    ref: setOutsideClickTargetRef,
+    ref: mergedRef,
     xcss: styles.container,
     onMouseDown: onMouseDown,
     onMouseEnter: onMouseEnter
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-    title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteMenuActionsTitle)
   }, /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
-    surface: {
-      type: 'menu',
-      key: 'paste-menu'
-    },
+    surface: pasteMenuSurface,
     components: components
-  })));
+  }));
 };

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

@@ -16,12 +16,14 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
 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");
+var _PasteOptionsDropdownButton = require("./PasteOptionsDropdownButton");
 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"
@@ -100,21 +102,49 @@ var PasteMenuItem = function PasteMenuItem(_ref) {
   }, displayLabel);
 };
 var PasteOptionsNestedMenu = function PasteOptionsNestedMenu(_ref2) {
-  var children = _ref2.children;
+  var children = _ref2.children,
+    hasVisibleAiActions = _ref2.hasVisibleAiActions;
   var intl = (0, _reactIntlNext.useIntl)();
+  var label = intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteMenuActionsPasteAs);
+  if (!hasVisibleAiActions) {
+    return /*#__PURE__*/_react.default.createElement(_PasteOptionsDropdownButton.PasteOptionsDropdownButton, {
+      elemBefore: /*#__PURE__*/_react.default.createElement(_clipboard.default, {
+        size: "small",
+        label: ""
+      }),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_chevronDown.default, {
+        size: "small",
+        label: ""
+      }),
+      label: label,
+      testId: "paste-options-nested-menu",
+      tooltipContent: label
+    }, children);
+  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_clipboard.default, {
       size: "small",
-      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+      label: label
     }),
     elemAfter: /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
       size: "small",
-      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+      label: ""
     }),
     testId: "paste-options-nested-menu",
-    text: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+    text: label
   }, children);
 };
+var getHasVisibleAiActions = function getHasVisibleAiActions(api) {
+  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;
+    }));
+  });
+  return (0, _hasVisibleButton.getVisibleKeys)(aiMenuItems, ['menu-item']).length > 0;
+};
 var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
   var api = _ref3.api;
   return [{
@@ -134,17 +164,14 @@ 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;
+      var hasVisibleAiActions = getHasVisibleAiActions(api);
+      if (!hasVisibleAiActions) {
+        return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+          padding: "space.050"
+        }, props.children);
+      }
       return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-        hasSeparator: hasVisibleAiActions
+        hasSeparator: true
       }, props.children);
     }
   }, {
@@ -156,7 +183,10 @@ var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteM
       rank: _toolbar.PASTE_MENU_SECTION_RANK[_toolbar.PASTE_NESTED_MENU.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(PasteOptionsNestedMenu, null, props.children);
+      var hasVisibleAiActions = getHasVisibleAiActions(api);
+      return /*#__PURE__*/_react.default.createElement(PasteOptionsNestedMenu, {
+        hasVisibleAiActions: hasVisibleAiActions
+      }, props.children);
     }
   }, {
     type: _toolbar.PASTE_MENU_NESTED_SECTION.type,

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

@@ -0,0 +1,52 @@
+/* PasteOptionsDropdownButton.tsx generated by @compiled/babel-plugin v0.39.1 */
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PasteOptionsDropdownButton = void 0;
+var _runtime = require("@compiled/react/runtime");
+var _react = _interopRequireWildcard(require("react"));
+var _dropdownMenu = _interopRequireDefault(require("@atlaskit/dropdown-menu"));
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+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); }
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+/**
+ * A compact dropdown button for paste options, styled like floating toolbar buttons.
+ * Renders as a ToolbarButton with an icon and dropdown caret that opens a
+ * dropdown menu below. Used when AI actions are not visible and the paste
+ * options menu is the only content.
+ */
+var PasteOptionsDropdownButton = exports.PasteOptionsDropdownButton = function PasteOptionsDropdownButton(_ref) {
+  var children = _ref.children,
+    elemBefore = _ref.elemBefore,
+    elemAfter = _ref.elemAfter,
+    label = _ref.label,
+    testId = _ref.testId,
+    tooltipContent = _ref.tooltipContent;
+  var trigger = (0, _react.useCallback)(function (triggerProps) {
+    var button = /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
+      ref: triggerProps.triggerRef,
+      isSelected: triggerProps.isSelected,
+      "aria-expanded": triggerProps['aria-expanded'],
+      "aria-haspopup": triggerProps['aria-haspopup'],
+      onClick: triggerProps.onClick,
+      testId: testId,
+      iconBefore: elemBefore,
+      label: label
+    }, elemAfter);
+    if (tooltipContent) {
+      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+        content: tooltipContent,
+        position: "top"
+      }, button);
+    }
+    return button;
+  }, [testId, elemBefore, elemAfter, label, tooltipContent]);
+  return /*#__PURE__*/_react.default.createElement(_dropdownMenu.default, {
+    placement: "bottom-start",
+    trigger: trigger
+  }, children);
+};

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

@@ -1,7 +1,7 @@
 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';
-import { EditorToolbarProvider, PASTE_MENU } from '@atlaskit/editor-common/toolbar';
+import { AI_PASTE_MENU_SECTION, EditorToolbarProvider, PASTE_MENU } from '@atlaskit/editor-common/toolbar';
 import { findOverflowScrollParent, Popup } from '@atlaskit/editor-common/ui';
 import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
@@ -101,6 +101,36 @@ export function findBlockAncestorDOM(editorView, pos) {
   return null;
 }
 
+/**
+ * Positions the paste menu inline, immediately to the right of the cursor
+ * at the paste end position, vertically centered with the line.
+ * Used for short pastes without AI actions.
+ */
+export function onInlinePositionCalculated(editorView, pasteEndPos, targetElement, popupContentRef) {
+  return position => {
+    var _popupContentRef$curr, _popupContentRef$curr2, _position$top, _position$left;
+    const endCoords = editorView.coordsAtPos(pasteEndPos);
+    const targetRect = targetElement.getBoundingClientRect();
+
+    // Vertical: center the menu with the line at the paste end position.
+    const lineHeight = endCoords.bottom - endCoords.top;
+    const lineMidpoint = endCoords.top + lineHeight / 2;
+    const menuHeight = (_popupContentRef$curr = (_popupContentRef$curr2 = popupContentRef.current) === null || _popupContentRef$curr2 === void 0 ? void 0 : _popupContentRef$curr2.getBoundingClientRect().height) !== null && _popupContentRef$curr !== void 0 ? _popupContentRef$curr : lineHeight;
+    const menuTop = lineMidpoint - menuHeight / 2;
+    const topDelta = menuTop - (targetRect.top + targetRect.height);
+    const adjustedTop = ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta;
+
+    // Horizontal: position to the right of the cursor
+    const leftDelta = endCoords.right - targetRect.right;
+    const adjustedLeft = ((_position$left = position.left) !== null && _position$left !== void 0 ? _position$left : 0) + leftDelta;
+    return {
+      ...position,
+      top: adjustedTop,
+      left: adjustedLeft
+    };
+  };
+}
+
 /**
  * Adjusts the position of the paste menu so that:
  *
@@ -131,7 +161,7 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
   const tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
   const blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return position => {
-    var _position$top;
+    var _position$top2;
     const startCoords = editorView.coordsAtPos(pasteStartPos);
     const endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     const targetRect = targetElement.getBoundingClientRect();
@@ -141,7 +171,7 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
     // 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.
     const topDelta = startCoords.top - (targetRect.top + targetRect.height);
-    let adjustedTop = ((_position$top = position.top) !== null && _position$top !== void 0 ? _position$top : 0) + topDelta;
+    let adjustedTop = ((_position$top2 = position.top) !== null && _position$top2 !== void 0 ? _position$top2 : 0) + topDelta;
 
     // Sticky-top: clamp to the scroll container's top edge when the paste
     // start has scrolled above the visible area, but only while some pasted
@@ -163,13 +193,13 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
     // re-anchoring to its right edge.
     let adjustedLeft = position.left;
     if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
-      var _position$left;
+      var _position$left2;
       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;
+      adjustedLeft = ((_position$left2 = position.left) !== null && _position$left2 !== void 0 ? _position$left2 : 0) + leftDelta;
     }
     return {
       ...position,
@@ -185,7 +215,7 @@ export const PasteActionsMenu = ({
   boundariesElement,
   scrollableElement
 }) => {
-  var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$analytics, _api$uiControlRegistr, _api$uiControlRegistr2;
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
   const {
     lastContentPasted
@@ -196,8 +226,8 @@ export const PasteActionsMenu = ({
     };
   });
   const prevShowToolbarRef = useRef(false);
+  const popupContentRef = useRef(null);
   useEffect(() => {
-    var _lastContentPasted$te, _lastContentPasted$te2;
     if (!lastContentPasted) {
       hideToolbar()(editorView.state, editorView.dispatch);
       return;
@@ -220,7 +250,7 @@ export const PasteActionsMenu = ({
         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;
+    const legacyVisible = isToolbarVisible(editorView.state, lastContentPasted);
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   const {
@@ -236,22 +266,6 @@ export const PasteActionsMenu = ({
       pasteEndPos: (_pluginState$pasteEnd = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteEndPos) !== null && _pluginState$pasteEnd !== void 0 ? _pluginState$pasteEnd : 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 : [];
-  const visibleAiActionKeys = getVisibleKeys(aiSurfaceComponents, ['button', 'menu-item']);
-  useEffect(() => {
-    if (!prevShowToolbarRef.current && isToolbarShown) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({
-        action: ACTION.OPENED,
-        actionSubject: ACTION_SUBJECT.PASTE_ACTIONS_MENU,
-        eventType: EVENT_TYPE.UI,
-        attributes: {
-          visibleAiActions: visibleAiActionKeys
-        }
-      });
-    }
-    prevShowToolbarRef.current = isToolbarShown;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isToolbarShown, editorAnalyticsAPI]);
   const preventEditorFocusLoss = useCallback(e => {
     e.preventDefault();
   }, []);
@@ -283,18 +297,52 @@ export const PasteActionsMenu = ({
   // onPositionCalculated with fresh viewport coordinates.
   const overflowScrollParent = isToolbarShown ? findOverflowScrollParent(editorView.dom) : false;
   const effectiveScrollableElement = overflowScrollParent || scrollableElement;
-  const pasteMenuComponents = (_api$uiControlRegistr3 = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
+  const pasteMenuComponents = (_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 anyComponentVisible = hasVisibleButton(pasteMenuComponents);
+
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  const aiMenuItems = pasteMenuComponents.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 visibleAiActionKeys = getVisibleKeys(aiMenuItems, ['menu-item']);
+
+  // Two positioning modes:
+  // 1. Inline: no AI actions visible — menu appears to the right of the cursor,
+  //    vertically centered with the text line.
+  // 2. Block-anchored: AI actions are visible — menu appears at the right edge
+  //    of the content block, aligned with paste start.
+  const hasVisibleAiActions = visibleAiActionKeys.length > 0;
+  useEffect(() => {
+    if (!prevShowToolbarRef.current && isToolbarShown) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({
+        action: ACTION.OPENED,
+        actionSubject: ACTION_SUBJECT.PASTE_ACTIONS_MENU,
+        eventType: EVENT_TYPE.UI,
+        attributes: {
+          visibleAiActions: visibleAiActionKeys
+        }
+      });
+    }
+    prevShowToolbarRef.current = isToolbarShown;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isToolbarShown, editorAnalyticsAPI]);
+  const useInlinePosition = !hasVisibleAiActions;
   if (!isToolbarShown) {
     return null;
   }
   if (!anyComponentVisible) {
     return null;
   }
-  const target = getTargetElement(editorView, pasteStartPos);
+  const target = getTargetElement(editorView, useInlinePosition ? pasteEndPos : pasteStartPos);
   if (!target) {
     return null;
   }
+
+  // Choose positioning strategy based on whether the menu appears inline
+  // (right of cursor for short pastes) or anchored to the block ancestor
+  // (right side of content area for longer pastes / AI actions).
+  const positionCalculator = useInlinePosition ? onInlinePositionCalculated(editorView, pasteEndPos, target, popupContentRef) : onPositionCalculated(editorView, pasteStartPos, pasteEndPos, target, effectiveScrollableElement);
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -303,10 +351,10 @@ export const PasteActionsMenu = ({
     minPopupMargin: PASTE_MENU_GAP_HORIZONTAL,
     zIndex: akEditorFloatingPanelZIndex,
     alignX: "end",
-    alignY: "bottom"
+    alignY: useInlinePosition ? 'top' : '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),
+    onPositionCalculated: positionCalculator,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
@@ -317,6 +365,7 @@ export const PasteActionsMenu = ({
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    components: pasteMenuComponents
+    components: pasteMenuComponents,
+    contentRef: popupContentRef
   }))));
 };