Skip to content

[a11y] Fix focus on generate API keys in connectors config #237522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2025
+57 −6
Merged

[a11y] Fix focus on generate API keys in connectors config #237522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7fd83a
[a11y] Fix focus on generate API keys in connectors config
dennis-tismenko Oct 3, 2025
45183b8
Merge branch 'main' into a11y/connectors-api-key-fix-focus
elasticmachine Oct 3, 2025
035b9b0
Merge branch 'main' into a11y/connectors-api-key-fix-focus
elasticmachine Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions ...tent_connectors/public/components/connector_detail/components/generated_config_fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* 2.0.
*/

import React, { useState } from 'react';
import React, { useRef, useState } from 'react';
import type { ComponentProps } from 'react';

import {
EuiButtonIcon,
Expand Down Expand Up @@ -35,9 +36,10 @@ import { EuiLinkTo } from '../../shared/react_router_helpers';
import { MANAGE_API_KEYS_URL } from '../../../../common/constants';

const ConfirmModal: React.FC<{
focusTrapProps?: ComponentProps<typeof EuiConfirmModal>['focusTrapProps'];
onCancel: () => void;
onConfirm: () => void;
}> = ({ onCancel, onConfirm }) => {
}> = ({ onCancel, onConfirm, focusTrapProps }) => {
const confirmModalTitleId = useGeneratedHtmlId();

return (
Expand Down Expand Up @@ -65,6 +67,7 @@ const ConfirmModal: React.FC<{
}
)}
defaultFocusedButton="confirm"
focusTrapProps={focusTrapProps}
>
{i18n.translate(
'xpack.contentConnectors.content.indices.configurationConnector.apiKey.confirmModal.description',
Expand All @@ -90,6 +93,8 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
generateApiKey,
isGenerateLoading,
}) => {
const generateButtonRef = useRef<HTMLButtonElement>(null);
const refreshButtonRef = useRef<HTMLButtonElement>(null);
const [isModalVisible, setIsModalVisible] = useState(false);
const refreshButtonClick = () => {
setIsModalVisible(true);
Expand All @@ -108,7 +113,25 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({

return (
<>
{isModalVisible && <ConfirmModal onCancel={onCancel} onConfirm={onConfirm} />}
{isModalVisible && (
<ConfirmModal
onCancel={onCancel}
onConfirm={onConfirm}
focusTrapProps={{
returnFocus: () => {
if (generateButtonRef.current) {
generateButtonRef.current.focus();
return false;
}
if (refreshButtonRef.current) {
refreshButtonRef.current.focus();
return false;
}
return true;
},
}}
/>
)}
<>
<EuiFlexGrid columns={3} alignItems="center" gutterSize="s">
<EuiFlexItem>
Expand Down Expand Up @@ -241,6 +264,7 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
size="xs"
iconType="refresh"
buttonRef={refreshButtonRef}
isLoading={isGenerateLoading}
onClick={refreshButtonClick}
disabled={!connector.index_name}
Expand Down Expand Up @@ -274,6 +298,7 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
size="xs"
iconType="refresh"
buttonRef={generateButtonRef}
isLoading={isGenerateLoading}
onClick={refreshButtonClick}
disabled={!connector.index_name}
Expand All @@ -294,6 +319,7 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
<>
<EuiSpacer size="m" />
<EuiCallOut
announceOnMount
color="success"
size="s"
title={i18n.translate(
Expand Down
31 changes: 28 additions & 3 deletions ...erprise_search_content/components/connector_detail/components/generated_config_fields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
* 2.0.
*/

import React, { useState } from 'react';
import React, { useRef, useState } from 'react';
import type { ComponentProps } from 'react';

import {
EuiButtonIcon,
Expand Down Expand Up @@ -43,9 +44,10 @@ export interface GeneratedConfigFieldsProps {
}

const ConfirmModal: React.FC<{
focusTrapProps?: ComponentProps<typeof EuiConfirmModal>['focusTrapProps'];
onCancel: () => void;
onConfirm: () => void;
}> = ({ onCancel, onConfirm }) => {
}> = ({ onCancel, onConfirm, focusTrapProps }) => {
const modalTitleId = useGeneratedHtmlId();

return (
Expand Down Expand Up @@ -73,6 +75,7 @@ const ConfirmModal: React.FC<{
}
)}
defaultFocusedButton="confirm"
focusTrapProps={focusTrapProps}
>
{i18n.translate(
'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.confirmModal.description',
Expand All @@ -91,6 +94,8 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
generateApiKey,
isGenerateLoading,
}) => {
const generateButtonRef = useRef<HTMLButtonElement>(null);
const refreshButtonRef = useRef<HTMLButtonElement>(null);
const [isModalVisible, setIsModalVisible] = useState(false);
const refreshButtonClick = () => {
setIsModalVisible(true);
Expand All @@ -109,7 +114,25 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({

return (
<>
{isModalVisible && <ConfirmModal onCancel={onCancel} onConfirm={onConfirm} />}
{isModalVisible && (
<ConfirmModal
onCancel={onCancel}
onConfirm={onConfirm}
focusTrapProps={{
returnFocus: () => {
if (generateButtonRef.current) {
generateButtonRef.current.focus();
return false;
}
if (refreshButtonRef.current) {
refreshButtonRef.current.focus();
return false;
}
return true;
},
}}
/>
)}
<>
<EuiFlexGrid columns={3} alignItems="center" gutterSize="s">
<EuiFlexItem>
Expand Down Expand Up @@ -242,6 +265,7 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
size="xs"
iconType="refresh"
buttonRef={refreshButtonRef}
isLoading={isGenerateLoading}
onClick={refreshButtonClick}
disabled={!connector.index_name}
Expand Down Expand Up @@ -275,6 +299,7 @@ export const GeneratedConfigFields: React.FC<GeneratedConfigFieldsProps> = ({
data-test-subj="enterpriseSearchGeneratedConfigFieldsButton"
size="xs"
iconType="refresh"
buttonRef={generateButtonRef}
isLoading={isGenerateLoading}
onClick={refreshButtonClick}
disabled={!connector.index_name}
Expand Down