From 0a387c5fefdacc6dab30837088dc919e5982991b Mon Sep 17 00:00:00 2001 From: Jialecl Date: Wed, 17 Sep 2025 11:19:48 +0200 Subject: [PATCH 1/2] Added private property to disable focusLock in the dialog --- packages/lib/src/dialog/Dialog.tsx | 43 +++++++++++++++++++++--------- packages/lib/src/dialog/types.ts | 5 ++++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/packages/lib/src/dialog/Dialog.tsx b/packages/lib/src/dialog/Dialog.tsx index 74a2192345..2cbc2d420a 100644 --- a/packages/lib/src/dialog/Dialog.tsx +++ b/packages/lib/src/dialog/Dialog.tsx @@ -64,6 +64,7 @@ const DxcDialog = ({ onCloseClick, overlay = true, tabIndex = 0, + disableFocusLock = false, }: DialogPropsType): JSX.Element => { const translatedLabels = useContext(HalstackLanguageContext); @@ -88,19 +89,35 @@ const DxcDialog = ({ {overlay && } - - {children} - {closable && ( - - - - )} - + {!disableFocusLock ? ( + + {children} + {closable && ( + + + + )} + + ) : ( +
+ {children} + {closable && ( + + + + )} +
+ )}
, document.body diff --git a/packages/lib/src/dialog/types.ts b/packages/lib/src/dialog/types.ts index a7f729ae6d..cbeb075cbd 100644 --- a/packages/lib/src/dialog/types.ts +++ b/packages/lib/src/dialog/types.ts @@ -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; From 76cfecbdd0cf80671648f87b45152ba669162af2 Mon Sep 17 00:00:00 2001 From: Jialecl Date: Wed, 17 Sep 2025 12:12:12 +0200 Subject: [PATCH 2/2] removed unnecessary div --- packages/lib/src/dialog/Dialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lib/src/dialog/Dialog.tsx b/packages/lib/src/dialog/Dialog.tsx index 2cbc2d420a..720b6717f1 100644 --- a/packages/lib/src/dialog/Dialog.tsx +++ b/packages/lib/src/dialog/Dialog.tsx @@ -104,7 +104,7 @@ const DxcDialog = ({ )} ) : ( -
+ <> {children} {closable && ( @@ -116,7 +116,7 @@ const DxcDialog = ({ /> )} -
+ )} ,