From 81f9a1da3a4fcc77136dad20215a9a5471f391f7 Mon Sep 17 00:00:00 2001 From: crockwave Date: Wed, 24 Jun 2020 16:02:14 -0500 Subject: [PATCH] Final commit on replacing componentWillReceiveProps deprecated method --- app/soapbox/features/reblogs/index.js | 2 +- .../features/search/components/header.js | 2 +- .../features/status/components/card.js | 2 +- app/soapbox/features/status/index.js | 22 +++++++++---------- app/soapbox/features/ui/components/bundle.js | 2 +- .../ui/components/focal_point_modal.js | 2 +- .../features/ui/components/image_loader.js | 2 +- .../features/ui/components/report_modal.js | 2 +- app/soapbox/features/video/index.js | 2 +- 9 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/soapbox/features/reblogs/index.js b/app/soapbox/features/reblogs/index.js index d71c4330b..0c7c667aa 100644 --- a/app/soapbox/features/reblogs/index.js +++ b/app/soapbox/features/reblogs/index.js @@ -41,7 +41,7 @@ class Reblogs extends ImmutablePureComponent { this.props.dispatch(fetchStatus(this.props.params.statusId)); } - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) { this.props.dispatch(fetchReblogs(nextProps.params.statusId)); this.props.dispatch(fetchStatus(nextProps.params.statusId)); diff --git a/app/soapbox/features/search/components/header.js b/app/soapbox/features/search/components/header.js index 02f7cd36e..82ccb46c6 100644 --- a/app/soapbox/features/search/components/header.js +++ b/app/soapbox/features/search/components/header.js @@ -21,7 +21,7 @@ class Header extends ImmutablePureComponent { submittedValue: '', }; - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (nextProps.submitted) { const submittedValue = nextProps.value; this.setState({ submittedValue }); diff --git a/app/soapbox/features/status/components/card.js b/app/soapbox/features/status/components/card.js index af2308461..bbca9db93 100644 --- a/app/soapbox/features/status/components/card.js +++ b/app/soapbox/features/status/components/card.js @@ -75,7 +75,7 @@ export default class Card extends React.PureComponent { embedded: false, }; - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (!Immutable.is(this.props.card, nextProps.card)) { this.setState({ embedded: false }); } diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index be2227311..b68c6f6af 100644 --- a/app/soapbox/features/status/index.js +++ b/app/soapbox/features/status/index.js @@ -147,17 +147,6 @@ class Status extends ImmutablePureComponent { attachFullscreenListener(this.onFullScreenChange); } - componentWillReceiveProps(nextProps) { - if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) { - this._scrolledIntoView = false; - this.props.dispatch(fetchStatus(nextProps.params.statusId)); - } - - if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) { - this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') }); - } - } - handleToggleMediaVisibility = () => { this.setState({ showMedia: !this.state.showMedia }); } @@ -404,7 +393,16 @@ class Status extends ImmutablePureComponent { this.node = c; } - componentDidUpdate() { + componentDidUpdate(nextProps) { + if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) { + this._scrolledIntoView = false; + this.props.dispatch(fetchStatus(nextProps.params.statusId)); + } + + if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) { + this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') }); + } + if (this._scrolledIntoView) { return; } diff --git a/app/soapbox/features/ui/components/bundle.js b/app/soapbox/features/ui/components/bundle.js index a3c7ab77e..532bff159 100644 --- a/app/soapbox/features/ui/components/bundle.js +++ b/app/soapbox/features/ui/components/bundle.js @@ -37,7 +37,7 @@ class Bundle extends React.PureComponent { this.load(this.props); } - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (nextProps.fetchComponent !== this.props.fetchComponent) { this.load(nextProps); } diff --git a/app/soapbox/features/ui/components/focal_point_modal.js b/app/soapbox/features/ui/components/focal_point_modal.js index 9ec15768a..9119a192e 100644 --- a/app/soapbox/features/ui/components/focal_point_modal.js +++ b/app/soapbox/features/ui/components/focal_point_modal.js @@ -38,7 +38,7 @@ class FocalPointModal extends ImmutablePureComponent { this.updatePositionFromMedia(this.props.media); } - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (this.props.media.get('id') !== nextProps.media.get('id')) { this.updatePositionFromMedia(nextProps.media); } diff --git a/app/soapbox/features/ui/components/image_loader.js b/app/soapbox/features/ui/components/image_loader.js index 02a0441fa..939886f17 100644 --- a/app/soapbox/features/ui/components/image_loader.js +++ b/app/soapbox/features/ui/components/image_loader.js @@ -42,7 +42,7 @@ export default class ImageLoader extends React.PureComponent { this.loadImage(this.props); } - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (this.props.src !== nextProps.src) { this.loadImage(nextProps); } diff --git a/app/soapbox/features/ui/components/report_modal.js b/app/soapbox/features/ui/components/report_modal.js index fcd31afb1..dbe48f27f 100644 --- a/app/soapbox/features/ui/components/report_modal.js +++ b/app/soapbox/features/ui/components/report_modal.js @@ -83,7 +83,7 @@ class ReportModal extends ImmutablePureComponent { this.props.dispatch(expandAccountTimeline(this.props.account.get('id'), { withReplies: true })); } - componentWillReceiveProps(nextProps) { + componentDidUpdate(nextProps) { if (this.props.account !== nextProps.account && nextProps.account) { this.props.dispatch(expandAccountTimeline(nextProps.account.get('id'), { withReplies: true })); } diff --git a/app/soapbox/features/video/index.js b/app/soapbox/features/video/index.js index d49e08e65..490748274 100644 --- a/app/soapbox/features/video/index.js +++ b/app/soapbox/features/video/index.js @@ -291,7 +291,7 @@ class Video extends React.PureComponent { document.removeEventListener('MSFullscreenChange', this.handleFullscreenChange, true); } - componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps) { if (!is(nextProps.visible, this.props.visible) && nextProps.visible !== undefined) { this.setState({ revealed: nextProps.visible }); }