Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Components: Do not render FormTokenField label when not defined #61336

Merged
merged 8 commits into from
May 8, 2024
Merged

Components: Do not render FormTokenField label when not defined #61336

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc0bf33
do not render label elements when undedined
retrofox May 2, 2024
7674066
changelog
retrofox May 6, 2024
e0c125b
tweak changelog
retrofox May 6, 2024
2797345
Update packages/components/CHANGELOG.md
alexstine May 7, 2024
cf2e02e
Update packages/components/CHANGELOG.md
alexstine May 7, 2024
64a42b4
Merge branch 'trunk' into update/form-token-field-null-label
retrofox May 7, 2024
4908c3e
Merge branch 'trunk' of github.com:WordPress/gutenberg into update/fo…
alexstine May 8, 2024
f960d4c
Move changelog entry to unreleased.
alexstine May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

### Enhancements

- `FormTokenField`: Hide label when not defined ([#61395](https://github.com/WordPress/gutenberg/pull/61336)).
- Replaced `classnames` package with the faster and smaller `clsx` package ([#61138](https://github.com/WordPress/gutenberg/pull/61138)).
- `InputControl`: Add a password visibility toggle story ([#60898](https://github.com/WordPress/gutenberg/pull/60898)).
- `View`: Fix prop types ([#60919](https://github.com/WordPress/gutenberg/pull/60919)).
Expand Down
14 changes: 8 additions & 6 deletions packages/components/src/form-token-field/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,12 +694,14 @@ export function FormTokenField( props: FormTokenFieldProps ) {
/* eslint-disable jsx-a11y/no-static-element-interactions */
return (
<div { ...tokenFieldProps }>
<StyledLabel
htmlFor={ `components-form-token-input-${ instanceId }` }
className="components-form-token-field__label"
>
{ label }
</StyledLabel>
{ label && (
<StyledLabel
htmlFor={ `components-form-token-input-${ instanceId }` }
className="components-form-token-field__label"
>
{ label }
</StyledLabel>
) }
<div
ref={ tokensAndInput }
className={ classes }
Expand Down
Loading