Page MenuHomePhabricator

D6745.diff
No OneTemporary

D6745.diff

diff --git a/web/chat/thread-top-bar.react.js b/web/chat/thread-top-bar.react.js
--- a/web/chat/thread-top-bar.react.js
+++ b/web/chat/thread-top-bar.react.js
@@ -6,14 +6,13 @@
import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useResolvedThreadInfo } from 'lib/utils/entity-helpers.js';
-import ThreadAncestors from './chat-thread-ancestors.react.js';
import ThreadMenu from './thread-menu.react.js';
import css from './thread-top-bar.css';
-type threadTopBarProps = {
+type ThreadTopBarProps = {
+threadInfo: ThreadInfo,
};
-function ThreadTopBar(props: threadTopBarProps): React.Node {
+function ThreadTopBar(props: ThreadTopBarProps): React.Node {
const { threadInfo } = props;
const threadBackgroundColorStyle = React.useMemo(
() => ({
@@ -36,7 +35,6 @@
style={threadBackgroundColorStyle}
/>
<p className={css.threadTitle}>{uiName}</p>
- <ThreadAncestors threadInfo={threadInfo} />
</div>
{threadMenu}
</div>
diff --git a/web/chat/chat-thread-ancestors.css b/web/navigation-panels/chat-thread-ancestors.css
rename from web/chat/chat-thread-ancestors.css
rename to web/navigation-panels/chat-thread-ancestors.css
diff --git a/web/chat/chat-thread-ancestors.react.js b/web/navigation-panels/chat-thread-ancestors.react.js
rename from web/chat/chat-thread-ancestors.react.js
rename to web/navigation-panels/chat-thread-ancestors.react.js
diff --git a/web/navigation-panels/nav-state-info-bar.css b/web/navigation-panels/nav-state-info-bar.css
new file mode 100644
--- /dev/null
+++ b/web/navigation-panels/nav-state-info-bar.css
@@ -0,0 +1,27 @@
+div.topBarContainer {
+ display: flex;
+ background-color: var(--bg);
+ align-items: center;
+ justify-content: space-between;
+ padding: 16px;
+ color: var(--thread-top-bar-color);
+ border-bottom: 1px solid var(--border);
+}
+
+div.topBarThreadInfo {
+ height: 24px;
+ display: flex;
+ align-items: center;
+ column-gap: 8px;
+}
+
+div.threadColorSquare {
+ width: 24px;
+ height: 24px;
+ border-radius: 4px;
+}
+
+p.threadTitle {
+ font-size: var(--m-font-16);
+ font-weight: var(--bold);
+}
diff --git a/web/chat/thread-top-bar.react.js b/web/navigation-panels/nav-state-info-bar.react.js
copy from web/chat/thread-top-bar.react.js
copy to web/navigation-panels/nav-state-info-bar.react.js
--- a/web/chat/thread-top-bar.react.js
+++ b/web/navigation-panels/nav-state-info-bar.react.js
@@ -2,18 +2,16 @@
import * as React from 'react';
-import { threadIsPending } from 'lib/shared/thread-utils.js';
import type { ThreadInfo } from 'lib/types/thread-types.js';
import { useResolvedThreadInfo } from 'lib/utils/entity-helpers.js';
import ThreadAncestors from './chat-thread-ancestors.react.js';
-import ThreadMenu from './thread-menu.react.js';
-import css from './thread-top-bar.css';
+import css from './nav-state-info-bar.css';
-type threadTopBarProps = {
+type NavStateInfoBarProps = {
+threadInfo: ThreadInfo,
};
-function ThreadTopBar(props: threadTopBarProps): React.Node {
+function NavStateInfoBar(props: NavStateInfoBarProps): React.Node {
const { threadInfo } = props;
const threadBackgroundColorStyle = React.useMemo(
() => ({
@@ -22,11 +20,6 @@
[threadInfo.color],
);
- let threadMenu = null;
- if (!threadIsPending(threadInfo.id)) {
- threadMenu = <ThreadMenu threadInfo={threadInfo} />;
- }
-
const { uiName } = useResolvedThreadInfo(threadInfo);
return (
<div className={css.topBarContainer}>
@@ -38,9 +31,8 @@
<p className={css.threadTitle}>{uiName}</p>
<ThreadAncestors threadInfo={threadInfo} />
</div>
- {threadMenu}
</div>
);
}
-export default ThreadTopBar;
+export default NavStateInfoBar;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 11:37 AM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2579496
Default Alt Text
D6745.diff (3 KB)

Event Timeline