Fix ace a11y listener (elastic#60639)

Also move the hook use_ui_ace_keyboard_mode.tsx into es_ui_shared This was defined (and used) in both Console and SearchProfiler. Co-authored-by: Elastic Machine <[email protected]> # Conflicts: # src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx # src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx # src/plugins/console/public/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx # src/plugins/es_ui_shared/public/index.ts # src/plugins/es_ui_shared/public/use_ui_ace_keyboard_mode.tsx # x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx # x-pack/plugins/searchprofiler/public/application/editor/editor.tsx
jloleysens · Mar 20, 2020 · ee1a10a · ee1a10a
1 parent 54f8c49
commit ee1a10a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 113 deletions.
diff --git a/...ns/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx b/...ns/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx
@@ -28,7 +28,7 @@ import * as qs from 'querystring-browser';
 
 import { EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { useServicesContext, useEditorReadContext } from '../../../../contexts';
-import { useUIAceKeyboardMode } from '../use_ui_ace_keyboard_mode';
+import { useUIAceKeyboardMode } from '../../../../../../../../../../plugins/es_ui_shared/public';
 import { ConsoleMenu } from '../../../../components';
 
 import { autoIndent, getDocumentation } from '../console_menu_actions';

diff --git a/src/plugins/es_ui_shared/public/index.ts b/src/plugins/es_ui_shared/public/index.ts
@@ -18,3 +18,5 @@
  */
 
 export * from './components/json_editor';
+
+export { useUIAceKeyboardMode } from './use_ui_ace_keyboard_mode';
diff --git a/...ditor/legacy/use_ui_ace_keyboard_mode.tsx → ...hared/public/use_ui_ace_keyboard_mode.tsx b/...ditor/legacy/use_ui_ace_keyboard_mode.tsx → ...hared/public/use_ui_ace_keyboard_mode.tsx
@@ -96,7 +96,7 @@ export function useUIAceKeyboardMode(aceTextAreaElement: HTMLTextAreaElement | n
     }
     return () => {
       if (aceTextAreaElement) {
-        document.removeEventListener('keydown', documentKeyDownListener);
+        document.removeEventListener('keydown', documentKeyDownListener, { capture: true });
         aceTextAreaElement.removeEventListener('keydown', aceKeydownListener);
         const textAreaContainer = aceTextAreaElement.parentElement;
         if (textAreaContainer && textAreaContainer.contains(overlayMountNode.current!)) {

diff --git a/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.tsx b/x-pack/legacy/plugins/searchprofiler/public/np_ready/application/editor/editor.tsx
@@ -8,7 +8,7 @@ import React, { memo, useRef, useEffect, useState } from 'react';
 import { Editor as AceEditor } from 'brace';
 
 import { initializeEditor } from './init_editor';
-import { useUIAceKeyboardMode } from './use_ui_ace_keyboard_mode';
+import { useUIAceKeyboardMode } from '../../../../../../../../src/plugins/es_ui_shared/public';
 
 interface EditorShim {
   getValue(): string;

diff --git a/...cy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx b/...cy/plugins/searchprofiler/public/np_ready/application/editor/use_ui_ace_keyboard_mode.tsx