@atlaskit/editor-plugin-block-menu 6.0.31 → 6.0.33

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.33
+
+### Patch Changes
+
+- [`3b3aa281c8524`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3b3aa281c8524) -
+  Editor 4149 Fix keyboard navigation inside turn into
+- Updated dependencies
+
+## 6.0.32
+
+### Patch Changes
+
+- [`9b8e6a65567af`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b8e6a65567af) -
+  ENGHEALTH-48871: Add missing menu role to block menu.
+- Updated dependencies
+
 ## 6.0.31
 
 ### Patch Changes

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

@@ -23,6 +23,7 @@ var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _prosemirrorHistory = require("@atlaskit/prosemirror-history");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockMenuProvider = require("./block-menu-provider");
 var _BlockMenuRenderer = require("./block-menu-renderer/BlockMenuRenderer");
@@ -86,15 +87,27 @@ var BlockMenuContent = function BlockMenuContent(_ref2) {
     setOutsideClickTargetRef(el);
     setRef === null || setRef === void 0 || setRef(el);
   };
+  var shouldDisableArrowKeyNavigation = function shouldDisableArrowKeyNavigation(event) {
+    if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown') {
+      return false;
+    }
+    var target = event.target;
+    if (!(target instanceof HTMLElement)) {
+      return false;
+    }
+    return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
+  };
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     testId: "editor-block-menu",
+    role: (0, _expValEquals.expValEquals)('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
     ref: ref,
     xcss: (0, _css.cx)(styles.base, (0, _experiments.editorExperiment)('platform_synced_block', true) && styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/_react.default.createElement(_uiMenu.ArrowKeyNavigationProvider, {
     type: _uiMenu.ArrowKeyNavigationType.MENU,
     handleClose: function handleClose(e) {
       return e.preventDefault();
-    }
+    },
+    disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
   }, /*#__PURE__*/_react.default.createElement(_BlockMenuRenderer.BlockMenuRenderer, {
     allRegisteredComponents: blockMenuComponents || []
   })));

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

@@ -14,6 +14,7 @@ import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { Box } from '@atlaskit/primitives/compiled';
 import { redo, undo } from '@atlaskit/prosemirror-history';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
@@ -79,13 +80,25 @@ const BlockMenuContent = ({
     setOutsideClickTargetRef(el);
     setRef === null || setRef === void 0 ? void 0 : setRef(el);
   };
+  const shouldDisableArrowKeyNavigation = event => {
+    if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown') {
+      return false;
+    }
+    const target = event.target;
+    if (!(target instanceof HTMLElement)) {
+      return false;
+    }
+    return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
+  };
   return /*#__PURE__*/React.createElement(Box, {
     testId: "editor-block-menu",
+    role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
     ref: ref,
     xcss: cx(styles.base, editorExperiment('platform_synced_block', true) && styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU,
-    handleClose: e => e.preventDefault()
+    handleClose: e => e.preventDefault(),
+    disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
   }, /*#__PURE__*/React.createElement(BlockMenuRenderer, {
     allRegisteredComponents: blockMenuComponents || []
   })));

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

@@ -15,6 +15,7 @@ import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { Box } from '@atlaskit/primitives/compiled';
 import { redo, undo } from '@atlaskit/prosemirror-history';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useBlockMenu } from './block-menu-provider';
 import { BlockMenuRenderer } from './block-menu-renderer/BlockMenuRenderer';
@@ -77,15 +78,27 @@ var BlockMenuContent = function BlockMenuContent(_ref2) {
     setOutsideClickTargetRef(el);
     setRef === null || setRef === void 0 || setRef(el);
   };
+  var shouldDisableArrowKeyNavigation = function shouldDisableArrowKeyNavigation(event) {
+    if (event.key !== 'ArrowUp' && event.key !== 'ArrowDown') {
+      return false;
+    }
+    var target = event.target;
+    if (!(target instanceof HTMLElement)) {
+      return false;
+    }
+    return target.closest('[data-toolbar-nested-dropdown-menu]') !== null;
+  };
   return /*#__PURE__*/React.createElement(Box, {
     testId: "editor-block-menu",
+    role: expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'menu' : undefined,
     ref: ref,
     xcss: cx(styles.base, editorExperiment('platform_synced_block', true) && styles.emptyMenuSectionStyles)
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     type: ArrowKeyNavigationType.MENU,
     handleClose: function handleClose(e) {
       return e.preventDefault();
-    }
+    },
+    disableArrowKeyNavigation: shouldDisableArrowKeyNavigation
   }, /*#__PURE__*/React.createElement(BlockMenuRenderer, {
     allRegisteredComponents: blockMenuComponents || []
   })));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.31",
+	"version": "6.0.33",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^18.0.0",
+		"@atlaskit/tmp-editor-statsig": "^20.0.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"