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.

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

InputControl : Deprecate 36px default size #66897

Merged
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 @@ -5,6 +5,7 @@
### Deprecations

- `SelectControl`: Deprecate 36px default size ([#66898](https://github.com/WordPress/gutenberg/pull/66898)).
- `InputControl`: Deprecate 36px default size ([#66897](https://github.com/WordPress/gutenberg/pull/66897)).

## 29.0.0 (2024-12-11)

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/input-control/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const Example = () => {

return (
<InputControl
__next40pxDefaultSize
value={ value }
onChange={ ( nextValue ) => setValue( nextValue ?? '' ) }
/>
Expand Down
10 changes: 10 additions & 0 deletions packages/components/src/input-control/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { space } from '../utils/space';
import { useDraft } from './utils';
import BaseControl from '../base-control';
import { useDeprecated36pxDefaultSizeProp } from '../utils/use-deprecated-props';
import { maybeWarnDeprecated36pxSize } from '../utils/deprecated-36px-size';

const noop = () => {};

Expand All @@ -36,6 +37,7 @@ export function UnforwardedInputControl(
) {
const {
__next40pxDefaultSize,
__shouldNotWarnDeprecated36pxSize,
__unstableStateReducer: stateReducer = ( state ) => state,
__unstableInputWidth,
className,
Expand Down Expand Up @@ -68,6 +70,13 @@ export function UnforwardedInputControl(

const helpProp = !! help ? { 'aria-describedby': `${ id }__help` } : {};

maybeWarnDeprecated36pxSize( {
componentName: 'InputControl',
__next40pxDefaultSize,
size,
__shouldNotWarnDeprecated36pxSize,
} );

return (
<BaseControl
className={ classes }
Expand Down Expand Up @@ -125,6 +134,7 @@ export function UnforwardedInputControl(
*
* return (
* <InputControl
* __next40pxDefaultSize
* value={ value }
* onChange={ ( nextValue ) => setValue( nextValue ?? '' ) }
* />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export const Default = Template.bind( {} );
Default.args = {
label: 'Value',
placeholder: 'Placeholder',
__next40pxDefaultSize: true,
};

export const WithHelpText = Template.bind( {} );
Expand Down Expand Up @@ -117,7 +118,6 @@ export const ShowPassword: StoryFn< typeof InputControl > = ( args ) => {
return (
<InputControl
type={ visible ? 'text' : 'password' }
label="Password"
suffix={
<InputControlSuffixWrapper variant="control">
<Button
Expand All @@ -132,3 +132,8 @@ export const ShowPassword: StoryFn< typeof InputControl > = ( args ) => {
/>
);
};
ShowPassword.args = {
...Default.args,
label: 'Password',
placeholder: undefined,
};
12 changes: 9 additions & 3 deletions packages/components/src/input-control/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ import BaseInputControl from '../';
const getInput = () => screen.getByTestId( 'input' );

describe( 'InputControl', () => {
const InputControl = ( props ) => (
<BaseInputControl { ...props } data-testid="input" />
);
const InputControl = ( props ) => {
return (
<BaseInputControl
{ ...props }
__next40pxDefaultSize
data-testid="input"
/>
);
};

describe( 'Basic rendering', () => {
it( 'should render', () => {
Expand Down
5 changes: 4 additions & 1 deletion packages/components/src/modal/stories/index.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ const Template: StoryFn< typeof Modal > = ( { onRequestClose, ...args } ) => {
anim id est laborum.
</p>

<InputControl style={ { marginBottom: '20px' } } />
<InputControl
__next40pxDefaultSize
style={ { marginBottom: '20px' } }
/>

<Button variant="secondary" onClick={ closeModal }>
Close Modal
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/number-control/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ function UnforwardedNumberControl(
return stateReducerProp?.( baseState, action ) ?? baseState;
} }
size={ size }
__shouldNotWarnDeprecated36pxSize
suffix={
spinControls === 'custom' ? (
<>
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/palette-edit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const DEFAULT_COLOR = '#000';
function NameInput( { value, onChange, label }: NameInputProps ) {
return (
<NameInputControl
size="compact"
label={ label }
hideLabelFromVision
value={ value }
Expand Down
6 changes: 3 additions & 3 deletions packages/components/src/panel/stories/index.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ _PanelRow.args = {
children: (
<PanelBody title="My Profile">
<PanelRow>
<InputControl label="First name" />
<InputControl label="Last name" />
<InputControl label="First name" __next40pxDefaultSize />
<InputControl label="Last name" __next40pxDefaultSize />
</PanelRow>
<PanelRow>
<div style={ { flex: 1 } }>
<InputControl label="Email" />
<InputControl label="Email" __next40pxDefaultSize />
</div>
</PanelRow>
</PanelBody>
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/tree-grid/stories/index.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ const Rows = ( {
label="Description"
hideLabelFromVision
placeholder="Description"
__next40pxDefaultSize
{ ...props }
/>
) }
Expand All @@ -121,6 +122,7 @@ const Rows = ( {
label="Notes"
hideLabelFromVision
placeholder="Notes"
__next40pxDefaultSize
{ ...props }
/>
) }
Expand Down
Loading