chore: Add tag group component #29387
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,7 +1,11 @@ | ||
| import React, { forwardRef } from "react"; | ||
| import type { HTMLAttributes } from "react"; | ||
| import { useDOMRef } from "@react-spectrum/utils"; | ||
| import type { | ||
| DOMRef, | ||
| SpectrumHelpTextProps, | ||
| ValidationState, | ||
| } from "@react-types/shared"; | ||
|
|
||
| interface HelpTextProps extends Omit<SpectrumHelpTextProps, "showErrorIcon"> { | ||
| /** Props for the help text description element. */ | ||
|
|
@@ -10,6 +14,8 @@ interface HelpTextProps extends Omit<SpectrumHelpTextProps, "showErrorIcon"> { | |
| errorMessageProps?: HTMLAttributes<HTMLElement>; | ||
| /** classname */ | ||
| className?: string; | ||
| /** validation state for help text */ | ||
| validationState?: ValidationState; | ||
| } | ||
|
|
||
| function _HelpText(props: HelpTextProps, ref: DOMRef<HTMLDivElement>) { | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ import type { CheckboxGroupContextType } from "../Checkbox"; | |
|
|
||
| export interface SwitchProps | ||
| extends Omit<SpectrumSwitchProps, keyof StyleProps>, | ||
| InlineLabelProps, | ||
| Validation<boolean> { | ||
| className?: string; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ function TextArea(props: TextAreaProps, ref: TextAreaRef) { | |
| // not in stately because this is so we know when to re-measure, which is a spectrum design | ||
| const [inputValue, setInputValue] = useControlledState( | ||
| props.value, | ||
| props.defaultValue ?? "", | ||
| () => { | ||
| // | ||
| }, | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -17,7 +17,8 @@ | |
| "@react-aria/visually-hidden": "^3.8.0", | ||
| "clsx": "^2.0.0", | ||
| "colorjs.io": "^0.4.3", | ||
| "lodash": "*", | ||
| "react-aria-components": "^1.0.0-rc.0" | ||
| }, | ||
| "devDependencies": { | ||
| "eslint-plugin-storybook": "^0.6.10" | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from "./src"; |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import clsx from "clsx"; | ||
| import React from "react"; | ||
| import { | ||
| Tag as HeadlessTag, | ||
| Button as HeadlessButton, | ||
| } from "react-aria-components"; | ||
| import { getTypographyClassName } from "@design-system/theming"; | ||
| import type { TagProps as HeadlessTagProps } from "react-aria-components"; | ||
KelvinOm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| import styles from "./styles.module.css"; | ||
| import { CloseIcon } from "../../Modal/src/CloseIcon"; | ||
KelvinOm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| function Tag({ children, ...props }: HeadlessTagProps) { | ||
| const textValue = typeof children === "string" ? children : undefined; | ||
|
|
||
| return ( | ||
| <HeadlessTag | ||
| textValue={textValue} | ||
| {...props} | ||
| className={clsx(styles["tag"], getTypographyClassName("footnote"))} | ||
| > | ||
| {({ allowsRemoving }) => ( | ||
| <> | ||
| <span>{children}</span> | ||
| {allowsRemoving && ( | ||
| <HeadlessButton slot="remove"> | ||
| <CloseIcon /> | ||
| </HeadlessButton> | ||
| )} | ||
| </> | ||
| )} | ||
| </HeadlessTag> | ||
| ); | ||
| } | ||
|
|
||
| export { Tag }; | ||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import React from "react"; | ||
| import { | ||
| Label as HeadlessLabel, | ||
| TagGroup as HeadlessTagGroup, | ||
| TagList as HeadlessTagList, | ||
| Text as HeadlessText, | ||
| } from "react-aria-components"; | ||
| import type { | ||
| TagGroupProps as HeadlessTagGroupProps, | ||
| TagListProps as HeadlessTagListProps, | ||
| } from "react-aria-components"; | ||
|
|
||
| import { Text } from "../../Text"; | ||
| import styles from "./styles.module.css"; | ||
| import { getTypographyClassName } from "@design-system/theming"; | ||
|
|
||
| interface TagGroupProps<T> | ||
| extends Omit<HeadlessTagGroupProps, "children">, | ||
| Pick<HeadlessTagListProps<T>, "items" | "children" | "renderEmptyState"> { | ||
| label?: string; | ||
| description?: string; | ||
| errorMessage?: string; | ||
| } | ||
|
|
||
| function TagGroup<T extends object>(props: TagGroupProps<T>) { | ||
| const { | ||
| children, | ||
| description, | ||
| errorMessage, | ||
| items, | ||
| label, | ||
| renderEmptyState, | ||
| ...rest | ||
| } = props; | ||
|
|
||
| return ( | ||
| <HeadlessTagGroup {...rest} className={styles["tag-group"]}> | ||
| {Boolean(label) && <HeadlessLabel>{<Text>{label}</Text>}</HeadlessLabel>} | ||
| <HeadlessTagList | ||
| className={styles["tag-list"]} | ||
| items={items} | ||
| renderEmptyState={renderEmptyState} | ||
| > | ||
| {children} | ||
| </HeadlessTagList> | ||
| {Boolean(description) && ( | ||
| <HeadlessText | ||
| className={getTypographyClassName("footnote")} | ||
| slot="description" | ||
| > | ||
| {description} | ||
| </HeadlessText> | ||
| )} | ||
| {Boolean(errorMessage) && ( | ||
| <HeadlessText | ||
| className={getTypographyClassName("footnote")} | ||
| slot="errorMessage" | ||
| > | ||
| {errorMessage} | ||
| </HeadlessText> | ||
| )} | ||
| </HeadlessTagGroup> | ||
| ); | ||
| } | ||
|
|
||
| export { TagGroup }; |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export { TagGroup } from "./TagGroup"; | ||
| export { Tag } from "./Tag"; |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| .tag-group { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: var(--inner-spacing-2); | ||
|
|
||
| /** | ||
| * ---------------------------------------------------------------------------- | ||
| * ERROR MESSAGE | ||
| *----------------------------------------------------------------------------- | ||
| */ | ||
| [slot="errorMessage"] { | ||
| color: var(--color-fg-negative); | ||
| } | ||
| } | ||
|
|
||
| .tag-list { | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| gap: var(--inner-spacing-2); | ||
| } | ||
|
|
||
| .tag { | ||
| height: var(--sizing-6); | ||
| color: var(--color-fg); | ||
| background-color: var(--color-bg-neutral-subtle); | ||
| border-radius: var(--border-radius-1); | ||
| padding: 0 var(--inner-spacing-2); | ||
| outline: none; | ||
| cursor: default; | ||
| display: flex; | ||
| align-items: center; | ||
| transition: border-color 200ms; | ||
| overflow: hidden; | ||
|
|
||
| &:has([slot="remove"]) { | ||
| padding-inline-end: 0; | ||
| } | ||
|
|
||
| /** | ||
| * ---------------------------------------------------------------------------- | ||
| * HOVERED | ||
| *----------------------------------------------------------------------------- | ||
| */ | ||
| &[data-hovered] { | ||
| background-color: var(--color-bg-neutral-subtle-hover); | ||
| } | ||
|
|
||
| &[data-focus-visible] { | ||
| outline: 2px solid var(--color-bd-focus); | ||
| outline-offset: 2px; | ||
| } | ||
|
|
||
| /** | ||
| * ---------------------------------------------------------------------------- | ||
| * SELECTED TAG | ||
| *----------------------------------------------------------------------------- | ||
| */ | ||
| &[data-selected] { | ||
| border-color: var(--color-bd-neutral); | ||
| background: var(--color-bg-neutral); | ||
| color: var(--color-fg-on-neutral); | ||
| } | ||
|
|
||
| /** | ||
| * ---------------------------------------------------------------------------- | ||
| * REMOVE BUTTON | ||
| *----------------------------------------------------------------------------- | ||
| */ | ||
| [slot="remove"] { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| height: var(--sizing-6); | ||
| width: var(--sizing-6); | ||
| background: none; | ||
| border: none; | ||
| padding: 0; | ||
| margin-inline-start: var(--inner-spacing-1); | ||
| color: var(--color-fg); | ||
| transition: color 200ms; | ||
| outline: none; | ||
| font-size: 0.95em; | ||
|
|
||
| &[data-hovered] { | ||
| background: var(--color-bg-neutral-subtle-hover); | ||
| } | ||
|
|
||
| svg { | ||
| width: 1em; | ||
| height: 1em; | ||
| } | ||
|
|
||
| &[data-hovered] { | ||
| color: var(--remove-button-color-hovered); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * ---------------------------------------------------------------------------- | ||
| * DISABLED TAG | ||
| *----------------------------------------------------------------------------- | ||
| */ | ||
| &[data-disabled] { | ||
| opacity: var(--opacity-disabled); | ||
| } | ||
| } |
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.
❤️