From 74506c0c4779adb2bad4e2f6a4b71a4519b81d37 Mon Sep 17 00:00:00 2001
From: Apoorva Chaturvedi <apoorva9191@gmail.com>
Date: Sun, 30 Jan 2022 12:06:40 +0530
Subject: [PATCH] passing country as prop instead of countryCode as it is not
 unique

---
 .../src/components/PhoneNumberInput.tsx       | 19 ++++++++-------
 .../phonenumberinput.test.tsx.snap            |  2 +-
 .../__tests__/phonenumberinput.test.tsx       | 24 +++++++++----------
 .../components/typings/PhoneNumberInput.ts    |  9 +++----
 .../stories/phoneNumberInput.story.tsx        | 13 +++++-----
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/packages/pebble-web/src/components/PhoneNumberInput.tsx b/packages/pebble-web/src/components/PhoneNumberInput.tsx
index f8061088..fd8c4505 100644
--- a/packages/pebble-web/src/components/PhoneNumberInput.tsx
+++ b/packages/pebble-web/src/components/PhoneNumberInput.tsx
@@ -11,12 +11,12 @@ import {
 import { labelStyle } from "./styles/Input.styles";
 import { colors } from "pebble-shared";
 
-export default class PhoneNumberInput<
-  OptionType = string
-> extends React.Component<PhoneNumberInputProps<OptionType>> {
-  onCountrySelect = (countryCode: OptionType) => {
+export default class PhoneNumberInput<OptionType> extends React.Component<
+  PhoneNumberInputProps<OptionType>
+> {
+  onCountrySelect = (country: OptionType) => {
     this.props.onChange({
-      countryCode,
+      country,
       phone: this.props.phone
     });
   };
@@ -27,7 +27,7 @@ export default class PhoneNumberInput<
       return;
     }
     this.props.onChange({
-      countryCode: this.props.countryCode,
+      country: this.props.country,
       phone: _value
     });
   };
@@ -35,7 +35,8 @@ export default class PhoneNumberInput<
   render() {
     const {
       phone,
-      countryCode,
+      codeExtractor,
+      country,
       className,
       selectProps,
       inputProps,
@@ -57,8 +58,8 @@ export default class PhoneNumberInput<
         <Select<OptionType>
           placeholder=""
           onChange={this.onCountrySelect}
-          value={countryCode + ""}
-          selected={countryCode}
+          value={codeExtractor(country) + ""}
+          selected={country}
           {...selectProps}
           className={cx(selectStyle, selectProps && selectProps.className)}
         >
diff --git a/packages/pebble-web/src/components/__tests__/__snapshots__/phonenumberinput.test.tsx.snap b/packages/pebble-web/src/components/__tests__/__snapshots__/phonenumberinput.test.tsx.snap
index d957bdf7..a4c331ab 100644
--- a/packages/pebble-web/src/components/__tests__/__snapshots__/phonenumberinput.test.tsx.snap
+++ b/packages/pebble-web/src/components/__tests__/__snapshots__/phonenumberinput.test.tsx.snap
@@ -284,7 +284,7 @@ exports[`Component: Select default snapshot 1`] = `
               id="phone-select-input-test"
               onChange={[Function]}
               readOnly={true}
-              value="+1"
+              value="+91"
             />
             <label
               className="emotion-2 _pebble_input_label_focused"
diff --git a/packages/pebble-web/src/components/__tests__/phonenumberinput.test.tsx b/packages/pebble-web/src/components/__tests__/phonenumberinput.test.tsx
index f084a30b..e780c411 100644
--- a/packages/pebble-web/src/components/__tests__/phonenumberinput.test.tsx
+++ b/packages/pebble-web/src/components/__tests__/phonenumberinput.test.tsx
@@ -11,13 +11,15 @@ import countries from "./fixtures/countrycodes";
 
 const SELECT_INPUT_ID = "phone-select-input-test";
 const PHONE_INPUT_ID = "phone-test-input-test";
+type Country = typeof countries[0];
 
-function getComponent(props: Partial<PhoneNumberInputProps> = {}) {
+function getComponent(props: Partial<PhoneNumberInputProps<Country>> = {}) {
   return (
     <PhoneNumberInput
       onChange={() => {}}
       phone=""
-      countryCode="+1"
+      country={countries[0]}
+      codeExtractor={(country: Country) => country.country_code}
       {...props}
       selectProps={{
         inputProps: {
@@ -36,7 +38,7 @@ function getComponent(props: Partial<PhoneNumberInputProps> = {}) {
       {countries.map(country => (
         <Option
           key={country.id}
-          value={country.country_code}
+          value={country}
           label={`${country.name} (${country.country_code})`}
         />
       ))}
@@ -86,7 +88,7 @@ describe("Component: Select", () => {
     expect(
       spy.calledWith({
         phone: "99997876",
-        countryCode: "+1"
+        country: countries[0]
       })
     ).toBeTruthy();
   });
@@ -128,7 +130,7 @@ describe("Component: Select", () => {
     expect(
       spy.calledWith({
         phone: "",
-        countryCode: "+1"
+        country: countries[0]
       })
     ).toBeTruthy();
   });
@@ -142,14 +144,11 @@ describe("Component: Select", () => {
     );
 
     component.find(`#${SELECT_INPUT_ID}`).simulate("click");
-    component
-      .find(Option)
-      .at(0)
-      .simulate("click");
+    component.find(Option).at(1).simulate("click");
     expect(
       spy.calledWith({
         phone: "",
-        countryCode: countries[0].country_code
+        country: countries[1]
       })
     ).toBeTruthy();
   });
@@ -160,7 +159,8 @@ describe("Component: Select", () => {
       getComponent({
         onChange: spy,
         phone: "998127",
-        countryCode: countries[0].country_code
+        country: countries[0],
+        codeExtractor: (country: Country) => country.country_code
       })
     );
 
@@ -169,6 +169,6 @@ describe("Component: Select", () => {
         .value
     ).toEqual("998127");
     const props = component.find(Select).props();
-    expect(props.selected).toEqual(countries[0].country_code);
+    expect(props.selected).toEqual(countries[0]);
   });
 });
diff --git a/packages/pebble-web/src/components/typings/PhoneNumberInput.ts b/packages/pebble-web/src/components/typings/PhoneNumberInput.ts
index d358224d..87bc0236 100644
--- a/packages/pebble-web/src/components/typings/PhoneNumberInput.ts
+++ b/packages/pebble-web/src/components/typings/PhoneNumberInput.ts
@@ -2,16 +2,17 @@ import { SingleSelectProps } from "./Select";
 import { SimpleInputProps } from "./Input";
 import { Omit } from "utility-types";
 
-export interface PhoneNumberInputProps<OptionType = string> {
-  countryCode: OptionType;
+export interface PhoneNumberInputProps<OptionType> {
+  country: OptionType;
   phone: string;
   onChange: ({
-    countryCode,
+    country,
     phone
   }: {
-    countryCode: OptionType;
+    country: OptionType;
     phone: string;
   }) => void;
+  codeExtractor: (country: OptionType) => string;
 
   // Optional
   className?: string;
diff --git a/packages/pebble-web/stories/phoneNumberInput.story.tsx b/packages/pebble-web/stories/phoneNumberInput.story.tsx
index 06c134b4..f03f0ef1 100644
--- a/packages/pebble-web/stories/phoneNumberInput.story.tsx
+++ b/packages/pebble-web/stories/phoneNumberInput.story.tsx
@@ -9,22 +9,23 @@ import countries from "../src/components/__tests__/fixtures/countrycodes";
 import { action } from "@storybook/addon-actions";
 
 interface State {
-  countryCode: string;
+  country: typeof countries[0];
   phone: string;
 }
 
 storiesOf("Components/PhoneNumberInput", module).add(
   "Material",
-  withState<State>({ countryCode: "+91", phone: "" })(({ store }) => (
+  withState<State>({ country: countries[0], phone: "" })(({ store }) => (
     <PhoneNumberInput
-      countryCode={store.state.countryCode}
+      country={store.state.country}
+      codeExtractor={country => country.country_code}
       phone={store.state.phone}
       placeholder="Alternate Phone Number"
       onChange={arg => {
-        const { countryCode, phone } = arg;
+        const { country, phone } = arg;
         action("onChange")(arg);
         store.set({
-          countryCode: `${countryCode}`,
+          country,
           phone
         });
       }}
@@ -32,7 +33,7 @@ storiesOf("Components/PhoneNumberInput", module).add(
       {countries.map(country => (
         <Option
           key={country.id}
-          value={country.country_code}
+          value={country}
           label={`${country.name} (${country.country_code})`}
         />
       ))}