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

Merge remote-tracking branch 'origin/fix/106-wip' into HEAD

This commit is contained in:
claudiulodro 2018-09-06 11:48:37 -07:00
parent 37a7a0ca6c 30aa4814e6
commit cb2e63f130
2 changed files with 15 additions and 7 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

@ -1710,7 +1710,8 @@ var ProductSpecificSearchResults = function (_React$Component3) {
_this3.state = { _this3.state = {
products: [], products: [],
query: '' query: '',
loaded: false
}; };
_this3.updateResults = _this3.updateResults.bind(_this3); _this3.updateResults = _this3.updateResults.bind(_this3);
@ -1768,7 +1769,8 @@ var ProductSpecificSearchResults = function (_React$Component3) {
var query = this.getQuery(); var query = this.getQuery();
self.setState({ self.setState({
query: query query: query,
loaded: false
}); });
if (query.length) { if (query.length) {
@ -1776,13 +1778,15 @@ var ProductSpecificSearchResults = function (_React$Component3) {
// Only update the results if they are for the latest query. // Only update the results if they are for the latest query.
if (query === self.getQuery()) { if (query === self.getQuery()) {
self.setState({ self.setState({
products: products products: products,
loaded: true
}); });
} }
}); });
} else { } else {
self.setState({ self.setState({
products: [] products: [],
loaded: true
}); });
} }
} }
@ -1794,7 +1798,7 @@ var ProductSpecificSearchResults = function (_React$Component3) {
}, { }, {
key: 'render', key: 'render',
value: function render() { value: function render() {
if (!this.getQuery().length) { if (!this.state.loaded || !this.state.query.length) {
return null; return null;
} }

8
plugins/woocommerce-blocks/assets/js/views/specific-select.jsx
View File

@ -185,6 +185,7 @@ class ProductSpecificSearchResults extends React.Component {
this.state = { this.state = {
products: [], products: [],
query: '', query: '',
loaded: false
}; };
this.updateResults = this.updateResults.bind( this ); this.updateResults = this.updateResults.bind( this );
@ -228,7 +229,8 @@ class ProductSpecificSearchResults extends React.Component {
const query = this.getQuery(); const query = this.getQuery();
self.setState( { self.setState( {
query: query query: query,
loaded: false
} ); } );
if ( query.length ) { if ( query.length ) {
@ -237,12 +239,14 @@ class ProductSpecificSearchResults extends React.Component {
if ( query === self.getQuery() ) { if ( query === self.getQuery() ) {
self.setState( { self.setState( {
products: products, products: products,
loaded: true
} ); } );
} }
} ); } );
} else { } else {
self.setState( { self.setState( {
products: [], products: [],
loaded: true
} ); } );
} }
} }
@ -251,7 +255,7 @@ class ProductSpecificSearchResults extends React.Component {
* Render. * Render.
*/ */
render() { render() {
if ( ! this.getQuery().length ) { if ( ! this.state.loaded || ! this.state.query.length ) {
return null; return null;
} }