Page MenuHomePhabricator

D3782.diff
No OneTemporary

D3782.diff

diff --git a/web/chat/chat-thread-list-item.react.js b/web/chat/chat-thread-list-item.react.js
--- a/web/chat/chat-thread-list-item.react.js
+++ b/web/chat/chat-thread-list-item.react.js
@@ -95,7 +95,7 @@
return (
<ChatThreadListSidebar
sidebarInfo={sidebarInfo}
- isMultipleSidebarItem={index > 0}
+ isSubsequentItem={index > 0}
key={sidebarInfo.threadInfo.id}
/>
);
diff --git a/web/chat/chat-thread-list-sidebar.react.js b/web/chat/chat-thread-list-sidebar.react.js
--- a/web/chat/chat-thread-list-sidebar.react.js
+++ b/web/chat/chat-thread-list-sidebar.react.js
@@ -15,10 +15,10 @@
type Props = {
+sidebarInfo: SidebarInfo,
- +isMultipleSidebarItem: boolean,
+ +isSubsequentItem: boolean,
};
function ChatThreadListSidebar(props: Props): React.Node {
- const { sidebarInfo, isMultipleSidebarItem } = props;
+ const { sidebarInfo, isSubsequentItem } = props;
const { threadInfo, mostRecentNonLocalMessage } = sidebarInfo;
const {
currentUser: { unread },
@@ -40,10 +40,7 @@
onClick={onClick}
>
<div className={css.dotContainer}>{unreadDot}</div>
- <SidebarItem
- sidebarInfo={sidebarInfo}
- extendArrow={isMultipleSidebarItem}
- />
+ <SidebarItem sidebarInfo={sidebarInfo} extendArrow={isSubsequentItem} />
<ChatThreadListItemMenu
threadInfo={threadInfo}
mostRecentNonLocalMessage={mostRecentNonLocalMessage}
diff --git a/web/chat/sidebar-item.react.js b/web/chat/sidebar-item.react.js
--- a/web/chat/sidebar-item.react.js
+++ b/web/chat/sidebar-item.react.js
@@ -26,9 +26,14 @@
const unreadCls = classNames(css.sidebarTitle, { [css.unread]: unread });
+ let arrowExtender;
+ if (extendArrow) {
+ arrowExtender = <div className={css.threadArrowExtender} />;
+ }
+
return (
<>
- {extendArrow ? <div className={css.threadArrowExtender} /> : null}
+ {arrowExtender}
<SWMansionIcon icon="right-angle-arrow" size={28} />
<div className={css.spacer} />
<a className={css.threadButtonSidebar} onClick={onClick}>

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 9:52 AM (19 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2579284
Default Alt Text
D3782.diff (2 KB)

Event Timeline