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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

Browse source 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
This commit is contained in:
Michael Telatynski 2021-06-29 22:14:40 +01:00
commit 8f4879ea96
638 changed files with 3442 additions and 4515 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/TimelinePanel.tsx
View file

@ -519,7 +519,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
// we won't load this event now, because we don't want to push any
// events off the other end of the timeline. But we need to note
// that we can now paginate.
this.setState({canForwardPaginate: true});
this.setState({ canForwardPaginate: true });
return;
}
@ -661,7 +661,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
};
private onSync = (clientSyncState: SyncState, prevState: SyncState, data: object): void => {
this.setState({ clientSyncState });
this.setState({ clientSyncState });
};
private readMarkerTimeout(readMarkerPosition: number): number {
@ -839,7 +839,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
this.sendReadReceipt();
};
// advance the read marker past any events we sent ourselves.
private advanceReadMarkerPastMyEvents(): void {
if (!this.props.manageReadMarkers) return;
@ -955,7 +954,6 @@ class TimelinePanel extends React.Component<IProps, IState> {
&& !this.timelineWindow.canPaginate(EventTimeline.FORWARDS);
}
/* get the current scroll state. See ScrollPanel.getScrollState for
* details.
*
@ -1053,7 +1051,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
private loadTimeline(eventId?: string, pixelOffset?: number, offsetBase?: number): void {
this.timelineWindow = new TimelineWindow(
MatrixClientPeg.get(), this.props.timelineSet,
{windowLimit: this.props.timelineCap});
{ windowLimit: this.props.timelineCap });
const onLoaded = () => {
// clear the timeline min-height when