status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-21 13:48:13 +00:00
Code Issues Projects Releases Wiki Activity

Remove TimerMixin from TimerExample

Browse Source 
Summary: $title

Reviewed By: yungsters

Differential Revision: D10180650

fbshipit-source-id: e757f2ae9a2de582c4b5260e557a66b5ad0c7f57
This commit is contained in:
Eli White 2018-10-03 14:59:31 -07:00 committed by Facebook Github Bot
parent fdfe4220e0
commit 8a2187b8f9
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
RNTester/js/TimerExample.js
View File

@ -14,10 +14,6 @@ var React = require('react');
var createReactClass = require('create-react-class'); var createReactClass = require('create-react-class');
var ReactNative = require('react-native'); var ReactNative = require('react-native');
var {AlertIOS, Platform, ToastAndroid, Text, View} = ReactNative; var {AlertIOS, Platform, ToastAndroid, Text, View} = ReactNative;
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
* found when Flow v0.54 was deployed. To see the error delete this comment and
* run Flow. */
var TimerMixin = require('react-timer-mixin');
var RNTesterButton = require('./RNTesterButton'); var RNTesterButton = require('./RNTesterButton');
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error /* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
* found when Flow v0.54 was deployed. To see the error delete this comment and * found when Flow v0.54 was deployed. To see the error delete this comment and
@ -123,13 +119,15 @@ class RequestIdleCallbackTester extends React.Component<{}, $FlowFixMeState> {
var TimerTester = createReactClass({ var TimerTester = createReactClass({
displayName: 'TimerTester', displayName: 'TimerTester',
mixins: [TimerMixin],
_ii: 0, _ii: 0,
_iters: 0, _iters: 0,
_start: 0, _start: 0,
_timerId: (null: ?TimeoutID),
_rafId: (null: ?AnimationFrameID),
_intervalId: (null: ?IntervalID),
_immediateId: (null: ?Object),
_timerFn: (null: ?() => any), _timerFn: (null: ?() => any),
_handle: (null: any),
render: function() { render: function() {
var args = 'fn' + (this.props.dt !== undefined ? ', ' + this.props.dt : ''); var args = 'fn' + (this.props.dt !== undefined ? ', ' + this.props.dt : '');
@ -140,6 +138,24 @@ var TimerTester = createReactClass({
); );
}, },
componentWillUnmount() {
if (this._timerId != null) {
clearTimeout(this._timerId);
}
if (this._rafId != null) {
cancelAnimationFrame(this._rafId);
}
if (this._immediateId != null) {
clearImmediate(this._immediateId);
}
if (this._intervalId != null) {
clearInterval(this._intervalId);
}
},
_run: function() { _run: function() {
if (!this._start) { if (!this._start) {
var d = new Date(); var d = new Date();
@ -152,19 +168,25 @@ var TimerTester = createReactClass({
} else if (this.props.dt > 20) { } else if (this.props.dt > 20) {
this._iters = 10; this._iters = 10;
} }
this._timerFn = () => this.setTimeout(this._run, this.props.dt); this._timerFn = () => {
this._timerId = setTimeout(this._run, this.props.dt);
};
} else if (this.props.type === 'requestAnimationFrame') { } else if (this.props.type === 'requestAnimationFrame') {
this._timerFn = () => this.requestAnimationFrame(this._run); this._timerFn = () => {
this._rafId = requestAnimationFrame(this._run);
};
} else if (this.props.type === 'setImmediate') { } else if (this.props.type === 'setImmediate') {
this._iters = 5000; this._iters = 5000;
this._timerFn = () => this.setImmediate(this._run); this._timerFn = () => {
this._immediateId = setImmediate(this._run);
};
} else if (this.props.type === 'setInterval') { } else if (this.props.type === 'setInterval') {
this._iters = 30; // Only used for forceUpdate periodicidy this._iters = 30; // Only used for forceUpdate periodicidy
this._timerFn = null; this._timerFn = null;
this._handle = this.setInterval(this._run, this.props.dt); this._intervalId = setInterval(this._run, this.props.dt);
} }
} }
if (this._ii >= this._iters && !this._handle) { if (this._ii >= this._iters && this._intervalId == null) {
var d = new Date(); var d = new Date();
var e = d.getTime() - this._start; var e = d.getTime() - this._start;
var msg = var msg =
@ -195,14 +217,16 @@ var TimerTester = createReactClass({
if (this._ii % (this._iters / 5) === 0) { if (this._ii % (this._iters / 5) === 0) {
this.forceUpdate(); this.forceUpdate();
} }
this._timerFn && this._timerFn(); if (this._timerFn) {
this._timerId = this._timerFn();
}
}, },
clear: function() { clear: function() {
this.clearInterval(this._handle); // invalid handles are ignored if (this._intervalId != null) {
if (this._handle) { clearInterval(this._intervalId);
// Configure things so we can do a final run to update UI and reset state. // Configure things so we can do a final run to update UI and reset state.
this._handle = null; this._intervalId = null;
this._iters = this._ii; this._iters = this._ii;
this._run(); this._run();
} }