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

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-paste-options-toolbar
 
+## 8.4.1
+
+### Patch Changes
+
+- [`1a9b3a0f8a1c1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1a9b3a0f8a1c1) -
+  [ux] EDITOR-5892 Refactor Paste actions menu to use a single ui controls registry entry and single
+  SurfaceRenderer. Tweaked visibility rules and increased test coverage.
+- Updated dependencies
+
+## 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

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");
@@ -17,8 +15,6 @@ 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;
@@ -30,29 +26,7 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
       editorAnalyticsAPI: editorAnalyticsAPI
     }));
   }
-  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({
+  return {
     name: 'pasteOptionsToolbarPlugin',
     pmPlugins: function pmPlugins() {
       return [{
@@ -64,10 +38,33 @@ var pasteOptionsToolbarPlugin = exports.pasteOptionsToolbarPlugin = function pas
           });
         }
       }];
-    }
-  }, (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)) {
@@ -106,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;
@@ -124,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,7 +6,7 @@ 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");
@@ -16,18 +16,20 @@ function createPlugin(dispatch, options) {
     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) {
       return {
-        update: function update(view, prevState) {
+        update: function update(_view, prevState) {
           return prevState;
         }
       };
@@ -53,13 +55,13 @@ function createPlugin(dispatch, options) {
         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

@@ -14,6 +14,9 @@ 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 _toolbar2 = require("../toolbar");
+var _hasVisibleButton = require("./hasVisibleButton");
 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);
@@ -37,20 +40,48 @@ function getPopupOffset(dom) {
   return [-(window.innerWidth - rightEdge - 50), 20];
 }
 var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref) {
-  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
   var api = _ref.api,
     editorView = _ref.editorView,
     mountTo = _ref.mountTo,
     boundariesElement = _ref.boundariesElement,
     scrollableElement = _ref.scrollableElement;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['pasteOptionsToolbarPlugin'], function (states) {
+  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;
       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
       };
     }),
-    showToolbar = _useSharedPluginState.showToolbar;
+    isToolbarShown = _useSharedPluginState2.showToolbar;
   var preventEditorFocusLoss = (0, _react.useCallback)(function (e) {
     e.preventDefault();
   }, []);
@@ -74,19 +105,18 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
       handleDismiss();
     }
   }, [handleDismiss]);
-  if (!showToolbar) {
+  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_toolbar.PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+  var anyComponentVisible = (0, _hasVisibleButton.hasVisibleButton)(pasteMenuComponents);
+  if (!isToolbarShown) {
+    return null;
+  }
+  if (!anyComponentVisible) {
     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 : [];
-  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,
@@ -101,13 +131,11 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenuProvider, {
-    isOpen: showToolbar,
+    isOpen: isToolbarShown,
     setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/_react.default.createElement(_PasteActionsMenuContent.PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents,
-    pasteSurfaceComponents: pasteSurfaceComponents
+    components: pasteMenuComponents
   }))));
 };

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

@@ -9,7 +9,10 @@ exports.PasteActionsMenuContent = void 0;
 require("./PasteActionsMenuContent.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _messages = require("@atlaskit/editor-common/messages");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
+var _editorToolbar = require("@atlaskit/editor-toolbar");
 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); }
@@ -19,23 +22,21 @@ var styles = {
 var PasteActionsMenuContent = exports.PasteActionsMenuContent = function PasteActionsMenuContent(_ref) {
   var onMouseDown = _ref.onMouseDown,
     onMouseEnter = _ref.onMouseEnter,
-    aiSurface = _ref.aiSurface,
-    aiSurfaceComponents = _ref.aiSurfaceComponents,
-    pasteSurfaceComponents = _ref.pasteSurfaceComponents;
+    components = _ref.components;
   var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
+  var intl = (0, _reactIntlNext.useIntl)();
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     ref: setOutsideClickTargetRef,
     xcss: styles.container,
     onMouseDown: onMouseDown,
     onMouseEnter: onMouseEnter
-  }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
-    surface: aiSurface,
-    components: aiSurfaceComponents
-  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
+  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+    title: intl.formatMessage(_messages.pasteOptionsToolbarMessages.pasteMenuActionsTitle)
+  }, /*#__PURE__*/_react.default.createElement(_editorUiControlModel.SurfaceRenderer, {
     surface: {
       type: 'menu',
       key: 'paste-menu'
     },
-    components: pasteSurfaceComponents
-  }));
+    components: components
+  })));
 };

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

@@ -127,6 +127,11 @@ var getPasteMenuComponents = exports.getPasteMenuComponents = function getPasteM
       key: _toolbar.PASTE_MENU.key,
       rank: _toolbar.PASTE_MENU_RANK[_toolbar.PASTE_MENU_SECTION.key]
     }],
+    isHidden: function isHidden() {
+      var _api$pasteOptionsTool, _pluginState$showLega;
+      var pluginState = api === null || api === void 0 || (_api$pasteOptionsTool = api.pasteOptionsToolbarPlugin) === null || _api$pasteOptionsTool === void 0 ? void 0 : _api$pasteOptionsTool.sharedState.currentState();
+      return !((_pluginState$showLega = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showLegacyOptions) !== null && _pluginState$showLega !== void 0 ? _pluginState$showLega : false);
+    },
     component: function component(props) {
       return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
         hasSeparator: true

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

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasVisibleButton = void 0;
+var _isComponentOrAncestorHidden = function isComponentOrAncestorHidden(component, componentsByKey) {
+  var _component$isHidden, _component$parents;
+  if ((_component$isHidden = component.isHidden) !== null && _component$isHidden !== void 0 && _component$isHidden.call(component)) {
+    return true;
+  }
+  return ((_component$parents = component.parents) !== null && _component$parents !== void 0 ? _component$parents : []).some(function (parent) {
+    var parentComponent = componentsByKey.get(parent.key);
+    return parentComponent ? _isComponentOrAncestorHidden(parentComponent, componentsByKey) : false;
+  });
+};
+
+/**
+ * Returns true when at least one menu-item button in the list is visible.
+ * A button is visible when neither it nor any of its ancestors are hidden.
+ */
+var hasVisibleButton = exports.hasVisibleButton = function hasVisibleButton(components) {
+  var componentsByKey = new Map(components.map(function (c) {
+    return [c.key, c];
+  }));
+  return components.filter(function (c) {
+    return c.type === 'menu-item';
+  }).some(function (c) {
+    return !_isComponentOrAncestorHidden(c, componentsByKey);
+  });
+};

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

@@ -19,28 +19,6 @@ export const pasteOptionsToolbarPlugin = ({
       editorAnalyticsAPI
     }));
   }
-  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
-    };
-  };
   return {
     name: 'pasteOptionsToolbarPlugin',
     pmPlugins() {
@@ -53,9 +31,32 @@ export const pasteOptionsToolbarPlugin = ({
         })
       }];
     },
-    ...(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)) {
@@ -97,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

@@ -10,6 +10,8 @@ export function createPlugin(dispatch, options) {
     key: pasteOptionsPluginKey,
     state: createPluginState(dispatch, {
       showToolbar: false,
+      showLegacyOptions: false,
+      pasteAncestorNodeNames: [],
       pasteStartPos: 0,
       pasteEndPos: 0,
       plaintext: '',
@@ -21,7 +23,7 @@ export function createPlugin(dispatch, options) {
     }),
     view(_editorView) {
       return {
-        update(view, prevState) {
+        update(_view, prevState) {
           return prevState;
         }
       };

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,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { EditorToolbarProvider, PASTE_MENU } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
@@ -6,7 +6,10 @@ import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-re
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
-import { hideToolbar, highlightContent } from '../../editor-commands/commands';
+import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
+import { ToolbarDropdownOption } from '../../types/types';
+import { isToolbarVisible } from '../toolbar';
+import { hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -37,9 +40,38 @@ export const PasteActionsMenu = ({
   boundariesElement,
   scrollableElement
 }) => {
-  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
   const {
-    showToolbar
+    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
   } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
     var _pluginState$showTool;
     const pluginState = states.pasteOptionsToolbarPluginState;
@@ -70,19 +102,18 @@ export const PasteActionsMenu = ({
       handleDismiss();
     }
   }, [handleDismiss]);
-  if (!showToolbar) {
+  const pasteMenuComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
+  const anyComponentVisible = hasVisibleButton(pasteMenuComponents);
+  if (!isToolbarShown) {
+    return null;
+  }
+  if (!anyComponentVisible) {
     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 : [];
-  const pasteSurfaceComponents = (_api$uiControlRegistr3 = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
   return /*#__PURE__*/React.createElement(PopupWithListeners, {
     target: target,
     mountTo: mountTo,
@@ -97,13 +128,11 @@ export const PasteActionsMenu = ({
   }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView
   }, /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, {
-    isOpen: showToolbar,
+    isOpen: isToolbarShown,
     setIsOpen: handleSetIsOpen
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents,
-    pasteSurfaceComponents: pasteSurfaceComponents
+    components: pasteMenuComponents
   }))));
 };