mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Address alpha feedback

Browse source
This commit is contained in:
Scott Nonnenberg 2019-08-20 12:34:52 -07:00
parent 191f5860a8
commit 90c2a97aa7
9 changed files with 78 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/components/conversation/Timeline.tsx
View file

@ -578,10 +578,7 @@ export class Timeline extends React.PureComponent<Props, State> {
public getRowCount() {
const { haveOldest, oldestUnreadIndex, typingContact } = this.props;
const { items } = this.props;
if (!items || items.length < 1) {
return 0;
}
const itemsCount = items && items.length ? items.length : 0;
let extraRows = 0;
@ -597,7 +594,7 @@ export class Timeline extends React.PureComponent<Props, State> {
extraRows += 1;
}
return items.length + extraRows;
return itemsCount + extraRows;
}
public fromRowToItemIndex(row: number): number | undefined {
@ -848,13 +845,13 @@ export class Timeline extends React.PureComponent<Props, State> {
areUnreadBelowCurrentPosition,
} = this.state;
if (!items || items.length < 1) {
return null;
}
const rowCount = this.getRowCount();
const scrollToIndex = this.getScrollTarget();
if (!items || rowCount === 0) {
return null;
}
return (
<div className="module-timeline">
<AutoSizer>