Skip to content
Open
Show file tree
Hide file tree
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
16 changes: 5 additions & 11 deletions packages/app/src/pages/session.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,8 @@ export default function Page() {
const messagesReady = createMemo(() => {
const id = params.id
if (!id) return true
return sync.data.message[id] !== undefined
// Ready if messages are loaded OR the session exists in the list (show immediately, load in background)
return sync.data.message[id] !== undefined || sync.session.get(id) !== undefined
})
const historyMore = createMemo(() => {
const id = params.id
Expand Down Expand Up @@ -536,12 +537,6 @@ export default function Page() {

createComputed((prev) => {
const key = sessionKey()
if (key !== prev) {
setStore("deferRender", true)
requestAnimationFrame(() => {
setTimeout(() => setStore("deferRender", false), 0)
})
}
return key
}, sessionKey())

Expand Down Expand Up @@ -755,7 +750,7 @@ export default function Page() {

const hasScrollGesture = () => Date.now() - ui.scrollGesture < scrollGestureWindowMs

const [sessionSync] = createResource(
createResource(
() => [sdk.directory, params.id] as const,
([directory, id]) => {
if (refreshFrame !== undefined) cancelAnimationFrame(refreshFrame)
Expand Down Expand Up @@ -1124,7 +1119,7 @@ export default function Page() {
loadingClass: string
emptyClass: string
}) => (
<Show when={!store.deferRender}>
<Show when={true}>
<SessionReviewTab
title={changesTitle()}
empty={reviewEmpty(input)}
Expand Down Expand Up @@ -1789,7 +1784,6 @@ export default function Page() {

return (
<div class="relative bg-background-base size-full overflow-hidden flex flex-col">
{sessionSync() ?? ""}
<SessionHeader />
<div class="flex-1 min-h-0 flex flex-col md:flex-row">
<Show when={!isDesktop() && !!params.id}>
Expand Down Expand Up @@ -1882,7 +1876,7 @@ export default function Page() {

<SessionComposerRegion
state={composer}
ready={!store.deferRender && messagesReady()}
ready={messagesReady()}
centered={centered()}
inputRef={(el) => {
inputRef = el
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,14 @@ export function SessionComposerRegion(props: {
createEffect(() => {
route.sessionKey()
const ready = props.ready
const delay = 140

clear()
setStore("ready", false)
if (!ready) return

frame = requestAnimationFrame(() => {
frame = undefined
timer = window.setTimeout(() => {
setStore("ready", true)
timer = undefined
}, delay)
setStore("ready", true)
})
})

Expand Down
5 changes: 5 additions & 0 deletions packages/app/src/pages/session/message-timeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1021,6 +1021,11 @@ export function MessageTimeline(props: {
</Button>
</div>
</Show>
<Show when={props.renderedUserMessages.length === 0 && props.historyLoading}>
<div class="flex items-center justify-center py-12">
<Spinner />
</div>
</Show>
<For each={rendered()}>
{(messageID) => {
const active = createMemo(() => activeMessageID() === messageID)
Expand Down
Loading