@atlaskit/editor-plugin-paste-options-toolbar 8.2.4 → 8.4.0

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

@@ -0,0 +1,205 @@
+/* PasteMenuComponents.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.isPasteOptionSelected = exports.getPasteMenuComponents = void 0;
+require("./PasteMenuComponents.compiled.css");
+var _runtime = require("@compiled/react/runtime");
+var _react = _interopRequireWildcard(require("react"));
+var _react2 = require("@compiled/react");
+var _reactIntlNext = require("react-intl-next");
+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 _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");
+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"
+};
+var isPasteOptionSelected = exports.isPasteOptionSelected = function isPasteOptionSelected(pasteType, selectedOption) {
+  switch (pasteType) {
+    case 'rich-text':
+      return selectedOption === _types.ToolbarDropdownOption.RichText;
+    case 'markdown':
+      return selectedOption === _types.ToolbarDropdownOption.Markdown;
+    case 'plain-text':
+      return selectedOption === _types.ToolbarDropdownOption.PlainText;
+    default:
+      return false;
+  }
+};
+var PasteMenuItem = function PasteMenuItem(_ref) {
+  var api = _ref.api,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    pasteType = _ref.pasteType;
+  var intl = (0, _reactIntlNext.useIntl)();
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorView = _useEditorToolbar.editorView;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['pasteOptionsToolbarPlugin'], function (states) {
+      var _pluginState$selected, _pluginState$plaintex, _pluginState$isPlainT;
+      var pluginState = states.pasteOptionsToolbarPluginState;
+      return {
+        selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : _types.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
+      };
+    }),
+    selectedOption = _useSharedPluginState.selectedOption,
+    plaintextLength = _useSharedPluginState.plaintextLength,
+    isPlainText = _useSharedPluginState.isPlainText;
+  var getDefaultLabel = (0, _react.useCallback)(function (type) {
+    switch (type) {
+      case 'rich-text':
+        return intl.formatMessage(_messages.pasteOptionsToolbarMessages.richTextAction);
+      case 'markdown':
+        return intl.formatMessage(_messages.pasteOptionsToolbarMessages.markdownAction);
+      case 'plain-text':
+        return intl.formatMessage(_messages.pasteOptionsToolbarMessages.plainTextAction);
+      default:
+        return type;
+    }
+  }, [intl]);
+  var handleClick = (0, _react.useCallback)(function (e) {
+    e.preventDefault();
+    if (!editorView) {
+      return;
+    }
+    switch (pasteType) {
+      case 'rich-text':
+        (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
+        break;
+      case 'markdown':
+        (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        break;
+      case 'plain-text':
+        (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
+        break;
+    }
+  }, [editorView, editorAnalyticsAPI, plaintextLength, pasteType]);
+  if (pasteType === 'rich-text' && isPlainText) {
+    return null;
+  }
+  var displayLabel = getDefaultLabel(pasteType);
+  var isSelected = isPasteOptionSelected(pasteType, selectedOption);
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    onClick: handleClick,
+    isSelected: isSelected,
+    testId: "paste-".concat(pasteType, "-menu-item"),
+    hasNestedDropdownMenu: true
+  }, displayLabel);
+};
+var PasteOptionsNestedMenu = function PasteOptionsNestedMenu(_ref2) {
+  var children = _ref2.children;
+  var intl = (0, _reactIntlNext.useIntl)();
+  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_clipboard.default, {
+      size: "small",
+      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+    }),
+    elemAfter: /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
+      size: "small",
+      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+    }),
+    testId: "paste-options-nested-menu",
+    text: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteOptions)
+  }, children);
+};
+var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
+  var api = _ref3.api,
+    editorAnalyticsAPI = _ref3.editorAnalyticsAPI;
+  return [{
+    type: _toolbar.PASTE_MENU.type,
+    key: _toolbar.PASTE_MENU.key
+  }, {
+    type: _toolbar.PASTE_MENU_SECTION.type,
+    key: _toolbar.PASTE_MENU_SECTION.key,
+    parents: [{
+      type: _toolbar.PASTE_MENU.type,
+      key: _toolbar.PASTE_MENU.key,
+      rank: _toolbar.PASTE_MENU_RANK[_toolbar.PASTE_MENU_SECTION.key]
+    }],
+    component: function component(props) {
+      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+        hasSeparator: true
+      }, props.children);
+    }
+  }, {
+    type: _toolbar.PASTE_NESTED_MENU.type,
+    key: _toolbar.PASTE_NESTED_MENU.key,
+    parents: [{
+      type: _toolbar.PASTE_MENU_SECTION.type,
+      key: _toolbar.PASTE_MENU_SECTION.key,
+      rank: _toolbar.PASTE_MENU_SECTION_RANK[_toolbar.PASTE_NESTED_MENU.key]
+    }],
+    component: function component(props) {
+      return /*#__PURE__*/_react.default.createElement(PasteOptionsNestedMenu, null, props.children);
+    }
+  }, {
+    type: _toolbar.PASTE_MENU_NESTED_SECTION.type,
+    key: _toolbar.PASTE_MENU_NESTED_SECTION.key,
+    parents: [{
+      type: _toolbar.PASTE_NESTED_MENU.type,
+      key: _toolbar.PASTE_NESTED_MENU.key,
+      rank: _toolbar.PASTE_NESTED_MENU_RANK[_toolbar.PASTE_MENU_NESTED_SECTION.key]
+    }],
+    component: function component(props) {
+      return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
+        xcss: (0, _react2.cx)(nestedMenuStyles.narrowSection)
+      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, props.children));
+    }
+  }, {
+    key: _toolbar.PASTE_RICH_TEXT_MENU_ITEM.key,
+    type: _toolbar.PASTE_RICH_TEXT_MENU_ITEM.type,
+    component: function component() {
+      return /*#__PURE__*/_react.default.createElement(PasteMenuItem, {
+        api: api,
+        editorAnalyticsAPI: editorAnalyticsAPI,
+        pasteType: "rich-text"
+      });
+    },
+    parents: [{
+      key: _toolbar.PASTE_MENU_NESTED_SECTION.key,
+      type: _toolbar.PASTE_MENU_NESTED_SECTION.type,
+      rank: _toolbar.PASTE_MENU_NESTED_SECTION_RANK[_toolbar.PASTE_RICH_TEXT_MENU_ITEM.key]
+    }]
+  }, {
+    key: _toolbar.PASTE_MARKDOWN_MENU_ITEM.key,
+    type: _toolbar.PASTE_MARKDOWN_MENU_ITEM.type,
+    component: function component() {
+      return /*#__PURE__*/_react.default.createElement(PasteMenuItem, {
+        api: api,
+        editorAnalyticsAPI: editorAnalyticsAPI,
+        pasteType: "markdown"
+      });
+    },
+    parents: [{
+      key: _toolbar.PASTE_MENU_NESTED_SECTION.key,
+      type: _toolbar.PASTE_MENU_NESTED_SECTION.type,
+      rank: _toolbar.PASTE_MENU_NESTED_SECTION_RANK[_toolbar.PASTE_MARKDOWN_MENU_ITEM.key]
+    }]
+  }, {
+    key: _toolbar.PASTE_PLAIN_TEXT_MENU_ITEM.key,
+    type: _toolbar.PASTE_PLAIN_TEXT_MENU_ITEM.type,
+    component: function component() {
+      return /*#__PURE__*/_react.default.createElement(PasteMenuItem, {
+        api: api,
+        editorAnalyticsAPI: editorAnalyticsAPI,
+        pasteType: "plain-text"
+      });
+    },
+    parents: [{
+      key: _toolbar.PASTE_MENU_NESTED_SECTION.key,
+      type: _toolbar.PASTE_MENU_NESTED_SECTION.type,
+      rank: _toolbar.PASTE_MENU_NESTED_SECTION_RANK[_toolbar.PASTE_PLAIN_TEXT_MENU_ITEM.key]
+    }]
+  }];
+};

package/dist/es2019/editor-commands/commands.js

@@ -4,7 +4,7 @@ import { PastePluginActionTypes as ActionTypes } from '../editor-actions/actions
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { formatMarkdown, formatPlainText, formatRichText } from '../pm-plugins/util/format-handlers';
 import { pasteOptionsPluginKey, ToolbarDropdownOption } from '../types/types';
-export const showToolbar = (lastContentPasted, selectedOption) => {
+export const showToolbar = (lastContentPasted, selectedOption, showLegacyOptions = true, pasteAncestorNodeNames = []) => {
   const commandAction = _editorState => {
     var _lastContentPasted$te;
     return {
@@ -15,7 +15,9 @@ export const showToolbar = (lastContentPasted, selectedOption) => {
         isPlainText: lastContentPasted.isPlainText,
         richTextSlice: lastContentPasted.pastedSlice,
         pasteStartPos: lastContentPasted.pasteStartPos,
-        pasteEndPos: lastContentPasted.pasteEndPos
+        pasteEndPos: lastContentPasted.pasteEndPos,
+        showLegacyOptions,
+        pasteAncestorNodeNames
       }
     };
   };

package/dist/es2019/pasteOptionsToolbarPlugin.js

@@ -5,34 +5,20 @@ 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 const pasteOptionsToolbarPlugin = ({
   api
 }) => {
   var _api$analytics;
   const editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
-  const getSharedState = editorState => {
-    var _pluginState$isPlainT, _pluginState$pasteEnd, _pluginState$pasteSta, _pluginState$plaintex, _pluginState$selected, _pluginState$showTool;
-    if (!editorState) {
-      return {
-        isPlainText: false,
-        pasteEndPos: 0,
-        pasteStartPos: 0,
-        plaintextLength: 0,
-        selectedOption: ToolbarDropdownOption.None,
-        showToolbar: false
-      };
-    }
-    const pluginState = pasteOptionsPluginKey.getState(editorState);
-    return {
-      isPlainText: (_pluginState$isPlainT = pluginState === null || pluginState === void 0 ? void 0 : pluginState.isPlainText) !== null && _pluginState$isPlainT !== void 0 ? _pluginState$isPlainT : false,
-      pasteEndPos: (_pluginState$pasteEnd = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteEndPos) !== null && _pluginState$pasteEnd !== void 0 ? _pluginState$pasteEnd : 0,
-      pasteStartPos: (_pluginState$pasteSta = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteStartPos) !== null && _pluginState$pasteSta !== void 0 ? _pluginState$pasteSta : 0,
-      plaintextLength: (_pluginState$plaintex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.plaintext.length) !== null && _pluginState$plaintex !== void 0 ? _pluginState$plaintex : 0,
-      selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : ToolbarDropdownOption.None,
-      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
-    };
-  };
+  if (expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)) {
+    var _api$uiControlRegistr;
+    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getPasteMenuComponents({
+      api,
+      editorAnalyticsAPI
+    }));
+  }
   return {
     name: 'pasteOptionsToolbarPlugin',
     pmPlugins() {
@@ -40,12 +26,37 @@ export const pasteOptionsToolbarPlugin = ({
         name: 'pasteOptionsToolbarPlugin',
         plugin: ({
           dispatch
-        }) => createPlugin(dispatch)
+        }) => createPlugin(dispatch, {
+          useNewPasteMenu: expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)
+        })
       }];
     },
-    ...(expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true) ? {
-      getSharedState
-    } : {}),
+    getSharedState(editorState) {
+      var _pluginState$isPlainT, _pluginState$pasteAnc, _pluginState$pasteEnd, _pluginState$pasteSta, _pluginState$plaintex, _pluginState$selected, _pluginState$showLega, _pluginState$showTool;
+      if (!editorState) {
+        return {
+          isPlainText: false,
+          pasteAncestorNodeNames: [],
+          pasteEndPos: 0,
+          pasteStartPos: 0,
+          plaintextLength: 0,
+          selectedOption: ToolbarDropdownOption.None,
+          showLegacyOptions: false,
+          showToolbar: false
+        };
+      }
+      const pluginState = pasteOptionsPluginKey.getState(editorState);
+      return {
+        isPlainText: (_pluginState$isPlainT = pluginState === null || pluginState === void 0 ? void 0 : pluginState.isPlainText) !== null && _pluginState$isPlainT !== void 0 ? _pluginState$isPlainT : false,
+        pasteAncestorNodeNames: (_pluginState$pasteAnc = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteAncestorNodeNames) !== null && _pluginState$pasteAnc !== void 0 ? _pluginState$pasteAnc : [],
+        pasteEndPos: (_pluginState$pasteEnd = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteEndPos) !== null && _pluginState$pasteEnd !== void 0 ? _pluginState$pasteEnd : 0,
+        pasteStartPos: (_pluginState$pasteSta = pluginState === null || pluginState === void 0 ? void 0 : pluginState.pasteStartPos) !== null && _pluginState$pasteSta !== void 0 ? _pluginState$pasteSta : 0,
+        plaintextLength: (_pluginState$plaintex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.plaintext.length) !== null && _pluginState$plaintex !== void 0 ? _pluginState$plaintex : 0,
+        selectedOption: (_pluginState$selected = pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectedOption) !== null && _pluginState$selected !== void 0 ? _pluginState$selected : ToolbarDropdownOption.None,
+        showLegacyOptions: (_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false,
+        showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
+      };
+    },
     pluginsOptions: {
       floatingToolbar(state, intl) {
         if (expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)) {
@@ -72,8 +83,7 @@ export const pasteOptionsToolbarPlugin = ({
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        editorAnalyticsAPI: editorAnalyticsAPI
+        scrollableElement: popupsScrollableElement
       });
     },
     usePluginHook({
@@ -88,6 +98,9 @@ export const pasteOptionsToolbarPlugin = ({
         };
       });
       useEffect(() => {
+        if (expValEquals('platform_editor_paste_actions_menu', 'isEnabled', true)) {
+          return;
+        }
         if (!lastContentPasted) {
           hideToolbar()(editorView.state, editorView.dispatch);
           return;

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

@@ -5,11 +5,13 @@ 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, {
       showToolbar: false,
+      showLegacyOptions: false,
+      pasteAncestorNodeNames: [],
       pasteStartPos: 0,
       pasteEndPos: 0,
       plaintext: '',
@@ -19,17 +21,22 @@ export function createPlugin(dispatch) {
       richTextSlice: Slice.empty,
       selectedOption: ToolbarDropdownOption.None
     }),
-    view(editorView) {
+    view(_editorView) {
       return {
-        update(view, prevState) {
+        update(_view, prevState) {
           return prevState;
         }
       };
     },
     props: {
       handleDOMEvents: {
-        // Hide toolbar when clicked outside the editor
-        blur: checkAndHideToolbar,
+        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/es2019/pm-plugins/reducer.js

@@ -6,6 +6,8 @@ export const reducer = (state, action) => {
         return {
           ...state,
           showToolbar: true,
+          showLegacyOptions: action.data.showLegacyOptions,
+          pasteAncestorNodeNames: action.data.pasteAncestorNodeNames,
           highlightContent: false,
           isPlainText: action.data.isPlainText,
           plaintext: action.data.plaintext,

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

@@ -1,14 +1,15 @@
-import React, { useCallback, useMemo } from 'react';
-import { useIntl } from 'react-intl-next';
+import React, { useCallback, useEffect } 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 { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
+import { buildChildrenMap, willComponentRender } from '@atlaskit/editor-ui-control-model';
+import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
 import { ToolbarDropdownOption } from '../../types/types';
+import { isToolbarVisible } from '../toolbar';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -32,29 +33,62 @@ function getPopupOffset(dom) {
   const rightEdge = dom.getBoundingClientRect().right;
   return [-(window.innerWidth - rightEdge - 50), 20];
 }
+
+/**
+ * Returns true when at least one component in the given list would produce
+ * visible output (i.e. is not hidden and, for containers, has at least one
+ * visible descendant).
+ */
+const hasVisibleComponent = components => {
+  const childrenMap = buildChildrenMap(components);
+  return components.some(c => willComponentRender(c, childrenMap));
+};
 export const PasteActionsMenu = ({
   api,
   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
+    lastContentPasted
+  } = useSharedPluginStateWithSelector(api, ['paste'], states => {
+    var _states$pasteState;
+    return {
+      lastContentPasted: (_states$pasteState = states.pasteState) === null || _states$pasteState === void 0 ? void 0 : _states$pasteState.lastContentPasted
+    };
+  });
+  useEffect(() => {
+    if (!lastContentPasted) {
+      hideToolbar()(editorView.state, editorView.dispatch);
+      return;
+    }
+    let selectedOption = ToolbarDropdownOption.None;
+    if (!lastContentPasted.isPlainText) {
+      selectedOption = ToolbarDropdownOption.RichText;
+    } else if (lastContentPasted.isShiftPressed) {
+      selectedOption = ToolbarDropdownOption.PlainText;
+    } else {
+      selectedOption = ToolbarDropdownOption.Markdown;
+    }
+    const $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
+    const pasteAncestorNodeNames = [];
+    for (let depth = $pos.depth; depth > 0; depth--) {
+      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+    }
+    const legacyVisible = isToolbarVisible(editorView.state, lastContentPasted);
+    showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
+  }, [lastContentPasted, editorView]);
+  const {
+    showToolbar: isToolbarShown,
+    showLegacyOptions
   } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
-    var _pluginState$showTool, _pluginState$isPlainT, _pluginState$selected, _pluginState$plaintex;
+    var _pluginState$showTool, _pluginState$showLega;
     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
+      showLegacyOptions: (_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false
     };
   });
   const preventEditorFocusLoss = useCallback(e => {
@@ -66,54 +100,37 @@ 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]);
-  if (!showToolbar) {
+  }, [handleDismiss]);
+  const aiSurface = {
+    type: 'menu',
+    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 : [];
+  const anyAiComponentVisible = hasVisibleComponent(aiSurfaceComponents);
+  if (!isToolbarShown) {
+    return null;
+  }
+  if (!showLegacyOptions && !anyAiComponentVisible) {
     return null;
   }
   const target = getTargetElement(editorView);
   if (!target) {
     return null;
   }
-  const aiSurface = {
-    type: 'menu',
-    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 : [];
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -123,15 +140,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: isToolbarShown,
+    setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
-    options: options,
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
     aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents
-  })));
+    aiSurfaceComponents: aiSurfaceComponents,
+    pasteSurfaceComponents: showLegacyOptions ? 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}