Skip to content

Cover block: check fontSizes settings before setting fontSize in innerBlocks #34993

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
ramonjd merged 1 commit into from
Sep 22, 2021
Merged

Cover block: check fontSizes settings before setting fontSize in innerBlocks #34993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions packages/block-library/src/cover/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,21 @@ import {
getPositionClassName,
} from './shared';

/**
* Module Constants
*/

const INNER_BLOCKS_TEMPLATE = [
[
'core/paragraph',
{
align: 'center',
fontSize: 'large',
placeholder: __( 'Write title…' ),
},
],
];

const { __Visualizer: BoxControlVisualizer } = BoxControl;

function getInnerBlocksTemplate( attributes ) {
return [
[
'core/paragraph',
{
align: 'center',
placeholder: __( 'Write title…' ),
...attributes,
},
],
];
}

function retrieveFastAverageColor() {
if ( ! retrieveFastAverageColor.fastAverageColor ) {
retrieveFastAverageColor.fastAverageColor = new FastAverageColor();
Expand Down Expand Up @@ -603,12 +601,19 @@ function CoverEdit( {

const ref = useRef();
const blockProps = useBlockProps( { ref } );

// Check for fontSize support before we pass a fontSize attribute to the innerBlocks.
const hasFontSizes = !! useSetting( 'typography.fontSizes' )?.length;
const innerBlocksTemplate = getInnerBlocksTemplate( {
fontSize: hasFontSizes ? 'large' : undefined,
} );

const innerBlocksProps = useInnerBlocksProps(
{
className: 'wp-block-cover__inner-container',
},
{
template: INNER_BLOCKS_TEMPLATE,
template: innerBlocksTemplate,
templateInsertUpdatesSelection: true,
}
);
Expand Down