Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

- `ConfirmDialog`: Migrate styles from Emotion to an SCSS Module ([#80394](https://github.com/WordPress/gutenberg/pull/80394)).
- `SearchControl`: Migrate styles from Emotion to an SCSS Module ([#80474](https://github.com/WordPress/gutenberg/pull/80474)).
- `FormTokenField`: Migrate styles from Emotion to an SCSS Module ([#80472](https://github.com/WordPress/gutenberg/pull/80472)).
- `InputControl`, `SelectControl`, `CustomSelectControl`, `ToggleGroupControl`, and `RangeControl`: Remove obsolete internal `__shouldNotWarnDeprecated36pxSize` prop ([#80323](https://github.com/WordPress/gutenberg/pull/80323)).
- `InputControl`, `SelectControl`, `CustomSelectControl`: Remove obsolete `__unstable-large` from the public `size` type. The value continues to work at runtime, and is equivalent to the `default` size. ([#80081](https://github.com/WordPress/gutenberg/pull/80081)).
- `ToggleGroupControl`: Migrate styles from Emotion to SCSS Modules and use WPDS tokens for migrated visual values ([#80381](https://github.com/WordPress/gutenberg/pull/80381)).
Expand Down
9 changes: 5 additions & 4 deletions packages/components/src/form-token-field/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import deprecated from '@wordpress/deprecated';
*/
import Token from './token';
import TokenInput from './token-input';
import { TokensAndInputWrapperFlex } from './styles';
import SuggestionsList from './suggestions-list';
import type { FormTokenFieldProps, TokenItem } from './types';
import { FlexItem } from '../flex';
import { Flex, FlexItem } from '../flex';
import styles from './style.module.scss';
import {
StyledHelp,
StyledLabel,
Expand Down Expand Up @@ -826,14 +826,15 @@ export function FormTokenField( props: FormTokenFieldProps ) {
onMouseDown={ onContainerTouched }
onTouchStart={ onContainerTouched }
>
<TokensAndInputWrapperFlex
<Flex
className={ styles[ 'tokens-and-input' ] }
justify="flex-start"
align="center"
gap={ 1 }
wrap
>
{ renderTokensAndInput() }
</TokensAndInputWrapperFlex>
</Flex>
{ isExpanded && (
<SuggestionsList
instanceId={ instanceId }
Expand Down
6 changes: 6 additions & 0 deletions packages/components/src/form-token-field/style.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@use "@wordpress/base-styles/mixins" as mixins;

.tokens-and-input {
padding: 7px;
@include mixins.reset;
}
15 changes: 0 additions & 15 deletions packages/components/src/form-token-field/styles.ts

This file was deleted.

5 changes: 0 additions & 5 deletions tools/eslint/suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,11 +706,6 @@
"count": 1
}
},
"packages/components/src/form-token-field/styles.ts": {
"no-restricted-imports": {
"count": 1
}
},
"packages/components/src/grid/hook.ts": {
"no-restricted-imports": {
"count": 1
Expand Down
Loading