Skip to content

fix: retire workspace picker results when dismissed #61

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

Open
ooiuuii wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: retire workspace picker results when dismissed #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions web/src/workspace/AddWorkspaceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export const AddWorkspaceDialog = ({
tRef.current = t
}, [t])
const [stage, setStage] = useState<Stage>({ kind: 'idle' })
const cancelPendingPickRef = useRef<(() => void) | null>(null)
const [commandPresets, setCommandPresets] = useState<CommandPreset[]>([])
const [commandPresetId, setCommandPresetId] = useState(DEFAULT_COMMAND_PRESET_ID)
const [commandPresetError, setCommandPresetError] = useState<string | null>(null)
Expand All @@ -88,6 +89,9 @@ export const AddWorkspaceDialog = ({
useEffect(() => {
if (trigger === 0) return
let cancelled = false
cancelPendingPickRef.current = () => {
cancelled = true
}
setCommandPresetError(null)
const presetsReady = listCommandPresets()
.then((presets) => {
Expand Down Expand Up @@ -162,6 +166,7 @@ export const AddWorkspaceDialog = ({
}, [trigger])

const handleCancel = () => {
cancelPendingPickRef.current?.()
setStage({ kind: 'idle' })
onClose()
}
Expand All @@ -170,8 +175,7 @@ export const AddWorkspaceDialog = ({
// linger on top of the demo workspace view.
const handleTryDemo = onTryDemo
? () => {
setStage({ kind: 'idle' })
onClose()
handleCancel()
onTryDemo()
}
: undefined
Expand Down Expand Up @@ -207,11 +211,10 @@ export const AddWorkspaceDialog = ({

if (stage.kind === 'idle') return null
if (stage.kind === 'picking') {
// Esc / click-outside cancels the in-flight picker; without onOpenChange
// the dialog was unkillable until the native picker resolved.
const cancelPicking = () => setStage({ kind: 'idle' })
// Dismiss pending results too: the native picker may have returned while
// presets are still loading, and this component stays mounted after close.
return (
<Dialog.Root open onOpenChange={(next) => !next && cancelPicking()}>
<Dialog.Root open onOpenChange={(next) => !next && handleCancel()}>
<Dialog.Portal>
<Dialog.Overlay className="app-overlay fixed inset-0 z-40" />
<Dialog.Content
Expand Down