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

[Optimization] Optimizing CountDown Component Deprecated React Lifecycle #358

Merged
merged 2 commits into from
Oct 15, 2023
Merged

[Optimization] Optimizing CountDown Component Deprecated React Lifecycle #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d38f3
[Optimization] Optimizing CountDown Component Deprecated React Lifecycle
VampireAchao Oct 15, 2023
6e7233a
[Improve] Improve error messaging and value assignment
VampireAchao Oct 15, 2023
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
75 changes: 41 additions & 34 deletions src/components/CountDown/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,47 @@ function fixedZero(val) {
return val * 1 < 10 ? `0${val}` : val;
}

function initTime(target) {
let lastTime = 0;
let targetTime = 0;
try {
if (Object.prototype.toString.call(target) === '[object Date]') {
targetTime = target.getTime();
} else {
targetTime = new Date(target).getTime();
}
} catch (e) {
throw new Error(`invalid target prop ${e.message}`);
}

lastTime = targetTime - new Date().getTime();
return {
lastTime: Math.max(lastTime, 0),
};
}

class CountDown extends Component {

static getDerivedStateFromProps(nextProps, prevState) {
if (nextProps.target !== prevState.target) {
const {lastTime} = initTime(nextProps.target);
return {
lastTime,
target: nextProps.target,
resetTimer: true,
};
}
return null;
}

timer = 0;

interval = 1000;

constructor(props) {
super(props);

const { lastTime } = this.initTime(props);
const {lastTime} = initTime(props.target);

this.state = {
lastTime,
Expand All @@ -40,45 +72,20 @@ class CountDown extends Component {
this.tick();
}

componentWillReceiveProps(nextProps) {
const { target } = this.props;
if (target !== nextProps.target) {
clearTimeout(this.timer);
const { lastTime } = this.initTime(nextProps);
this.setState(
{
lastTime,
},
() => {
this.tick();
}
);
componentDidUpdate() {
if (!this.state.resetTimer) {
return
}
clearTimeout(this.timer);
this.tick();
// eslint-disable-next-line react/no-did-update-set-state
this.setState({resetTimer: false});
}

componentWillUnmount() {
clearTimeout(this.timer);
}

initTime = props => {
let lastTime = 0;
let targetTime = 0;
try {
if (Object.prototype.toString.call(props.target) === '[object Date]') {
targetTime = props.target.getTime();
} else {
targetTime = new Date(props.target).getTime();
}
} catch (e) {
throw new Error('invalid target prop', e);
}

lastTime = targetTime - new Date().getTime();
return {
lastTime: lastTime < 0 ? 0 : lastTime,
};
};

// defaultFormat = time => (
// <span>{moment(time).format('hh:mm:ss')}</span>
// );
Expand All @@ -101,7 +108,7 @@ class CountDown extends Component {
};

tick = () => {
const { onEnd } = this.props;
const { onEnd = () => {} } = this.props;
let { lastTime } = this.state;

this.timer = setTimeout(() => {
Expand Down
Loading