From dad5f0114069463ca45f183b5aafd1dbd796ee54 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Sat, 1 Nov 2025 01:16:42 +0800
Subject: [PATCH] Revert form layout changes (#40048)

---
 .../GitHubIntegrationConnectionForm.tsx       |   7 +-
 .../src/form/Layout/FormLayout.tsx            | 150 +++++++++---------
 2 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
index 152da94ad04..252894e8bbe 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
@@ -464,7 +464,12 @@ const GitHubIntegrationConnectionForm = ({
                           </Button>
                         </FormControl_Shadcn_>
                       </PopoverTrigger_Shadcn_>
-                      <PopoverContent_Shadcn_ className="p-0 w-80" side="bottom" align="start">
+                      <PopoverContent_Shadcn_
+                        portal
+                        className="p-0 w-80"
+                        side="bottom"
+                        align="start"
+                      >
                         <Command_Shadcn_>
                           <CommandInput_Shadcn_ placeholder="Search repositories..." />
                           <CommandList_Shadcn_ className="!max-h-[200px]">
diff --git a/packages/ui-patterns/src/form/Layout/FormLayout.tsx b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
index a3379cfa368..54d41edfe57 100644
--- a/packages/ui-patterns/src/form/Layout/FormLayout.tsx
+++ b/packages/ui-patterns/src/form/Layout/FormLayout.tsx
@@ -42,11 +42,11 @@ const ContainerVariants = cva('relative grid gap-10', {
       false: '',
     },
     layout: {
-      horizontal: 'flex flex-col gap-2 md:grid @lg:grid-cols-12',
+      horizontal: 'flex flex-col gap-2 md:grid md:grid-cols-12',
       vertical: 'flex flex-col gap-2',
       flex: 'flex flex-row gap-3',
       'flex-row-reverse':
-        'flex flex-col-reverse gap-2 @lg:gap-6 @lg:flex-row-reverse @lg:justify-between',
+        'flex flex-col-reverse gap-2 md:gap-6 md:flex-row-reverse md:justify-between',
     },
     flex: {
       true: '',
@@ -233,7 +233,7 @@ const FlexContainer = cva('', {
     },
     {
       layout: 'flex-row-reverse',
-      className: 'flex flex-col justify-center items-start @lg:items-end shrink-0',
+      className: 'flex flex-col justify-center items-start md:items-end shrink-0',
     },
   ],
 })
@@ -359,85 +359,83 @@ export const FormLayout = React.forwardRef<
     )
 
     return (
-      <div className="@container">
-        <div
-          ref={ref}
-          {...props}
-          className={cn(ContainerVariants({ size, flex, align, layout }), className)}
-        >
-          {flex && (
-            <div className={cn(FlexContainer({ flex, align, layout }))}>
-              {props.children}
-              {layout === 'flex-row-reverse' && renderError}
+      <div
+        ref={ref}
+        {...props}
+        className={cn(ContainerVariants({ size, flex, align, layout }), className)}
+      >
+        {flex && (
+          <div className={cn(FlexContainer({ flex, align, layout }))}>
+            {props.children}
+            {layout === 'flex-row-reverse' && renderError}
+          </div>
+        )}
+        {hasLabel || labelOptional || layout === 'horizontal' ? (
+          <>
+            <div
+              className={cn(LabelContainerVariants({ align, labelLayout, flex, layout }))}
+              data-formlayout-id={'labelContainer'}
+            >
+              {hasLabel && isReactForm ? (
+                <FormLabel_Shadcn_
+                  className="text-foreground flex gap-2 items-center break-all"
+                  data-formlayout-id="formLabel"
+                  htmlFor={props.name || id}
+                >
+                  <LabelContents />
+                </FormLabel_Shadcn_>
+              ) : (
+                <Label_Shadcn_
+                  className="text-foreground flex gap-2 items-center break-all leading-normal"
+                  data-formlayout-id="label"
+                  htmlFor={props.name || id}
+                >
+                  <LabelContents />
+                </Label_Shadcn_>
+              )}
+              {labelOptional && (
+                <span
+                  className={cn(LabelOptionalVariants({ size }))}
+                  id={id + '-optional'}
+                  data-formlayout-id={'labelOptional'}
+                >
+                  {labelOptional}
+                </span>
+              )}
+              {flex && (
+                <>
+                  {renderDescription}
+                  {layout !== 'flex-row-reverse' && renderError}
+                </>
+              )}
             </div>
-          )}
-          {hasLabel || labelOptional || layout === 'horizontal' ? (
+          </>
+        ) : null}
+        {!flex && (
+          <div
+            className={cn(DataContainerVariants({ align, layout }))}
+            style={style}
+            data-formlayout-id={'dataContainer'}
+          >
             <>
               <div
-                className={cn(LabelContainerVariants({ align, labelLayout, flex, layout }))}
-                data-formlayout-id={'labelContainer'}
+                className={cn(
+                  NonBoxInputContainer({
+                    nonBoxInput,
+                    // @ts-expect-error
+                    label,
+                    layout,
+                  })
+                )}
+                data-formlayout-id={'nonBoxInputContainer'}
               >
-                {hasLabel && isReactForm ? (
-                  <FormLabel_Shadcn_
-                    className="text-foreground flex gap-2 items-center break-all"
-                    data-formlayout-id="formLabel"
-                    htmlFor={props.name || id}
-                  >
-                    <LabelContents />
-                  </FormLabel_Shadcn_>
-                ) : (
-                  <Label_Shadcn_
-                    className="text-foreground flex gap-2 items-center break-all leading-normal"
-                    data-formlayout-id="label"
-                    htmlFor={props.name || id}
-                  >
-                    <LabelContents />
-                  </Label_Shadcn_>
-                )}
-                {labelOptional && (
-                  <span
-                    className={cn(LabelOptionalVariants({ size }))}
-                    id={id + '-optional'}
-                    data-formlayout-id={'labelOptional'}
-                  >
-                    {labelOptional}
-                  </span>
-                )}
-                {flex && (
-                  <>
-                    {renderDescription}
-                    {layout !== 'flex-row-reverse' && renderError}
-                  </>
-                )}
+                {props.children}
               </div>
+              {renderError}
+              {renderDescription}
             </>
-          ) : null}
-          {!flex && (
-            <div
-              className={cn(DataContainerVariants({ align, layout }))}
-              style={style}
-              data-formlayout-id={'dataContainer'}
-            >
-              <>
-                <div
-                  className={cn(
-                    NonBoxInputContainer({
-                      nonBoxInput,
-                      // @ts-expect-error
-                      label,
-                      layout,
-                    })
-                  )}
-                  data-formlayout-id={'nonBoxInputContainer'}
-                >
-                  {props.children}
-                </div>
-                {renderError}
-                {renderDescription}
-              </>
-            </div>
-          )}
-        </div>
+          </div>
+        )}
       </div>
     )
   }