Skip to content

LineHeightControl: Fix application of zero values in editor #48917

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

Merged
aaronrobertshaw merged 3 commits into from
May 4, 2023
Merged

LineHeightControl: Fix application of zero values in editor #48917

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
9e45f3d
Fix detection of when LineHeightControl has set value
aaronrobertshaw Mar 8, 2023
1fffc22
Tweak LineHeightControl width in storybook
aaronrobertshaw Mar 8, 2023
e55615b
Ensure onChange is called with string
aaronrobertshaw Apr 18, 2023
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
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/global-styles/typography-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export default function TypographyPanel( {
immutableSet( value, [ 'typography', 'lineHeight' ], newValue )
);
};
const hasLineHeight = () => !! value?.typography?.lineHeight;
const hasLineHeight = () => value?.typography?.lineHeight !== undefined;
Copy link
Contributor Author

@aaronrobertshaw aaronrobertshaw Apr 18, 2023

Choose a reason for hiding this comment

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

I've kept this tweak to the line height value detection so it can correctly check any old numeric line-height values that might be 0 in existing blocks/styles.

const resetLineHeight = () => setLineHeight( undefined );

// Letter Spacing
Expand Down
9 changes: 7 additions & 2 deletions packages/block-editor/src/components/line-height-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,17 @@ const LineHeightControl = ( {
: { marginBottom: 24 };

const handleOnChange = ( nextValue, { event } ) => {
if ( nextValue === '' ) {
onChange();
return;
}
Comment on lines +88 to +91
Copy link
Contributor Author

@aaronrobertshaw aaronrobertshaw Apr 18, 2023

Choose a reason for hiding this comment

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

This is needed if we land #49750 which changes cleanEmptyObject to keep anything that !== undefined.

It also allows the following onChange calls to simply convert the value to a string improving zero value handling.


if ( event.type === 'click' ) {
onChange( adjustNextValue( nextValue, false ) );
onChange( adjustNextValue( `${ nextValue }`, false ) );
return;
}

onChange( nextValue );
onChange( `${ nextValue }` );
};

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/line-height-control/stories/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Template = ( props ) => {
export const Default = Template.bind( {} );
Default.args = {
__nextHasNoMarginBottom: true,
__unstableInputWidth: '60px',
__unstableInputWidth: '100px',
};

export const UnconstrainedWidth = Template.bind( {} );
Expand Down