diff --git a/packages/app/src/runtime/animated-presence.ts b/packages/app/src/runtime/animated-presence.ts index 4923e9638d2..e1a96cc1c59 100644 --- a/packages/app/src/runtime/animated-presence.ts +++ b/packages/app/src/runtime/animated-presence.ts @@ -1,25 +1,40 @@ -import { createMemo, type Accessor } from "solid-js" +import { createMemo, createSignal, onCleanup, type Accessor } from "solid-js" import createPresence from "solid-presence" export function createAnimatedPresence( value: Accessor, element: Accessor, identity?: Accessor, + minimumDuration = 0, ) { - const animation = createMemo<{ identity?: unknown; show: boolean; animate: boolean; value: T | undefined }>( - (previous) => { - const currentIdentity = identity?.() - const current = value() - const show = current !== undefined - const same = !identity || previous?.identity === currentIdentity - return { - identity: currentIdentity, - show, - animate: previous !== undefined && same && (previous.animate || previous.show !== show), - value: current ?? (same ? previous?.value : undefined), - } - }, - ) + const [tick, setTick] = createSignal(0) + const animation = createMemo<{ + identity?: unknown + show: boolean + animate: boolean + value: T | undefined + started: number + }>((previous) => { + tick() + const currentIdentity = identity?.() + const current = value() + const same = !identity || previous?.identity === currentIdentity + const started = same && previous?.show ? previous.started : performance.now() + const remaining = + current === undefined && same && previous?.show ? minimumDuration - (performance.now() - started) : 0 + const show = current !== undefined || remaining > 0 + if (remaining > 0) { + const timer = setTimeout(() => setTick((value) => value + 1), remaining) + onCleanup(() => clearTimeout(timer)) + } + return { + identity: currentIdentity, + show, + started, + animate: previous !== undefined && same && (previous.animate || previous.show !== show), + value: current ?? (same ? previous?.value : undefined), + } + }) const presence = createPresence({ show: () => animation().show, element }) return { ...presence, diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx index 5a9248632c9..f1ff5ad17de 100644 --- a/packages/app/src/session/timeline/message-timeline.tsx +++ b/packages/app/src/session/timeline/message-timeline.tsx @@ -539,7 +539,12 @@ function MessageTimelineView( .findLast((ref) => blocking.has(ref.partID))?.partID }) const [backgroundHintRef, setBackgroundHintRef] = createSignal() - const backgroundHintPresence = createAnimatedPresence(backgroundHintPartID, () => backgroundHintRef() ?? null) + const backgroundHintPresence = createAnimatedPresence( + backgroundHintPartID, + () => backgroundHintRef() ?? null, + sessionID, + 1000, + ) const showWorking = createMemo(() => { const id = sessionID() if (!id || sessionStatus().type !== "busy") return false