Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change UNSAFE_componentWillReceiveProps to getDerivedStateFromProps #99

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Components/Brewers.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ class Brewers extends Component {
BrewerStore.unsubscribe();
}

// Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState){
if(nextProps.language!==prevState.language){
BrewerStore.provideBrewers(nextProps.language);
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/Components/Coffees.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ class Coffees extends Component {
CoffeeStore.unsubscribe();
}

// Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
CoffeeStore.provideCoffees(nextProps.language);
}
}
Expand Down
3 changes: 1 addition & 2 deletions src/Components/ContactMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ export class MapContainer extends Component {
}
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
static getDerivedStateFromProps(nextProps) {
this.focusOnAddress(nextProps.focusOnAddress);
}

Expand Down
5 changes: 2 additions & 3 deletions src/Components/LatestArticles.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ class LatestArticles extends Component {
ArticleStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
ArticleStore.provideArticles(nextProps.language);
dateFormat.i18n = dateFormats[nextProps.language] || dateFormats[0];
}
Expand Down
5 changes: 2 additions & 3 deletions src/Components/TasteOurCoffee.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ class TasteOurCoffee extends Component {
CafeStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
CafeStore.provideCompanyCafes(nextProps.language);
}
}
Expand Down
13 changes: 6 additions & 7 deletions src/Pages/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ class About extends Component {
AboutStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
AboutStore.provideFacts(
this.props.language,
this.props.match.params.urlSlug
prevState.language,
prevState.match.params.urlSlug
);
AboutStore.provideMetaData(
this.props.language,
this.props.match.params.urlSlug
prevState.language,
prevState.match.params.urlSlug
);
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/Pages/Article.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@ class Article extends Component {
ArticleStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
ArticleStore.provideArticle(
this.props.match.params.articleId,
prevState.match.params.articleId,
nextProps.language
);
dateFormat.i18n = dateFormats[nextProps.language] || dateFormats[0];
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/Articles.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ class Articles extends Component {
ArticleStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
ArticleStore.provideArticles(nextProps.language);
dateFormat.i18n = dateFormats[nextProps.language] || dateFormats[0];
}
Expand Down
7 changes: 3 additions & 4 deletions src/Pages/Brewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ class Brewer extends Component {
BrewerStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
static getDerivedStateFromProps(nextProps, prevState) {
if (
this.props.language !== nextProps.language ||
this.props.match.params.brewerSlug !== nextProps.match.params.brewerSlug
prevState.language !== nextProps.language ||
prevState.match.params.brewerSlug !== nextProps.match.params.brewerSlug
) {
BrewerStore.provideBrewer(nextProps.language);
}
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/Cafes.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ class Cafes extends Component {
CafeStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
CafeStore.provideCompanyCafes(nextProps.language);
CafeStore.providePartnerCafes(nextProps.language);
}
Expand Down
7 changes: 3 additions & 4 deletions src/Pages/Coffee.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ class Coffee extends Component {
CoffeeStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
static getDerivedStateFromProps(nextProps, prevState) {
if (
this.props.language !== nextProps.language ||
this.props.match.params.coffeeSlug !== nextProps.match.params.coffeeSlug
prevState.language !== nextProps.language ||
prevState.match.params.coffeeSlug !== nextProps.match.params.coffeeSlug
) {
CoffeeStore.provideCoffee(nextProps.language);
}
Expand Down
5 changes: 2 additions & 3 deletions src/Pages/Contacts.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ class Contacts extends Component {
CafeStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
CafeStore.provideCompanyCafes(nextProps.language);
this.selectAddress(undefined);
}
Expand Down
7 changes: 3 additions & 4 deletions src/Pages/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ class Home extends Component {
HomeStore.unsubscribe();
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.language !== nextProps.language) {
HomeStore.provideMetaData(this.props.language);
static getDerivedStateFromProps(nextProps, prevState) {
if (prevState.language !== nextProps.language) {
HomeStore.provideMetaData(prevState.language);
}
}

Expand Down