@atlaskit/editor-plugin-paste-options-toolbar 9.1.5 → 9.1.7

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';
@@ -66,10 +66,77 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
 }
 
 /**
- * Adjusts the vertical position of the paste menu to align with the top of the
- * pasted content using the exact coordinates at the paste start position,
- * and sticks the menu to the top of the scroll container when the pasted
- * content scrolls above the visible area.
+ * Finds the DOM element for the nearest block-level ProseMirror ancestor of
+ * the given document position. Uses ProseMirror's schema (`node.isBlock`)
+ * rather than CSS display properties, so the check is always in sync with the
+ * document model.
+ *
+ * Returns `null` if no block ancestor can be resolved to a DOM element.
+ */
+export function findBlockAncestorDOM(editorView, pos) {
+  try {
+    const $pos = editorView.state.doc.resolve(pos);
+    // Walk up the document tree from the resolved position's innermost
+    // node towards the root. $pos.node(depth) gives the ancestor at each
+    // depth; $pos.start(depth) gives the position just inside that ancestor,
+    // so `$pos.start(depth) - 1` is the position of the ancestor node itself
+    // (which is what nodeDOM expects).
+    for (let depth = $pos.depth; depth >= 0; depth--) {
+      const node = $pos.node(depth);
+      if (node.isBlock) {
+        const domNode = editorView.nodeDOM($pos.start(depth) - 1);
+        if (domNode instanceof HTMLElement) {
+          return domNode;
+        }
+        // depth 0 is the doc node — nodeDOM(–1) won't work, so try
+        // the editor's own DOM element as a fallback.
+        if (depth === 0 && editorView.dom instanceof HTMLElement) {
+          return editorView.dom;
+        }
+      }
+    }
+  } catch {
+    // Position may be out of range after a concurrent edit — fall through.
+  }
+  return null;
+}
+
+/**
+ * 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:
+ *
+ * **Vertical:** The menu aligns with the top of the pasted content using the
+ * exact coordinates at the paste start position, and sticks to the top of the
+ * scroll container when the pasted content scrolls above the visible area.
  *
  * The Popup uses alignY="bottom", which positions the popup below the target
  * element's bottom edge. This override:
@@ -80,21 +147,31 @@ export function getVisualEndBottom(editorView, pasteEndPos, tableAfterPos) {
  *    to the scroll container's top edge (sticky-top).
  * 3. Stops sticking once the entire pasted range (pasteEndPos) has scrolled
  *    above the visible area.
+ *
+ * **Horizontal:** When the target element is an inline element (e.g. a mark
+ * wrapper like `<strong>`, or an inline node like an emoji), the Popup's
+ * `alignX="end"` would place the menu at the right edge of that narrow
+ * element. This override resolves the nearest block-level ProseMirror
+ * ancestor (using `node.isBlock` from the document schema) and re-anchors
+ * the horizontal position to its right edge, so the menu consistently
+ * appears at the right side of the content area.
  */
 export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, targetElement, scrollableElement) {
   // Pre-compute once per render to avoid doc.resolve() on every scroll frame.
   const tableAfterPos = resolveTableAfterPos(editorView, pasteEndPos);
+  const blockAncestorDOM = findBlockAncestorDOM(editorView, pasteStartPos);
   return position => {
-    var _position$top;
+    var _position$top2;
     const startCoords = editorView.coordsAtPos(pasteStartPos);
     const endBottom = getVisualEndBottom(editorView, pasteEndPos, tableAfterPos);
     const targetRect = targetElement.getBoundingClientRect();
 
+    // ── Vertical adjustment ──────────────────────────────────────────
     // The Popup places the menu at the target's bottom edge by default.
     // We shift it up so it aligns with the paste start position.
     // Both coordinates are in viewport space, so the delta is offset-parent agnostic.
     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
@@ -105,9 +182,29 @@ export function onPositionCalculated(editorView, pasteStartPos, pasteEndPos, tar
         adjustedTop += scrollContainerTop - startCoords.top + PASTE_MENU_GAP_TOP;
       }
     }
+
+    // ── Horizontal adjustment ────────────────────────────────────────
+    // When pasted content starts with a mark (bold, italic, link …) or
+    // an inline node (emoji, smart link, inline image …),
+    // findDomRefAtPos returns the narrow inline wrapper element. The
+    // Popup's alignX="end" then places the menu at that element's right
+    // edge instead of the content area's right edge. We correct this by
+    // resolving the nearest block-level ProseMirror ancestor and
+    // re-anchoring to its right edge.
+    let adjustedLeft = position.left;
+    if (blockAncestorDOM && blockAncestorDOM !== targetElement) {
+      var _position$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$left2 = position.left) !== null && _position$left2 !== void 0 ? _position$left2 : 0) + leftDelta;
+    }
     return {
       ...position,
-      top: adjustedTop
+      top: adjustedTop,
+      left: adjustedLeft
     };
   };
 }
@@ -129,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;
@@ -153,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 {
@@ -218,16 +315,34 @@ export const PasteActionsMenu = ({
   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 anyComponentVisible = hasVisibleButton(pasteMenuComponents);
+
+  // 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 = getVisibleKeys(
+  // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- pasteMenuComponents changes by reference each render; filter is small (< 10 items)
+  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));
+  }), ['menu-item']).length > 0;
+  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,
@@ -236,9 +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, {
@@ -249,6 +365,7 @@ export const PasteActionsMenu = ({
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    components: pasteMenuComponents
+    components: pasteMenuComponents,
+    contentRef: popupContentRef
   }))));
 };

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

@@ -1,35 +1,38 @@
 /* PasteActionsMenuContent.tsx generated by @compiled/babel-plugin v0.39.1 */
 import "./PasteActionsMenuContent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-import React, { useContext } from 'react';
-import { useIntl } from 'react-intl-next';
-import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
+import React, { useCallback, useContext } from 'react';
+import { PASTE_MENU } from '@atlaskit/editor-common/toolbar';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { Box } from '@atlaskit/primitives/compiled';
 const styles = {
   container: "_2rko12b0 _bfhk1bhr _16qs130s"
 };
+const pasteMenuSurface = {
+  type: PASTE_MENU.type,
+  key: PASTE_MENU.key
+};
 export const PasteActionsMenuContent = ({
   onMouseDown,
   onMouseEnter,
-  components
+  components,
+  contentRef
 }) => {
   const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
-  const intl = useIntl();
+  const mergedRef = useCallback(node => {
+    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 ? void 0 : setOutsideClickTargetRef(node);
+    if (contentRef) {
+      contentRef.current = node;
+    }
+  }, [setOutsideClickTargetRef, contentRef]);
   return /*#__PURE__*/React.createElement(Box, {
-    ref: setOutsideClickTargetRef,
+    ref: mergedRef,
     xcss: styles.container,
     onMouseDown: onMouseDown,
     onMouseEnter: onMouseEnter
-  }, /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    title: intl.formatMessage(messages.pasteMenuActionsTitle)
   }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    surface: {
-      type: 'menu',
-      key: 'paste-menu'
-    },
+    surface: pasteMenuSurface,
     components: components
-  })));
+  }));
 };

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

@@ -8,12 +8,14 @@ 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, AI_PASTE_MENU_SECTION } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem, ToolbarDropdownItemSection, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
+import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 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';
+import { PasteOptionsDropdownButton } from './PasteOptionsDropdownButton';
 const nestedMenuStyles = {
   narrowSection: "_10gv1lit"
 };
@@ -94,22 +96,48 @@ const PasteMenuItem = ({
   }, displayLabel);
 };
 const PasteOptionsNestedMenu = ({
-  children
+  children,
+  hasVisibleAiActions
 }) => {
   const intl = useIntl();
+  const label = intl.formatMessage(messages.pasteMenuActionsPasteAs);
+  if (!hasVisibleAiActions) {
+    return /*#__PURE__*/React.createElement(PasteOptionsDropdownButton, {
+      elemBefore: /*#__PURE__*/React.createElement(ClipboardIcon, {
+        size: "small",
+        label: ""
+      }),
+      elemAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
+        size: "small",
+        label: ""
+      }),
+      label: label,
+      testId: "paste-options-nested-menu",
+      tooltipContent: label
+    }, children);
+  }
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/React.createElement(ClipboardIcon, {
       size: "small",
-      label: intl.formatMessage(messages.pasteOptions)
+      label: label
     }),
     elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
       size: "small",
-      label: intl.formatMessage(messages.pasteOptions)
+      label: ""
     }),
     testId: "paste-options-nested-menu",
-    text: intl.formatMessage(messages.pasteOptions)
+    text: label
   }, children);
 };
+const getHasVisibleAiActions = api => {
+  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));
+  });
+  return getVisibleKeys(aiMenuItems, ['menu-item']).length > 0;
+};
 export const getPasteMenuComponents = ({
   api
 }) => [{
@@ -129,15 +157,14 @@ export const getPasteMenuComponents = ({
     return !((_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false);
   },
   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;
+    const hasVisibleAiActions = getHasVisibleAiActions(api);
+    if (!hasVisibleAiActions) {
+      return /*#__PURE__*/React.createElement(Box, {
+        padding: "space.050"
+      }, props.children);
+    }
     return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-      hasSeparator: hasVisibleAiActions
+      hasSeparator: true
     }, props.children);
   }
 }, {
@@ -148,7 +175,12 @@ export const getPasteMenuComponents = ({
     key: PASTE_MENU_SECTION.key,
     rank: PASTE_MENU_SECTION_RANK[PASTE_NESTED_MENU.key]
   }],
-  component: props => /*#__PURE__*/React.createElement(PasteOptionsNestedMenu, null, props.children)
+  component: props => {
+    const hasVisibleAiActions = getHasVisibleAiActions(api);
+    return /*#__PURE__*/React.createElement(PasteOptionsNestedMenu, {
+      hasVisibleAiActions: hasVisibleAiActions
+    }, props.children);
+  }
 }, {
   type: PASTE_MENU_NESTED_SECTION.type,
   key: PASTE_MENU_NESTED_SECTION.key,

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

@@ -0,0 +1,47 @@
+/* PasteOptionsDropdownButton.tsx generated by @compiled/babel-plugin v0.39.1 */
+import { ax, ix } from "@compiled/react/runtime";
+import React, { useCallback } from 'react';
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+import DropdownMenu from '@atlaskit/dropdown-menu';
+import { ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+
+/**
+ * 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.
+ */
+export const PasteOptionsDropdownButton = ({
+  children,
+  elemBefore,
+  elemAfter,
+  label,
+  testId,
+  tooltipContent
+}) => {
+  const trigger = useCallback(triggerProps => {
+    const button = /*#__PURE__*/React.createElement(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.createElement(ToolbarTooltip, {
+        content: tooltipContent,
+        position: "top"
+      }, button);
+    }
+    return button;
+  }, [testId, elemBefore, elemAfter, label, tooltipContent]);
+  return /*#__PURE__*/React.createElement(DropdownMenu, {
+    placement: "bottom-start",
+    trigger: trigger
+  }, children);
+};

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

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