Skip to content

fix(ios): grok composer keeps focus — stop shell placement flipping on focus #10

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
boggspa merged 2 commits into from
Jun 18, 2026
Merged

fix(ios): grok composer keeps focus — stop shell placement flipping on focus #10

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
4e5d811
Fix copy transcript popover contrast
boggspa Jun 18, 2026
0f1c257
fix(ios): grok composer keeps focus — stop shell placement flipping o…
boggspa Jun 18, 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
16 changes: 13 additions & 3 deletions ios/TaskWraithKit/Sources/TaskWraithUI/ThreadDetailViews.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,16 @@ struct ThreadDetailView: View {
&& (hasAttachedRows || card.isEnsemble
|| !(card.queuedComposerPrompts ?? []).isEmpty)
let tuckedTab = resolved.layout.tuckedAboveTab && hasAboveContent
// SHELL PLACEMENT must be focus-INDEPENDENT. The core/outer
// `.composerShellIf` below toggle a ViewModifier on/off; because
// `composerShellIf` is a @ViewBuilder if/else, flipping it changes
// the subtree's structural identity, which tears down + rebuilds the
// Composer and RESETS its @FocusState — so for grok (the only
// tuckedAboveTab shell) focus never latched and BOTH the above rows
// and the telemetry collapsed. Key placement off the STATIC recipe
// flag, not the focus-derived `tuckedTab`. (`tuckedTab` still drives
// the focus-gated tab geometry/spacing, which don't change identity.)
let tuckedShell = resolved.layout.tuckedAboveTab
VStack(spacing: tuckedTab ? -10 : (detached ? 6 : 0)) {
// Above-rows group: inner VStack spacing matches the outer so
// non-tuck stays identical; the grok tuck makes it the inset,
Expand Down Expand Up @@ -1009,10 +1019,10 @@ struct ThreadDetailView: View {
planLanes: card.todoLanes ?? [])
}
}
.composerShellIf((detached && !inputOwnsSurface) || tuckedTab, resolved)
.zIndex(tuckedTab ? 1 : 0)
.composerShellIf((detached && !inputOwnsSurface) || tuckedShell, resolved)
.zIndex(tuckedShell ? 1 : 0)
}
.composerShellIf(!detached && !tuckedTab, resolved)
.composerShellIf(!detached && !tuckedShell, resolved)
.task(id: composerGitWorkspaceIds(card: card).joined(separator: "\n")) {
for workspaceId in composerGitWorkspaceIds(card: card) {
await model.refreshGitSnapshotCache(workspaceId: workspaceId)
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/src/assets/css/03-composer-welcome-activity.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4245,10 +4245,10 @@
display: grid;
gap: 10px;
padding: 12px;
border: 1px solid color-mix(in srgb, var(--border) 70%, transparent);
border: 1px solid color-mix(in srgb, var(--panel-border, var(--border)) 88%, var(--text-primary) 12%);
border-radius: 10px;
background: var(--panel-bg, var(--surface-base));
box-shadow: 0 18px 46px rgba(0, 0, 0, 0.34);
background: var(--panel-bg-solid, var(--surface-1, var(--surface-base)));
box-shadow: 0 18px 46px rgba(0, 0, 0, 0.46);
color: var(--text-primary);
}

Expand Down
Loading