[Services] Remove unused key services (#7256)

elastic · Oct 6, 2023 · eb091bd · eb091bd
1 parent c77af6e
commit eb091bd
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 95 deletions.
diff --git a/src/components/context_menu/context_menu_panel.tsx b/src/components/context_menu/context_menu_panel.tsx
@@ -19,7 +19,7 @@ import { tabbable, FocusableElement } from 'tabbable';
 import { CommonProps, NoArgCallback, keysOf } from '../common';
 import { EuiIcon } from '../icon';
 import { EuiResizeObserver } from '../observer/resize_observer';
-import { cascadingMenuKeys } from '../../services';
+import { keys } from '../../services';
 import {
   EuiContextMenuItem,
   EuiContextMenuItemProps,
@@ -164,7 +164,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {
         document.activeElement === this.backButton ||
         document.activeElement === this.panel)
     ) {
-      if (event.key === cascadingMenuKeys.ARROW_LEFT) {
+      if (event.key === keys.ARROW_LEFT) {
         if (showPreviousPanel) {
           event.preventDefault();
           event.stopPropagation();
@@ -179,7 +179,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {
 
     if (items?.length) {
       switch (event.key) {
-        case cascadingMenuKeys.TAB:
+        case keys.TAB:
           requestAnimationFrame(() => {
             // NOTE: document.activeElement is stale if not wrapped in requestAnimationFrame
             const focusedItemIndex = this.state.menuItems.indexOf(
@@ -197,7 +197,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {
           });
           break;
 
-        case cascadingMenuKeys.ARROW_UP:
+        case keys.ARROW_UP:
           event.preventDefault();
           this.focusMenuItem('up');
 
@@ -206,7 +206,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {
           }
           break;
 
-        case cascadingMenuKeys.ARROW_DOWN:
+        case keys.ARROW_DOWN:
           event.preventDefault();
           this.focusMenuItem('down');
 
@@ -215,7 +215,7 @@ export class EuiContextMenuPanel extends Component<Props, State> {
           }
           break;
 
-        case cascadingMenuKeys.ARROW_RIGHT:
+        case keys.ARROW_RIGHT:
           if (this.props.showNextPanel) {
             event.preventDefault();
             this.props.showNextPanel(

diff --git a/src/components/popover/popover.tsx b/src/components/popover/popover.tsx
@@ -23,7 +23,7 @@ import { CommonProps, NoArgCallback } from '../common';
 import { FocusTarget, EuiFocusTrap, EuiFocusTrapProps } from '../focus_trap';
 
 import {
-  cascadingMenuKeys,
+  keys,
   getTransitionTimings,
   getWaitDuration,
   performOnFrame,
@@ -383,7 +383,7 @@ export class EuiPopover extends Component<Props, State> {
   };
 
   onKeyDown = (event: KeyboardEvent) => {
-    if (event.key === cascadingMenuKeys.ESCAPE) {
+    if (event.key === keys.ESCAPE) {
       this.onEscapeKey(event as unknown as Event);
     }
   };

diff --git a/src/services/accessibility/accessible_click_keys.ts b/src/services/accessibility/accessible_click_keys.ts
diff --git a/src/services/accessibility/cascading_menu_keys.ts b/src/services/accessibility/cascading_menu_keys.ts
diff --git a/src/services/accessibility/combo_box_keys.ts b/src/services/accessibility/combo_box_keys.ts
diff --git a/src/services/accessibility/index.ts b/src/services/accessibility/index.ts
@@ -6,7 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { accessibleClickKeys } from './accessible_click_keys';
-export { cascadingMenuKeys } from './cascading_menu_keys';
-export { comboBoxKeys } from './combo_box_keys';
 export { htmlIdGenerator, useGeneratedHtmlId } from './html_id_generator';
diff --git a/src/services/index.ts b/src/services/index.ts
@@ -8,13 +8,7 @@
 
 // Export all keys under a `keys` named variable
 import * as keys from './keys';
-export {
-  accessibleClickKeys,
-  cascadingMenuKeys,
-  comboBoxKeys,
-  htmlIdGenerator,
-  useGeneratedHtmlId,
-} from './accessibility';
+export { htmlIdGenerator, useGeneratedHtmlId } from './accessibility';
 export { CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT } from './alignment';
 export type { HorizontalAlignment } from './alignment';
 export {

diff --git a/upcoming_changelogs/7256.md b/upcoming_changelogs/7256.md
@@ -0,0 +1,3 @@
+**Breaking changes**
+
+- Removed exported `accessibleClickKeys`, `comboBoxKeys`, and `cascadingMenuKeys` services. Use the generic `keys` service instead
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Breaking changes

		- Removed exported `accessibleClickKeys`, `comboBoxKeys`, and `cascadingMenuKeys` services. Use the generic `keys` service instead