Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-23 01:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add user badges to typing bubbles, refactor typing logic

Browse Source
This commit is contained in:
Evan Hahn
2021-11-15 14:01:58 -06:00
committed by GitHub
parent ede34ecee3
commit f4e336836f
13 changed files with 125 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ts/components/conversation/Timeline.tsx
View File

@@ -94,7 +94,7 @@ type PropsHousekeepingType = {
areWeAdmin?: boolean;
isGroupV1AndDisabled?: boolean;
isIncomingMessageRequest: boolean;
typingContact?: unknown;
typingContactId?: string;
unreadCount?: number;
selectedMessageId?: string;
@@ -859,7 +859,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
}
public getRowCount(): number {
const { oldestUnreadIndex, typingContact } = this.props;
const { oldestUnreadIndex, typingContactId } = this.props;
const { items } = this.props;
const itemsCount = items && items.length ? items.length : 0;
@@ -870,7 +870,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
extraRows += 1;
}
if (typingContact) {
if (typingContactId) {
extraRows += 1;
}
@@ -1033,7 +1033,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
resetCounter,
scrollToBottomCounter,
scrollToIndex,
typingContact,
typingContactId,
} = this.props;
// We recompute the hero row's height if:
@@ -1097,7 +1097,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
if (
items !== prevProps.items ||
oldestUnreadIndex !== prevProps.oldestUnreadIndex ||
Boolean(typingContact) !== Boolean(prevProps.typingContact)
Boolean(typingContactId) !== Boolean(prevProps.typingContactId)
) {
const { atTop } = this.state;
@@ -1135,13 +1135,13 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
const rowsIterator = Timeline.getEphemeralRows({
items,
oldestUnreadIndex,
typingContact: Boolean(typingContact),
hasTypingContact: Boolean(typingContactId),
haveOldest,
});
const prevRowsIterator = Timeline.getEphemeralRows({
items: prevProps.items,
oldestUnreadIndex: prevProps.oldestUnreadIndex,
typingContact: Boolean(prevProps.typingContact),
hasTypingContact: Boolean(prevProps.typingContactId),
haveOldest: prevProps.haveOldest,
});
@@ -1578,13 +1578,13 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
}
private static *getEphemeralRows({
items,
typingContact,
oldestUnreadIndex,
hasTypingContact,
haveOldest,
items,
oldestUnreadIndex,
}: {
items: ReadonlyArray<string>;
typingContact: boolean;
hasTypingContact: boolean;
oldestUnreadIndex?: number;
haveOldest: boolean;
}): Iterator<string> {
@@ -1597,7 +1597,7 @@ export class Timeline extends React.PureComponent<PropsType, StateType> {
yield `item:${items[i]}`;
}
if (typingContact) {
if (hasTypingContact) {
yield 'typing-contact';
}
}