Skip to content

Update: Disable font size when fit text is enabled and the opposite. #72533

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
jorgefilipecosta merged 2 commits into from
Oct 22, 2025
Merged

Update: Disable font size when fit text is enabled and the opposite. #72533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c6e7eb
Update: Disable font size when fit text is enabled and the opposite.
jorgefilipecosta Oct 21, 2025
5600f54
test improvement
jorgefilipecosta Oct 21, 2025
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
31 changes: 27 additions & 4 deletions packages/block-editor/src/hooks/fit-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,16 @@ function useFitText( { fitText, name, clientId } ) {
* @param {Function} props.setAttributes Function to set block attributes.
* @param {string} props.name Block name.
* @param {boolean} props.fitText Whether fit text is enabled.
* @param {string} props.fontSize Font size slug.
* @param {Object} props.style Block style object.
*/
export function FitTextControl( {
clientId,
fitText = false,
setAttributes,
name,
fontSize,
style,
} ) {
if ( ! hasBlockSupport( name, FIT_TEXT_SUPPORT_KEY ) ) {
return null;
Expand All @@ -203,9 +207,28 @@ export function FitTextControl( {
__nextHasNoMarginBottom
label={ __( 'Fit text' ) }
checked={ fitText }
onChange={ () =>
setAttributes( { fitText: ! fitText || undefined } )
}
onChange={ () => {
const newFitText = ! fitText || undefined;
const updates = { fitText: newFitText };

// When enabling fit text, clear font size if it has a value
if ( newFitText ) {
if ( fontSize ) {
updates.fontSize = undefined;
}
if ( style?.typography?.fontSize ) {
updates.style = {
...style,
typography: {
...style?.typography,
fontSize: undefined,
},
};
}
}

setAttributes( updates );
} }
help={
fitText
? __( 'Text will resize to fit its container.' )
Expand Down Expand Up @@ -278,7 +301,7 @@ const hasFitTextSupport = ( blockNameOrType ) => {
export default {
useBlockProps,
addSaveProps,
attributeKeys: [ 'fitText' ],
attributeKeys: [ 'fitText', 'fontSize', 'style' ],
hasSupport: hasFitTextSupport,
edit: FitTextControl,
};
19 changes: 15 additions & 4 deletions packages/block-editor/src/hooks/typography.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,30 @@ function TypographyInspectorControl( { children, resetAllFilter } ) {

export function TypographyPanel( { clientId, name, setAttributes, settings } ) {
function selector( select ) {
const { style, fontFamily, fontSize } =
const { style, fontFamily, fontSize, fitText } =
select( blockEditorStore ).getBlockAttributes( clientId ) || {};
return { style, fontFamily, fontSize };
return { style, fontFamily, fontSize, fitText };
}
const { style, fontFamily, fontSize } = useSelect( selector, [ clientId ] );
const { style, fontFamily, fontSize, fitText } = useSelect( selector, [
clientId,
] );
const isEnabled = useHasTypographyPanel( settings );
const value = useMemo(
() => attributesToStyle( { style, fontFamily, fontSize } ),
[ style, fontSize, fontFamily ]
);
Comment on lines 127 to 130
Copy link
Contributor

@jeryj jeryj Oct 22, 2025

Choose a reason for hiding this comment

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

Should fitText get memoized too?


const onChange = ( newStyle ) => {
setAttributes( styleToAttributes( newStyle ) );
const newAttributes = styleToAttributes( newStyle );

// If setting a font size and fitText is currently enabled, disable it
const hasFontSize =
newAttributes.fontSize || newAttributes.style?.typography?.fontSize;
if ( hasFontSize && fitText ) {
newAttributes.fitText = undefined;
}

setAttributes( newAttributes );
};

if ( ! isEnabled ) {
Expand Down
83 changes: 83 additions & 0 deletions test/e2e/specs/editor/blocks/fit-text.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,89 @@ test.describe( 'Fit Text', () => {
// Fit text should scale up significantly for short content
expect( fitTextSize ).toBeGreaterThan( normalSize * 2 );
} );

test( 'should disable fit text when a font size is selected', async ( {
editor,
page,
} ) => {
await editor.insertBlock( {
name: 'core/heading',
attributes: {
content: 'Test Heading',
level: 2,
fitText: true,
},
} );

await editor.openDocumentSettingsSidebar();

// Set a custom font size
await page.click(
'role=region[name="Editor settings"i] >> role=button[name="Set custom size"i]'
);
await page.click( 'role=spinbutton[name="Font size"i]' );
await page.keyboard.type( '24' );

// fitText should be cleared
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/heading',
attributes: expect.objectContaining( {
content: 'Test Heading',
level: 2,
style: {
typography: {
fontSize: '24px',
},
},
} ),
},
] );
} );

test( 'should clear font size when fit text is enabled', async ( {
editor,
page,
} ) => {
await editor.insertBlock( {
name: 'core/heading',
attributes: {
content: 'Test Heading',
level: 2,
fontSize: 'large',
},
} );

await editor.openDocumentSettingsSidebar();

// Enable Fit text control via Typography options menu
await page
.getByRole( 'region', { name: 'Editor settings' } )
.getByRole( 'button', { name: 'Typography options' } )
.click();
await page
.getByRole( 'menu', { name: 'Typography options' } )
.getByRole( 'menuitemcheckbox', { name: 'Show Fit text' } )
.click();

const fitTextToggle = page.getByRole( 'checkbox', {
name: 'Fit text',
} );

await fitTextToggle.click();

// fontSize should be cleared
await expect.poll( editor.getBlocks ).toMatchObject( [
{
name: 'core/heading',
attributes: expect.objectContaining( {
content: 'Test Heading',
level: 2,
fitText: true,
} ),
},
] );
} );
} );

test.describe( 'Frontend functionality', () => {
Expand Down
Loading