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

Merge pull request #3023 from urbit/lf/chat-max-backlog

Browse Source 
chat: qol fixes
This commit is contained in:
matildepark 2020-06-17 11:14:28 -04:00 committed by GitHub
commit d5d25140f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/interface/src/apps/chat/components/chat.js
View File

@ -22,6 +22,7 @@ function getNumPending(props) {
const ACTIVITY_TIMEOUT = 60000; // a minute const ACTIVITY_TIMEOUT = 60000; // a minute
const DEFAULT_BACKLOG_SIZE = 300; const DEFAULT_BACKLOG_SIZE = 300;
const MAX_BACKLOG_SIZE = 1000;
function scrollIsAtTop(container) { function scrollIsAtTop(container) {
if ((navigator.userAgent.includes("Safari") && if ((navigator.userAgent.includes("Safari") &&
@ -136,14 +137,15 @@ export class ChatScreen extends Component {
const unread = props.length - props.read; const unread = props.length - props.read;
const unreadUnloaded = unread - props.envelopes.length; const unreadUnloaded = unread - props.envelopes.length;
const excessUnread = unreadUnloaded > MAX_BACKLOG_SIZE;
if(unreadUnloaded + 20 > DEFAULT_BACKLOG_SIZE) { if(!excessUnread && unreadUnloaded + 20 > DEFAULT_BACKLOG_SIZE) {
this.askForMessages(unreadUnloaded + 20); this.askForMessages(unreadUnloaded + 20);
} else { } else {
this.askForMessages(DEFAULT_BACKLOG_SIZE); this.askForMessages(DEFAULT_BACKLOG_SIZE);
} }
if(props.read === props.length){ if(excessUnread || props.read === props.length){
this.scrolledToMarker = true; this.scrolledToMarker = true;
this.setState( this.setState(
{ {

6
pkg/interface/src/apps/chat/components/lib/message.js
View File

@ -87,8 +87,8 @@ export class Message extends Component {
className="o-80-d" className="o-80-d"
src={letter.url} src={letter.url}
style={{ style={{
width: '50%', height: 'min(250px, 20vh)',
maxWidth: '250px' maxWidth: '80vw'
}} }}
></img> ></img>
); );
@ -154,7 +154,7 @@ export class Message extends Component {
); );
} else { } else {
return ( return (
<section> <section className="chat-md-message">
<MessageMarkdown <MessageMarkdown
source={letter.text} source={letter.text}
/> />

4
pkg/interface/src/apps/chat/css/custom.css
View File

@ -60,6 +60,10 @@ h2 {
line-height: 16px; line-height: 16px;
} }
.chat-md-message > pre {
overflow-x: auto;
}
.mono { .mono {
font-family: "Source Code Pro", monospace; font-family: "Source Code Pro", monospace;
} }