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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 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/pasteOptionsToolbarPlugin.js

@@ -14,6 +14,7 @@ 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; }
@@ -22,6 +23,13 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
   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 ((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
+    }));
+  }
   var getSharedState = function getSharedState(editorState) {
     var _pluginState$isPlainT, _pluginState$pasteEnd, _pluginState$pasteSta, _pluginState$plaintex, _pluginState$selected, _pluginState$showTool;
     if (!editorState) {
@@ -51,7 +59,9 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         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)
+          });
         }
       }];
     }
@@ -83,8 +93,7 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        editorAnalyticsAPI: editorAnalyticsAPI
+        scrollableElement: popupsScrollableElement
       });
     },
     usePluginHook: function usePluginHook(_ref4) {

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

@@ -11,7 +11,7 @@ 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, {
@@ -25,7 +25,7 @@ function createPlugin(dispatch) {
       richTextSlice: _model.Slice.empty,
       selectedOption: _types.ToolbarDropdownOption.None
     }),
-    view: function view(editorView) {
+    view: function view(_editorView) {
       return {
         update: function update(view, prevState) {
           return prevState;
@@ -34,8 +34,13 @@ function createPlugin(dispatch) {
     },
     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
       },

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

@@ -6,16 +6,14 @@ 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 _commands = require("../../editor-commands/commands");
-var _types = require("../../types/types");
 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);
@@ -39,28 +37,20 @@ function getPopupOffset(dom) {
   return [-(window.innerWidth - rightEdge - 50), 20];
 }
 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)();
+    scrollableElement = _ref.scrollableElement;
   var _useSharedPluginState = (0, _hooks.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 : _types.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 = (0, _react.useCallback)(function (e) {
     e.preventDefault();
   }, []);
@@ -70,42 +60,20 @@ 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]);
+  }, [handleDismiss]);
   if (!showToolbar) {
     return null;
   }
@@ -118,6 +86,7 @@ var PasteActionsMenu = exports.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(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
   return /*#__PURE__*/_react.default.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -127,15 +96,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: showToolbar,
+    setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/_react.default.createElement(_PasteActionsMenuContent.PasteActionsMenuContent, {
-    options: options,
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
     aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents
-  })));
+    aiSurfaceComponents: aiSurfaceComponents,
+    pasteSurfaceComponents: 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}

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/pasteOptionsToolbarPlugin.js

@@ -5,12 +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;
+  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
+    }));
+  }
   const getSharedState = editorState => {
     var _pluginState$isPlainT, _pluginState$pasteEnd, _pluginState$pasteSta, _pluginState$plaintex, _pluginState$selected, _pluginState$showTool;
     if (!editorState) {
@@ -40,7 +48,9 @@ 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) ? {
@@ -72,8 +82,7 @@ export const pasteOptionsToolbarPlugin = ({
         editorView: editorView,
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
-        scrollableElement: popupsScrollableElement,
-        editorAnalyticsAPI: editorAnalyticsAPI
+        scrollableElement: popupsScrollableElement
       });
     },
     usePluginHook({

package/dist/es2019/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(editorView) {
+    view(_editorView) {
       return {
         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: 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
       },