diff --git a/packages/block-editor/src/components/block-types-list/index.js b/packages/block-editor/src/components/block-types-list/index.js index ee17ab5219904..17456e2c7cd86 100644 --- a/packages/block-editor/src/components/block-types-list/index.js +++ b/packages/block-editor/src/components/block-types-list/index.js @@ -10,31 +10,31 @@ import InserterListItem from '../inserter-list-item'; function BlockTypesList( { items = [], onSelect, onHover = () => {}, children } ) { const normalizedItems = items.reduce( ( result, item ) => { - const { patterns = [] } = item; - const hasDefaultPattern = patterns.some( ( { isDefault } ) => isDefault ); + const { variations = [] } = item; + const hasDefaultVariation = variations.some( ( { isDefault } ) => isDefault ); - // If there is no default inserter pattern provided, + // If there is no default inserter variation provided, // then default block type is displayed. - if ( ! hasDefaultPattern ) { + if ( ! hasDefaultVariation ) { result.push( item ); } - if ( patterns.length ) { + if ( variations.length ) { result = result.concat( - patterns.map( ( pattern ) => { + variations.map( ( variation ) => { return { ...item, - id: `${ item.id }-${ pattern.name }`, - icon: pattern.icon || item.icon, - title: pattern.title || item.title, - description: pattern.description || item.description, - // If `example` is explicitly undefined for the pattern, the preview will not be shown. - example: pattern.hasOwnProperty( 'example' ) ? pattern.example : item.example, + id: `${ item.id }-${ variation.name }`, + icon: variation.icon || item.icon, + title: variation.title || item.title, + description: variation.description || item.description, + // If `example` is explicitly undefined for the variation, the preview will not be shown. + example: variation.hasOwnProperty( 'example' ) ? variation.example : item.example, initialAttributes: { ...item.initialAttributes, - ...pattern.attributes, + ...variation.attributes, }, - innerBlocks: pattern.innerBlocks, + innerBlocks: variation.innerBlocks, }; } ) ); diff --git a/packages/block-editor/src/components/block-pattern-picker/index.js b/packages/block-editor/src/components/block-variation-picker/index.js similarity index 55% rename from packages/block-editor/src/components/block-pattern-picker/index.js rename to packages/block-editor/src/components/block-variation-picker/index.js index 7a967afef4e66..ee31da6f637d1 100644 --- a/packages/block-editor/src/components/block-pattern-picker/index.js +++ b/packages/block-editor/src/components/block-variation-picker/index.js @@ -9,16 +9,16 @@ import classnames from 'classnames'; import { __ } from '@wordpress/i18n'; import { Button, Placeholder } from '@wordpress/components'; -function BlockPatternPicker( { +function BlockVariationPicker( { icon = 'layout', - label = __( 'Choose pattern' ), - instructions = __( 'Select a pattern to start with.' ), - patterns, + label = __( 'Choose variation' ), + instructions = __( 'Select a variation to start with.' ), + variations, onSelect, allowSkip, } ) { - const classes = classnames( 'block-editor-block-pattern-picker', { - 'has-many-patterns': patterns.length > 4, + const classes = classnames( 'block-editor-block-variation-picker', { + 'has-many-variations': variations.length > 4, } ); return ( @@ -28,23 +28,23 @@ function BlockPatternPicker( { * Safari+VoiceOver won't announce the list otherwise. */ /* eslint-disable jsx-a11y/no-redundant-roles */ } -