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.

Sign up for GitHub

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

Jump to bottom

Change componentWillReceiveProps to getDerivedStateFromProps #105

Merged
merged 4 commits into from
Oct 24, 2018
Merged

Change componentWillReceiveProps to getDerivedStateFromProps #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef72926
Change componentWillReceiveProps to getDerivedStateFromProps
Karl-EdwardFPJeanMehu Oct 2, 2018
4ff03f8
Merge branch 'master' into deprecated_lifecycle
petrsvihlik Oct 3, 2018
59063a9
Merge branch 'master' into deprecated_lifecycle
Simply007 Oct 3, 2018
a64d25d
Merge branch 'master' into deprecated_lifecycle
petrsvihlik Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Components/Brewers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,14 @@ 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 (prevState.language !== nextProps.language) {
BrewerStore.provideBrewers(nextProps.language);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
9 changes: 6 additions & 3 deletions src/Components/Coffees.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ 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);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
2 changes: 1 addition & 1 deletion src/Components/ContactMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class MapContainer extends Component {
}

//TODO: Method will be removed in React 17, will need to be rewritten if still required.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clould you please remove this comment line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure!

UNSAFE_componentWillReceiveProps(nextProps) {
componentDidUPdate(nextProps) {
this.focusOnAddress(nextProps.focusOnAddress);
}

Expand Down
9 changes: 6 additions & 3 deletions src/Components/LatestArticles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ 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];
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
9 changes: 6 additions & 3 deletions src/Components/TasteOurCoffee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ 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);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
17 changes: 10 additions & 7 deletions src/Pages/About.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,21 @@ 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
nextProps.language,
nextProps.match.params.urlSlug
);
AboutStore.provideMetaData(
this.props.language,
this.props.match.params.urlSlug
nextProps.language,
nextProps.match.params.urlSlug
);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
12 changes: 8 additions & 4 deletions src/Pages/Article.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,19 @@ 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];

return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
9 changes: 6 additions & 3 deletions src/Pages/Articles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,15 @@ 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];
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
19 changes: 13 additions & 6 deletions src/Pages/Brewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import Metadata from '../Components/Metadata';

let getState = props => {
return {
brewer: BrewerStore.getBrewer(props.match.params.brewerSlug, props.language)
brewer: BrewerStore.getBrewer(
props.match.params.brewerSlug,
props.language
),
match: { params: { brewerSlug: props.match.params.brewerSlug } }
};
};

Expand All @@ -27,14 +31,17 @@ 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);
BrewerStore.provideBrewers(nextProps.language);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
9 changes: 6 additions & 3 deletions src/Pages/Cafes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ 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);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
11 changes: 7 additions & 4 deletions src/Pages/Coffee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,17 @@ 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);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down
11 changes: 7 additions & 4 deletions src/Pages/Contacts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ 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);
return {
language: nextProps.language,
selectedAddress: undefined
};
}
return null;
}

onChange(language) {
Expand Down
11 changes: 7 additions & 4 deletions src/Pages/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ 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(nextProps.language);
return {
language: nextProps.language
};
}
return null;
}

onChange() {
Expand Down