From 57a6f74407776fdd83584e0b975edd8472e80da1 Mon Sep 17 00:00:00 2001
From: Gildas Garcia <1122076+djhi@users.noreply.github.com>
Date: Thu, 27 Aug 2026 10:34:10 +0200
Subject: [PATCH] Revert "fix: FormItemLayout does not apply item id correctly"
 (#49635)

Reverts supabase/supabase#49593 because we currently provide `id`
manually in some places and that breaks many tests. We didn't see the
failures because the PR only modified `ui-patterns` which isn't in the
paths checked to actually run the tests (this must be fixed too).

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

* **Bug Fixes**
* Improved form accessibility by correctly associating labels with their
corresponding fields in React form layouts.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---
 packages/ui-patterns/src/form/Layout/FormLayout.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ui-patterns/src/form/Layout/FormLayout.tsx b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
index e944eab71a5..37f67aa61a3 100644
--- a/packages/ui-patterns/src/form/Layout/FormLayout.tsx
+++ b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
@@ -398,6 +398,7 @@ export const FormLayout = React.forwardRef<
                 <FormLabel
                   className="text-foreground flex gap-2 items-center wrap-break-word"
                   data-formlayout-id="formLabel"
+                  htmlFor={props.name || id}
                 >
                   <LabelContents />
                 </FormLabel>