@atlaskit/editor-plugin-block-menu 29.0.18 → 29.0.19

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 29.0.19
+
+### Patch Changes
+
+- [`d2113fc99fc6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d2113fc99fc6f) -
+  [FFCLEANUP-243893] Clean up the `platform_editor_menu_radius_update` experiment, keeping the
+  shipped treatment: editor menus always use the large border radius, hide empty menu sections, and
+  the block menu and paste actions menu always render inside `ToolbarMenuContainer`.
+- Updated dependencies
+
 ## 29.0.18
 
 ### Patch Changes

package/compass.yml

@@ -35,7 +35,7 @@ customFields:
     value: true
   - name: Reviewer Selection Mechanism
     type: text
-    value: random(2)
+    value: randomTZIgnored(2)
   - name: Required Reviewer Approvals
     type: number
     value: 1

package/dist/cjs/ui/block-menu.compiled.css

@@ -1,5 +1 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1cc0glyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])~*){border-block-start:none}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
-._1k2yglyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])){display:none}
-._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._p12fnklw{max-width:20pc}

package/dist/cjs/ui/block-menu.js

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* block-menu.tsx generated by @compiled/babel-plugin v3.0.4 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -13,7 +13,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _css = require("@atlaskit/css");
 var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _surfaceDragHandleElement = require("@atlaskit/editor-common/block-controls/surface-drag-handle-element");
 var _key = require("@atlaskit/editor-common/block-menu/key");
@@ -28,7 +27,6 @@ var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useShar
 var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _toolbarMenuContainer = require("@atlaskit/editor-toolbar/toolbar-menu-container");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _box = require("@atlaskit/primitives/compiled/box");
 var _redo = require("@atlaskit/prosemirror-history/redo");
 var _undo = require("@atlaskit/prosemirror-history/undo");
 var _blockMenuProvider = require("./block-menu-provider");
@@ -38,9 +36,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 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 styles = {
-  base: "_2rko12b0 _bfhk1bhr _16qs130s",
-  maxWidthStyles: "_p12fnklw",
-  emptyMenuSectionStyles: "_1cc0glyw _1k2yglyw"
+  maxWidthStyles: "_p12fnklw"
 };
 var DEFAULT_MENU_WIDTH = 230;
 var DRAG_HANDLE_OFFSET_PADDING = 5;
@@ -145,28 +141,10 @@ var BlockMenuContent = function BlockMenuContent(_ref4) {
     }
     return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
   };
-  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_menu_radius_update')) {
-    return /*#__PURE__*/_react.default.createElement(_toolbarMenuContainer.ToolbarMenuContainer, {
-      testId: _key.BLOCK_MENU_TEST_ID,
-      ref: ref,
-      xcss: styles.maxWidthStyles
-    }, /*#__PURE__*/_react.default.createElement(_ArrowKeyNavigationProvider.ArrowKeyNavigationProvider, {
-      type: _types.ArrowKeyNavigationType.MENU
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      handleClose: function handleClose(e) {
-        return e.preventDefault();
-      },
-      disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
-    }, /*#__PURE__*/_react.default.createElement(_BlockMenuRenderer.BlockMenuRenderer, {
-      allRegisteredComponents: blockMenuComponents || []
-    })));
-  }
-  return /*#__PURE__*/_react.default.createElement(_box.Box, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarMenuContainer.ToolbarMenuContainer, {
     testId: _key.BLOCK_MENU_TEST_ID,
-    role: "menu",
     ref: ref,
-    xcss: (0, _css.cx)(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
+    xcss: styles.maxWidthStyles
   }, /*#__PURE__*/_react.default.createElement(_ArrowKeyNavigationProvider.ArrowKeyNavigationProvider, {
     type: _types.ArrowKeyNavigationType.MENU
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)

package/dist/es2019/ui/block-menu.compiled.css

@@ -1,5 +1 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1cc0glyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])~*){border-block-start:none}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
-._1k2yglyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])){display:none}
-._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._p12fnklw{max-width:20pc}

package/dist/es2019/ui/block-menu.js

@@ -1,9 +1,8 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* block-menu.tsx generated by @compiled/babel-plugin v3.0.4 */
 import "./block-menu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useContext, useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl';
-import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { surfaceDragHandleElementStore } from '@atlaskit/editor-common/block-controls/surface-drag-handle-element';
 import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu/key';
@@ -18,16 +17,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSha
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { Box } from '@atlaskit/primitives/compiled/box';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
 import { BlockMenuTargetVisibilityProvider } from './block-menu-target-visibility-context';
 const styles = {
-  base: "_2rko12b0 _bfhk1bhr _16qs130s",
-  maxWidthStyles: "_p12fnklw",
-  emptyMenuSectionStyles: "_1cc0glyw _1k2yglyw"
+  maxWidthStyles: "_p12fnklw"
 };
 const DEFAULT_MENU_WIDTH = 230;
 const DRAG_HANDLE_OFFSET_PADDING = 5;
@@ -133,26 +129,10 @@ const BlockMenuContent = ({
     }
     return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
   };
-  if (isExperimentEnabled('platform_editor_menu_radius_update')) {
-    return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
-      testId: BLOCK_MENU_TEST_ID,
-      ref: ref,
-      xcss: styles.maxWidthStyles
-    }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
-      type: ArrowKeyNavigationType.MENU
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      handleClose: e => e.preventDefault(),
-      disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
-    }, /*#__PURE__*/React.createElement(BlockMenuRenderer, {
-      allRegisteredComponents: blockMenuComponents || []
-    })));
-  }
-  return /*#__PURE__*/React.createElement(Box, {
+  return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
     testId: BLOCK_MENU_TEST_ID,
-    role: "menu",
     ref: ref,
-    xcss: cx(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
+    xcss: styles.maxWidthStyles
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)

package/dist/esm/ui/block-menu.compiled.css

@@ -1,5 +1 @@
-._2rko12b0{border-radius:var(--ds-radius-small,4px)}
-._1cc0glyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])~*){border-block-start:none}._16qs130s{box-shadow:var(--ds-shadow-overlay,0 8px 9pt #1e1f2126,0 0 1px #1e1f214f)}
-._1k2yglyw [data-toolbar-component=menu-section]:not(:has([data-toolbar-component=menu-item])){display:none}
-._bfhk1bhr{background-color:var(--ds-surface-overlay,#fff)}
 ._p12fnklw{max-width:20pc}

package/dist/esm/ui/block-menu.js

@@ -1,4 +1,4 @@
-/* block-menu.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* block-menu.tsx generated by @compiled/babel-plugin v3.0.4 */
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./block-menu.compiled.css";
@@ -7,7 +7,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import React, { useContext, useEffect, useRef } from 'react';
 import { injectIntl } from 'react-intl';
-import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { surfaceDragHandleElementStore } from '@atlaskit/editor-common/block-controls/surface-drag-handle-element';
 import { BLOCK_MENU_TEST_ID } from '@atlaskit/editor-common/block-menu/key';
@@ -22,16 +21,13 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSha
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { Box } from '@atlaskit/primitives/compiled/box';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
 import { BlockMenuTargetVisibilityProvider } from './block-menu-target-visibility-context';
 var styles = {
-  base: "_2rko12b0 _bfhk1bhr _16qs130s",
-  maxWidthStyles: "_p12fnklw",
-  emptyMenuSectionStyles: "_1cc0glyw _1k2yglyw"
+  maxWidthStyles: "_p12fnklw"
 };
 var DEFAULT_MENU_WIDTH = 230;
 var DRAG_HANDLE_OFFSET_PADDING = 5;
@@ -136,28 +132,10 @@ var BlockMenuContent = function BlockMenuContent(_ref4) {
     }
     return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
   };
-  if (isExperimentEnabled('platform_editor_menu_radius_update')) {
-    return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
-      testId: BLOCK_MENU_TEST_ID,
-      ref: ref,
-      xcss: styles.maxWidthStyles
-    }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
-      type: ArrowKeyNavigationType.MENU
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      handleClose: function handleClose(e) {
-        return e.preventDefault();
-      },
-      disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
-    }, /*#__PURE__*/React.createElement(BlockMenuRenderer, {
-      allRegisteredComponents: blockMenuComponents || []
-    })));
-  }
-  return /*#__PURE__*/React.createElement(Box, {
+  return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
     testId: BLOCK_MENU_TEST_ID,
-    role: "menu",
     ref: ref,
-    xcss: cx(styles.base, styles.maxWidthStyles, styles.emptyMenuSectionStyles)
+    xcss: styles.maxWidthStyles
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "29.0.18",
+	"version": "29.0.19",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,12 +43,12 @@
 		"@atlaskit/primitives": "^22.7.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
 		"@atlaskit/tmp-editor-statsig": "^260.0.0",
-		"@atlaskit/tokens": "^20.10.0",
+		"@atlaskit/tokens": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.9.0",
+		"@atlaskit/editor-common": "^134.16.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -61,7 +61,7 @@
 		}
 	},
 	"devDependencies": {
-		"@atlaskit/editor-common": "^134.9.0",
+		"@atlaskit/editor-common": "^134.16.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"@atlassian/workbench": "workspace:*",
 		"react": "^19.2.0",