Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor code style fixes in All Products blocks (https://github.com/woocommerce/woocommerce-blocks/pull/1330)

This commit is contained in:
Albert Juhé Lluveras 2019-12-05 17:03:31 +01:00 committed by GitHub
parent b6e278e84f
commit 578ddbe94d
3 changed files with 64 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/woocommerce-blocks/assets/js/blocks/products/all-products/edit.js
View File

@ -160,10 +160,7 @@ class Editor extends Component {
const onDone = () => {
const { block, setAttributes } = this.props;
setAttributes( {
layoutConfig: getProductLayoutConfig(
this.blockMap,
block.innerBlocks
),
layoutConfig: getProductLayoutConfig( block.innerBlocks ),
} );
this.setState( { innerBlocks: block.innerBlocks } );
this.togglePreview();

5
plugins/woocommerce-blocks/assets/js/blocks/products/base-utils.js
View File

@ -42,10 +42,9 @@ export const DEFAULT_PRODUCT_LIST_LAYOUT = [
/**
* Converts innerblocks to a list of layout configs.
*
* @param {Object} blockMap Map of blocks as returned by `getBlockMap`.
* @param {Object[]} innerBlocks Inner block components.
*/
export const getProductLayoutConfig = ( blockMap, innerBlocks ) => {
export const getProductLayoutConfig = ( innerBlocks ) => {
if ( ! innerBlocks || innerBlocks.length === 0 ) {
return [];
}
@ -58,7 +57,7 @@ export const getProductLayoutConfig = ( blockMap, innerBlocks ) => {
product: undefined,
children:
block.innerBlocks.length > 0
? getProductLayoutConfig( blockMap, block.innerBlocks )
? getProductLayoutConfig( block.innerBlocks )
: [],
},
];

133
plugins/woocommerce-blocks/assets/js/blocks/products/edit.js
View File

@ -2,7 +2,6 @@
* External dependencies
*/
import { __ } from '@wordpress/i18n';
import { Fragment } from '@wordpress/element';
import { ToggleControl, SelectControl } from '@wordpress/components';
/**
@ -13,81 +12,71 @@ import './editor.scss';
export const getSharedContentControls = ( attributes, setAttributes ) => {
const { contentVisibility } = attributes;
return (
<Fragment>
<ToggleControl
label={ __(
'Show Sorting Dropdown',
'woo-gutenberg-products-block'
) }
checked={ contentVisibility.orderBy }
onChange={ () =>
setAttributes( {
contentVisibility: {
...contentVisibility,
orderBy: ! contentVisibility.orderBy,
},
} )
}
/>
</Fragment>
<ToggleControl
label={ __(
'Show Sorting Dropdown',
'woo-gutenberg-products-block'
) }
checked={ contentVisibility.orderBy }
onChange={ () =>
setAttributes( {
contentVisibility: {
...contentVisibility,
orderBy: ! contentVisibility.orderBy,
},
} )
}
/>
);
};
export const getSharedListControls = ( attributes, setAttributes ) => {
return (
<Fragment>
<SelectControl
label={ __(
'Order Products By',
'woo-gutenberg-products-block'
) }
value={ attributes.orderby }
options={ [
{
label: __(
'Newness - newest first',
'woo-gutenberg-products-block'
),
value: 'date',
},
{
label: __(
'Price - low to high',
'woo-gutenberg-products-block'
),
value: 'price',
},
{
label: __(
'Price - high to low',
'woo-gutenberg-products-block'
),
value: 'price-desc',
},
{
label: __(
'Rating - highest first',
'woo-gutenberg-products-block'
),
value: 'rating',
},
{
label: __(
'Sales - most first',
'woo-gutenberg-products-block'
),
value: 'popularity',
},
{
label: __(
'Menu Order',
'woo-gutenberg-products-block'
),
value: 'menu_order',
},
] }
onChange={ ( orderby ) => setAttributes( { orderby } ) }
/>
</Fragment>
<SelectControl
label={ __( 'Order Products By', 'woo-gutenberg-products-block' ) }
value={ attributes.orderby }
options={ [
{
label: __(
'Newness - newest first',
'woo-gutenberg-products-block'
),
value: 'date',
},
{
label: __(
'Price - low to high',
'woo-gutenberg-products-block'
),
value: 'price',
},
{
label: __(
'Price - high to low',
'woo-gutenberg-products-block'
),
value: 'price-desc',
},
{
label: __(
'Rating - highest first',
'woo-gutenberg-products-block'
),
value: 'rating',
},
{
label: __(
'Sales - most first',
'woo-gutenberg-products-block'
),
value: 'popularity',
},
{
label: __( 'Menu Order', 'woo-gutenberg-products-block' ),
value: 'menu_order',
},
] }
onChange={ ( orderby ) => setAttributes( { orderby } ) }
/>
);
};