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

Toggle open/close when clicking on settings groups

This commit is contained in:
claudiulodro 2018-02-15 11:54:03 -08:00
parent d94773bd6f
commit f8f01a8e8f
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/woocommerce-blocks/assets/js/products-block.js
View File

@ -290,18 +290,24 @@ var ProductsBlockSettingsEditor = function (_React$Component3) {
expanded_group: ''
};
// If a settings group expand the group but keep display settings the same.
if ('undefined' !== PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container && PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container) {
var is_group = 'undefined' !== PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container && PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container;
if (is_group) {
// If a group and it has not been expanded, expand it.
new_state = {
menu_visible: true,
expanded_group: value
};
// If a group and it has already been expanded, collapse it.
};if (this.state.expanded_group === PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container) {
new_state.expanded_group = '';
}
}
this.setState(new_state);
// Only update the display setting if a non-group setting was selected.
if ('undefined' === PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container || !PRODUCTS_BLOCK_DISPLAY_SETTINGS[value].group_container) {
if (!is_group) {
this.props.update_display_callback(value);
}
}

15
plugins/woocommerce-blocks/assets/js/products-block.jsx
View File

@ -140,18 +140,25 @@ class ProductsBlockSettingsEditor extends React.Component {
expanded_group: '',
};
// If a settings group expand the group but keep display settings the same.
if ( 'undefined' !== PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container && PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container ) {
const is_group = 'undefined' !== PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container && PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container;
if ( is_group ) {
// If the group has not been expanded, expand it.
new_state = {
menu_visible: true,
expanded_group: value,
}
}
// If the group has already been expanded, collapse it.
if ( this.state.expanded_group === PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container ) {
new_state.expanded_group = '';
}
}
this.setState( new_state );
// Only update the display setting if a non-group setting was selected.
if ( 'undefined' === PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container || ! PRODUCTS_BLOCK_DISPLAY_SETTINGS[ value ].group_container ) {
if ( ! is_group ) {
this.props.update_display_callback( value );
}
}