diff --git a/webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx b/webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx index 70b8852092..d2c913dd9e 100644 --- a/webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx +++ b/webapp/packages/core-blocks/src/CommonDialog/CommonDialog/CommonDialogWrapper.tsx @@ -22,13 +22,17 @@ export interface CommonDialogWrapperProps { fixedSize?: boolean; fixedWidth?: boolean; freeHeight?: boolean; + autofocus?: boolean; className?: string; children?: React.ReactNode; } export const CommonDialogWrapper = observer( - forwardRef(function CommonDialogWrapper({ size = 'medium', fixedSize, fixedWidth, freeHeight, 'aria-label': ariaLabel, className, children }, ref) { - const [focusedRef] = useFocus({ autofocus: true }); + forwardRef(function CommonDialogWrapper( + { size = 'medium', fixedSize, fixedWidth, freeHeight, autofocus = true, 'aria-label': ariaLabel, className, children }, + ref, + ) { + const [focusedRef] = useFocus({ autofocus }); const computedStyles = useS(styles); const context = useContext(DialogContext); const dialogState = useDialogState({ visible: true }); diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx index 9013b7501d..dbec7fa912 100644 --- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx +++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx @@ -148,7 +148,12 @@ export const AuthDialog: DialogComponent = observer(function state.switchAuthMode(tabData.tabId); }} > - +