Skip to content

Commit 752e449

Browse files
committed
tweak(ui): improve collpase area
1 parent 5d419a0 commit 752e449

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

packages/app/src/pages/session/composer/session-question-dock.tsx

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -233,36 +233,18 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
233233
setStore("editing", false)
234234
}
235235

236-
const click = (target: EventTarget | null) => {
237-
if (store.sending) return
238-
if (!(target instanceof Node)) {
239-
fold()
240-
return
241-
}
242-
243-
const list = root?.querySelector('[data-slot="question-options"]')
244-
if (list instanceof HTMLElement && list.contains(target)) return
245-
fold()
246-
}
247-
248236
return (
249237
<DockPrompt
250238
kind="question"
251239
ref={(el) => (root = el)}
252-
bodyProps={{
253-
onClick: (event) => click(event.target),
254-
}}
255240
header={
256241
<div
257242
data-action="session-question-toggle"
258243
class="flex flex-1 min-w-0 items-center gap-2 cursor-default select-none"
259244
role="button"
260245
tabIndex={0}
261246
style={{ margin: "0 -10px", padding: "0 0 0 10px" }}
262-
onClick={(event) => {
263-
event.stopPropagation()
264-
fold()
265-
}}
247+
onClick={fold}
266248
onKeyDown={(event) => {
267249
if (event.key !== "Enter" && event.key !== " ") return
268250
event.preventDefault()
@@ -314,14 +296,13 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
314296
classList={{
315297
"mb-6": store.collapsed && picked() === 0,
316298
}}
317-
onClick={(event) => {
318-
event.stopPropagation()
319-
fold()
320-
}}
299+
role={store.collapsed ? "button" : undefined}
300+
tabIndex={store.collapsed ? 0 : undefined}
301+
onClick={fold}
321302
onKeyDown={(event) => {
303+
if (!store.collapsed) return
322304
if (event.key !== "Enter" && event.key !== " ") return
323305
event.preventDefault()
324-
event.stopPropagation()
325306
fold()
326307
}}
327308
>

packages/ui/src/components/dock-prompt.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ComponentProps, JSX } from "solid-js"
1+
import type { JSX } from "solid-js"
22
import { DockShell, DockTray } from "./dock-surface"
33

44
export function DockPrompt(props: {
@@ -7,13 +7,12 @@ export function DockPrompt(props: {
77
children: JSX.Element
88
footer: JSX.Element
99
ref?: (el: HTMLDivElement) => void
10-
bodyProps?: Omit<ComponentProps<"div">, "children">
1110
}) {
1211
const slot = (name: string) => `${props.kind}-${name}`
1312

1413
return (
1514
<div data-component="dock-prompt" data-kind={props.kind} ref={props.ref}>
16-
<DockShell {...(props.bodyProps ?? {})} data-slot={slot("body")}>
15+
<DockShell data-slot={slot("body")}>
1716
<div data-slot={slot("header")}>{props.header}</div>
1817
<div data-slot={slot("content")}>{props.children}</div>
1918
</DockShell>

0 commit comments

Comments
 (0)