Merge branch 'main' into vaggelis/sdk-1780-clerkremix-v4012-requestin…

…it-duplex-option-is-required-when
clerk · Jun 13, 2024 · 9db8246 · 9db8246
2 parents 691fbc0 + 8488bac
commit 9db8246
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 15 deletions.
diff --git a/.changeset/bright-icons-brake.md b/.changeset/bright-icons-brake.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/five-forks-arrive.md b/.changeset/five-forks-arrive.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/ui/src/common/EmailField.tsx → packages/ui/src/common/email-field.tsx b/packages/ui/src/common/EmailField.tsx → packages/ui/src/common/email-field.tsx
diff --git a/packages/ui/src/common/FirstNameField.tsx → packages/ui/src/common/first-name-field.tsx b/packages/ui/src/common/FirstNameField.tsx → packages/ui/src/common/first-name-field.tsx
diff --git a/packages/ui/src/common/LastNameField.tsx → packages/ui/src/common/last-name-field.tsx b/packages/ui/src/common/LastNameField.tsx → packages/ui/src/common/last-name-field.tsx
diff --git a/packages/ui/src/common/OTPField.tsx → packages/ui/src/common/otp-field.tsx b/packages/ui/src/common/OTPField.tsx → packages/ui/src/common/otp-field.tsx
diff --git a/packages/ui/src/common/PasswordField.tsx → packages/ui/src/common/password-field.tsx b/packages/ui/src/common/PasswordField.tsx → packages/ui/src/common/password-field.tsx
diff --git a/...es/ui/src/common/PhoneNumberField/data.ts → .../ui/src/common/phone-number-field/data.ts b/...es/ui/src/common/PhoneNumberField/data.ts → .../ui/src/common/phone-number-field/data.ts
diff --git a/.../ui/src/common/PhoneNumberField/index.tsx → ...i/src/common/phone-number-field/index.tsx b/.../ui/src/common/PhoneNumberField/index.tsx → ...i/src/common/phone-number-field/index.tsx
diff --git a/...oneNumberField/useFormattedPhoneNumber.ts → ...e-number-field/useFormattedPhoneNumber.ts b/...oneNumberField/useFormattedPhoneNumber.ts → ...e-number-field/useFormattedPhoneNumber.ts
diff --git a/...s/ui/src/common/PhoneNumberField/utils.ts → ...ui/src/common/phone-number-field/utils.ts b/...s/ui/src/common/PhoneNumberField/utils.ts → ...ui/src/common/phone-number-field/utils.ts
diff --git a/packages/ui/src/components/sign-in/sign-in.tsx b/packages/ui/src/components/sign-in/sign-in.tsx
@@ -2,10 +2,10 @@ import { useClerk } from '@clerk/clerk-react';
 import * as Common from '@clerk/elements/common';
 import * as SignIn from '@clerk/elements/sign-in';
 
-import { EmailField } from '~/common/EmailField';
-import { OTPField } from '~/common/OTPField';
-import { PasswordField } from '~/common/PasswordField';
-import { PhoneNumberField } from '~/common/PhoneNumberField';
+import { EmailField } from '~/common/email-field';
+import { OTPField } from '~/common/otp-field';
+import { PasswordField } from '~/common/password-field';
+import { PhoneNumberField } from '~/common/phone-number-field';
 import { PROVIDERS } from '~/constants';
 import { getEnabledSocialConnectionsFromEnvironment } from '~/hooks/getEnabledSocialConnectionsFromEnvironment';
 import { Button } from '~/primitives/button';
@@ -63,7 +63,7 @@ export function SignInComponent() {
                       })}
                     </Connection.Root>
                     <Seperator>or</Seperator>
-                    <div className='space-y-4'>
+                    <div className='flex flex-col gap-4'>
                       {/* @ts-ignore Expected https://github.com/clerk/javascript/blob/12f78491d6b10f2be63891f8a7f76fc6acf37c00/packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx#L248-L249 */}
                       <PhoneNumberField locationBasedCountryIso={clerk.__internal_country} />
                       <EmailField disabled={isGlobalLoading} />

diff --git a/packages/ui/src/components/sign-up/sign-up.tsx b/packages/ui/src/components/sign-up/sign-up.tsx
@@ -2,11 +2,11 @@ import { useClerk } from '@clerk/clerk-react';
 import * as Common from '@clerk/elements/common';
 import * as SignUp from '@clerk/elements/sign-up';
 
-import { EmailField } from '~/common/EmailField';
-import { FirstNameField } from '~/common/FirstNameField';
-import { LastNameField } from '~/common/LastNameField';
-import { OTPField } from '~/common/OTPField';
-import { PasswordField } from '~/common/PasswordField';
+import { EmailField } from '~/common/email-field';
+import { FirstNameField } from '~/common/first-name-field';
+import { LastNameField } from '~/common/last-name-field';
+import { OTPField } from '~/common/otp-field';
+import { PasswordField } from '~/common/password-field';
 import { PROVIDERS } from '~/constants';
 import { getEnabledSocialConnectionsFromEnvironment } from '~/hooks/getEnabledSocialConnectionsFromEnvironment';
 import { Button } from '~/primitives/button';
@@ -67,7 +67,7 @@ export function SignUpComponent() {
                     </Connection.Root>
 
                     <Seperator>or</Seperator>
-                    <div className='space-y-4'>
+                    <div className='flex flex-col gap-4'>
                       <div className='flex gap-4'>
                         <FirstNameField disabled={isGlobalLoading} />
                         <LastNameField disabled={isGlobalLoading} />

diff --git a/packages/ui/src/primitives/card.tsx b/packages/ui/src/primitives/card.tsx
@@ -30,7 +30,7 @@ export const Content = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTM
       ref={forwardedRef}
       {...props}
       className={cn(
-        'bg-gray-surface shadow-gray-a3 border-gray-a6 relative -mx-px -mt-px space-y-8 rounded-[inherit] border px-10 py-8 shadow-sm',
+        'bg-gray-surface shadow-gray-a3 border-gray-a6 relative -mx-px -mt-px flex flex-col gap-8 rounded-[inherit] border px-10 py-8 shadow-sm',
         className,
       )}
     >
@@ -47,7 +47,7 @@ export const Header = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTML
     <div
       ref={forwardedRef}
       {...props}
-      className={cn('space-y-space-1 text-center', className)}
+      className={cn('flex flex-col gap-1 text-center', className)}
     >
       {children}
     </div>
@@ -91,7 +91,7 @@ export const Body = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDi
     <div
       ref={forwardedRef}
       {...props}
-      className={cn('space-y-6 rounded-lg', className)}
+      className={cn('flex flex-col gap-6 rounded-lg', className)}
     >
       {children}
     </div>

diff --git a/packages/ui/src/primitives/field.tsx b/packages/ui/src/primitives/field.tsx
@@ -14,7 +14,11 @@ export const Root = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDi
     <div
       ref={forwardedRef}
       {...props}
-      className={cn('has-[[data-field-input][disabled]]:[--cl-field-label-opacity:0.5]', 'space-y-2', className)}
+      className={cn(
+        'has-[[data-field-input][disabled]]:[--cl-field-label-opacity:0.5]',
+        'flex flex-col gap-2',
+        className,
+      )}
     >
       {children}
     </div>