-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
… TripsQA/Design
- Loading branch information
Showing
42 changed files
with
380 additions
and
429 deletions.
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
102 changes: 34 additions & 68 deletions
102
src/components/Auth/SignupInfo/AuthDropDown/AuthDropDown.tsx
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
82 changes: 12 additions & 70 deletions
82
src/components/Auth/SignupInfo/AuthDropDown/AuthDropDownOption.tsx
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,76 +1,18 @@ | ||
| // interface Props { | ||
| // children: string; | ||
| // clickHandler?: VoidFunction; | ||
| // showDownIcon?: boolean; | ||
| // } | ||
|
|
||
| // const AuthDropDownOption = ({ | ||
| // children, | ||
| // clickHandler, | ||
| // showDownIcon = false, | ||
| // }: Props) => { | ||
| // return ( | ||
| // <button | ||
| // onClick={clickHandler} | ||
| // className="relative h-12 w-full border-b border-solid border-gray3 hover:bg-gray1"> | ||
| // {children} | ||
| // {showDownIcon && ( | ||
| // <div className="absolute right-2 top-4"> | ||
| // <DownIcon size={20} color="#888888" /> | ||
| // </div> | ||
| // )} | ||
| // </button> | ||
| // ); | ||
| // }; | ||
|
|
||
| // export default AuthDropDownOption; | ||
|
|
||
| // const AuthDropDownOption = ({ children }: Props) => { | ||
| // return ( | ||
| // <Select.Item> | ||
| // <Select.ItemText>{children}</Select.ItemText> | ||
| // <Select.ItemIndicator className="absolute left-0 inline-flex w-[25px] items-center justify-center"> | ||
| // {/* <CheckIcon /> */} | ||
| // </Select.ItemIndicator> | ||
| // </Select.Item> | ||
| // ); | ||
| // }; | ||
|
|
||
| // export default AuthDropDownOption; | ||
|
|
||
| // interface SelectItemProps { | ||
| // value: string; | ||
| // children: ReactNode; | ||
| // className?: string; | ||
| // disabled?: boolean; | ||
| // } | ||
|
|
||
| // const AuthDropDownOption = React.forwardRef( | ||
| // ( | ||
| // { children, className, ...props }: SelectItemProps, | ||
| // forwardedRef: Ref<HTMLDivElement>, | ||
| // ) => { | ||
| // return ( | ||
| // <Select.Item | ||
| // className="body5 relative flex h-12 w-full select-none items-center border-b border-solid border-gray3 pl-[25px] pr-[35px] text-gray6 hover:bg-gray1" | ||
| // {...props} | ||
| // ref={forwardedRef}> | ||
| // <Select.ItemText>{children}</Select.ItemText> | ||
| // <Select.ItemIndicator className="absolute left-0 inline-flex w-[25px] items-center justify-center"> | ||
| // <CheckIcon /> | ||
| // </Select.ItemIndicator> | ||
| // </Select.Item> | ||
| // ); | ||
| // }, | ||
| // ); | ||
|
|
||
| // export default AuthDropDownOption; | ||
| import * as Select from '@radix-ui/react-select'; | ||
|
|
||
| interface Props { | ||
| option: SelectOption; | ||
| id: string; | ||
| children: string; | ||
| } | ||
|
|
||
| const AuthDropDownOption = ({ option }: Props) => { | ||
| return <option value={option.id}>{option.value}</option>; | ||
| const AuthDropDownOption = ({ id, children }: Props) => { | ||
| return ( | ||
| <Select.Item | ||
| value={id} | ||
| className="flex h-12 items-center justify-center border-b border-solid border-gray3"> | ||
| <Select.ItemText className="body5 text-gray6">{children}</Select.ItemText> | ||
| </Select.Item> | ||
| ); | ||
| }; | ||
|
|
||
| export default AuthDropDownOption; |
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
Oops, something went wrong.