imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Remove jittery timeline scrolling after jumping to an event (#8263)

Browse source 
* Fix: Remove jittery timeline scrolling after jumping to an event

* Fix: Remove onUserScroll handler and merge it with onScroll

* Fix: Reset scrollIntoView state earlier

Co-authored-by: Janne Mareike Koschinski <jannemk@element.io>
This commit is contained in:
Janne Mareike Koschinski 2022-04-08 20:48:57 +02:00 • committed by GitHub
parent 285dc25b3e
commit 579a166113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 118 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/views/right_panel/TimelineCard.tsx
View file

@ -146,19 +146,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
}
};
private onUserScroll = (): void => {
if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: this.props.room.roomId,
event_id: this.state.initialEventId,
highlighted: false,
replyingToEvent: this.state.replyToEvent,
metricsTrigger: undefined, // room doesn't change
});
}
};
private onScroll = (): void => {
const timelinePanel = this.timelinePanel.current;
if (!timelinePanel) return;
@ -171,6 +158,17 @@ export default class TimelineCard extends React.Component<IProps, IState> {
atEndOfLiveTimeline: false,
});
}
if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: this.props.room.roomId,
event_id: this.state.initialEventId,
highlighted: false,
replyingToEvent: this.state.replyToEvent,
metricsTrigger: undefined, // room doesn't change
});
}
};
private onMeasurement = (narrow: boolean): void => {
@ -263,7 +261,6 @@ export default class TimelineCard extends React.Component<IProps, IState> {
resizeNotifier={this.props.resizeNotifier}
highlightedEventId={highlightedEventId}
onScroll={this.onScroll}
onUserScroll={this.onUserScroll}
/>
</div>