@atlaskit/editor-plugin-paste-options-toolbar 8.2.3 → 8.3.0

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

@@ -1,14 +1,12 @@
-import React, { useCallback, useMemo } from 'react';
-import { useIntl } from 'react-intl-next';
+import React, { useCallback } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
-import { EditorToolbarProvider } from '@atlaskit/editor-common/toolbar';
+import { EditorToolbarProvider, PASTE_MENU } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { changeToMarkdownWithAnalytics, changeToPlainTextWithAnalytics, changeToRichTextWithAnalytics, hideToolbar, highlightContent } from '../../editor-commands/commands';
-import { ToolbarDropdownOption } from '../../types/types';
+import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
+import { hideToolbar, highlightContent } from '../../editor-commands/commands';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -37,24 +35,16 @@ export const PasteActionsMenu = ({
   editorView,
   mountTo,
   boundariesElement,
-  scrollableElement,
-  editorAnalyticsAPI
+  scrollableElement
 }) => {
-  var _api$uiControlRegistr, _api$uiControlRegistr2;
-  const intl = useIntl();
+  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
   const {
-    showToolbar,
-    isPlainText,
-    selectedOption,
-    plaintextLength
+    showToolbar
   } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
-    var _pluginState$showTool, _pluginState$isPlainT, _pluginState$selected, _pluginState$plaintex;
+    var _pluginState$showTool;
     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,
-      isPlainText: (_pluginState$isPlainT = pluginState === null || pluginState === void 0 ? void 0 : pluginState.isPlainText) !== null && _pluginState$isPlainT !== void 0 ? _pluginState$isPlainT : false,
-      selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : ToolbarDropdownOption.None,
-      plaintextLength: (_pluginState$plaintex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.plaintextLength) !== null && _pluginState$plaintex !== void 0 ? _pluginState$plaintex : 0
+      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
     };
   });
   const preventEditorFocusLoss = useCallback(e => {
@@ -66,42 +56,20 @@ export const PasteActionsMenu = ({
   const handleMouseEnter = useCallback(() => {
     highlightContent()(editorView.state, editorView.dispatch);
   }, [editorView]);
-  const handleRichText = useCallback(e => {
-    e.preventDefault();
-    changeToRichTextWithAnalytics(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI]);
-  const handleMarkdown = useCallback(e => {
-    e.preventDefault();
-    changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  const handlePlainText = useCallback(e => {
-    e.preventDefault();
-    changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  const options = useMemo(() => {
-    const items = [];
-    if (!isPlainText) {
-      items.push({
-        id: 'editor.paste.richText',
-        label: intl.formatMessage(messages.richText),
-        selected: selectedOption === ToolbarDropdownOption.RichText,
-        onClick: handleRichText
-      });
+  const handleClickOutside = useCallback(evt => {
+    if (evt.target instanceof Element) {
+      const isInsideNestedDropdown = evt.target.closest('[data-toolbar-nested-dropdown-menu]');
+      if (isInsideNestedDropdown) {
+        return;
+      }
+    }
+    handleDismiss();
+  }, [handleDismiss]);
+  const handleSetIsOpen = useCallback(isOpen => {
+    if (!isOpen) {
+      handleDismiss();
     }
-    items.push({
-      id: 'editor.paste.markdown',
-      label: intl.formatMessage(messages.markdown),
-      selected: selectedOption === ToolbarDropdownOption.Markdown,
-      onClick: handleMarkdown
-    });
-    items.push({
-      id: 'editor.paste.plainText',
-      label: intl.formatMessage(messages.plainText),
-      selected: selectedOption === ToolbarDropdownOption.PlainText,
-      onClick: handlePlainText
-    });
-    return items;
-  }, [isPlainText, selectedOption, intl, handleRichText, handleMarkdown, handlePlainText]);
+  }, [handleDismiss]);
   if (!showToolbar) {
     return null;
   }
@@ -114,6 +82,7 @@ export const PasteActionsMenu = ({
     key: 'ai-paste-menu'
   };
   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(aiSurface.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+  const pasteSurfaceComponents = (_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 : [];
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -123,15 +92,18 @@ export const PasteActionsMenu = ({
     zIndex: akEditorFloatingPanelZIndex,
     alignX: "right",
     alignY: "bottom",
-    handleClickOutside: handleDismiss,
+    handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView
+  }, /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, {
+    isOpen: showToolbar,
+    setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
-    options: options,
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
     aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents
-  })));
+    aiSurfaceComponents: aiSurfaceComponents,
+    pasteSurfaceComponents: pasteSurfaceComponents
+  }))));
 };

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

@@ -1,10 +1,4 @@
 
 ._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._18zrpxbi{padding-inline:var(--ds-space-200,1pc)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}
-._1rjcu2gc{padding-block:var(--ds-space-100,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
-._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
-._bfhksm61{background-color:var(--ds-background-neutral-subtle,#00000000)}
-._k48pwu06{font-weight:var(--ds-font-weight-bold,653)}
-._syazi7uo{color:var(--ds-text,#292a2e)}
-._irr31dpa:hover{background-color:var(--ds-background-neutral-subtle-hovered,#0515240f)}
+._1rjc1b66{padding-block:var(--ds-space-050,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

@@ -2,21 +2,18 @@
 import "./PasteActionsMenuContent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext } from 'react';
-import { cx } from '@atlaskit/css';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
-import { Box, Pressable } from '@atlaskit/primitives/compiled';
+import { Box } from '@atlaskit/primitives/compiled';
 const styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s",
-  option: "_1rjcu2gc _18zrpxbi _syazi7uo _bfhksm61 _irr31dpa",
-  selectedOption: "_k48pwu06"
+  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
 };
 export const PasteActionsMenuContent = ({
-  options,
   onMouseDown,
   onMouseEnter,
   aiSurface,
-  aiSurfaceComponents
+  aiSurfaceComponents,
+  pasteSurfaceComponents
 }) => {
   const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
   return /*#__PURE__*/React.createElement(Box, {
@@ -27,9 +24,11 @@ export const PasteActionsMenuContent = ({
   }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
     surface: aiSurface,
     components: aiSurfaceComponents
-  }), options.map(option => /*#__PURE__*/React.createElement(Pressable, {
-    key: option.id,
-    xcss: cx(styles.option, option.selected && styles.selectedOption),
-    onClick: option.onClick
-  }, option.label)));
+  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
+    surface: {
+      type: 'menu',
+      key: 'paste-menu'
+    },
+    components: pasteSurfaceComponents
+  }));
 };

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

@@ -0,0 +1 @@
+._10gv1lit button{min-width:10pc}

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

@@ -0,0 +1,187 @@
+/* PasteMenuComponents.tsx generated by @compiled/babel-plugin v0.39.1 */
+import "./PasteMenuComponents.compiled.css";
+import { ax, ix } from "@compiled/react/runtime";
+import React, { useCallback } from 'react';
+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 { 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';
+const nestedMenuStyles = {
+  narrowSection: "_10gv1lit"
+};
+export const isPasteOptionSelected = (pasteType, selectedOption) => {
+  switch (pasteType) {
+    case 'rich-text':
+      return selectedOption === ToolbarDropdownOption.RichText;
+    case 'markdown':
+      return selectedOption === ToolbarDropdownOption.Markdown;
+    case 'plain-text':
+      return selectedOption === ToolbarDropdownOption.PlainText;
+    default:
+      return false;
+  }
+};
+const PasteMenuItem = ({
+  api,
+  editorAnalyticsAPI,
+  pasteType
+}) => {
+  const intl = useIntl();
+  const {
+    editorView
+  } = useEditorToolbar();
+  const {
+    selectedOption,
+    plaintextLength,
+    isPlainText
+  } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
+    var _pluginState$selected, _pluginState$plaintex, _pluginState$isPlainT;
+    const pluginState = states.pasteOptionsToolbarPluginState;
+    return {
+      selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : ToolbarDropdownOption.None,
+      plaintextLength: (_pluginState$plaintex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.plaintextLength) !== null && _pluginState$plaintex !== void 0 ? _pluginState$plaintex : 0,
+      isPlainText: (_pluginState$isPlainT = pluginState === null || pluginState === void 0 ? void 0 : pluginState.isPlainText) !== null && _pluginState$isPlainT !== void 0 ? _pluginState$isPlainT : false
+    };
+  });
+  const getDefaultLabel = useCallback(type => {
+    switch (type) {
+      case 'rich-text':
+        return intl.formatMessage(messages.richTextAction);
+      case 'markdown':
+        return intl.formatMessage(messages.markdownAction);
+      case 'plain-text':
+        return intl.formatMessage(messages.plainTextAction);
+      default:
+        return type;
+    }
+  }, [intl]);
+  const handleClick = useCallback(e => {
+    e.preventDefault();
+    if (!editorView) {
+      return;
+    }
+    switch (pasteType) {
+      case 'rich-text':
+        changeToRichTextWithAnalytics(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
+        break;
+      case 'markdown':
+        changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        break;
+      case 'plain-text':
+        changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        break;
+    }
+  }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);
+  if (pasteType === 'rich-text' && isPlainText) {
+    return null;
+  }
+  const displayLabel = getDefaultLabel(pasteType);
+  const isSelected = isPasteOptionSelected(pasteType, selectedOption);
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
+    isSelected: isSelected,
+    testId: `paste-${pasteType}-menu-item`,
+    hasNestedDropdownMenu: true
+  }, displayLabel);
+};
+const PasteOptionsNestedMenu = ({
+  children
+}) => {
+  const intl = useIntl();
+  return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
+    elemBefore: /*#__PURE__*/React.createElement(ClipboardIcon, {
+      size: "small",
+      label: intl.formatMessage(messages.pasteOptions)
+    }),
+    elemAfter: /*#__PURE__*/React.createElement(ChevronRightIcon, {
+      size: "small",
+      label: intl.formatMessage(messages.pasteOptions)
+    }),
+    testId: "paste-options-nested-menu",
+    text: intl.formatMessage(messages.pasteOptions)
+  }, children);
+};
+export const getPasteMenuComponents = ({
+  api,
+  editorAnalyticsAPI
+}) => [{
+  type: PASTE_MENU.type,
+  key: PASTE_MENU.key
+}, {
+  type: PASTE_MENU_SECTION.type,
+  key: PASTE_MENU_SECTION.key,
+  parents: [{
+    type: PASTE_MENU.type,
+    key: PASTE_MENU.key,
+    rank: PASTE_MENU_RANK[PASTE_MENU_SECTION.key]
+  }],
+  component: props => /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    hasSeparator: true
+  }, props.children)
+}, {
+  type: PASTE_NESTED_MENU.type,
+  key: PASTE_NESTED_MENU.key,
+  parents: [{
+    type: PASTE_MENU_SECTION.type,
+    key: PASTE_MENU_SECTION.key,
+    rank: PASTE_MENU_SECTION_RANK[PASTE_NESTED_MENU.key]
+  }],
+  component: props => /*#__PURE__*/React.createElement(PasteOptionsNestedMenu, null, props.children)
+}, {
+  type: PASTE_MENU_NESTED_SECTION.type,
+  key: PASTE_MENU_NESTED_SECTION.key,
+  parents: [{
+    type: PASTE_NESTED_MENU.type,
+    key: PASTE_NESTED_MENU.key,
+    rank: PASTE_NESTED_MENU_RANK[PASTE_MENU_NESTED_SECTION.key]
+  }],
+  component: props => /*#__PURE__*/React.createElement(Box, {
+    xcss: cx(nestedMenuStyles.narrowSection)
+  }, /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, null, props.children))
+}, {
+  key: PASTE_RICH_TEXT_MENU_ITEM.key,
+  type: PASTE_RICH_TEXT_MENU_ITEM.type,
+  component: () => /*#__PURE__*/React.createElement(PasteMenuItem, {
+    api: api,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    pasteType: "rich-text"
+  }),
+  parents: [{
+    key: PASTE_MENU_NESTED_SECTION.key,
+    type: PASTE_MENU_NESTED_SECTION.type,
+    rank: PASTE_MENU_NESTED_SECTION_RANK[PASTE_RICH_TEXT_MENU_ITEM.key]
+  }]
+}, {
+  key: PASTE_MARKDOWN_MENU_ITEM.key,
+  type: PASTE_MARKDOWN_MENU_ITEM.type,
+  component: () => /*#__PURE__*/React.createElement(PasteMenuItem, {
+    api: api,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    pasteType: "markdown"
+  }),
+  parents: [{
+    key: PASTE_MENU_NESTED_SECTION.key,
+    type: PASTE_MENU_NESTED_SECTION.type,
+    rank: PASTE_MENU_NESTED_SECTION_RANK[PASTE_MARKDOWN_MENU_ITEM.key]
+  }]
+}, {
+  key: PASTE_PLAIN_TEXT_MENU_ITEM.key,
+  type: PASTE_PLAIN_TEXT_MENU_ITEM.type,
+  component: () => /*#__PURE__*/React.createElement(PasteMenuItem, {
+    api: api,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    pasteType: "plain-text"
+  }),
+  parents: [{
+    key: PASTE_MENU_NESTED_SECTION.key,
+    type: PASTE_MENU_NESTED_SECTION.type,
+    rank: PASTE_MENU_NESTED_SECTION_RANK[PASTE_PLAIN_TEXT_MENU_ITEM.key]
+  }]
+}];

package/dist/esm/pasteOptionsToolbarPlugin.js

@@ -8,11 +8,19 @@ import { hideToolbar, showToolbar } from './editor-commands/commands';
 import { createPlugin } from './pm-plugins/main';
 import { pasteOptionsPluginKey, ToolbarDropdownOption } from './types/types';
 import { PasteActionsMenu } from './ui/on-paste-actions-menu/PasteActionsMenu';
+import { getPasteMenuComponents } from './ui/on-paste-actions-menu/PasteMenuComponents';
 import { buildToolbar, isToolbarVisible } from './ui/toolbar';
 export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref) {
   var _api$analytics;
   var api = _ref.api;
   var editorAnalyticsAPI = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
+  if (expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)) {
+    var _api$uiControlRegistr;
+    api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register(getPasteMenuComponents({
+      api: api,
+      editorAnalyticsAPI: editorAnalyticsAPI
+    }));
+  }
   var getSharedState = function getSharedState(editorState) {
     var _pluginState$isPlainT, _pluginState$pasteEnd, _pluginState$pasteSta, _pluginState$plaintex, _pluginState$selected, _pluginState$showTool;
     if (!editorState) {
@@ -42,7 +50,9 @@ export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref)
         name: 'pasteOptionsToolbarPlugin',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch;
-          return createPlugin(dispatch);
+          return createPlugin(dispatch, {
+            useNewPasteMenu: expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)
+          });
         }
       }];
     }
@@ -74,8 +84,7 @@ export var pasteOptionsToolbarPlugin = function pasteOptionsToolbarPlugin(_ref)
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        editorAnalyticsAPI: editorAnalyticsAPI
+        scrollableElement: popupsScrollableElement
       });
     },
     usePluginHook: function usePluginHook(_ref4) {

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

@@ -5,7 +5,7 @@ import { checkAndHideToolbar } from '../editor-commands/commands';
 import { pasteOptionsPluginKey, ToolbarDropdownOption } from '../types/types';
 import { PASTE_HIGHLIGHT_DECORATION_KEY, TEXT_HIGHLIGHT_CLASS } from './constants';
 import { createPluginState } from './plugin-factory';
-export function createPlugin(dispatch) {
+export function createPlugin(dispatch, options) {
   return new SafePlugin({
     key: pasteOptionsPluginKey,
     state: createPluginState(dispatch, {
@@ -19,7 +19,7 @@ export function createPlugin(dispatch) {
       richTextSlice: Slice.empty,
       selectedOption: ToolbarDropdownOption.None
     }),
-    view: function view(editorView) {
+    view: function view(_editorView) {
       return {
         update: function update(view, prevState) {
           return prevState;
@@ -28,8 +28,13 @@ export function createPlugin(dispatch) {
     },
     props: {
       handleDOMEvents: {
-        // Hide toolbar when clicked outside the editor
-        blur: checkAndHideToolbar,
+        blur: function blur(view) {
+          if (options !== null && options !== void 0 && options.useNewPasteMenu) {
+            return false;
+          }
+          checkAndHideToolbar(view);
+          return false;
+        },
         // Hide toolbar when clicked anywhere within the editor, tr.getMeta('pointer') does not work if clicked on the same line after pasting so relying on mousedown event
         mousedown: checkAndHideToolbar
       },

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

@@ -1,14 +1,12 @@
-import React, { useCallback, useMemo } from 'react';
-import { useIntl } from 'react-intl-next';
+import React, { useCallback } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
-import { EditorToolbarProvider } from '@atlaskit/editor-common/toolbar';
+import { EditorToolbarProvider, PASTE_MENU } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
-import { changeToMarkdownWithAnalytics, changeToPlainTextWithAnalytics, changeToRichTextWithAnalytics, hideToolbar, highlightContent } from '../../editor-commands/commands';
-import { ToolbarDropdownOption } from '../../types/types';
+import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
+import { hideToolbar, highlightContent } from '../../editor-commands/commands';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -31,28 +29,20 @@ function getPopupOffset(dom) {
   return [-(window.innerWidth - rightEdge - 50), 20];
 }
 export var PasteActionsMenu = function PasteActionsMenu(_ref) {
-  var _api$uiControlRegistr, _api$uiControlRegistr2;
+  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
   var api = _ref.api,
     editorView = _ref.editorView,
     mountTo = _ref.mountTo,
     boundariesElement = _ref.boundariesElement,
-    scrollableElement = _ref.scrollableElement,
-    editorAnalyticsAPI = _ref.editorAnalyticsAPI;
-  var intl = useIntl();
+    scrollableElement = _ref.scrollableElement;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], function (states) {
-      var _pluginState$showTool, _pluginState$isPlainT, _pluginState$selected, _pluginState$plaintex;
+      var _pluginState$showTool;
       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,
-        isPlainText: (_pluginState$isPlainT = pluginState === null || pluginState === void 0 ? void 0 : pluginState.isPlainText) !== null && _pluginState$isPlainT !== void 0 ? _pluginState$isPlainT : false,
-        selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : ToolbarDropdownOption.None,
-        plaintextLength: (_pluginState$plaintex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.plaintextLength) !== null && _pluginState$plaintex !== void 0 ? _pluginState$plaintex : 0
+        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
       };
     }),
-    showToolbar = _useSharedPluginState.showToolbar,
-    isPlainText = _useSharedPluginState.isPlainText,
-    selectedOption = _useSharedPluginState.selectedOption,
-    plaintextLength = _useSharedPluginState.plaintextLength;
+    showToolbar = _useSharedPluginState.showToolbar;
   var preventEditorFocusLoss = useCallback(function (e) {
     e.preventDefault();
   }, []);
@@ -62,42 +52,20 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
   var handleMouseEnter = useCallback(function () {
     highlightContent()(editorView.state, editorView.dispatch);
   }, [editorView]);
-  var handleRichText = useCallback(function (e) {
-    e.preventDefault();
-    changeToRichTextWithAnalytics(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI]);
-  var handleMarkdown = useCallback(function (e) {
-    e.preventDefault();
-    changeToMarkdownWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  var handlePlainText = useCallback(function (e) {
-    e.preventDefault();
-    changeToPlainTextWithAnalytics(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  var options = useMemo(function () {
-    var items = [];
-    if (!isPlainText) {
-      items.push({
-        id: 'editor.paste.richText',
-        label: intl.formatMessage(messages.richText),
-        selected: selectedOption === ToolbarDropdownOption.RichText,
-        onClick: handleRichText
-      });
+  var handleClickOutside = useCallback(function (evt) {
+    if (evt.target instanceof Element) {
+      var isInsideNestedDropdown = evt.target.closest('[data-toolbar-nested-dropdown-menu]');
+      if (isInsideNestedDropdown) {
+        return;
+      }
+    }
+    handleDismiss();
+  }, [handleDismiss]);
+  var handleSetIsOpen = useCallback(function (isOpen) {
+    if (!isOpen) {
+      handleDismiss();
     }
-    items.push({
-      id: 'editor.paste.markdown',
-      label: intl.formatMessage(messages.markdown),
-      selected: selectedOption === ToolbarDropdownOption.Markdown,
-      onClick: handleMarkdown
-    });
-    items.push({
-      id: 'editor.paste.plainText',
-      label: intl.formatMessage(messages.plainText),
-      selected: selectedOption === ToolbarDropdownOption.PlainText,
-      onClick: handlePlainText
-    });
-    return items;
-  }, [isPlainText, selectedOption, intl, handleRichText, handleMarkdown, handlePlainText]);
+  }, [handleDismiss]);
   if (!showToolbar) {
     return null;
   }
@@ -110,6 +78,7 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     key: 'ai-paste-menu'
   };
   var aiSurfaceComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(aiSurface.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+  var pasteSurfaceComponents = (_api$uiControlRegistr3 = api === null || api === 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 : [];
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -119,15 +88,18 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     zIndex: akEditorFloatingPanelZIndex,
     alignX: "right",
     alignY: "bottom",
-    handleClickOutside: handleDismiss,
+    handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView
+  }, /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, {
+    isOpen: showToolbar,
+    setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
-    options: options,
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
     aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents
-  })));
+    aiSurfaceComponents: aiSurfaceComponents,
+    pasteSurfaceComponents: pasteSurfaceComponents
+  }))));
 };

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

@@ -1,10 +1,4 @@
 
 ._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._18zrpxbi{padding-inline:var(--ds-space-200,1pc)}
-._1rjc1b66{padding-block:var(--ds-space-050,4px)}
-._1rjcu2gc{padding-block:var(--ds-space-100,8px)}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
-._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
-._bfhksm61{background-color:var(--ds-background-neutral-subtle,#00000000)}
-._k48pwu06{font-weight:var(--ds-font-weight-bold,653)}
-._syazi7uo{color:var(--ds-text,#292a2e)}
-._irr31dpa:hover{background-color:var(--ds-background-neutral-subtle-hovered,#0515240f)}
+._1rjc1b66{padding-block:var(--ds-space-050,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

@@ -2,21 +2,18 @@
 import "./PasteActionsMenuContent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext } from 'react';
-import { cx } from '@atlaskit/css';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
-import { Box, Pressable } from '@atlaskit/primitives/compiled';
+import { Box } from '@atlaskit/primitives/compiled';
 var styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s",
-  option: "_1rjcu2gc _18zrpxbi _syazi7uo _bfhksm61 _irr31dpa",
-  selectedOption: "_k48pwu06"
+  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
 };
 export var PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
-  var options = _ref.options,
-    onMouseDown = _ref.onMouseDown,
+  var onMouseDown = _ref.onMouseDown,
     onMouseEnter = _ref.onMouseEnter,
     aiSurface = _ref.aiSurface,
-    aiSurfaceComponents = _ref.aiSurfaceComponents;
+    aiSurfaceComponents = _ref.aiSurfaceComponents,
+    pasteSurfaceComponents = _ref.pasteSurfaceComponents;
   var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
   return /*#__PURE__*/React.createElement(Box, {
     ref: setOutsideClickTargetRef,
@@ -26,11 +23,11 @@ export var PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
   }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
     surface: aiSurface,
     components: aiSurfaceComponents
-  }), options.map(function (option) {
-    return /*#__PURE__*/React.createElement(Pressable, {
-      key: option.id,
-      xcss: cx(styles.option, option.selected && styles.selectedOption),
-      onClick: option.onClick
-    }, option.label);
+  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
+    surface: {
+      type: 'menu',
+      key: 'paste-menu'
+    },
+    components: pasteSurfaceComponents
   }));
 };