Skip to content
This repository has been archived by the owner on Dec 30, 2022. It is now read-only.

Commit

Permalink
refactor(InstantSearch): migrate life cycles (#2349)
Browse files Browse the repository at this point in the history
  • Loading branch information
Haroenv authored and Yannick Croissant committed Jun 17, 2019
1 parent d3a7d4d commit e7573d4
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 100 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"conventional-changelog-cli": "2.0.12",
"copy-webpack-plugin": "5.0.2",
"css-loader": "2.1.1",
"enzyme": "3.9.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.12.1",
"enzyme-to-json": "3.3.5",
"eslint": "5.16.0",
Expand Down
118 changes: 60 additions & 58 deletions packages/react-instantsearch-core/src/widgets/InstantSearch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,8 @@ import createInstantSearchManager from '../core/createInstantSearchManager';
import { InstantSearchProvider, InstantSearchContext } from '../core/context';
import { Store } from '../core/createStore';

function validateNextProps(props, nextProps) {
if (!props.searchState && nextProps.searchState) {
throw new Error(
"You can't switch <InstantSearch> from being uncontrolled to controlled"
);
} else if (props.searchState && !nextProps.searchState) {
throw new Error(
"You can't switch <InstantSearch> from being controlled to uncontrolled"
);
}
function isControlled(props: Props) {
return Boolean(props.searchState);
}

// @TODO: move this to the helper?
Expand Down Expand Up @@ -137,64 +129,74 @@ class InstantSearch extends Component<Props, State> {
stalledSearchDelay: PropTypes.number,
};

isControlled: boolean;
isUnmounting: boolean;
aisManager: InstantSearchManager;

constructor(props: Props) {
super(props);
this.isControlled = Boolean(props.searchState);
const initialState = this.isControlled ? props.searchState : {};
this.isUnmounting = false;

this.aisManager = createInstantSearchManager({
indexName: props.indexName,
searchClient: props.searchClient,
initialState,
resultsState: props.resultsState,
stalledSearchDelay: props.stalledSearchDelay,
});

this.state = {
static getDerivedStateFromProps(
nextProps: Props,
prevState: State
): Partial<State> {
return {
contextValue: {
onInternalStateUpdate: this.onWidgetsInternalStateUpdate.bind(this),
createHrefForState: this.createHrefForState.bind(this),
onSearchForFacetValues: this.onSearchForFacetValues.bind(this),
onSearchStateChange: this.onSearchStateChange.bind(this),
onSearchParameters: this.onSearchParameters.bind(this),
store: this.aisManager.store,
widgetsManager: this.aisManager.widgetsManager,
mainTargetedIndex: this.props.indexName,
...prevState.contextValue,
mainTargetedIndex: nextProps.indexName,
},
};
}

componentWillReceiveProps(nextProps) {
// @TODO: DidUpdate
validateNextProps(this.props, nextProps);

if (this.props.indexName !== nextProps.indexName) {
this.aisManager.updateIndex(nextProps.indexName);
this.setState(state => ({
contextValue: {
...state.contextValue,
mainTargetedIndex: nextProps.indexName,
},
}));
isUnmounting: boolean = false;
aisManager: InstantSearchManager = createInstantSearchManager({
indexName: this.props.indexName,
searchClient: this.props.searchClient,
initialState: this.props.searchState || {},
resultsState: this.props.resultsState,
stalledSearchDelay: this.props.stalledSearchDelay,
});
isControlled: boolean = isControlled(this.props);

state = {
contextValue: {
onInternalStateUpdate: this.onWidgetsInternalStateUpdate.bind(this),
createHrefForState: this.createHrefForState.bind(this),
onSearchForFacetValues: this.onSearchForFacetValues.bind(this),
onSearchStateChange: this.onSearchStateChange.bind(this),
onSearchParameters: this.onSearchParameters.bind(this),
store: this.aisManager.store,
widgetsManager: this.aisManager.widgetsManager,
mainTargetedIndex: this.props.indexName,
},
};

componentDidUpdate(prevProps: Props) {
const nextIsControlled = isControlled(this.props);

if (!this.isControlled && nextIsControlled) {
throw new Error(
"You can't switch <InstantSearch> from being uncontrolled to controlled"
);
}

if (this.props.refresh !== nextProps.refresh) {
if (nextProps.refresh) {
this.aisManager.clearCache();
}
if (this.isControlled && !nextIsControlled) {
throw new Error(
"You can't switch <InstantSearch> from being controlled to uncontrolled"
);
}

if (this.props.searchClient !== nextProps.searchClient) {
this.aisManager.updateClient(nextProps.searchClient);
/*
* Clear cache when `refresh` changes to `true`.
* Prevents users to always clear the cache on render if they forget to revert it to `false`.
*/
if (this.props.refresh !== prevProps.refresh && this.props.refresh) {
this.aisManager.clearCache();
}

if (this.isControlled) {
this.aisManager.onExternalStateUpdate(nextProps.searchState);
this.aisManager.onExternalStateUpdate(this.props.searchState);
}

if (prevProps.indexName !== this.props.indexName) {
this.aisManager.updateIndex(this.props.indexName);
}

if (prevProps.searchClient !== this.props.searchClient) {
this.aisManager.updateClient(this.props.searchClient);
}
}

Expand Down Expand Up @@ -247,10 +249,10 @@ class InstantSearch extends Component<Props, State> {
}

render() {
const childrenCount = Children.count(this.props.children);
if (childrenCount === 0) {
if (Children.count(this.props.children) === 0) {
return null;
}

return (
<InstantSearchProvider value={this.state.contextValue}>
{this.props.children}
Expand Down
Loading

0 comments on commit e7573d4

Please sign in to comment.