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

Jump to bottom

CustomSelectControl: Add lint rule for 40px size prop usage #64559

Merged
merged 3 commits into from
Aug 16, 2024
Merged

CustomSelectControl: Add lint rule for 40px size prop usage #64559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a9bc91
Fix in DateFormatPicker
mirka Aug 15, 2024
2bddbe2
Make explicit in FontAppearanceControl
mirka Aug 15, 2024
72dc7e1
Add lint rule
mirka Aug 15, 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 .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ module.exports = {
...[
'BorderBoxControl',
'BorderControl',
'CustomSelectControl',
'DimensionControl',
'FontSizePicker',
'ToggleGroupControl',
Expand Down
1 change: 1 addition & 0 deletions packages/block-editor/src/components/date-format-picker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ function NonDefaultControls( { format, onChange } ) {
return (
<VStack>
<CustomSelectControl
__next40pxDefaultSize
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seen in the Date block.

Before After
DateFormatPicker, before DateFormatPicker, after

label={ __( 'Choose a format' ) }
options={ [ ...suggestedOptions, customOption ] }
value={
Expand Down
3 changes: 3 additions & 0 deletions packages/block-editor/src/components/font-appearance-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const getFontAppearanceLabel = ( hasFontStyles, hasFontWeights ) => {
*/
export default function FontAppearanceControl( props ) {
const {
/** Start opting into the larger default height that will become the default size in a future version. */
__next40pxDefaultSize = false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add FontAppearanceControl to the lint rule too? Or at least a TODO comment to update this in the future?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, good point 🤔 I'll go back and batch add the affected wp-block-editor components.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in #64591

onChange,
hasFontStyles = true,
hasFontWeights = true,
Expand Down Expand Up @@ -150,6 +152,7 @@ export default function FontAppearanceControl( props ) {
<CustomSelectControl
{ ...otherProps }
className="components-font-appearance-control"
__next40pxDefaultSize={ __next40pxDefaultSize }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was already passed through via otherProps, but making it explicit here.

label={ label }
describedBy={ getDescribedBy() }
options={ selectOptions }
Expand Down
Loading