Skip to content

Added private property to disable focusLock in the dialog #2287

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
Mil4n0r merged 2 commits into from
Sep 17, 2025
Merged

Added private property to disable focusLock in the dialog #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a387c5
Added private property to disable focusLock in the dialog
Jialecl Sep 17, 2025
76cfecb
removed unnecessary div
Jialecl Sep 17, 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
43 changes: 30 additions & 13 deletions packages/lib/src/dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const DxcDialog = ({
onCloseClick,
overlay = true,
tabIndex = 0,
disableFocusLock = false,
}: DialogPropsType): JSX.Element => {
const translatedLabels = useContext(HalstackLanguageContext);

Expand All @@ -88,19 +89,35 @@ const DxcDialog = ({
<DialogContainer>
{overlay && <Overlay onClick={onBackgroundClick} />}
<Dialog aria-label="Dialog" aria-modal={overlay} closable={closable} role="dialog">
<FocusLock>
{children}
{closable && (
<CloseIconActionContainer>
<DxcActionIcon
icon="close"
onClick={onCloseClick}
tabIndex={tabIndex}
title={translatedLabels.dialog.closeIconAriaLabel}
/>
</CloseIconActionContainer>
)}
</FocusLock>
{!disableFocusLock ? (
<FocusLock>
{children}
{closable && (
<CloseIconActionContainer>
<DxcActionIcon
icon="close"
onClick={onCloseClick}
tabIndex={tabIndex}
title={translatedLabels.dialog.closeIconAriaLabel}
/>
</CloseIconActionContainer>
)}
</FocusLock>
) : (
<>
{children}
{closable && (
<CloseIconActionContainer>
<DxcActionIcon
icon="close"
onClick={onCloseClick}
tabIndex={tabIndex}
title={translatedLabels.dialog.closeIconAriaLabel}
/>
</CloseIconActionContainer>
)}
</>
)}
</Dialog>
</DialogContainer>,
document.body
Expand Down
5 changes: 5 additions & 0 deletions packages/lib/src/dialog/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ type Props = {
* lead to unexpected behaviours with the focus within the dialog.
*/
tabIndex?: number;
/**
* If true the focusLock functionality won't work.
* @private
*/
disableFocusLock?: boolean
};

export default Props;