Render only visible conversations in left pane

This commit is contained in:
Scott Nonnenberg 2019-03-08 18:25:28 -08:00
parent 031b64a476
commit d72f89d776
6 changed files with 65 additions and 13 deletions

View File

@ -11,8 +11,6 @@
const conversations = new Whisper.ConversationCollection();
const inboxCollection = new (Backbone.Collection.extend({
initialize() {
this.on('change:timestamp change:name change:number', this.sort);
this.listenTo(conversations, 'add change:active_at', this.addActive);
this.listenTo(conversations, 'reset', () => this.reset([]));

View File

@ -43,6 +43,7 @@
"dependencies": {
"@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#36149a4b03ccf11ec18b9205e1bfd9056015cf07",
"@sindresorhus/is": "0.8.0",
"@types/react-virtualized": "9.18.12",
"backbone": "1.3.3",
"blob-util": "1.3.0",
"blueimp-canvas-to-blob": "3.14.0",

View File

@ -2989,8 +2989,10 @@
.module-left-pane__list {
flex-grow: 1;
flex-shrink: 1;
}
overflow-y: scroll;
.module-left-pane__virtual-list {
outline: none;
}
// Module: Start New Conversation

View File

@ -32,6 +32,7 @@ export type PropsData = {
type PropsHousekeeping = {
i18n: LocalizerType;
style?: Object;
onClick?: (id: string) => void;
};
@ -176,7 +177,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
}
public render() {
const { unreadCount, onClick, id, isSelected } = this.props;
const { unreadCount, onClick, id, isSelected, style } = this.props;
return (
<div
@ -186,6 +187,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
onClick(id);
}
}}
style={style}
className={classNames(
'module-conversation-list-item',
unreadCount > 0 ? 'module-conversation-list-item--has-unread' : null,

View File

@ -1,4 +1,5 @@
import React from 'react';
import { AutoSizer, List } from 'react-virtualized';
import {
ConversationListItem,
@ -23,11 +24,39 @@ export interface Props {
renderMainHeader: () => JSX.Element;
}
// from https://github.com/bvaughn/react-virtualized/blob/fb3484ed5dcc41bffae8eab029126c0fb8f7abc0/source/List/types.js#L5
type RowRendererParams = {
index: number;
isScrolling: boolean;
isVisible: boolean;
key: string;
parent: Object;
style: Object;
};
export class LeftPane extends React.Component<Props> {
public renderRow = ({ index, key, style }: RowRendererParams) => {
const { conversations, i18n, openConversationInternal } = this.props;
if (!conversations) {
return null;
}
const conversation = conversations[index];
return (
<ConversationListItem
key={key}
style={style}
{...conversation}
onClick={openConversationInternal}
i18n={i18n}
/>
);
};
public renderList() {
const {
conversations,
i18n,
conversations,
openConversationInternal,
startNewConversation,
searchResults,
@ -44,16 +73,28 @@ export class LeftPane extends React.Component<Props> {
);
}
if (!conversations || !conversations.length) {
return null;
}
// Note: conversations is not a known prop for List, but it is required to ensure that
// it re-renders when our conversation data changes. Otherwise it would just render
// on startup and scroll.
return (
<div className="module-left-pane__list">
{(conversations || []).map(conversation => (
<ConversationListItem
key={conversation.phoneNumber}
{...conversation}
onClick={openConversationInternal}
i18n={i18n}
/>
))}
<AutoSizer>
{({ height, width }) => (
<List
className="module-left-pane__virtual-list"
conversations={conversations}
height={height}
rowCount={conversations.length}
rowHeight={64}
rowRenderer={this.renderRow}
width={width}
/>
)}
</AutoSizer>
</div>
);
}

View File

@ -176,6 +176,14 @@
"@types/react" "*"
redux "^4.0.0"
"@types/react-virtualized@9.18.12":
version "9.18.12"
resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.12.tgz#541e65c5e0b4629d6a1c6f339171c7943e016ecb"
integrity sha512-Msdpt9zvYlb5Ul4PA339QUkJ0/z2O+gaFxed1rG+2rZjbe6XdYo7jWfJe206KBnjj84DwPPIbPFQCtoGuNwNTQ==
dependencies:
"@types/prop-types" "*"
"@types/react" "*"
"@types/react@*", "@types/react@16.8.5":
version "16.8.5"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.5.tgz#03b9a6597bc20f6eaaed43f377a160f7e41c2b90"