Skip to content

fix(session-ui): keep permission actions inside the dock prompt shell #48536

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
CannonRS wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −12
Open

fix(session-ui): keep permission actions inside the dock prompt shell #48536

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions packages/app/src/pages/session/composer/session-permission-dock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function SessionPermissionDock(props: {
return (
<DockPrompt
kind="permission"
footerInside
header={
<div data-slot="permission-row" data-variant="header">
<span data-slot="permission-icon">
Expand Down
3 changes: 2 additions & 1 deletion packages/session-ui/src/components/dock-prompt.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Use with form controls or confirmation buttons in the footer.

### API
- Required: \`kind\` (question | permission), \`header\`, \`children\`, \`footer\`.
- Optional: \`ref\` for measuring or focus management.
- Optional: \`ref\` for measuring or focus management and \`footerInside\` to keep actions in the shell.

### Variants and states
- Question and permission layouts (data attributes).
Expand Down Expand Up @@ -55,6 +55,7 @@ export const Basic = story.Basic
export const Permission = {
args: {
kind: "permission",
footerInside: true,
header: "Allow access?",
children: "This action needs permission to proceed.",
footer: "Approve or deny",
Expand Down
10 changes: 8 additions & 2 deletions packages/session-ui/src/components/dock-prompt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import type { JSX } from "solid-js"
import { Show, type JSX } from "solid-js"
import { DockShell, DockTray } from "@opencode-ai/ui/dock-surface"

export function DockPrompt(props: {
kind: "question" | "permission"
header: JSX.Element
children: JSX.Element
footer: JSX.Element
footerInside?: boolean
ref?: (el: HTMLDivElement) => void
onKeyDown?: JSX.EventHandlerUnion<HTMLDivElement, KeyboardEvent>
}) {
Expand All @@ -16,8 +17,13 @@ export function DockPrompt(props: {
<DockShell data-slot={slot("body")}>
<div data-slot={slot("header")}>{props.header}</div>
<div data-slot={slot("content")}>{props.children}</div>
<Show when={props.footerInside}>
<div data-slot={slot("footer")}>{props.footer}</div>
</Show>
</DockShell>
<DockTray data-slot={slot("footer")}>{props.footer}</DockTray>
<Show when={!props.footerInside}>
<DockTray data-slot={slot("footer")}>{props.footer}</DockTray>
</Show>
</div>
)
}
14 changes: 5 additions & 9 deletions packages/session-ui/src/components/message-part.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@
gap: 16px;
flex: 1;
min-height: 0;
padding: 12px 12px 0;
padding: 12px;
}

[data-slot="permission-header"] {
Expand Down Expand Up @@ -818,21 +818,17 @@
[data-slot="permission-footer"] {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: flex-end;
flex-shrink: 0;
padding: 32px 8px 8px;
margin-top: -24px;
padding: 0;
}

[data-slot="permission-footer-actions"] {
display: flex;
align-items: center;
justify-content: flex-end;
flex-wrap: wrap;
gap: 8px;

[data-component="button"] {
padding-left: 12px;
padding-right: 12px;
}
}
}

Expand Down
Loading