Headless UI v2 #3085
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,4 @@ enableGlobalCache: false | |
|
|
||
| nodeLinker: node-modules | ||
|
|
||
| yarnPath: .yarn/releases/yarn-4.2.2.cjs | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Combobox, ComboboxButton, ComboboxInput } from "@headlessui/react"; | ||
| import { ErrorMessage } from "@hookform/error-message"; | ||
| import { useState } from "react"; | ||
| import { | ||
|
|
@@ -57,11 +57,11 @@ export default function CountrySelector< | |
| {country.flag || null} | ||
| </span> | ||
|
|
||
| <ComboboxButton> | ||
| {({ open }) => <DrawerIcon isOpen={open} size={25} className="mr-1" />} | ||
| </ComboboxButton> | ||
|
|
||
| <ComboboxInput | ||
| ref={ref} | ||
| placeholder={props.placeholder} | ||
| onChange={(event) => setQuery(event.target.value as any)} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| import { ComboboxOption, ComboboxOptions } from "@headlessui/react"; | ||
| import { isEmpty } from "helpers"; | ||
| import type { Country } from "types/components"; | ||
|
|
||
| const containerStyle = | ||
|
|
@@ -16,29 +15,21 @@ export default function Options({ query, options }: Props) { | |
| o.name.toLocaleLowerCase().includes(query.toLocaleLowerCase()) | ||
| ); | ||
| return ( | ||
| <ComboboxOptions | ||
| className={containerStyle} | ||
| style={{ height: options.length <= 10 ? "auto" : "10rem" }} | ||
| > | ||
| {(!isEmpty(options) && | ||
| filtered.map((country) => ( | ||
| <ComboboxOption | ||
| className="data-[selected]:bg-blue-l2 hover:bg-blue-l2 flex items-center gap-2 p-2 text-sm font-heading" | ||
| key={country.name} | ||
| value={country} | ||
| > | ||
|
There was a problem hiding this comment.
|
||
| <span className="text-2xl">{country.flag}</span> | ||
| <span>{country.name}</span> | ||
| </ComboboxOption> | ||
| ))) || <div className="p-2 text-sm">{query} not found</div>} | ||
| </ComboboxOptions> | ||
| ); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { ComboboxOption, ComboboxOptions } from "@headlessui/react"; | ||
| import QueryLoader from "components/QueryLoader"; | ||
| import type { CurrencyOption } from "types/components"; | ||
| import type { QueryState } from "types/third-party/redux"; | ||
|
|
@@ -48,25 +48,20 @@ export default function CurrencyOptions({ | |
| }} | ||
| > | ||
| {(currencies) => ( | ||
| <ComboboxOptions | ||
| anchor="bottom" | ||
| className={`${classes} w-[var(--input-width)] bg-white dark:bg-blue-d6 shadow-lg rounded [--anchor-max-height:13rem] overflow-y-auto scroller text-base ring-1 ring-black ring-opacity-5 focus:outline-none`} | ||
| > | ||
| {currencies.map(({ code, name, min, rate }) => ( | ||
| <ComboboxOption | ||
| key={code} | ||
| value={{ code, name, min, rate }} | ||
| className="flex items-center gap-2 p-2 cursor-pointer truncate data-[selected]:bg-[--accent-secondary] hover:bg-[--accent-secondary]" | ||
| > | ||
| {!!name ? `${code.toUpperCase()} - ${name}` : code.toUpperCase()} | ||
| </ComboboxOption> | ||
| ))} | ||
| </ComboboxOptions> | ||
| )} | ||
| </QueryLoader> | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Combobox, ComboboxButton, ComboboxInput } from "@headlessui/react"; | ||
| import Icon from "components/Icon/Icon"; | ||
| import { unpack } from "helpers"; | ||
| import { useState } from "react"; | ||
|
|
@@ -54,9 +54,9 @@ export default function CurrencySelector<T extends CurrencyOption>({ | |
| as="div" | ||
| className={`relative items-center grid grid-cols-[1fr_auto] field-container ${style.combobox}`} | ||
| > | ||
| <ComboboxInput | ||
| id="wise__currency" | ||
| className="w-full dark:border-navy px-4 py-3.5 text-sm leading-5 focus:ring-0" | ||
| displayValue={(currency: T) => | ||
| !!currency.name | ||
| ? `${currency.code.toUpperCase()} - ${currency.name}` | ||
|
|
@@ -65,7 +65,7 @@ export default function CurrencySelector<T extends CurrencyOption>({ | |
| onChange={(event) => setQuery(event.target.value)} | ||
| spellCheck={false} | ||
| /> | ||
| <ComboboxButton className="flex items-center absolute inset-y-0 right-2"> | ||
| {({ open }) => | ||
| isCurrencyLoading ? ( | ||
| <Icon | ||
|
|
@@ -77,12 +77,12 @@ export default function CurrencySelector<T extends CurrencyOption>({ | |
| <DrawerIcon | ||
| isOpen={open} | ||
| size={25} | ||
| className={`${isCurrencyError ? "text-red" : ""}`} | ||
| aria-hidden | ||
| /> | ||
| ) | ||
| } | ||
| </ComboboxButton> | ||
|
|
||
| <CurrencyOptions | ||
| query={query} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| import { DialogPanel, DialogTitle, TransitionChild } from "@headlessui/react"; | ||
| import React, { type FC } from "react"; | ||
|
|
||
| const ModalFn: FC<any> = (props) => ( | ||
| <TransitionChild | ||
| as={React.Fragment} | ||
| enter="transform ease-out duration-300" | ||
| enterFrom="opacity-0" | ||
|
|
@@ -11,14 +11,14 @@ const ModalFn: FC<any> = (props) => ( | |
| leaveFrom="opacity-100" | ||
| leaveTo="opacity-0" | ||
| > | ||
| <DialogPanel {...props} /> | ||
| </TransitionChild> | ||
| ); | ||
|
|
||
| const TitleFn: FC<any> = (props) => <DialogTitle {...props} />; | ||
|
|
||
| const ModalFnRoot = ModalFn as typeof DialogPanel; | ||
| const Title = TitleFn as typeof DialogTitle; | ||
|
|
||
| const Modal = Object.assign(ModalFnRoot, { Title }); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,10 @@ | ||
| import { | ||
| Combobox, | ||
| ComboboxButton, | ||
| ComboboxInput, | ||
| ComboboxOption, | ||
| ComboboxOptions, | ||
| } from "@headlessui/react"; | ||
| import { ErrorMessage } from "@hookform/error-message"; | ||
| import Icon, { DrawerIcon } from "components/Icon"; | ||
| import { isEmpty } from "helpers"; | ||
|
|
@@ -64,7 +70,7 @@ export function MultiSelector< | |
| multiple | ||
| > | ||
| <FocusableInput ref={ref} /> | ||
| <ComboboxButton | ||
| aria-invalid={invalid} | ||
| aria-disabled={isDisabled} | ||
| as="div" | ||
|
|
@@ -84,7 +90,7 @@ export function MultiSelector< | |
| {searchable ? ( | ||
| <div className="inline-flex items-center gap-2 text-navy-l1 dark:text-navy-l2 pl-3 bg-white/5 rounded"> | ||
| <Icon type="Search" size={20} /> | ||
| <ComboboxInput | ||
| className="appearance-none bg-transparent first:pl-3 focus:outline-none h-10" | ||
| value={searchText} | ||
| onChange={(e) => setSearchText(e.target.value)} | ||
|
|
@@ -105,8 +111,8 @@ export function MultiSelector< | |
| /> | ||
| </> | ||
| )} | ||
| </ComboboxButton> | ||
| <ComboboxOptions className={`${styles.options} ${cls.options}`}> | ||
| {optionsAvailable && ( | ||
| <div className="flex justify-between p-4"> | ||
| {isAllSelected ? ( | ||
|
|
@@ -125,22 +131,16 @@ export function MultiSelector< | |
|
|
||
| {optionsAvailable && | ||
| filteredOptions.map((o) => ( | ||
| <ComboboxOption key={o.value} value={o} className={styles.option}> | ||
| {o.label} | ||
| </ComboboxOption> | ||
| ))} | ||
| {!optionsAvailable && ( | ||
| <p className="text-navy-l1 dark:text-navy-l2 text-sm px-4 py-2"> | ||
| No options found | ||
| </p> | ||
| )} | ||
| </ComboboxOptions> | ||
| <ErrorMessage | ||
| name={name} | ||
| errors={errors} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,9 @@ | ||
| import { | ||
| Listbox, | ||
| ListboxButton, | ||
| ListboxOption, | ||
| ListboxOptions, | ||
| } from "@headlessui/react"; | ||
| import { DrawerIcon } from "components/Icon"; | ||
| import { unpack } from "helpers"; | ||
| import { type AriaAttributes, forwardRef } from "react"; | ||
|
|
@@ -31,7 +36,7 @@ export const NativeSelect = forwardRef(function Select<V extends ValKey>( | |
| className="relative" | ||
| > | ||
| <FocusableInput ref={ref} /> | ||
| <ListboxButton | ||
| aria-invalid={props["aria-invalid"]} | ||
| aria-disabled={props.disabled} | ||
| id={props.id} | ||
|
|
@@ -48,20 +53,18 @@ export const NativeSelect = forwardRef(function Select<V extends ValKey>( | |
| /> | ||
| </> | ||
| )} | ||
| </ListboxButton> | ||
| <ListboxOptions className={`${styles.options} ${cls.options}`}> | ||
| {(props.options ?? []).map((o) => ( | ||
| <ListboxOption | ||
| key={o.value} | ||
| value={o.value} | ||
| className={styles.option} | ||
| > | ||
| {o.label} | ||
| </ListboxOption> | ||
| ))} | ||
| </ListboxOptions> | ||
| </Listbox> | ||
| ); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we got many peer deps warning due to rework shipped in 4.3.0