diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx index 8c71bf77..74d327a9 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/Sidebar.tsx @@ -7,6 +7,7 @@ import { useSidebarState } from '../util/contextForServices.js'; // import { SidebarChat } from './SidebarChat.js'; import '../styles.css' +import { SidebarThreadSelector } from './SidebarThreadSelector.js'; const Sidebar = () => { const [sidebarState, sidebarStateService] = useSidebarState() @@ -15,18 +16,18 @@ const Sidebar = () => { return
- { + {/* { const tabs = ['chat', 'settings', 'threadSelector'] const index = tabs.indexOf(tab) sidebarStateService.setState({ currentTab: tabs[(index + 1) % tabs.length] as any }) - }}>clickme {tab} + }}>clickme {tab} */}
- {/* setTab('chat')} /> */} +
- {/* */} + {/* */}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx index 54829333..a1706501 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx @@ -111,7 +111,9 @@ const ChatBubble = ({ chatMessage }: { chatMessage: ChatMessage }) => { -export const SidebarChat = ({ chatInputRef }: { chatInputRef: React.RefObject }) => { +export const SidebarChat = () => { + + const chatInputRef = useRef(null) const fileService = useService('fileService') diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx index b89bb1b6..e66d2798 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { useThreadsState } from '../util/contextForServices.js'; +import { useSidebarState, useThreadsState } from '../util/contextForServices.js'; const truncate = (s: string) => { @@ -11,9 +11,11 @@ const truncate = (s: string) => { } -export const SidebarThreadSelector = ({ onClose }: { onClose: () => void }) => { +export const SidebarThreadSelector = () => { const [threadsState, threadsStateService] = useThreadsState() + const [sidebarState, sidebarStateService] = useSidebarState() + const { allThreads } = threadsState // sorted by most recent to least recent @@ -24,7 +26,7 @@ export const SidebarThreadSelector = ({ onClose }: { onClose: () => void }) => { {/* X button at top right */}
-