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

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 8.4.0
+
+### Minor Changes
+
+- [`8cb8a3e42b2c2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8cb8a3e42b2c2) -
+  [ux] EDITOR-5668 Introducing configurable visibility rules to determine which AI actions should
+  display in on-paste menu
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.3.0
+
+### Minor Changes
+
+- [`d7675f084fe05`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7675f084fe05) -
+  [ux] [EDITOR-5669] refactored existing paste actions menu to use control registry and platform
+  toolbars
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.2.4
 
 ### Patch Changes

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

@@ -11,6 +11,8 @@ var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _formatHandlers = require("../pm-plugins/util/format-handlers");
 var _types = require("../types/types");
 var showToolbar = exports.showToolbar = function showToolbar(lastContentPasted, selectedOption) {
+  var showLegacyOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var pasteAncestorNodeNames = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var commandAction = function commandAction(_editorState) {
     var _lastContentPasted$te;
     return {
@@ -21,7 +23,9 @@ var showToolbar = exports.showToolbar = function showToolbar(lastContentPasted,
         isPlainText: lastContentPasted.isPlainText,
         richTextSlice: lastContentPasted.pastedSlice,
         pasteStartPos: lastContentPasted.pasteStartPos,
-        pasteEndPos: lastContentPasted.pasteEndPos
+        pasteEndPos: lastContentPasted.pasteEndPos,
+        showLegacyOptions: showLegacyOptions,
+        pasteAncestorNodeNames: pasteAncestorNodeNames
       }
     };
   };

package/dist/cjs/pasteOptionsToolbarPlugin.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pasteOptionsToolbarPlugin = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -14,50 +12,59 @@ var _commands = require("./editor-commands/commands");
 var _main = require("./pm-plugins/main");
 var _types = require("./types/types");
 var _PasteActionsMenu = require("./ui/on-paste-actions-menu/PasteActionsMenu");
+var _PasteMenuComponents = require("./ui/on-paste-actions-menu/PasteMenuComponents");
 var _toolbar = require("./ui/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); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var pasteOptionsToolbarPlugin = exports.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;
-  var getSharedState = function 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: _types.ToolbarDropdownOption.None,
-        showToolbar: false
-      };
-    }
-    var pluginState = _types.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 : _types.ToolbarDropdownOption.None,
-      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false
-    };
-  };
-  return _objectSpread(_objectSpread({
+  if ((0, _expValEquals.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((0, _PasteMenuComponents.getPasteMenuComponents)({
+      api: api,
+      editorAnalyticsAPI: editorAnalyticsAPI
+    }));
+  }
+  return {
     name: 'pasteOptionsToolbarPlugin',
     pmPlugins: function pmPlugins() {
       return [{
         name: 'pasteOptionsToolbarPlugin',
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch;
-          return (0, _main.createPlugin)(dispatch);
+          return (0, _main.createPlugin)(dispatch, {
+            useNewPasteMenu: (0, _expValEquals.expValEquals)('platform_editor_paste_actions_menu', 'isEnabled', true)
+          });
         }
       }];
-    }
-  }, (0, _expValEquals.expValEquals)('platform_editor_paste_actions_menu', 'isEnabled', true) ? {
-    getSharedState: getSharedState
-  } : {}), {}, {
+    },
+    getSharedState: function 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: _types.ToolbarDropdownOption.None,
+          showLegacyOptions: false,
+          showToolbar: false
+        };
+      }
+      var pluginState = _types.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 : _types.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: function floatingToolbar(state, intl) {
         if ((0, _expValEquals.expValEquals)('platform_editor_paste_actions_menu', 'isEnabled', true)) {
@@ -83,8 +90,7 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        editorAnalyticsAPI: editorAnalyticsAPI
+        scrollableElement: popupsScrollableElement
       });
     },
     usePluginHook: function usePluginHook(_ref4) {
@@ -97,6 +103,9 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         }),
         lastContentPasted = _useSharedPluginState.lastContentPasted;
       (0, _react.useEffect)(function () {
+        if ((0, _expValEquals.expValEquals)('platform_editor_paste_actions_menu', 'isEnabled', true)) {
+          return;
+        }
         if (!lastContentPasted) {
           (0, _commands.hideToolbar)()(editorView.state, editorView.dispatch);
           return;
@@ -115,5 +124,5 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         (0, _commands.showToolbar)(lastContentPasted, selectedOption)(editorView.state, editorView.dispatch);
       }, [lastContentPasted, editorView]);
     }
-  });
+  };
 };

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

@@ -6,36 +6,43 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = createPlugin;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _view = require("@atlaskit/editor-prosemirror/view");
+var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _commands = require("../editor-commands/commands");
 var _types = require("../types/types");
 var _constants = require("./constants");
 var _pluginFactory = require("./plugin-factory");
-function createPlugin(dispatch) {
+function createPlugin(dispatch, options) {
   return new _safePlugin.SafePlugin({
     key: _types.pasteOptionsPluginKey,
     state: (0, _pluginFactory.createPluginState)(dispatch, {
       showToolbar: false,
+      showLegacyOptions: false,
+      pasteAncestorNodeNames: [],
       pasteStartPos: 0,
       pasteEndPos: 0,
       plaintext: '',
       isPlainText: false,
       highlightContent: false,
-      highlightDecorationSet: _view.DecorationSet.empty,
+      highlightDecorationSet: _view2.DecorationSet.empty,
       richTextSlice: _model.Slice.empty,
       selectedOption: _types.ToolbarDropdownOption.None
     }),
-    view: function view(editorView) {
+    view: function view(_editorView) {
       return {
-        update: function update(view, prevState) {
+        update: function update(_view, prevState) {
           return prevState;
         }
       };
     },
     props: {
       handleDOMEvents: {
-        // Hide toolbar when clicked outside the editor
-        blur: _commands.checkAndHideToolbar,
+        blur: function blur(view) {
+          if (options !== null && options !== void 0 && options.useNewPasteMenu) {
+            return false;
+          }
+          (0, _commands.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: _commands.checkAndHideToolbar
       },
@@ -48,13 +55,13 @@ function createPlugin(dispatch) {
         var _ref = _types.pasteOptionsPluginKey.getState(state) || {},
           highlightContent = _ref.highlightContent,
           pasteStartPos = _ref.pasteStartPos;
-        var decorationSet = (_pasteOptionsPluginKe = (_pasteOptionsPluginKe2 = _types.pasteOptionsPluginKey.getState(state)) === null || _pasteOptionsPluginKe2 === void 0 ? void 0 : _pasteOptionsPluginKe2.highlightDecorationSet) !== null && _pasteOptionsPluginKe !== void 0 ? _pasteOptionsPluginKe : _view.DecorationSet.empty;
+        var decorationSet = (_pasteOptionsPluginKe = (_pasteOptionsPluginKe2 = _types.pasteOptionsPluginKey.getState(state)) === null || _pasteOptionsPluginKe2 === void 0 ? void 0 : _pasteOptionsPluginKe2.highlightDecorationSet) !== null && _pasteOptionsPluginKe !== void 0 ? _pasteOptionsPluginKe : _view2.DecorationSet.empty;
         if (!highlightContent) {
           return decorationSet;
         }
         var selection = state.tr.selection;
         var pasteEndPos = selection.$anchor.pos;
-        var highlightDecoration = _view.Decoration.inline(pasteStartPos, pasteEndPos, {
+        var highlightDecoration = _view2.Decoration.inline(pasteStartPos, pasteEndPos, {
           class: _constants.TEXT_HIGHLIGHT_CLASS
         }, {
           key: _constants.PASTE_HIGHLIGHT_DECORATION_KEY

package/dist/cjs/pm-plugins/reducer.js

@@ -15,6 +15,8 @@ var reducer = exports.reducer = function reducer(state, action) {
       {
         return _objectSpread(_objectSpread({}, state), {}, {
           showToolbar: true,
+          showLegacyOptions: action.data.showLegacyOptions,
+          pasteAncestorNodeNames: action.data.pasteAncestorNodeNames,
           highlightContent: false,
           isPlainText: action.data.isPlainText,
           plaintext: action.data.plaintext,

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

@@ -6,16 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PasteActionsMenu = void 0;
 var _react = _interopRequireWildcard(require("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 _ui = require("@atlaskit/editor-common/ui");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _editorUiControlModel = require("@atlaskit/editor-ui-control-model");
 var _commands = require("../../editor-commands/commands");
 var _types = require("../../types/types");
+var _toolbar2 = require("../toolbar");
 var _PasteActionsMenuContent = require("./PasteActionsMenuContent");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
@@ -38,29 +39,63 @@ function getPopupOffset(dom) {
   var 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).
+ */
+var hasVisibleComponent = function hasVisibleComponent(components) {
+  var childrenMap = (0, _editorUiControlModel.buildChildrenMap)(components);
+  return components.some(function (c) {
+    return (0, _editorUiControlModel.willComponentRender)(c, childrenMap);
+  });
+};
 var PasteActionsMenu = exports.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 = (0, _reactIntlNext.useIntl)();
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['pasteOptionsToolbarPlugin'], function (states) {
-      var _pluginState$showTool, _pluginState$isPlainT, _pluginState$selected, _pluginState$plaintex;
+    scrollableElement = _ref.scrollableElement;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['paste'], function (states) {
+      var _states$pasteState;
+      return {
+        lastContentPasted: (_states$pasteState = states.pasteState) === null || _states$pasteState === void 0 ? void 0 : _states$pasteState.lastContentPasted
+      };
+    }),
+    lastContentPasted = _useSharedPluginState.lastContentPasted;
+  (0, _react.useEffect)(function () {
+    if (!lastContentPasted) {
+      (0, _commands.hideToolbar)()(editorView.state, editorView.dispatch);
+      return;
+    }
+    var selectedOption = _types.ToolbarDropdownOption.None;
+    if (!lastContentPasted.isPlainText) {
+      selectedOption = _types.ToolbarDropdownOption.RichText;
+    } else if (lastContentPasted.isShiftPressed) {
+      selectedOption = _types.ToolbarDropdownOption.PlainText;
+    } else {
+      selectedOption = _types.ToolbarDropdownOption.Markdown;
+    }
+    var $pos = editorView.state.doc.resolve(lastContentPasted.pasteStartPos);
+    var pasteAncestorNodeNames = [];
+    for (var depth = $pos.depth; depth > 0; depth--) {
+      pasteAncestorNodeNames.push($pos.node(depth).type.name);
+    }
+    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) {
+      var _pluginState$showTool, _pluginState$showLega;
       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 : _types.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
       };
     }),
-    showToolbar = _useSharedPluginState.showToolbar,
-    isPlainText = _useSharedPluginState.isPlainText,
-    selectedOption = _useSharedPluginState.selectedOption,
-    plaintextLength = _useSharedPluginState.plaintextLength;
+    isToolbarShown = _useSharedPluginState2.showToolbar,
+    showLegacyOptions = _useSharedPluginState2.showLegacyOptions;
   var preventEditorFocusLoss = (0, _react.useCallback)(function (e) {
     e.preventDefault();
   }, []);
@@ -70,54 +105,37 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   var handleMouseEnter = (0, _react.useCallback)(function () {
     (0, _commands.highlightContent)()(editorView.state, editorView.dispatch);
   }, [editorView]);
-  var handleRichText = (0, _react.useCallback)(function (e) {
-    e.preventDefault();
-    (0, _commands.changeToRichTextWithAnalytics)(editorAnalyticsAPI)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI]);
-  var handleMarkdown = (0, _react.useCallback)(function (e) {
-    e.preventDefault();
-    (0, _commands.changeToMarkdownWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  var handlePlainText = (0, _react.useCallback)(function (e) {
-    e.preventDefault();
-    (0, _commands.changeToPlainTextWithAnalytics)(editorAnalyticsAPI, plaintextLength)()(editorView.state, editorView.dispatch);
-  }, [editorView, editorAnalyticsAPI, plaintextLength]);
-  var options = (0, _react.useMemo)(function () {
-    var items = [];
-    if (!isPlainText) {
-      items.push({
-        id: 'editor.paste.richText',
-        label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.richText),
-        selected: selectedOption === _types.ToolbarDropdownOption.RichText,
-        onClick: handleRichText
-      });
+  var handleClickOutside = (0, _react.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 = (0, _react.useCallback)(function (isOpen) {
+    if (!isOpen) {
+      handleDismiss();
     }
-    items.push({
-      id: 'editor.paste.markdown',
-      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.markdown),
-      selected: selectedOption === _types.ToolbarDropdownOption.Markdown,
-      onClick: handleMarkdown
-    });
-    items.push({
-      id: 'editor.paste.plainText',
-      label: intl.formatMessage(_messages.pasteOptionsToolbarMessages.plainText),
-      selected: selectedOption === _types.ToolbarDropdownOption.PlainText,
-      onClick: handlePlainText
-    });
-    return items;
-  }, [isPlainText, selectedOption, intl, handleRichText, handleMarkdown, handlePlainText]);
-  if (!showToolbar) {
+  }, [handleDismiss]);
+  var aiSurface = {
+    type: 'menu',
+    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(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
+  var anyAiComponentVisible = hasVisibleComponent(aiSurfaceComponents);
+  if (!isToolbarShown) {
+    return null;
+  }
+  if (!showLegacyOptions && !anyAiComponentVisible) {
     return null;
   }
   var target = getTargetElement(editorView);
   if (!target) {
     return null;
   }
-  var aiSurface = {
-    type: 'menu',
-    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 : [];
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -127,15 +145,18 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex,
     alignX: "right",
     alignY: "bottom",
-    handleClickOutside: handleDismiss,
+    handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleDismiss
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView
+  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenuProvider, {
+    isOpen: isToolbarShown,
+    setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/_react.default.createElement(_PasteActionsMenuContent.PasteActionsMenuContent, {
-    options: options,
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
     aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents
-  })));
+    aiSurfaceComponents: aiSurfaceComponents,
+    pasteSurfaceComponents: showLegacyOptions ? pasteSurfaceComponents : []
+  }))));
 };

package/dist/cjs/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/cjs/ui/on-paste-actions-menu/PasteActionsMenuContent.js

@@ -9,22 +9,19 @@ exports.PasteActionsMenuContent = void 0;
 require("./PasteActionsMenuContent.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
-var _css = require("@atlaskit/css");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorUiControlModel = require("@atlaskit/editor-ui-control-model");
 var _compiled = require("@atlaskit/primitives/compiled");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var styles = {
-  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s",
-  option: "_1rjcu2gc _18zrpxbi _syazi7uo _bfhksm61 _irr31dpa",
-  selectedOption: "_k48pwu06"
+  container: "_2rko12b0 _1rjc1b66 _bfhk1bhr _16qs130s"
 };
 var PasteActionsMenuContent = exports.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 = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     ref: setOutsideClickTargetRef,
@@ -34,11 +31,11 @@ var PasteActionsMenuContent = exports.PasteActionsMenuContent = function PasteAc
   }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
     surface: aiSurface,
     components: aiSurfaceComponents
-  }), options.map(function (option) {
-    return /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
-      key: option.id,
-      xcss: (0, _css.cx)(styles.option, option.selected && styles.selectedOption),
-      onClick: option.onClick
-    }, option.label);
+  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
+    surface: {
+      type: 'menu',
+      key: 'paste-menu'
+    },
+    components: pasteSurfaceComponents
   }));
 };

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

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