ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3512 from tylershuster/backlog-height

Browse Source 
chat: make backlog height only reflect loaded messages
This commit is contained in:
matildepark 2020-09-18 21:03:27 -04:00 committed by GitHub
commit c19acbb041
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/interface/src/views/apps/chat/components/lib/ChatWindow.tsx
View File

@ -20,6 +20,7 @@ import { BacklogElement } from "./backlog-element";
const INITIAL_LOAD = 20;
const DEFAULT_BACKLOG_SIZE = 100;
const IDLE_THRESHOLD = 64;
const MAX_BACKLOG_SIZE = 1000;
type ChatWindowProps = RouteComponentProps<{
ship: Patp;
@ -188,8 +189,11 @@ export default class ChatWindow extends Component<ChatWindowProps, ChatWindowSta
this.setState({ fetchPending: true });
start = Math.min(mailboxSize - start, mailboxSize);
end = Math.max(mailboxSize - end, 0, start - MAX_BACKLOG_SIZE);
return api.chat
.fetchMessages(Math.max(mailboxSize - end, 0), Math.min(mailboxSize - start, mailboxSize), station)
.fetchMessages(end, start, station)
.finally(() => {
this.setState({ fetchPending: false });
});

14
pkg/interface/src/views/components/VirtualScroller.tsx
View File

@ -150,13 +150,13 @@ export default class VirtualScroller extends PureComponent<VirtualScrollerProps,
}
});
endgap += Math.abs(totalSize - data.size) * averageHeight;
// endgap += Math.abs(totalSize - data.size) * averageHeight; // Uncomment to make full height of backlog
startBuffer = new Map([...startBuffer].reverse().slice(0, visibleItems.size));
startBuffer.forEach((datum, index) => {
startgap -= this.heightOf(index);
});
visibleItems = new Map([...visibleItems].reverse());
endBuffer = new Map([...endBuffer].reverse());
const firstVisibleKey = Array.from(visibleItems.keys())[0] ?? this.estimateIndexFromScrollTop(scrollTop);
@ -228,7 +228,7 @@ export default class VirtualScroller extends PureComponent<VirtualScrollerProps,
componentWillUnmount() {
window.removeEventListener('keydown', this.invertedKeyHandler);
}
setWindow(element) {
if (!element) return;
if (this.window) {
@ -278,7 +278,7 @@ export default class VirtualScroller extends PureComponent<VirtualScrollerProps,
if (scrollTop !== scrollHeight) {
this.setState({ scrollTop });
}
this.calculateVisibleItems();
onScroll ? onScroll({ scrollTop, scrollHeight, windowHeight }) : null;
if (scrollTop === 0) {
@ -294,7 +294,7 @@ export default class VirtualScroller extends PureComponent<VirtualScrollerProps,
endgap,
visibleItems
} = this.state;
const {
origin = 'top',
loadRows,
@ -302,7 +302,7 @@ export default class VirtualScroller extends PureComponent<VirtualScrollerProps,
style,
data
} = this.props;
const indexesToRender = Array.from(visibleItems.keys());
const transform = origin === 'top' ? 'scale3d(1, 1, 1)' : 'scale3d(1, -1, 1)';