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

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @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

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

@@ -13,10 +13,10 @@ 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 _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);
@@ -39,20 +39,8 @@ 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, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
   var api = _ref.api,
     editorView = _ref.editorView,
     mountTo = _ref.mountTo,
@@ -87,15 +75,13 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
     (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$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,
-        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
       };
     }),
-    isToolbarShown = _useSharedPluginState2.showToolbar,
-    showLegacyOptions = _useSharedPluginState2.showLegacyOptions;
+    isToolbarShown = _useSharedPluginState2.showToolbar;
   var preventEditorFocusLoss = (0, _react.useCallback)(function (e) {
     e.preventDefault();
   }, []);
@@ -119,17 +105,12 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
       handleDismiss();
     }
   }, [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);
+  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 (!showLegacyOptions && !anyAiComponentVisible) {
+  if (!anyComponentVisible) {
     return null;
   }
   var target = getTargetElement(editorView);
@@ -155,8 +136,6 @@ var PasteActionsMenu = exports.PasteActionsMenu = function PasteActionsMenu(_ref
   }, /*#__PURE__*/_react.default.createElement(_PasteActionsMenuContent.PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents,
-    pasteSurfaceComponents: showLegacyOptions ? 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/ui/on-paste-actions-menu/PasteActionsMenu.js

@@ -6,10 +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 { buildChildrenMap, willComponentRender } from '@atlaskit/editor-ui-control-model';
 import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
+import { hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -33,16 +33,6 @@ function getPopupOffset(dom) {
   const rightEdge = dom.getBoundingClientRect().right;
   return [-(window.innerWidth - rightEdge - 50), 20];
 }
-
-/**
- * Returns true when at least one component in the given list would produce
- * visible output (i.e. is not hidden and, for containers, has at least one
- * visible descendant).
- */
-const hasVisibleComponent = components => {
-  const childrenMap = buildChildrenMap(components);
-  return components.some(c => willComponentRender(c, childrenMap));
-};
 export const PasteActionsMenu = ({
   api,
   editorView,
@@ -50,7 +40,7 @@ export const PasteActionsMenu = ({
   boundariesElement,
   scrollableElement
 }) => {
-  var _api$uiControlRegistr, _api$uiControlRegistr2, _api$uiControlRegistr3, _api$uiControlRegistr4;
+  var _api$uiControlRegistr, _api$uiControlRegistr2;
   const {
     lastContentPasted
   } = useSharedPluginStateWithSelector(api, ['paste'], states => {
@@ -81,14 +71,12 @@ export const PasteActionsMenu = ({
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   const {
-    showToolbar: isToolbarShown,
-    showLegacyOptions
+    showToolbar: isToolbarShown
   } = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], states => {
-    var _pluginState$showTool, _pluginState$showLega;
+    var _pluginState$showTool;
     const pluginState = states.pasteOptionsToolbarPluginState;
     return {
-      showToolbar: (_pluginState$showTool = pluginState === null || pluginState === void 0 ? void 0 : pluginState.showToolbar) !== null && _pluginState$showTool !== void 0 ? _pluginState$showTool : false,
-      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
     };
   });
   const preventEditorFocusLoss = useCallback(e => {
@@ -114,17 +102,12 @@ export const PasteActionsMenu = ({
       handleDismiss();
     }
   }, [handleDismiss]);
-  const aiSurface = {
-    type: 'menu',
-    key: 'ai-paste-menu'
-  };
-  const aiSurfaceComponents = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(aiSurface.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
-  const pasteSurfaceComponents = (_api$uiControlRegistr3 = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr4 = api.uiControlRegistry) === null || _api$uiControlRegistr4 === void 0 ? void 0 : _api$uiControlRegistr4.actions.getComponents(PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
-  const anyAiComponentVisible = hasVisibleComponent(aiSurfaceComponents);
+  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 (!showLegacyOptions && !anyAiComponentVisible) {
+  if (!anyComponentVisible) {
     return null;
   }
   const target = getTargetElement(editorView);
@@ -150,8 +133,6 @@ export const PasteActionsMenu = ({
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents,
-    pasteSurfaceComponents: showLegacyOptions ? pasteSurfaceComponents : []
+    components: pasteMenuComponents
   }))));
 };

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

@@ -2,7 +2,10 @@
 import "./PasteActionsMenuContent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext } from 'react';
+import { useIntl } from 'react-intl-next';
+import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { Box } from '@atlaskit/primitives/compiled';
 const styles = {
@@ -11,24 +14,22 @@ const styles = {
 export const PasteActionsMenuContent = ({
   onMouseDown,
   onMouseEnter,
-  aiSurface,
-  aiSurfaceComponents,
-  pasteSurfaceComponents
+  components
 }) => {
   const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
+  const intl = useIntl();
   return /*#__PURE__*/React.createElement(Box, {
     ref: setOutsideClickTargetRef,
     xcss: styles.container,
     onMouseDown: onMouseDown,
     onMouseEnter: onMouseEnter
-  }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    surface: aiSurface,
-    components: aiSurfaceComponents
-  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
+  }, /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    title: intl.formatMessage(messages.pasteMenuActionsTitle)
+  }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
     surface: {
       type: 'menu',
       key: 'paste-menu'
     },
-    components: pasteSurfaceComponents
-  }));
+    components: components
+  })));
 };

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

@@ -122,6 +122,11 @@ export const getPasteMenuComponents = ({
     key: PASTE_MENU.key,
     rank: PASTE_MENU_RANK[PASTE_MENU_SECTION.key]
   }],
+  isHidden: () => {
+    var _api$pasteOptionsTool, _pluginState$showLega;
+    const pluginState = api === null || api === void 0 ? 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: props => /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     hasSeparator: true
   }, props.children)

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

@@ -0,0 +1,19 @@
+const 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(parent => {
+    const 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.
+ */
+export const hasVisibleButton = components => {
+  const componentsByKey = new Map(components.map(c => [c.key, c]));
+  return components.filter(c => c.type === 'menu-item').some(c => !isComponentOrAncestorHidden(c, componentsByKey));
+};

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

@@ -6,10 +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 { buildChildrenMap, willComponentRender } from '@atlaskit/editor-ui-control-model';
 import { hideToolbar, highlightContent, showToolbar } from '../../editor-commands/commands';
 import { ToolbarDropdownOption } from '../../types/types';
 import { isToolbarVisible } from '../toolbar';
+import { hasVisibleButton } from './hasVisibleButton';
 import { PasteActionsMenuContent } from './PasteActionsMenuContent';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 function getTargetElement(editorView) {
@@ -31,20 +31,8 @@ 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 = buildChildrenMap(components);
-  return components.some(function (c) {
-    return willComponentRender(c, childrenMap);
-  });
-};
 export var 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,
@@ -79,15 +67,13 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
     showToolbar(lastContentPasted, selectedOption, legacyVisible, pasteAncestorNodeNames)(editorView.state, editorView.dispatch);
   }, [lastContentPasted, editorView]);
   var _useSharedPluginState2 = useSharedPluginStateWithSelector(api, ['pasteOptionsToolbarPlugin'], function (states) {
-      var _pluginState$showTool, _pluginState$showLega;
+      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,
-        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
       };
     }),
-    isToolbarShown = _useSharedPluginState2.showToolbar,
-    showLegacyOptions = _useSharedPluginState2.showLegacyOptions;
+    isToolbarShown = _useSharedPluginState2.showToolbar;
   var preventEditorFocusLoss = useCallback(function (e) {
     e.preventDefault();
   }, []);
@@ -111,17 +97,12 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
       handleDismiss();
     }
   }, [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(PASTE_MENU.key)) !== null && _api$uiControlRegistr3 !== void 0 ? _api$uiControlRegistr3 : [];
-  var anyAiComponentVisible = hasVisibleComponent(aiSurfaceComponents);
+  var pasteMenuComponents = (_api$uiControlRegistr = api === null || api === 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 : [];
+  var anyComponentVisible = hasVisibleButton(pasteMenuComponents);
   if (!isToolbarShown) {
     return null;
   }
-  if (!showLegacyOptions && !anyAiComponentVisible) {
+  if (!anyComponentVisible) {
     return null;
   }
   var target = getTargetElement(editorView);
@@ -147,8 +128,6 @@ export var PasteActionsMenu = function PasteActionsMenu(_ref) {
   }, /*#__PURE__*/React.createElement(PasteActionsMenuContent, {
     onMouseDown: preventEditorFocusLoss,
     onMouseEnter: handleMouseEnter,
-    aiSurface: aiSurface,
-    aiSurfaceComponents: aiSurfaceComponents,
-    pasteSurfaceComponents: showLegacyOptions ? pasteSurfaceComponents : []
+    components: pasteMenuComponents
   }))));
 };

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

@@ -2,7 +2,10 @@
 import "./PasteActionsMenuContent.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext } from 'react';
+import { useIntl } from 'react-intl-next';
+import { pasteOptionsToolbarMessages as messages } from '@atlaskit/editor-common/messages';
 import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { Box } from '@atlaskit/primitives/compiled';
 var styles = {
@@ -11,23 +14,21 @@ var styles = {
 export var 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 = useContext(OutsideClickTargetRefContext);
+  var intl = useIntl();
   return /*#__PURE__*/React.createElement(Box, {
     ref: setOutsideClickTargetRef,
     xcss: styles.container,
     onMouseDown: onMouseDown,
     onMouseEnter: onMouseEnter
-  }, aiSurface && aiSurfaceComponents && aiSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
-    surface: aiSurface,
-    components: aiSurfaceComponents
-  }), pasteSurfaceComponents && pasteSurfaceComponents.length > 0 && /*#__PURE__*/React.createElement(SurfaceRenderer, {
+  }, /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
+    title: intl.formatMessage(messages.pasteMenuActionsTitle)
+  }, /*#__PURE__*/React.createElement(SurfaceRenderer, {
     surface: {
       type: 'menu',
       key: 'paste-menu'
     },
-    components: pasteSurfaceComponents
-  }));
+    components: components
+  })));
 };

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

@@ -118,6 +118,11 @@ export var getPasteMenuComponents = function getPasteMenuComponents(_ref3) {
       key: PASTE_MENU.key,
       rank: PASTE_MENU_RANK[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.createElement(ToolbarDropdownItemSection, {
         hasSeparator: true

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

@@ -0,0 +1,25 @@
+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.
+ */
+export var 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/types/ui/on-paste-actions-menu/PasteActionsMenuContent.d.ts

@@ -1,11 +1,9 @@
 import React from 'react';
-import type { RegisterComponent, SurfaceIdentifier } from '@atlaskit/editor-ui-control-model';
+import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
 interface PasteActionsMenuContentProps {
-    aiSurface?: SurfaceIdentifier;
-    aiSurfaceComponents?: RegisterComponent[];
+    components: RegisterComponent[];
     onMouseDown: (e: React.MouseEvent) => void;
     onMouseEnter: () => void;
-    pasteSurfaceComponents?: RegisterComponent[];
 }
-export declare const PasteActionsMenuContent: ({ onMouseDown, onMouseEnter, aiSurface, aiSurfaceComponents, pasteSurfaceComponents, }: PasteActionsMenuContentProps) => React.JSX.Element;
+export declare const PasteActionsMenuContent: ({ onMouseDown, onMouseEnter, components, }: PasteActionsMenuContentProps) => React.JSX.Element;
 export {};

package/dist/types/ui/on-paste-actions-menu/hasVisibleButton.d.ts

@@ -0,0 +1,6 @@
+import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
+/**
+ * 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.
+ */
+export declare const hasVisibleButton: (components: RegisterComponent[]) => boolean;

package/dist/types-ts4.5/ui/on-paste-actions-menu/PasteActionsMenuContent.d.ts

@@ -1,11 +1,9 @@
 import React from 'react';
-import type { RegisterComponent, SurfaceIdentifier } from '@atlaskit/editor-ui-control-model';
+import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
 interface PasteActionsMenuContentProps {
-    aiSurface?: SurfaceIdentifier;
-    aiSurfaceComponents?: RegisterComponent[];
+    components: RegisterComponent[];
     onMouseDown: (e: React.MouseEvent) => void;
     onMouseEnter: () => void;
-    pasteSurfaceComponents?: RegisterComponent[];
 }
-export declare const PasteActionsMenuContent: ({ onMouseDown, onMouseEnter, aiSurface, aiSurfaceComponents, pasteSurfaceComponents, }: PasteActionsMenuContentProps) => React.JSX.Element;
+export declare const PasteActionsMenuContent: ({ onMouseDown, onMouseEnter, components, }: PasteActionsMenuContentProps) => React.JSX.Element;
 export {};

package/dist/types-ts4.5/ui/on-paste-actions-menu/hasVisibleButton.d.ts

@@ -0,0 +1,6 @@
+import type { RegisterComponent } from '@atlaskit/editor-ui-control-model';
+/**
+ * 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.
+ */
+export declare const hasVisibleButton: (components: RegisterComponent[]) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste-options-toolbar",
-	"version": "8.4.0",
+	"version": "8.4.1",
 	"description": "Paste options toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,15 +41,15 @@
 		"@atlaskit/icon": "^32.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^35.4.0",
-		"@atlaskit/tokens": "^11.0.0",
+		"@atlaskit/tmp-editor-statsig": "^35.5.0",
+		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.31.0",
+		"@atlaskit/editor-common": "^111.32.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},