wip(app): file tree mode
This commit is contained in:
@@ -2,7 +2,16 @@ import { useFile } from "@/context/file"
|
|||||||
import { Collapsible } from "@opencode-ai/ui/collapsible"
|
import { Collapsible } from "@opencode-ai/ui/collapsible"
|
||||||
import { FileIcon } from "@opencode-ai/ui/file-icon"
|
import { FileIcon } from "@opencode-ai/ui/file-icon"
|
||||||
import { Tooltip } from "@opencode-ai/ui/tooltip"
|
import { Tooltip } from "@opencode-ai/ui/tooltip"
|
||||||
import { createEffect, For, Match, splitProps, Switch, type ComponentProps, type ParentProps } from "solid-js"
|
import {
|
||||||
|
createEffect,
|
||||||
|
createMemo,
|
||||||
|
For,
|
||||||
|
Match,
|
||||||
|
splitProps,
|
||||||
|
Switch,
|
||||||
|
type ComponentProps,
|
||||||
|
type ParentProps,
|
||||||
|
} from "solid-js"
|
||||||
import { Dynamic } from "solid-js/web"
|
import { Dynamic } from "solid-js/web"
|
||||||
import type { FileNode } from "@opencode-ai/sdk/v2"
|
import type { FileNode } from "@opencode-ai/sdk/v2"
|
||||||
|
|
||||||
@@ -11,15 +20,45 @@ export default function FileTree(props: {
|
|||||||
class?: string
|
class?: string
|
||||||
nodeClass?: string
|
nodeClass?: string
|
||||||
level?: number
|
level?: number
|
||||||
|
allowed?: readonly string[]
|
||||||
onFileClick?: (file: FileNode) => void
|
onFileClick?: (file: FileNode) => void
|
||||||
}) {
|
}) {
|
||||||
const file = useFile()
|
const file = useFile()
|
||||||
const level = props.level ?? 0
|
const level = props.level ?? 0
|
||||||
|
|
||||||
|
const filter = createMemo(() => {
|
||||||
|
const allowed = props.allowed
|
||||||
|
if (!allowed) return
|
||||||
|
|
||||||
|
const files = new Set(allowed)
|
||||||
|
const dirs = new Set<string>()
|
||||||
|
|
||||||
|
for (const item of allowed) {
|
||||||
|
const parts = item.split("/")
|
||||||
|
const parents = parts.slice(0, -1)
|
||||||
|
for (const [idx] of parents.entries()) {
|
||||||
|
const dir = parents.slice(0, idx + 1).join("/")
|
||||||
|
if (dir) dirs.add(dir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { files, dirs }
|
||||||
|
})
|
||||||
|
|
||||||
createEffect(() => {
|
createEffect(() => {
|
||||||
void file.tree.list(props.path)
|
void file.tree.list(props.path)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const nodes = createMemo(() => {
|
||||||
|
const nodes = file.tree.children(props.path)
|
||||||
|
const current = filter()
|
||||||
|
if (!current) return nodes
|
||||||
|
return nodes.filter((node) => {
|
||||||
|
if (node.type === "file") return current.files.has(node.path)
|
||||||
|
return current.dirs.has(node.path)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
const Node = (
|
const Node = (
|
||||||
p: ParentProps &
|
p: ParentProps &
|
||||||
ComponentProps<"div"> &
|
ComponentProps<"div"> &
|
||||||
@@ -81,7 +120,7 @@ export default function FileTree(props: {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div class={`flex flex-col ${props.class ?? ""}`}>
|
<div class={`flex flex-col ${props.class ?? ""}`}>
|
||||||
<For each={file.tree.children(props.path)}>
|
<For each={nodes()}>
|
||||||
{(node) => {
|
{(node) => {
|
||||||
const expanded = () => file.tree.state(node.path)?.expanded ?? false
|
const expanded = () => file.tree.state(node.path)?.expanded ?? false
|
||||||
return (
|
return (
|
||||||
@@ -102,7 +141,12 @@ export default function FileTree(props: {
|
|||||||
</Node>
|
</Node>
|
||||||
</Collapsible.Trigger>
|
</Collapsible.Trigger>
|
||||||
<Collapsible.Content>
|
<Collapsible.Content>
|
||||||
<FileTree path={node.path} level={level + 1} onFileClick={props.onFileClick} />
|
<FileTree
|
||||||
|
path={node.path}
|
||||||
|
level={level + 1}
|
||||||
|
allowed={props.allowed}
|
||||||
|
onFileClick={props.onFileClick}
|
||||||
|
/>
|
||||||
</Collapsible.Content>
|
</Collapsible.Content>
|
||||||
</Collapsible>
|
</Collapsible>
|
||||||
</Match>
|
</Match>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -21,6 +21,12 @@
|
|||||||
transform: translateX(50%);
|
transform: translateX(50%);
|
||||||
cursor: col-resize;
|
cursor: col-resize;
|
||||||
|
|
||||||
|
&[data-edge="start"] {
|
||||||
|
inset-inline-start: 0;
|
||||||
|
inset-inline-end: auto;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
width: 3px;
|
width: 3px;
|
||||||
inset-block: 0;
|
inset-block: 0;
|
||||||
@@ -36,6 +42,12 @@
|
|||||||
transform: translateY(-50%);
|
transform: translateY(-50%);
|
||||||
cursor: row-resize;
|
cursor: row-resize;
|
||||||
|
|
||||||
|
&[data-edge="end"] {
|
||||||
|
inset-block-start: auto;
|
||||||
|
inset-block-end: 0;
|
||||||
|
transform: translateY(50%);
|
||||||
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
height: 3px;
|
height: 3px;
|
||||||
inset-inline: 0;
|
inset-inline: 0;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { splitProps, type JSX } from "solid-js"
|
|||||||
|
|
||||||
export interface ResizeHandleProps extends Omit<JSX.HTMLAttributes<HTMLDivElement>, "onResize"> {
|
export interface ResizeHandleProps extends Omit<JSX.HTMLAttributes<HTMLDivElement>, "onResize"> {
|
||||||
direction: "horizontal" | "vertical"
|
direction: "horizontal" | "vertical"
|
||||||
|
edge?: "start" | "end"
|
||||||
size: number
|
size: number
|
||||||
min: number
|
min: number
|
||||||
max: number
|
max: number
|
||||||
@@ -13,6 +14,7 @@ export interface ResizeHandleProps extends Omit<JSX.HTMLAttributes<HTMLDivElemen
|
|||||||
export function ResizeHandle(props: ResizeHandleProps) {
|
export function ResizeHandle(props: ResizeHandleProps) {
|
||||||
const [local, rest] = splitProps(props, [
|
const [local, rest] = splitProps(props, [
|
||||||
"direction",
|
"direction",
|
||||||
|
"edge",
|
||||||
"size",
|
"size",
|
||||||
"min",
|
"min",
|
||||||
"max",
|
"max",
|
||||||
@@ -25,6 +27,7 @@ export function ResizeHandle(props: ResizeHandleProps) {
|
|||||||
|
|
||||||
const handleMouseDown = (e: MouseEvent) => {
|
const handleMouseDown = (e: MouseEvent) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
const edge = local.edge ?? (local.direction === "vertical" ? "start" : "end")
|
||||||
const start = local.direction === "horizontal" ? e.clientX : e.clientY
|
const start = local.direction === "horizontal" ? e.clientX : e.clientY
|
||||||
const startSize = local.size
|
const startSize = local.size
|
||||||
let current = startSize
|
let current = startSize
|
||||||
@@ -34,7 +37,14 @@ export function ResizeHandle(props: ResizeHandleProps) {
|
|||||||
|
|
||||||
const onMouseMove = (moveEvent: MouseEvent) => {
|
const onMouseMove = (moveEvent: MouseEvent) => {
|
||||||
const pos = local.direction === "horizontal" ? moveEvent.clientX : moveEvent.clientY
|
const pos = local.direction === "horizontal" ? moveEvent.clientX : moveEvent.clientY
|
||||||
const delta = local.direction === "vertical" ? start - pos : pos - start
|
const delta =
|
||||||
|
local.direction === "vertical"
|
||||||
|
? edge === "end"
|
||||||
|
? pos - start
|
||||||
|
: start - pos
|
||||||
|
: edge === "start"
|
||||||
|
? start - pos
|
||||||
|
: pos - start
|
||||||
current = startSize + delta
|
current = startSize + delta
|
||||||
const clamped = Math.min(local.max, Math.max(local.min, current))
|
const clamped = Math.min(local.max, Math.max(local.min, current))
|
||||||
local.onResize(clamped)
|
local.onResize(clamped)
|
||||||
@@ -61,6 +71,7 @@ export function ResizeHandle(props: ResizeHandleProps) {
|
|||||||
{...rest}
|
{...rest}
|
||||||
data-component="resize-handle"
|
data-component="resize-handle"
|
||||||
data-direction={local.direction}
|
data-direction={local.direction}
|
||||||
|
data-edge={local.edge ?? (local.direction === "vertical" ? "start" : "end")}
|
||||||
classList={{
|
classList={{
|
||||||
...(local.classList ?? {}),
|
...(local.classList ?? {}),
|
||||||
[local.class ?? ""]: !!local.class,
|
[local.class ?? ""]: !!local.class,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { StickyAccordionHeader } from "./sticky-accordion-header"
|
|||||||
import { useDiffComponent } from "../context/diff"
|
import { useDiffComponent } from "../context/diff"
|
||||||
import { useI18n } from "../context/i18n"
|
import { useI18n } from "../context/i18n"
|
||||||
import { getDirectory, getFilename } from "@opencode-ai/util/path"
|
import { getDirectory, getFilename } from "@opencode-ai/util/path"
|
||||||
|
import { checksum } from "@opencode-ai/util/encode"
|
||||||
import { createEffect, createMemo, createSignal, For, Match, Show, Switch, type JSX } from "solid-js"
|
import { createEffect, createMemo, createSignal, For, Match, Show, Switch, type JSX } from "solid-js"
|
||||||
import { createStore } from "solid-js/store"
|
import { createStore } from "solid-js/store"
|
||||||
import { type FileContent, type FileDiff } from "@opencode-ai/sdk/v2"
|
import { type FileContent, type FileDiff } from "@opencode-ai/sdk/v2"
|
||||||
@@ -118,6 +119,12 @@ function dataUrlFromValue(value: unknown): string | undefined {
|
|||||||
return `data:${mime};base64,${content}`
|
return `data:${mime};base64,${content}`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function diffId(file: string): string | undefined {
|
||||||
|
const sum = checksum(file)
|
||||||
|
if (!sum) return
|
||||||
|
return `session-review-diff-${sum}`
|
||||||
|
}
|
||||||
|
|
||||||
type SessionReviewSelection = {
|
type SessionReviewSelection = {
|
||||||
file: string
|
file: string
|
||||||
range: SelectedLineRange
|
range: SelectedLineRange
|
||||||
@@ -489,7 +496,12 @@ export const SessionReview = (props: SessionReviewProps) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Accordion.Item value={diff.file} data-slot="session-review-accordion-item">
|
<Accordion.Item
|
||||||
|
value={diff.file}
|
||||||
|
id={diffId(diff.file)}
|
||||||
|
data-file={diff.file}
|
||||||
|
data-slot="session-review-accordion-item"
|
||||||
|
>
|
||||||
<StickyAccordionHeader>
|
<StickyAccordionHeader>
|
||||||
<Accordion.Trigger>
|
<Accordion.Trigger>
|
||||||
<div data-slot="session-review-trigger-content">
|
<div data-slot="session-review-trigger-content">
|
||||||
|
|||||||
Reference in New Issue
Block a user