Skip to content

Commit 5c3299b

Browse files
pcaillaudmory-bot
authored andcommitted
fix: disable interactive elements before hydration complete
GitOrigin-RevId: f5117b433982b6fd6c2fa0adba5d2d46c5ace665
1 parent 6bb82c7 commit 5c3299b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

packages/elements-react/src/theme/default/components/card/auth-method-list-item.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import lookup_secret from "../../assets/icons/code-asterix.svg"
1313
import logos from "../../provider-logos"
1414
import { isGroupImmediateSubmit } from "../../utils/form"
1515
import { ListItem } from "./list-item"
16+
import { useFormContext } from "react-hook-form"
1617

1718
const iconsMap: Record<string, typeof code> = {
1819
code,
@@ -33,6 +34,8 @@ export function DefaultAuthMethodListItem({
3334
const intl = useIntl()
3435
const Icon = iconsMap[group] || null
3536

37+
const { formState } = useFormContext()
38+
3639
return (
3740
<ListItem
3841
as="button"
@@ -47,6 +50,7 @@ export function DefaultAuthMethodListItem({
4750
onClick={onClick}
4851
type={isGroupImmediateSubmit(group) ? "submit" : "button"}
4952
data-testid={`ory/form/auth-picker/${group}`}
53+
disabled={!formState.isReady}
5054
/>
5155
)
5256
}

packages/elements-react/src/theme/default/components/form/button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const DefaultButton = ({
5858
const intl = useIntl()
5959
const label = getNodeLabel(node)
6060
const {
61-
formState: { isSubmitting },
61+
formState: { isSubmitting, isReady },
6262
setValue,
6363
} = useFormContext()
6464

@@ -92,7 +92,7 @@ export const DefaultButton = ({
9292
className={buttonStyles({
9393
intent: isPrimary ? "primary" : "secondary",
9494
})}
95-
disabled={rest.disabled ?? isSubmitting}
95+
disabled={!isReady && (rest.disabled ?? isSubmitting)}
9696
data-loading={clicked}
9797
>
9898
{clicked ? <Spinner /> : null}

0 commit comments

Comments
 (0)