From 609f4c9cbfc2f256360025d77f854e0104b03bc4 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Tue, 13 May 2025 17:27:46 -0700 Subject: [PATCH 1/3] UI --- .../void/browser/react/src/sidebar-tsx/SidebarChat.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 0252381b..3587438b 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 @@ -2605,7 +2605,7 @@ const CommandBarInChat = () => { // !select-text cursor-auto - const fileDetailsContent =
+ const fileDetailsContent =
{sortedCommandBarURIs.map((uri, i) => { const basename = getBasename(uri.fsPath) @@ -2856,12 +2856,16 @@ export const SidebarChat = () => { // resolve mount info const isResolved = chatThreadsState.allThreads[threadId]?.state.mountedInfo?.mountedIsResolvedRef.current + useEffect(() => { if (isResolved) return chatThreadsState.allThreads[threadId]?.state.mountedInfo?._whenMountedResolver?.({ textAreaRef: textAreaRef, scrollToBottom: () => scrollToBottom(scrollContainerRef), }) + + // Trigger a window resize event to ensure proper layout calculations + window.dispatchEvent(new Event('resize')) }, [chatThreadsState, threadId, textAreaRef, scrollContainerRef, isResolved]) From b35dfdf4755a2e18f13681a45d32d03e32ea62c8 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Tue, 13 May 2025 18:29:04 -0700 Subject: [PATCH 2/3] trigger resize --- .../contrib/void/browser/miscWokrbenchContrib.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts b/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts index 49a0d524..83b3ed7b 100644 --- a/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts +++ b/src/vs/workbench/contrib/void/browser/miscWokrbenchContrib.ts @@ -8,6 +8,8 @@ import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase import { IExtensionTransferService } from './extensionTransferService.js'; import { os } from '../common/helpers/systemInfo.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; +import { timeout } from '../../../../base/common/async.js'; +import { getActiveWindow } from '../../../../base/browser/dom.js'; // Onboarding contribution that mounts the component at startup export class MiscWorkbenchContribs extends Disposable implements IWorkbenchContribution { @@ -31,6 +33,16 @@ export class MiscWorkbenchContribs extends Disposable implements IWorkbenchContr this.extensionTransferService.deleteBlacklistExtensions(os) } + + // after some time, trigger a resize event for the blank screen error + timeout(5_000).then(() => { + // Get the active window reference for multi-window support + const targetWindow = getActiveWindow(); + // Trigger a window resize event to ensure proper layout calculations + targetWindow.dispatchEvent(new Event('resize')) + + }) + } } From 78c6baed82d557dd90d650613133011979155da6 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Tue, 13 May 2025 19:54:45 -0700 Subject: [PATCH 3/3] revert --- .../void/browser/react/src/sidebar-tsx/SidebarChat.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 3587438b..7e60cac8 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 @@ -2856,16 +2856,13 @@ export const SidebarChat = () => { // resolve mount info const isResolved = chatThreadsState.allThreads[threadId]?.state.mountedInfo?.mountedIsResolvedRef.current - useEffect(() => { if (isResolved) return chatThreadsState.allThreads[threadId]?.state.mountedInfo?._whenMountedResolver?.({ textAreaRef: textAreaRef, scrollToBottom: () => scrollToBottom(scrollContainerRef), }) - - // Trigger a window resize event to ensure proper layout calculations - window.dispatchEvent(new Event('resize')) + }, [chatThreadsState, threadId, textAreaRef, scrollContainerRef, isResolved])