Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Fix `FormItemLayout` usages for a11y (#49761)

Gildas Garcia3146650a5a23
diff --git a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
index 42deb0f33d0..59ba2b740fd 100644
--- a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
+++ b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx
@@ -580,18 +580,18 @@ export default function FormPatternsPageLayout() {
label="Select (Dropdown)"
description="Single selection from a list of options"
>
- <FormControl>
- <Select value={field.value} onValueChange={field.onChange}>
+ <Select value={field.value} onValueChange={field.onChange}>
+ <FormControl>
<SelectTrigger>
<SelectValue placeholder="Select an option" />
</SelectTrigger>
- <SelectContent>
- <SelectItem value="us-east-1">US East (N. Virginia)</SelectItem>
- <SelectItem value="us-west-2">US West (Oregon)</SelectItem>
- <SelectItem value="eu-west-1">EU West (Ireland)</SelectItem>
- </SelectContent>
- </Select>
- </FormControl>
+ </FormControl>
+ <SelectContent>
+ <SelectItem value="us-east-1">US East (N. Virginia)</SelectItem>
+ <SelectItem value="us-west-2">US West (Oregon)</SelectItem>
+ <SelectItem value="eu-west-1">EU West (Ireland)</SelectItem>
+ </SelectContent>
+ </Select>
</FormItemLayout>
)}
/>
diff --git a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
index 1b3a146e357..c3e734a6d7e 100644
--- a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
+++ b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx
@@ -573,18 +573,18 @@ export default function FormPatternsSidePanel() {
label="Select (Dropdown)"
description="Single selection from a list of options"
>
- <FormControl className="col-span-6">
- <Select value={field.value} onValueChange={field.onChange}>
+ <Select value={field.value} onValueChange={field.onChange}>
+ <FormControl className="col-span-6">
<SelectTrigger>
<SelectValue placeholder="Select an option" />
</SelectTrigger>
- <SelectContent>
- <SelectItem value="us-east-1">US East (N. Virginia)</SelectItem>
- <SelectItem value="us-west-2">US West (Oregon)</SelectItem>
- <SelectItem value="eu-west-1">EU West (Ireland)</SelectItem>
- </SelectContent>
- </Select>
- </FormControl>
+ </FormControl>
+ <SelectContent>
+ <SelectItem value="us-east-1">US East (N. Virginia)</SelectItem>
+ <SelectItem value="us-west-2">US West (Oregon)</SelectItem>
+ <SelectItem value="eu-west-1">EU West (Ireland)</SelectItem>
+ </SelectContent>
+ </Select>
</FormItemLayout>
)}
/>
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx
index 350802b852c..2a5568fdf5a 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx
@@ -183,13 +183,9 @@ export const NewTokenDialog = ({
name="tokenName"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="tokenName" label="Name">
+ <FormItemLayout label="Name">
<FormControl>
- <Input
- id="tokenName"
- {...field}
- placeholder="Provide a name for your token"
- />
+ <Input {...field} placeholder="Provide a name for your token" />
</FormControl>
</FormItemLayout>
)}
@@ -199,24 +195,24 @@ export const NewTokenDialog = ({
name="expiresAt"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="expiresAt" label="Expires in">
+ <FormItemLayout label="Expires in">
<div className="flex gap-2">
- <FormControl className="grow">
- <Select value={field.value} onValueChange={handleExpiryChange}>
+ <Select value={field.value} onValueChange={handleExpiryChange}>
+ <FormControl className="grow">
<SelectTrigger>
<SelectValue placeholder="Expires at" />
</SelectTrigger>
- <SelectContent>
- {Object.values(EXPIRES_AT_OPTIONS).map(
- (option: { value: string; label: string }) => (
- <SelectItem key={option.value} value={option.value}>
- {option.label}
- </SelectItem>
- )
- )}
- </SelectContent>
- </Select>
- </FormControl>
+ </FormControl>
+ <SelectContent>
+ {Object.values(EXPIRES_AT_OPTIONS).map(
+ (option: { value: string; label: string }) => (
+ <SelectItem key={option.value} value={option.value}>
+ {option.label}
+ </SelectItem>
+ )
+ )}
+ </SelectContent>
+ </Select>
{isCustomExpiry && (
<DatePicker
selectsRange={false}
diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/TokenDetails.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/TokenDetails.tsx
index a57127f6b65..7ef6accc758 100644
--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/TokenDetails.tsx
+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/TokenDetails.tsx
@@ -59,7 +59,7 @@ export const TokenDetails = ({ control, setValue }: TokenDetailsProps) => {
name="tokenName"
control={control}
render={({ field }) => (
- <FormItemLayout name="tokenName" label="Name" layout="flex-row-reverse">
+ <FormItemLayout label="Name" layout="flex-row-reverse">
<FormControl>
<Input {...field} placeholder="e.g. CI deploy token" />
</FormControl>
diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx
index 8b6ce19fb05..5f3accd726d 100644
--- a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx
+++ b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx
@@ -245,15 +245,9 @@ const SecondStep = ({
name="code"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="code" label="Authentication code">
+ <FormItemLayout label="Authentication code">
<FormControl>
- <Input
- id="code"
- autoFocus
- {...field}
- placeholder="XXXXXX"
- className="font-mono"
- />
+ <Input autoFocus {...field} placeholder="XXXXXX" className="font-mono" />
</FormControl>
</FormItemLayout>
)}
diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
index 74458383ac0..69a981d0bc7 100644
--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
@@ -239,7 +239,7 @@ export const EnableExtensionModal = ({
name="name"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="name" label="Schema name">
+ <FormItemLayout label="Schema name">
<FormControl>
<Input {...field} />
</FormControl>
diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx
index d23c09d6e3c..c4ac1a3aa38 100644
--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx
+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx
@@ -144,7 +144,7 @@ export const EditSecretModal = () => {
name="name"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="name" label="Name">
+ <FormItemLayout label="Name">
<FormControl>
<Input {...field} />
</FormControl>
@@ -156,11 +156,7 @@ export const EditSecretModal = () => {
name="description"
control={form.control}
render={({ field }) => (
- <FormItemLayout
- name="description"
- label="Description"
- labelOptional="Optional"
- >
+ <FormItemLayout label="Description" labelOptional="Optional">
<FormControl>
<Input {...field} data-lpignore="true" />
</FormControl>
@@ -172,7 +168,7 @@ export const EditSecretModal = () => {
name="secret"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="secret" label="Secret value">
+ <FormItemLayout label="Secret value">
<div className="relative">
<FormControl>
<Textarea
diff --git a/apps/studio/components/interfaces/Reports/CreateReportModal.tsx b/apps/studio/components/interfaces/Reports/CreateReportModal.tsx
index 54adb6f92fb..c1045a8f3dd 100644
--- a/apps/studio/components/interfaces/Reports/CreateReportModal.tsx
+++ b/apps/studio/components/interfaces/Reports/CreateReportModal.tsx
@@ -126,9 +126,9 @@ export const CreateReportModal = ({ visible, onCancel, afterSubmit }: CreateRepo
control={form.control}
name="name"
render={({ field }) => (
- <FormItemLayout name="name" layout="vertical" label="Name">
+ <FormItemLayout layout="vertical" label="Name">
<FormControl>
- <Input {...field} id="name" />
+ <Input {...field} />
</FormControl>
</FormItemLayout>
)}
@@ -139,11 +139,10 @@ export const CreateReportModal = ({ visible, onCancel, afterSubmit }: CreateRepo
control={form.control}
name="description"
render={({ field }) => (
- <FormItemLayout name="description" layout="vertical" label="Description">
+ <FormItemLayout layout="vertical" label="Description">
<FormControl>
<Textarea
{...field}
- id="description"
rows={4}
placeholder="Describe your custom report"
className="resize-none"
diff --git a/apps/studio/components/interfaces/Reports/UpdateModal.tsx b/apps/studio/components/interfaces/Reports/UpdateModal.tsx
index b9b46174e11..3e463ee3d49 100644
--- a/apps/studio/components/interfaces/Reports/UpdateModal.tsx
+++ b/apps/studio/components/interfaces/Reports/UpdateModal.tsx
@@ -103,9 +103,9 @@ export const UpdateCustomReportModal = ({
control={form.control}
name="name"
render={({ field }) => (
- <FormItemLayout name="name" layout="vertical" label="Name">
+ <FormItemLayout layout="vertical" label="Name">
<FormControl>
- <Input {...field} id="name" />
+ <Input {...field} />
</FormControl>
</FormItemLayout>
)}
@@ -116,11 +116,10 @@ export const UpdateCustomReportModal = ({
control={form.control}
name="description"
render={({ field }) => (
- <FormItemLayout name="description" layout="vertical" label="Description">
+ <FormItemLayout layout="vertical" label="Description">
<FormControl>
<Textarea
{...field}
- id="description"
rows={4}
placeholder="Describe your custom report"
className="resize-none"
diff --git a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
index b3273b870c2..68452878e89 100644
--- a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
+++ b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx
@@ -169,7 +169,7 @@ const RenameQueryForm = ({ snippet, onCancel, onComplete }: RenameQueryFormProps
control={form.control}
name="name"
render={({ field }) => (
- <FormItemLayout name="name" layout="vertical" label="Name">
+ <FormItemLayout layout="vertical" label="Name">
<FormControl>
<Input {...field} />
</FormControl>
@@ -209,11 +209,10 @@ const RenameQueryForm = ({ snippet, onCancel, onComplete }: RenameQueryFormProps
control={form.control}
name="description"
render={({ field }) => (
- <FormItemLayout name="description" layout="vertical" label="Description">
+ <FormItemLayout layout="vertical" label="Description">
<FormControl>
<Textarea
{...field}
- id="description"
rows={4}
placeholder="Describe query"
className="resize-none"
diff --git a/apps/studio/components/interfaces/SignIn/SignInForm.tsx b/apps/studio/components/interfaces/SignIn/SignInForm.tsx
index 755d30a08d1..6409890cdac 100644
--- a/apps/studio/components/interfaces/SignIn/SignInForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInForm.tsx
@@ -133,10 +133,9 @@ export const SignInForm = () => {
name="email"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="email" label="Email">
+ <FormItemLayout label="Email">
<FormControl>
<Input
- id="email"
type="email"
autoComplete="email"
{...field}
@@ -154,11 +153,10 @@ export const SignInForm = () => {
name="password"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="password" label="Password">
- <FormControl>
- <div className="relative">
+ <FormItemLayout label="Password">
+ <div className="relative">
+ <FormControl>
<Input
- id="password"
type={passwordHidden ? 'password' : 'text'}
autoComplete="current-password"
{...field}
@@ -166,17 +164,17 @@ export const SignInForm = () => {
disabled={isSubmitting}
className="pr-10"
/>
- <Button
- variant="default"
- title={passwordHidden ? `Show password` : `Hide password`}
- aria-label={passwordHidden ? `Show password` : `Hide password`}
- className="absolute right-1 top-1 px-1.5"
- icon={passwordHidden ? <Eye /> : <EyeOff />}
- disabled={isSubmitting}
- onClick={() => setPasswordHidden((prev) => !prev)}
- />
- </div>
- </FormControl>
+ </FormControl>
+ <Button
+ variant="default"
+ title={passwordHidden ? `Show password` : `Hide password`}
+ aria-label={passwordHidden ? `Show password` : `Hide password`}
+ className="absolute right-1 top-1 px-1.5"
+ icon={passwordHidden ? <Eye /> : <EyeOff />}
+ disabled={isSubmitting}
+ onClick={() => setPasswordHidden((prev) => !prev)}
+ />
+ </div>
</FormItemLayout>
)}
/>
diff --git a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
index 4127113a7d4..f6e42e82ce4 100644
--- a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx
@@ -88,15 +88,9 @@ export const SignInSSOForm = () => {
name="email"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="email" label="Email">
+ <FormItemLayout label="Email">
<FormControl>
- <Input
- id="email"
- type="email"
- autoComplete="email"
- {...field}
- placeholder="[email protected]"
- />
+ <Input type="email" autoComplete="email" {...field} placeholder="[email protected]" />
</FormControl>
</FormItemLayout>
)}
diff --git a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx b/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
index 14f36b063b6..084d79aad5c 100644
--- a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
+++ b/apps/studio/components/interfaces/SignIn/SignUpForm.tsx
@@ -159,10 +159,9 @@ export const SignUpForm = ({ onSuccess }: { onSuccess?: () => void }) => {
name="email"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="email" label="Email">
+ <FormItemLayout label="Email">
<FormControl>
<Input
- id="email"
autoComplete="email"
disabled={isSubmitting}
{...field}
@@ -178,11 +177,10 @@ export const SignUpForm = ({ onSuccess }: { onSuccess?: () => void }) => {
name="password"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="password" label="Password">
- <FormControl>
- <div className="relative">
+ <FormItemLayout label="Password">
+ <div className="relative">
+ <FormControl>
<Input
- id="password"
type={passwordHidden ? 'password' : 'text'}
autoComplete="new-password"
placeholder="&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;"
@@ -190,17 +188,17 @@ export const SignUpForm = ({ onSuccess }: { onSuccess?: () => void }) => {
onFocus={() => setShowConditions(true)}
disabled={isSubmitting}
/>
- <Button
- variant="default"
- title={passwordHidden ? `Show password` : `Hide password`}
- aria-label={passwordHidden ? `Show password` : `Hide password`}
- className="absolute right-1 top-1 px-1.5"
- icon={passwordHidden ? <Eye /> : <EyeOff />}
- disabled={isSubmitting}
- onClick={() => setPasswordHidden((prev) => !prev)}
- />
- </div>
- </FormControl>
+ </FormControl>
+ <Button
+ variant="default"
+ title={passwordHidden ? `Show password` : `Hide password`}
+ aria-label={passwordHidden ? `Show password` : `Hide password`}
+ className="absolute right-1 top-1 px-1.5"
+ icon={passwordHidden ? <Eye /> : <EyeOff />}
+ disabled={isSubmitting}
+ onClick={() => setPasswordHidden((prev) => !prev)}
+ />
+ </div>
</FormItemLayout>
)}
/>
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
index baa8f39d07a..26de06b2d34 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
@@ -193,7 +193,7 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)
name="newNamespace"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="newNamespace" label="Name of new namespace">
+ <FormItemLayout label="Name of new namespace">
<FormControl>
<Input {...field} placeholder="Provide a name for your new namespace" />
</FormControl>
@@ -211,7 +211,7 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)
name="name"
control={form.control}
render={({ field }) => (
- <FormItemLayout name="name" label="Name of table">
+ <FormItemLayout label="Name of table">
<FormControl>
<Input {...field} placeholder="Provide a name for your new table" />
</FormControl>
diff --git a/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx b/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
index 66e91a9e00b..0d77456324b 100644
--- a/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
+++ b/apps/studio/components/interfaces/Workers/DeployWorkerDialog.tsx
@@ -102,7 +102,7 @@ export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogPro
control={form.control}
name="name"
render={({ field }) => (
- <FormItemLayout name="name" label="Name">
+ <FormItemLayout label="Name">
<FormControl>
<Input {...field} placeholder="my-worker" />
</FormControl>
@@ -114,7 +114,7 @@ export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogPro
control={form.control}
name="runtime"
render={({ field }) => (
- <FormItemLayout name="runtime" label="Runtime">
+ <FormItemLayout label="Runtime">
<Select value={field.value} onValueChange={field.onChange}>
<FormControl>
<SelectTrigger>
@@ -138,7 +138,6 @@ export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogPro
name="size"
render={({ field }) => (
<FormItemLayout
- name="size"
label="Size"
description="Fixed at deploy time and cannot be changed later"
>
@@ -165,7 +164,6 @@ export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogPro
name="access"
render={({ field }) => (
<FormItemLayout
- name="access"
label="Access"
description="Public workers accept requests with a publishable key"
>
@@ -191,7 +189,7 @@ export const DeployWorkerDialog = ({ open, onOpenChange }: DeployWorkerDialogPro
control={form.control}
name="instances"
render={({ field }) => (
- <FormItemLayout name="instances" label="Instances" description="1 to 10">
+ <FormItemLayout label="Instances" description="1 to 10">
<FormControl>
<Input
{...field}