feat(WEB-162): final design edit profile page

components/TempDesignSystem/Form/Phone/index.tsx

@@ -1,99 +1,137 @@
 "use client"
 import "react-international-phone/style.css"
 
-import { useCallback, useEffect, useRef } from "react"
+import { parsePhoneNumber } from "libphonenumber-js"
+import {
+  Input as AriaInput,
+  Label as AriaLabel,
+  TextField,
+} from "react-aria-components"
 import { useController, useFormContext, useWatch } from "react-hook-form"
 import {
-  defaultCountries,
-  getCountry,
-  PhoneInput,
-  type PhoneInputRefType,
+  CountrySelector,
+  DialCodePreview,
+  ParsedCountry,
+  usePhoneInput,
 } from "react-international-phone"
+import { useIntl } from "react-intl"
 
+import { ChevronDownIcon } from "@/components/Icons"
 import ErrorMessage from "@/components/TempDesignSystem/Form/ErrorMessage"
+import Label from "@/components/TempDesignSystem/Form/Label"
+import Body from "@/components/TempDesignSystem/Text/Body"
 
 import styles from "./phone.module.css"
 
+import type { ChangeEvent } from "react"
+
 import type { PhoneProps } from "./phone"
 
 export default function Phone({
-  countrySelectName = "country",
+  ariaLabel = "Phone number input",
+  disabled = false,
+  label,
   name = "phoneNumber",
   placeholder = "",
   registerOptions = {
     required: true,
   },
 }: PhoneProps) {
-  const phoneRef = useRef<PhoneInputRefType>(null)
-  const { control, formState } = useFormContext()
-  const countryValue = useWatch({ name: countrySelectName })
-  const defaultCountry = getCountry({
-    countries: defaultCountries,
-    field: "iso2",
-    value: String(countryValue).toLowerCase(),
-  })
-  /**
-   * Holds the previous selected country to be able to update
-   * countrycode based on country select field.
-   * Since PhoneInput inputs the countrys dialcode (country code) upon
-   * selection, we need to check if the current value is just
-   * the previously selected countrys dialcode number.
-   */
-  const prevSelectedCountry = useRef<string | undefined>(countryValue)
-  const { field } = useController({
+  const { formatMessage } = useIntl()
+  const { control, setValue } = useFormContext()
+  const phone = useWatch({ name })
+
+  const { field, fieldState, formState } = useController({
     control,
+    disabled,
     name,
     rules: registerOptions,
   })
 
-  const handleCountrySelectForPhone = useCallback((country: string) => {
-    const selectedCountry = getCountry({
-      countries: defaultCountries,
-      field: "iso2",
-      value: country.toLowerCase(),
+  const { country, handlePhoneValueChange, inputValue, setCountry } =
+    usePhoneInput({
+      defaultCountry:
+        parsePhoneNumber(
+          formState.defaultValues?.phoneNumber
+        ).country?.toLowerCase() ?? "sv",
+      disableCountryGuess: true,
+      forceDialCode: true,
+      value: phone,
     })
 
-    if (selectedCountry) {
-      phoneRef.current?.setCountry(selectedCountry.iso2)
-      prevSelectedCountry.current = country.toLowerCase()
-    }
-  }, [])
+  function handleSelectCountry(value: ParsedCountry) {
+    setCountry(value.iso2)
+  }
 
-  useEffect(() => {
-    if (countryValue) {
-      if (field.value) {
-        if (prevSelectedCountry.current) {
-          if (prevSelectedCountry.current !== countryValue) {
-            const selectedCountryPrev = getCountry({
-              countries: defaultCountries,
-              field: "iso2",
-              value: prevSelectedCountry.current.toLowerCase(),
-            })
-            if (
-              field.value.replace("+", "") === selectedCountryPrev?.dialCode
-            ) {
-              handleCountrySelectForPhone(countryValue)
-            }
-          }
-        } else {
-          handleCountrySelectForPhone(countryValue)
-        }
-      } else {
-        handleCountrySelectForPhone(countryValue)
-      }
-    }
-  }, [countryValue, field.value, handleCountrySelectForPhone])
+  function handleChange(evt: ChangeEvent<HTMLInputElement>) {
+    handlePhoneValueChange(evt)
+    setValue(name, evt.target.value)
+  }
 
   return (
     <div className={styles.phone}>
-      <PhoneInput
-        {...field}
-        className={styles.input}
-        defaultCountry={defaultCountry?.iso2 ?? "se"}
-        placeholder={placeholder}
+      <CountrySelector
+        dropdownArrowClassName={styles.arrow}
+        flagClassName={styles.flag}
+        onSelect={handleSelectCountry}
         preferredCountries={["de", "dk", "fi", "no", "se", "gb"]}
-        ref={phoneRef}
+        selectedCountry={country.iso2}
+        renderButtonWrapper={(props) => (
+          <button
+            {...props.rootProps}
+            className={styles.select}
+            tabIndex={0}
+            type="button"
+          >
+            <Label required={!!registerOptions.required} size="small">
+              {formatMessage({ id: "Country code" })}
+            </Label>
+            <div className={styles.selectContainer}>
+              {props.children}
+              <Body asChild fontOnly>
+                <DialCodePreview
+                  className={styles.dialCode}
+                  dialCode={country.dialCode}
+                  prefix="+"
+                />
+              </Body>
+              <ChevronDownIcon
+                className={styles.chevron}
+                color="grey80"
+                height={18}
+                width={18}
+              />
+            </div>
+          </button>
+        )}
       />
+      <TextField
+        aria-label={ariaLabel}
+        defaultValue={field.value}
+        isDisabled={disabled ?? field.disabled}
+        isInvalid={fieldState.invalid}
+        isRequired={!!registerOptions?.required}
+        name={field.name}
+        type="tel"
+      >
+        <AriaLabel className={styles.inputContainer} htmlFor={field.name}>
+          <Body asChild fontOnly>
+            <AriaInput
+              className={styles.input}
+              id={field.name}
+              name={field.name}
+              onBlur={field.onBlur}
+              onChange={handleChange}
+              placeholder={placeholder}
+              ref={field.ref}
+              required={!!registerOptions.required}
+              value={inputValue}
+            />
+          </Body>
+          <Label required={!!registerOptions.required}>{label}</Label>
+        </AriaLabel>
+        <ErrorMessage errors={formState.errors} name={field.name} />
+      </TextField>
       <ErrorMessage errors={formState.errors} name={name} />
     </div>
   )

components/TempDesignSystem/Form/Phone/phone.module.css

@@ -1,26 +1,130 @@
 .phone {
-  --react-international-phone-border-color: var(--UI-Grey-60);
-  --react-international-phone-border-radius: var(--Corner-radius-Small);
-  --react-international-phone-font-size: var(
-    --typography-Body-Regular-fontSize
-  );
-  --react-international-phone-height: 40px;
-  --react-international-phone-text-color: var(--UI-Grey-60);
-}
-
-.phone :global(.react-international-phone-input-container) {
   display: grid;
-  /* r-i-p sets their width dynamically and doesn't respect the width property of its parent */
-  grid-template-columns: 470px minmax(203px, 1fr);
-  width: min(280px, 100%);
+  gap: var(--Spacing-x2);
+  grid-template-columns: max(164px) 1fr;
+
+  --react-international-phone-background-color: var(--Main-Grey-White);
+  --react-international-phone-border-color: var(--Scandic-Beige-40);
+  --react-international-phone-dropdown-preferred-list-divider-color: var(
+    --Scandic-Brand-Pale-Peach
+  );
+  --react-international-phone-selected-dropdown-item-background-color: var(
+    --Scandic-Blue-00
+  );
+  --react-international-phone-text-color: var(--Main-Grey-100);
+
+  --react-international-phone-dropdown-preferred-list-divider-margin: 8px;
+
+  --react-international-phone-height: 60px;
+  --react-international-phone-dropdown-top: calc(
+    var(--react-international-phone-height) + var(--Spacing-x1)
+  );
 }
 
-/* react-international-phone only exposes variables to change border-color */
-.phone :global(.react-international-phone-country-selector-button),
-.phone :global(.react-international-phone-input) {
-  border-width: 2px;
+.phone:has(.input:active, .input:focus) {
+  --react-international-phone-border-color: var(--Scandic-Blue-90);
 }
 
-.phone :global(.react-international-phone-input) {
+.phone :global(.react-international-phone-country-selector-dropdown) {
+  background: var(--Main-Grey-White);
+  border-radius: var(--Corner-radius-Medium);
+  box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
+  gap: var(--Spacing-x1);
+  outline: none;
+  padding: var(--Spacing-x2);
+}
+
+.phone
+  :global(.react-international-phone-country-selector-dropdown__list-item) {
+  border-radius: var(--Corner-radius-Medium);
+  padding: var(--Spacing-x1) var(--Spacing-x1) var(--Spacing-x1)
+    var(--Spacing-x-one-and-half);
+}
+
+.phone
+  :global(.react-international-phone-country-selector-button__button-content) {
+  align-self: center;
+}
+
+.inputContainer,
+.select {
+  align-content: center;
+  background-color: var(--Main-Grey-White);
+  border-color: var(--Scandic-Beige-40);
+  border-style: solid;
+  border-width: 1px;
+  border-radius: var(--Corner-radius-Medium);
+  display: grid;
+  gap: var(--Spacing-x-half);
+  grid-template-rows: auto auto;
+  height: 60px;
   padding: var(--Spacing-x1) var(--Spacing-x2);
+  transition: border-color 200ms ease;
+}
+
+.select {
+  width: 100%;
+}
+
+.select[aria-expanded="true"] .chevron {
+  transform: rotate(180deg);
+}
+
+.selectContainer {
+  background-color: var(--Main-Grey-White);
+  border: none;
+  display: grid;
+  gap: var(--Spacing-x1);
+  grid-template-columns: auto 1fr auto;
+  height: 18px;
+  justify-content: flex-start;
+  order: 2;
+}
+
+.arrow {
+  display: none;
+}
+
+.flag {
+  height: 18px;
+  margin: 0;
+  width: 18px;
+}
+
+.select .dialCode {
+  border: none;
+  color: var(--Main-Grey-100);
+  line-height: 1;
+  justify-self: flex-start;
+  padding: 0;
+}
+
+.inputContainer:has(.input:not(:focus):placeholder-shown) {
+  gap: 0;
+  grid-template-rows: 1fr;
+}
+
+.inputContainer:has(.input:active, .input:focus) {
+  border-color: var(--Scandic-Blue-90);
+}
+
+.input {
+  background: none;
+  border: none;
+  color: var(--Main-Grey-100);
+  height: 18px;
+  margin: 0;
+  order: 2;
+  overflow: visible;
+  padding: 0;
+}
+
+.input:not(:active, :focus):placeholder-shown {
+  height: 0px;
+}
+
+.input:focus,
+.input:focus:placeholder-shown {
+  height: 18px;
+  outline: none;
 }

components/TempDesignSystem/Form/Phone/phone.ts

@@ -1,7 +1,9 @@
 import type { RegisterOptions } from "react-hook-form"
 
 export type PhoneProps = {
-  countrySelectName?: string
+  ariaLabel?: string
+  disabled?: boolean
+  label: string
   name?: string
   placeholder?: string
   registerOptions?: RegisterOptions