verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] Scroll to top crashing when ref is undefined (#2252) 

* [FIX] Check if exists scroll ref

* Remove scrollTo

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Djorkaeff Alexandre 2020-07-08 13:36:37 -03:00 committed by GitHub
parent 83fbb8c304
commit 362ef0085e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/RoomView/index.js
View File

@ -769,7 +769,7 @@ class RoomView extends React.Component {
if (handleCommandScroll(event)) {
const offset = input === 'UIKeyInputUpArrow' ? 100 : -100;
this.offset += offset;
this.flatList.scrollToOffset({ offset: this.offset });
this.flatList?.scrollToOffset({ offset: this.offset });
} else if (handleCommandRoomActions(event)) {
this.goRoomActionsView();
} else if (handleCommandSearchMessages(event)) {

24
app/views/RoomsListView/index.js
View File

@ -512,12 +512,7 @@ class RoomsListView extends React.Component {
this.setHeader();
closeSearchHeader();
setTimeout(() => {
const offset = 0;
if (this.scroll.scrollTo) {
this.scroll.scrollTo({ x: 0, y: offset, animated: true });
} else if (this.scroll.scrollToOffset) {
this.scroll.scrollToOffset({ offset });
}
this.scrollToTop();
}, 200);
});
};
@ -546,9 +541,7 @@ class RoomsListView extends React.Component {
search: result,
searching: true
});
if (this.scroll && this.scroll.scrollTo) {
this.scroll.scrollTo({ x: 0, y: 0, animated: true });
}
this.scrollToTop();
}, 300);
getRoomTitle = item => RocketChat.getRoomTitle(item)
@ -569,15 +562,16 @@ class RoomsListView extends React.Component {
this.goRoom({ item, isMasterDetail });
};
scrollToTop = () => {
if (this.scroll?.scrollToOffset) {
this.scroll.scrollToOffset({ offset: 0 });
}
}
toggleSort = () => {
const { toggleSortDropdown } = this.props;
const offset = 0;
if (this.scroll.scrollTo) {
this.scroll.scrollTo({ x: 0, y: offset, animated: true });
} else if (this.scroll.scrollToOffset) {
this.scroll.scrollToOffset({ offset });
}
this.scrollToTop();
setTimeout(() => {
toggleSortDropdown();
}, 100);