From 3475d63cdd7ef396aaefc4a28c920d36253b0607 Mon Sep 17 00:00:00 2001 From: lang-sky Date: Mon, 10 Feb 2020 09:22:05 +0800 Subject: [PATCH] in Core.js - UNSAFE_willMount removed & put defaultSort to url --- __tests__/SortFilter.spec.js | 2 +- src/SortFilter/Core.js | 29 ++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/__tests__/SortFilter.spec.js b/__tests__/SortFilter.spec.js index bb61e82..34fcea1 100644 --- a/__tests__/SortFilter.spec.js +++ b/__tests__/SortFilter.spec.js @@ -49,7 +49,7 @@ test('Instantiate SortFilter component via mount', () => { expect(wrapper.find(Core).instance().element.current).toMatchSnapshot(); }) -function Elements({ itemSelector }) { +function Elements({ itemSelector, records }) { return records.map((record) => ); } diff --git a/src/SortFilter/Core.js b/src/SortFilter/Core.js index 6fb0146..cf2aa19 100644 --- a/src/SortFilter/Core.js +++ b/src/SortFilter/Core.js @@ -17,26 +17,12 @@ class Core extends Component { super(props); this.state = { // taxonomies: {}, - taxonomiesBodyTypeNames: [] + taxonomiesBodyTypeNames: Object.keys(this.props.taxonomies['Body Types']) }; this.element = React.createRef(); this.sizer = React.createRef(); } - UNSAFE_componentWillMount() { - /** - * Kick off the network request and update the state once it returns. - */ - const { taxonomies } = this.props; - this._loadProps() - .then(() => { - this.setState({ - // taxonomies, - taxonomiesBodyTypeNames: Object.keys(taxonomies['Body Types']) - }); - }); - } - componentDidMount() { // let options = { // // reverse: true, @@ -49,6 +35,7 @@ class Core extends Component { sizer: this.sizer.current, // initialSort: options }); + putSearchParams(this.props.defaultSort); this.sortFromUrlSearch(); } @@ -144,18 +131,6 @@ class Core extends Component { this.slider.classList.toggle('slider-closed'); } - /** - * Set delay - * @return {Promise} A promise which resolves with an array of objects. - */ - _loadProps() { - return new Promise((resolve) => { - setTimeout(() => { - resolve(this.props); - }, 500); - }); - } - render() { const { taxonomiesBodyTypeNames } = this.state; const { children, itemSelector } = this.props;