Specify Product Price ancestor and simplify Product Elements ancestors (#47802)
* Extend product elements sharedConfig ancestor with Product Collection and Products (Beta) * Utilise sharedConfig ancestor in Image block * Utilise sharedConfig ancestor in Price block * Utilise sharedConfig ancestor in Rating block * Utilise sharedConfig ancestor in Sale Badge block * Utilise sharedConfig ancestor in SKU block * Utilise sharedConfig ancestor in Stock Indicator block * Add changelog * Bring back original ancestors for Summary and Title blocks * Remove Product Price from a test as it's no longer available in global context
This commit is contained in:
parent
c70a09a57e
commit
92fec889f7
|
@ -27,12 +27,6 @@ const blockConfig: BlockConfiguration = {
|
|||
keywords: [ 'WooCommerce' ],
|
||||
description,
|
||||
usesContext: [ 'query', 'queryId', 'postId' ],
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
'core/post-template',
|
||||
'woocommerce/product-template',
|
||||
],
|
||||
textdomain: 'woocommerce',
|
||||
attributes,
|
||||
supports,
|
||||
|
|
|
@ -16,10 +16,8 @@ import {
|
|||
BLOCK_DESCRIPTION as description,
|
||||
} from './constants';
|
||||
|
||||
const { ancestor, ...configuration } = sharedConfig;
|
||||
|
||||
const blockConfig = {
|
||||
...configuration,
|
||||
...sharedConfig,
|
||||
apiVersion: 2,
|
||||
title,
|
||||
description,
|
||||
|
|
|
@ -15,12 +15,6 @@ import { supports } from './support';
|
|||
|
||||
const blockConfig: BlockConfiguration = {
|
||||
...sharedConfig,
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
'core/post-template',
|
||||
'woocommerce/product-template',
|
||||
],
|
||||
icon: { src: icon },
|
||||
supports,
|
||||
edit,
|
||||
|
|
|
@ -28,10 +28,7 @@ const blockConfig: BlockConfiguration = {
|
|||
edit,
|
||||
usesContext: [ 'query', 'queryId', 'postId' ],
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
'core/post-template',
|
||||
'woocommerce/product-template',
|
||||
...( sharedConfig.ancestor || [] ),
|
||||
'woocommerce/product-gallery',
|
||||
],
|
||||
};
|
||||
|
|
|
@ -28,7 +28,14 @@ const sharedConfig: Omit< BlockConfiguration, 'attributes' | 'title' > = {
|
|||
supports: {
|
||||
html: false,
|
||||
},
|
||||
ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
// Product Collection product template
|
||||
'woocommerce/product-template',
|
||||
// Products (Beta) product template
|
||||
'core/post-template',
|
||||
],
|
||||
save,
|
||||
deprecated: [
|
||||
{
|
||||
|
|
|
@ -17,10 +17,8 @@ import {
|
|||
BLOCK_DESCRIPTION as description,
|
||||
} from './constants';
|
||||
|
||||
const { ancestor, ...configuration } = sharedConfig;
|
||||
|
||||
const blockConfig: BlockConfiguration = {
|
||||
...configuration,
|
||||
...sharedConfig,
|
||||
apiVersion: 2,
|
||||
title,
|
||||
description,
|
||||
|
@ -28,10 +26,7 @@ const blockConfig: BlockConfiguration = {
|
|||
usesContext: [ 'query', 'queryId', 'postId' ],
|
||||
attributes,
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
'core/post-template',
|
||||
'woocommerce/product-template',
|
||||
...( sharedConfig.ancestor || [] ),
|
||||
'woocommerce/product-meta',
|
||||
],
|
||||
edit,
|
||||
|
|
|
@ -28,12 +28,6 @@ const blockConfig: BlockConfiguration = {
|
|||
supports,
|
||||
edit,
|
||||
usesContext: [ 'query', 'queryId', 'postId' ],
|
||||
ancestor: [
|
||||
'woocommerce/all-products',
|
||||
'woocommerce/single-product',
|
||||
'core/post-template',
|
||||
'woocommerce/product-template',
|
||||
],
|
||||
};
|
||||
|
||||
registerBlockType( 'woocommerce/product-stock-indicator', {
|
||||
|
|
|
@ -20,6 +20,9 @@ import { Save } from './save';
|
|||
|
||||
const blockConfig: BlockConfiguration = {
|
||||
...sharedConfig,
|
||||
// Product Summary is not expected to be available in Product Collection
|
||||
// nor Products (Beta). They use core/post-summary variation.
|
||||
ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
|
||||
apiVersion: 2,
|
||||
title,
|
||||
description,
|
||||
|
|
|
@ -22,6 +22,9 @@ import { Save } from './save';
|
|||
|
||||
const blockConfig: BlockConfiguration = {
|
||||
...sharedConfig,
|
||||
// Product Title is not expected to be available in Product Collection
|
||||
// nor Products (Beta). They use core/post-title variation.
|
||||
ancestor: [ 'woocommerce/all-products', 'woocommerce/single-product' ],
|
||||
apiVersion: 2,
|
||||
title,
|
||||
description,
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
Significance: patch
|
||||
Type: fix
|
||||
|
||||
Product Price: Narrow down the ancestors of the block so it's available in inserter only in places where block makes sense
|
|
@ -13,9 +13,6 @@ const singleProductPrice = '555.00';
|
|||
// all WooCommerce blocks except:
|
||||
// default cart and checkout blocks, mini-cart, product collection
|
||||
const blocks = [
|
||||
{
|
||||
name: 'Product Price',
|
||||
},
|
||||
{
|
||||
name: 'Product Search',
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue