From 344f34d70d6652a78ba704612715f33fae5f308c Mon Sep 17 00:00:00 2001
From: Omer Alpi <omeralpi@icloud.com>
Date: Tue, 12 Mar 2024 08:52:54 +0300
Subject: [PATCH] fix: simplify onChange handler (#9)

---
 README.md                        |  16 ++++-
 app/(home)/sections/hero.tsx     | 108 ++++++++++++++++---------------
 app/(home)/sections/variants.tsx |   1 -
 components/ui/phone-input.tsx    |  45 ++++++-------
 content/snippets/phone-input.mdx |  45 ++++++-------
 5 files changed, 115 insertions(+), 100 deletions(-)

diff --git a/README.md b/README.md
index 304492e..08d0336 100644
--- a/README.md
+++ b/README.md
@@ -63,8 +63,7 @@ export default function Hero() {
     <Form {...form}>
       <form
         onSubmit={form.handleSubmit(onSubmit)}
-        className="space-y-8 flex flex-col items-start"
-      >
+        className="space-y-8 flex flex-col items-start">
         <FormField
           control={form.control}
           name="phone"
@@ -88,6 +87,19 @@ export default function Hero() {
 }
 ```
 
+## Other Examples
+
+### Optional Phone Input
+
+```tsx
+const FormSchema = z.object({
+  phone: z
+    .string()
+    .refine(isValidPhoneNumber, { message: "Invalid phone number" })
+    .or(z.literal("")),
+});
+```
+
 ## Documentation
 
 You can find out more about the API and implementation in the
diff --git a/app/(home)/sections/hero.tsx b/app/(home)/sections/hero.tsx
index d73eae8..1a639e3 100644
--- a/app/(home)/sections/hero.tsx
+++ b/app/(home)/sections/hero.tsx
@@ -41,62 +41,64 @@ export default function Hero() {
   }
 
   return (
-    <section className="z-10 max-w-5xl w-full flex flex-col items-center text-center gap-5">
-      <div className="z-10 w-full flex flex-col items-center text-center gap-5">
-        <h1 className="scroll-m-20 text-4xl font-bold tracking-tight">Shadcn Phone Input</h1>
-        <p className="text-muted-foreground max-w-[450px]">
-          An implementation of a Phone Input component built on top of Shadcn UI&apos;s input component.
-        </p>
-        <div className="flex gap-2 mt-1">
-          <Link
-            href="#try"
-            className={`${buttonVariants({
-              variant: "default",
-              size: "lg",
-            })} min-w-[150px] shadow-sm`}
-          >
-            Try it out
-          </Link>
-          <Link
-            href={siteConfig.links.github}
-            className={`${buttonVariants({
-              variant: "secondary",
-              size: "lg",
-            })} shadow-sm`}
-          >
-            Github
-          </Link>
+    <>
+      <section className="z-10 max-w-5xl w-full flex flex-col items-center text-center gap-5">
+        <div className="z-10 w-full flex flex-col items-center text-center gap-5">
+          <h1 className="scroll-m-20 text-4xl font-bold tracking-tight">Shadcn Phone Input</h1>
+          <p className="text-muted-foreground max-w-[450px]">
+            An implementation of a Phone Input component built on top of Shadcn UI&apos;s input component.
+          </p>
+          <div className="flex gap-2 mt-1">
+            <Link
+              href="#try"
+              className={`${buttonVariants({
+                variant: "default",
+                size: "lg",
+              })} min-w-[150px] shadow-sm`}
+            >
+              Try it out
+            </Link>
+            <Link
+              href={siteConfig.links.github}
+              className={`${buttonVariants({
+                variant: "secondary",
+                size: "lg",
+              })} shadow-sm`}
+            >
+              Github
+            </Link>
+          </div>
         </div>
-      </div>
 
-      <div id="try" className="w-full py-8">
-        <div className="w-full relative my-4 flex flex-col space-y-2">
-          <div className="preview flex min-h-[350px] w-full justify-center p-10 items-start mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 relative rounded-md border">
-            <Form {...form}>
-              <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8 flex flex-col items-start">
-                <FormField
-                  control={form.control}
-                  name="phone"
-                  render={({ field }) => (
-                    <FormItem className="flex flex-col items-start">
-                      <FormLabel className="text-left">Phone Number</FormLabel>
-                      <FormControl className="w-full">
-                        <PhoneInput placeholder="Enter a phone number" {...field} />
-                      </FormControl>
-                      <FormDescription className="text-left">Enter a phone number</FormDescription>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <pre>
-                  <code className="text-foreground">{JSON.stringify(form.watch("phone"), null, 2)}</code>
-                </pre>
-                <Button type="submit">Submit</Button>
-              </form>
-            </Form>
+        <div id="try" className="w-full py-8">
+          <div className="w-full relative my-4 flex flex-col space-y-2">
+            <div className="preview flex min-h-[350px] w-full justify-center p-10 items-start mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 relative rounded-md border">
+              <Form {...form}>
+                <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8 flex flex-col items-start">
+                  <FormField
+                    control={form.control}
+                    name="phone"
+                    render={({ field }) => (
+                      <FormItem className="flex flex-col items-start">
+                        <FormLabel className="text-left">Phone Number</FormLabel>
+                        <FormControl className="w-full">
+                          <PhoneInput placeholder="Enter a phone number" {...field} />
+                        </FormControl>
+                        <FormDescription className="text-left">Enter a phone number</FormDescription>
+                        <FormMessage />
+                      </FormItem>
+                    )}
+                  />
+                  <pre>
+                    <code className="text-foreground">{JSON.stringify(form.watch("phone"), null, 2)}</code>
+                  </pre>
+                  <Button type="submit">Submit</Button>
+                </form>
+              </Form>
+            </div>
           </div>
         </div>
-      </div>
-    </section>
+      </section>
+    </>
   );
 }
diff --git a/app/(home)/sections/variants.tsx b/app/(home)/sections/variants.tsx
index 243323a..888e21b 100644
--- a/app/(home)/sections/variants.tsx
+++ b/app/(home)/sections/variants.tsx
@@ -2,7 +2,6 @@ import { PhoneInput } from "@/components/ui/phone-input";
 import React, { useState } from "react";
 import {
   Country,
-  Value,
   formatPhoneNumber,
   formatPhoneNumberIntl,
   getCountryCallingCode,
diff --git a/components/ui/phone-input.tsx b/components/ui/phone-input.tsx
index 4e49c3b..f99ab94 100644
--- a/components/ui/phone-input.tsx
+++ b/components/ui/phone-input.tsx
@@ -22,33 +22,34 @@ import { cn } from "@/lib/utils";
 
 type PhoneInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, "onChange" | "value"> &
   Omit<RPNInput.Props<typeof RPNInput.default>, "onChange"> & {
-    onChange: (value: RPNInput.Value) => void;
-    value: RPNInput.Value;
+    onChange?: (value: RPNInput.Value) => void;
   };
 
 const PhoneInput: React.ForwardRefExoticComponent<PhoneInputProps> = React.forwardRef<
   React.ElementRef<typeof RPNInput.default>,
   PhoneInputProps
->(({ className, onChange, ...props }, ref) => (
-  <RPNInput.default
-    ref={ref}
-    className={cn("flex", className)}
-    flagComponent={FlagComponent}
-    countrySelectComponent={CountrySelect}
-    inputComponent={InputComponent}
-    /**
-     * Handles the onChange event.
-     *
-     * react-phone-number-input might trigger the onChange event as undefined
-     * when a valid phone number is not entered. To prevent this,
-     * the value is coerced to an empty string.
-     *
-     * @param {E164Number | undefined} value - The entered value
-     */
-    onChange={(value) => onChange(value || "")}
-    {...props}
-  />
-));
+>(({ className, onChange, ...props }, ref) => {
+  return (
+    <RPNInput.default
+      ref={ref}
+      className={cn("flex", className)}
+      flagComponent={FlagComponent}
+      countrySelectComponent={CountrySelect}
+      inputComponent={InputComponent}
+      /**
+       * Handles the onChange event.
+       *
+       * react-phone-number-input might trigger the onChange event as undefined
+       * when a valid phone number is not entered. To prevent this,
+       * the value is coerced to an empty string.
+       *
+       * @param {E164Number | undefined} value - The entered value
+       */
+      onChange={(value) => onChange?.(value || "")}
+      {...props}
+    />
+  );
+});
 PhoneInput.displayName = "PhoneInput";
 
 const InputComponent = React.forwardRef<HTMLInputElement, InputProps>(({ className, ...props }, ref) => (
diff --git a/content/snippets/phone-input.mdx b/content/snippets/phone-input.mdx
index aab77bc..f4cd82c 100644
--- a/content/snippets/phone-input.mdx
+++ b/content/snippets/phone-input.mdx
@@ -35,32 +35,33 @@ type PhoneInputProps = Omit<
   "onChange" | "value"
 > &
   Omit<RPNInput.Props<typeof RPNInput.default>, "onChange"> & {
-    onChange: (value: RPNInput.Value) => void;
-    value: RPNInput.Value;
+    onChange?: (value: RPNInput.Value) => void;
   };
 
 const PhoneInput: React.ForwardRefExoticComponent<PhoneInputProps> =
   React.forwardRef<React.ElementRef<typeof RPNInput.default>, PhoneInputProps>(
-    ({ className, onChange, ...props }, ref) => (
-      <RPNInput.default
-        ref={ref}
-        className={cn("flex", className)}
-        flagComponent={FlagComponent}
-        countrySelectComponent={CountrySelect}
-        inputComponent={InputComponent}
-        /**
-         * Handles the onChange event.
-         *
-         * react-phone-number-input might trigger the onChange event as undefined
-         * when a valid phone number is not entered. To prevent this,
-         * the value is coerced to an empty string.
-         *
-         * @param {E164Number | undefined} value - The entered value
-         */
-        onChange={(value) => onChange(value || "")}
-        {...props}
-      />
-    ),
+    ({ className, onChange, ...props }, ref) => {
+      return (
+        <RPNInput.default
+          ref={ref}
+          className={cn("flex", className)}
+          flagComponent={FlagComponent}
+          countrySelectComponent={CountrySelect}
+          inputComponent={InputComponent}
+          /**
+           * Handles the onChange event.
+           *
+           * react-phone-number-input might trigger the onChange event as undefined
+           * when a valid phone number is not entered. To prevent this,
+           * the value is coerced to an empty string.
+           *
+           * @param {E164Number | undefined} value - The entered value
+           */
+          onChange={(value) => onChange?.(value || "")}
+          {...props}
+        />
+      );
+    },
   );
 PhoneInput.displayName = "PhoneInput";