Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[TimerMixin] Remove TimerMixin from ListView #21488

Closed
wants to merge 2 commits into from
Closed

[TimerMixin] Remove TimerMixin from ListView #21488

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
480f277
UPDATE: remove TimerMixin
exced Oct 4, 2018
90a3164
UPDATE: request animation frame list
exced Oct 5, 2018
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
23 changes: 19 additions & 4 deletions Libraries/Lists/ListView/ListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const RCTScrollViewManager = require('NativeModules').ScrollViewManager;
const ScrollView = require('ScrollView');
const ScrollResponder = require('ScrollResponder');
const StaticRenderer = require('StaticRenderer');
const TimerMixin = require('react-timer-mixin');
const View = require('View');
const cloneReferencedElement = require('react-clone-referenced-element');
const createReactClass = require('create-react-class');
Expand Down Expand Up @@ -216,14 +215,15 @@ type Props = $ReadOnly<{|

const ListView = createReactClass({
displayName: 'ListView',
_rafIds: ([]: Array<AnimationFrameID>),
_childFrames: ([]: Array<Object>),
_sentEndForContentLength: (null: ?number),
_scrollComponent: (null: ?React.ElementRef<typeof ScrollView>),
_prevRenderedRowsCount: 0,
_visibleRows: ({}: Object),
scrollProperties: ({}: Object),

mixins: [ScrollResponder.Mixin, TimerMixin],
mixins: [ScrollResponder.Mixin],

statics: {
DataSource: ListViewDataSource,
Expand Down Expand Up @@ -347,16 +347,23 @@ const ListView = createReactClass({
contentLength: null,
offset: 0,
};

this._rafIds = [];
this._childFrames = [];
this._visibleRows = {};
this._prevRenderedRowsCount = 0;
this._sentEndForContentLength = null;
},

componentWillUnmount: function() {
this._rafIds.forEach(cancelAnimationFrame);
this._rafIds = [];
},

componentDidMount: function() {
// do this in animation frame until componentDidMount actually runs after
// the component is laid out
this.requestAnimationFrame(() => {
this._requestAnimationFrame(() => {
this._measureAndUpdateScrollProps();
});
},
Expand Down Expand Up @@ -384,7 +391,7 @@ const ListView = createReactClass({
},

componentDidUpdate: function() {
this.requestAnimationFrame(() => {
this._requestAnimationFrame(() => {
this._measureAndUpdateScrollProps();
});
},
Expand Down Expand Up @@ -535,6 +542,14 @@ const ListView = createReactClass({
* Private methods
*/

_requestAnimationFrame: function(fn: () => void): void {
const rafId = requestAnimationFrame(() => {
this._rafIds.splice(this._rafIds.indexOf(rafId));
fn();
});
this._rafIds.push(rafId);
},

_measureAndUpdateScrollProps: function() {
const scrollComponent = this.getScrollResponder();
if (!scrollComponent || !scrollComponent.getInnerViewNode) {
Expand Down