Skip to content

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

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
diegolmello merged 3 commits into from
Jul 8, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97fa62e
[FIX] Check if exists scroll ref
djorkaeffalexandre Jul 8, 2020
1782e60
Merge branch 'develop' into fix.scroll-ref-undefined
diegolmello Jul 8, 2020
5288fb8
Remove scrollTo
diegolmello Jul 8, 2020
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
2 changes: 1 addition & 1 deletion app/views/RoomView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
24 changes: 9 additions & 15 deletions app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
};
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Expand Down