Skip to content

LUM-799: Replace GeometryReader with .onGeometryChange(for:) in ChatView #24423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashleeradka merged 2 commits into from
Apr 8, 2026
Merged

LUM-799: Replace GeometryReader with .onGeometryChange(for:) in ChatView #24423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfbff69
Replace GeometryReader with .onGeometryChange(for:) in ChatView
devin-ai-integration[bot] Apr 8, 2026
559248a
Absorb initial 0→real containerWidth transition as first measurement
devin-ai-integration[bot] Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions clients/macos/vellum-assistant/Features/Chat/ChatView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ struct ChatView: View {
@State private var currentMatchIndex = 0
@State private var showSkeleton = false
@State private var skeletonDebounceTask: Task<Void, Never>? = nil
@State private var containerWidth: CGFloat = 0
Comment thread
devin-ai-integration[bot] marked this conversation as resolved.

private var isEmptyState: Bool {
viewModel.paginatedVisibleMessages.isEmpty && viewModel.isHistoryLoaded
Expand All @@ -121,21 +122,23 @@ struct ChatView: View {
#if DEBUG
let _ = os_signpost(.event, log: PerfSignposts.log, name: "ChatView.body")
#endif
GeometryReader { proxy in
let containerWidth = proxy.size.width
ZStack {
mainContentStack(containerWidth: containerWidth)
.background(alignment: .bottom) {
chatBackground
}
.background(VColor.surfaceBase)
.overlay(alignment: .bottom) {
btwOverlay
}
.animation(VAnimation.fast, value: viewModel.btwResponse != nil)
ZStack {
mainContentStack(containerWidth: containerWidth)
.background(alignment: .bottom) {
chatBackground
}
.background(VColor.surfaceBase)
.overlay(alignment: .bottom) {
btwOverlay
}
.animation(VAnimation.fast, value: viewModel.btwResponse != nil)

dropTargetOverlay
}
dropTargetOverlay
}
.onGeometryChange(for: CGFloat.self) { proxy in
proxy.size.width
} action: { newWidth in
containerWidth = newWidth
}
.environment(\.dropActions, currentDropActions)
.onDrop(of: [.fileURL, .image, .png, .tiff], isTargeted: $isDropTargeted) { providers in
Expand Down
8 changes: 8 additions & 0 deletions clients/macos/vellum-assistant/Features/Chat/MessageListView+Lifecycle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,14 @@ extension MessageListView {

func handleContainerWidthChanged() {
guard containerWidth > 0, abs(containerWidth - scrollState.lastHandledContainerWidth) > 2 else { return }
// First real measurement (0 → actual width) is not a resize — just
// record the width so subsequent changes are detected as real resizes.
// This avoids spurious resize stabilization during initial load when
// containerWidth starts at 0 (e.g. from @State + .onGeometryChange).
guard scrollState.lastHandledContainerWidth > 0 else {
scrollState.lastHandledContainerWidth = containerWidth
return
}
scrollState.lastHandledContainerWidth = containerWidth
// Route through coordinator for policy decision.
let intents = scrollCoordinator.handle(.containerWidthChanged)
Expand Down