Skip to content

Commit 2c0b2ba

Browse files
joshenlimjoshenlim
authored
Smol feex (supabase#40041)
* Smol feex * Small fix
1 parent 3182df1 commit 2c0b2ba

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

‎apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
FormField_Shadcn_ as FormField,
1717
FormMessage_Shadcn_ as FormMessage,
1818
Input_Shadcn_ as Input,
19-
Input_Shadcn_,
2019
Popover_Shadcn_ as Popover,
2120
PopoverContent_Shadcn_ as PopoverContent,
2221
PopoverTrigger_Shadcn_ as PopoverTrigger,
@@ -83,7 +82,7 @@ export const BillingCustomerDataForm = ({
8382
<FormField
8483
control={form.control}
8584
name="billing_name"
86-
render={({ field }: { field: any }) => (
85+
render={({ field }) => (
8786
<FormItemLayout hideMessage label="Name">
8887
<FormControl>
8988
<Input {...field} disabled={disabled} />
@@ -96,7 +95,7 @@ export const BillingCustomerDataForm = ({
9695
<FormField
9796
control={form.control}
9897
name="line1"
99-
render={({ field }: { field: any }) => (
98+
render={({ field }) => (
10099
<FormItemLayout hideMessage label="Address line 1">
101100
<FormControl>
102101
<Input {...field} placeholder="123 Main Street" disabled={disabled} />
@@ -109,7 +108,7 @@ export const BillingCustomerDataForm = ({
109108
<FormField
110109
control={form.control}
111110
name="line2"
112-
render={({ field }: { field: any }) => (
111+
render={({ field }) => (
113112
<FormItemLayout hideMessage label="Address line 2 (optional)">
114113
<FormControl>
115114
<Input
@@ -127,7 +126,7 @@ export const BillingCustomerDataForm = ({
127126
<FormField
128127
control={form.control}
129128
name="country"
130-
render={({ field }: { field: any }) => (
129+
render={({ field }) => (
131130
<FormItemLayout hideMessage label="Country">
132131
<Popover open={showCountriesPopover} onOpenChange={setShowCountriesPopover}>
133132
<PopoverTrigger asChild>
@@ -155,7 +154,7 @@ export const BillingCustomerDataForm = ({
155154
</Button>
156155
</FormControl>
157156
</PopoverTrigger>
158-
<PopoverContent sameWidthAsTrigger className="p-0" align="start">
157+
<PopoverContent portal sameWidthAsTrigger className="p-0" align="start">
159158
<Command>
160159
<CommandInput placeholder="Search country..." />
161160
<CommandList>
@@ -195,7 +194,7 @@ export const BillingCustomerDataForm = ({
195194
<FormField
196195
control={form.control}
197196
name="postal_code"
198-
render={({ field }: { field: any }) => (
197+
render={({ field }) => (
199198
<FormItemLayout hideMessage label="Postal code">
200199
<FormControl>
201200
<Input {...field} placeholder="12345" disabled={disabled} />
@@ -210,7 +209,7 @@ export const BillingCustomerDataForm = ({
210209
<FormField
211210
control={form.control}
212211
name="city"
213-
render={({ field }: { field: any }) => (
212+
render={({ field }) => (
214213
<FormItemLayout hideMessage label="City">
215214
<FormControl>
216215
<Input {...field} disabled={disabled} />
@@ -222,7 +221,7 @@ export const BillingCustomerDataForm = ({
222221
<FormField
223222
control={form.control}
224223
name="state"
225-
render={({ field }: { field: any }) => (
224+
render={({ field }) => (
226225
<FormItemLayout hideMessage label="State / Province">
227226
<FormControl>
228227
<Input {...field} disabled={disabled} />
@@ -237,7 +236,7 @@ export const BillingCustomerDataForm = ({
237236
<FormField
238237
name="tax_id_name"
239238
control={form.control}
240-
render={({ field }) => (
239+
render={() => (
241240
<FormItemLayout hideMessage layout="vertical" label="Tax ID">
242241
<Popover open={showTaxIDsPopover} onOpenChange={setShowTaxIDsPopover}>
243242
<PopoverTrigger asChild>
@@ -248,14 +247,11 @@ export const BillingCustomerDataForm = ({
248247
size="medium"
249248
disabled={disabled}
250249
className={cn(
251-
'w-full justify-between h-[34px]',
250+
'w-full justify-between h-[34px] pr-2',
252251
!selectedTaxId && 'text-muted'
253252
)}
254253
iconRight={
255-
<ChevronsUpDown
256-
className="ml-2 h-4 w-4 shrink-0 opacity-50"
257-
strokeWidth={1.5}
258-
/>
254+
<ChevronsUpDown className="h-4 w-4 shrink-0 opacity-50" strokeWidth={1.5} />
259255
}
260256
>
261257
{selectedTaxId
@@ -264,7 +260,7 @@ export const BillingCustomerDataForm = ({
264260
</Button>
265261
</FormControl>
266262
</PopoverTrigger>
267-
<PopoverContent sameWidthAsTrigger className="p-0" align="start">
263+
<PopoverContent portal sameWidthAsTrigger className="p-0" align="start">
268264
<Command>
269265
<CommandInput placeholder="Search tax ID..." />
270266
<CommandList>
@@ -299,17 +295,17 @@ export const BillingCustomerDataForm = ({
299295
/>
300296

301297
{selectedTaxId && (
302-
<div className="flex items-center space-x-2">
298+
<div className="flex items-center space-x-2 [&>div]:w-full">
303299
<FormField
304300
name="tax_id_value"
305301
control={form.control}
306302
render={({ field }) => (
307-
<FormItemLayout hideMessage className="w-full">
303+
<FormItemLayout hideMessage>
308304
<FormControl>
309-
<Input_Shadcn_
305+
<Input
310306
{...field}
311-
placeholder={selectedTaxId?.placeholder}
312307
disabled={disabled}
308+
placeholder={selectedTaxId?.placeholder}
313309
/>
314310
</FormControl>
315311
</FormItemLayout>

‎apps/studio/components/layouts/Scaffold.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const ScaffoldContainer = forwardRef<
3434
ref={ref}
3535
{...props}
3636
className={cn(
37-
'mx-auto w-full',
37+
'mx-auto w-full @container',
3838
maxWidthClass,
3939
PADDING_CLASSES,
4040
bottomPadding && 'pb-16',
@@ -93,7 +93,7 @@ export const ScaffoldSection = forwardRef<
9393
{...props}
9494
className={cn(
9595
'flex flex-col first:pt-12 py-6',
96-
isFullWidth ? 'w-full' : 'gap-3 @lg:grid @md:grid-cols-12',
96+
isFullWidth ? 'w-full' : 'gap-3 @md:grid-cols-12 @lg:grid',
9797
className
9898
)}
9999
/>

0 commit comments

Comments
 (0)