Skip to content
Open
Changes from all commits
Commits
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
29 changes: 3 additions & 26 deletions packages/app/src/pages/session/composer/session-composer-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ export const todoState = (input: {

export const todoDockAtBoundary = (state: ReturnType<typeof todoState>) => state === "open"

const idle = { type: "idle" as const }

export function createSessionComposerController(options?: { closeMs?: number | (() => number) }) {
const params = useParams()
const sdk = useSDK()
Expand Down Expand Up @@ -66,7 +64,6 @@ export function createSessionComposerController(options?: { closeMs?: number | (
responding: undefined as string | undefined,
dock: todos().length > 0 && !done() && live(),
closing: false,
opening: false,
})

const permissionResponding = createMemo(() => {
Expand All @@ -93,7 +90,6 @@ export function createSessionComposerController(options?: { closeMs?: number | (
}

let timer: number | undefined
let raf: number | undefined

const closeMs = () => {
const value = options?.closeMs
Expand Down Expand Up @@ -121,9 +117,6 @@ export function createSessionComposerController(options?: { closeMs?: number | (
on(
() => [params.id, todos().length, done(), live()] as const,
([id, count, complete, active], previous) => {
if (raf) cancelAnimationFrame(raf)
raf = undefined

const next = todoState({
count,
done: complete,
Expand All @@ -133,15 +126,15 @@ export function createSessionComposerController(options?: { closeMs?: number | (
if (!previous || previous[0] !== id) {
if (timer) window.clearTimeout(timer)
timer = undefined
setStore({ sessionID: id, dock: todoDockAtBoundary(next), closing: false, opening: false })
setStore({ sessionID: id, dock: todoDockAtBoundary(next), closing: false })
if (next === "clear") clear()
return
}

if (next === "hide") {
if (timer) window.clearTimeout(timer)
timer = undefined
setStore({ dock: false, closing: false, opening: false })
setStore({ dock: false, closing: false })
return
}

Expand All @@ -155,21 +148,11 @@ export function createSessionComposerController(options?: { closeMs?: number | (
if (next === "open") {
if (timer) window.clearTimeout(timer)
timer = undefined
const hidden = !store.dock || store.closing
setStore({ dock: true, closing: false })
if (hidden) {
setStore("opening", true)
raf = requestAnimationFrame(() => {
setStore("opening", false)
raf = undefined
})
return
}
setStore("opening", false)
return
}

setStore({ dock: true, opening: false, closing: true })
setStore({ dock: true, closing: true })
if (!timer) scheduleClose()
},
),
Expand All @@ -180,11 +163,6 @@ export function createSessionComposerController(options?: { closeMs?: number | (
window.clearTimeout(timer)
})

onCleanup(() => {
if (!raf) return
cancelAnimationFrame(raf)
})

return {
blocked,
questionRequest,
Expand All @@ -197,7 +175,6 @@ export function createSessionComposerController(options?: { closeMs?: number | (
? store.dock
: todoDockAtBoundary(todoState({ count: todos().length, done: done(), live: live() })),
closing: () => store.sessionID === params.id && store.closing,
opening: () => store.sessionID === params.id && store.opening,
}
}

Expand Down