From f6faf6fdadef9ca8ce0e98e3da40437f43c411ad Mon Sep 17 00:00:00 2001
From: George Desipris <73396808+desiprisg@users.noreply.github.com>
Date: Tue, 10 Oct 2023 16:05:07 +0300
Subject: [PATCH] fix(clerk-js): Disable country code picker when form is
 submitting (#1853)

---
 .changeset/violet-avocados-fold.md                          | 5 +++++
 packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx | 1 +
 packages/clerk-js/src/ui/primitives/Input.tsx               | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/violet-avocados-fold.md

diff --git a/.changeset/violet-avocados-fold.md b/.changeset/violet-avocados-fold.md
new file mode 100644
index 0000000000..499ad32c43
--- /dev/null
+++ b/.changeset/violet-avocados-fold.md
@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Disable country picker button when form is submitted
diff --git a/packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx b/packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx
index fda71753ac..1aec5c0795 100644
--- a/packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx
+++ b/packages/clerk-js/src/ui/elements/PhoneInput/PhoneInput.tsx
@@ -111,6 +111,7 @@ const PhoneInputBase = forwardRef<HTMLInputElement, PhoneInputProps>((props, ref
               borderBottomRightRadius: '0',
               borderTopRightRadius: '0',
             })}
+            isDisabled={rest.isDisabled}
           >
             <Flag iso={iso} />
             <Text
diff --git a/packages/clerk-js/src/ui/primitives/Input.tsx b/packages/clerk-js/src/ui/primitives/Input.tsx
index 9d40363aa0..1d6788e6a2 100644
--- a/packages/clerk-js/src/ui/primitives/Input.tsx
+++ b/packages/clerk-js/src/ui/primitives/Input.tsx
@@ -39,7 +39,6 @@ type OwnProps = {
   isSuccessful?: boolean;
 };
 
-// @ts-ignore
 export type InputProps = PrimitiveProps<'input'> & StyleVariants<typeof applyVariants> & OwnProps & RequiredProp;
 
 export const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {