Skip to content

Replace componentWillReceiveProps with componentDidUpdate #560

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

Merged
merged 1 commit into from
Aug 28, 2018
Merged

Replace componentWillReceiveProps with componentDidUpdate #560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions src/components/anim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ import { connect } from 'react-redux';
import { VictoryAnimation } from 'victory-core';
import { victoryEases } from '../utils/types';

// TODO(540): Refactor to non-deprecated lifecycle methods.
// https://github.com/FormidableLabs/spectacle/issues/540
// - componentWillReceiveProps
// eslint-disable-next-line react/no-deprecated
class Anim extends Component {
state = {
activeAnimation: -1
Expand All @@ -36,29 +32,32 @@ class Anim extends Component {
node.dataset.animCount = this.props.toStyle.length;
}

componentWillReceiveProps(nextProps) {
componentDidUpdate(prevProps, prevState) {
const shouldDisableAnimation =
nextProps.route.params.indexOf('export') !== -1 ||
nextProps.route.params.indexOf('overview') !== -1;
this.props.route.params.indexOf('export') !== -1 ||
this.props.route.params.indexOf('overview') !== -1;

if (shouldDisableAnimation) {
// setState in componentDidUpdate OK if wrapped in a condition according to docs
// eslint-disable-next-line react/no-did-update-set-state
this.setState({ activeAnimation: this.props.toStyle.length - 1 });
return;
}

const animationStatus = this.getAnimationStatus();
if (animationStatus) {
const nextAnimation = animationStatus.every(a => a === true)
? animationStatus.length - 1
: animationStatus.indexOf(false) - 1;
if (this.state.activeAnimation !== nextAnimation) {
const state = nextProps.fragment;
const { slide } = this.props.route;
if (prevState.activeAnimation !== nextAnimation) {
const state = this.props.fragment;
const { slide } = prevProps.route;
this.context.stepCounter.setFragments(state.fragments[slide], slide);
if (this.props.onAnim) {
const forward = this.state.activeAnimation < nextAnimation;
this.props.onAnim(forward, nextAnimation);
if (prevProps.onAnim) {
const forward = prevState.activeAnimation < nextAnimation;
prevProps.onAnim(forward, nextAnimation);
}
// setState in componentDidUpdate OK if wrapped in a condition according to docs
// eslint-disable-next-line react/no-did-update-set-state
this.setState({
activeAnimation: nextAnimation
});
Expand Down