monadical/opencode
14
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(app): new layout issues

Browse Source
This commit is contained in:
Adam
2026-01-15 07:15:17 -06:00
parent 1698448016
commit f270ea65c5
1 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
packages/app/src/pages/layout.tsx
View File

@@ -315,7 +315,19 @@ export default function Layout(props: ParentProps) {
const currentSessions = createMemo(() => { const currentSessions = createMemo(() => {
const project = currentProject() const project = currentProject()
if (!project) return [] as Session[] if (!project) return [] as Session[]
if (workspaceSetting()) return projectSessions(project) if (workspaceSetting()) {
const dirs = workspaceIds(project)
const result: Session[] = []
for (const dir of dirs) {
const [dirStore] = globalSync.child(dir)
const dirSessions = dirStore.session
.filter((session) => session.directory === dirStore.path.directory)
.filter((session) => !session.parentID)
.toSorted(sortSessions)
result.push(...dirSessions)
}
return result
}
const [projectStore] = globalSync.child(project.worktree) const [projectStore] = globalSync.child(project.worktree)
return projectStore.session return projectStore.session
.filter((session) => session.directory === projectStore.path.directory) .filter((session) => session.directory === projectStore.path.directory)
@@ -464,89 +476,44 @@ export default function Layout(props: ParentProps) {
}) })
function navigateSessionByOffset(offset: number) { function navigateSessionByOffset(offset: number) {
const projects = layout.projects.list()
if (projects.length === 0) return
const project = currentProject()
const projectIndex = project ? projects.findIndex((p) => p.worktree === project.worktree) : -1
if (projectIndex === -1) {
const targetProject = offset > 0 ? projects[0] : projects[projects.length - 1]
if (targetProject) navigateToProject(targetProject.worktree)
return
}
const sessions = currentSessions() const sessions = currentSessions()
if (sessions.length === 0) return
const sessionIndex = params.id ? sessions.findIndex((s) => s.id === params.id) : -1 const sessionIndex = params.id ? sessions.findIndex((s) => s.id === params.id) : -1
let targetIndex: number let targetIndex: number
if (sessionIndex === -1) { if (sessionIndex === -1) {
targetIndex = offset > 0 ? 0 : sessions.length - 1 targetIndex = offset > 0 ? 0 : sessions.length - 1
} else { } else {
targetIndex = sessionIndex + offset targetIndex = (sessionIndex + offset + sessions.length) % sessions.length
} }
if (targetIndex >= 0 && targetIndex < sessions.length) { const session = sessions[targetIndex]
const session = sessions[targetIndex] if (!session) return
const next = sessions[targetIndex + 1]
const prev = sessions[targetIndex - 1]
if (offset > 0) { const next = sessions[(targetIndex + 1) % sessions.length]
if (next) prefetchSession(next, "high") const prev = sessions[(targetIndex - 1 + sessions.length) % sessions.length]
if (prev) prefetchSession(prev)
}
if (offset < 0) {
if (prev) prefetchSession(prev, "high")
if (next) prefetchSession(next)
}
if (import.meta.env.DEV) {
navStart({
dir: base64Encode(session.directory),
from: params.id,
to: session.id,
trigger: offset > 0 ? "alt+arrowdown" : "alt+arrowup",
})
}
navigateToSession(session)
queueMicrotask(() => scrollToSession(session.id))
return
}
const nextProjectIndex = projectIndex + (offset > 0 ? 1 : -1)
const nextProject = projects[nextProjectIndex]
if (!nextProject) return
const nextProjectSessions = projectSessions(nextProject)
if (nextProjectSessions.length === 0) {
navigateToProject(nextProject.worktree)
return
}
const index = offset > 0 ? 0 : nextProjectSessions.length - 1
const targetSession = nextProjectSessions[index]
const nextSession = nextProjectSessions[index + 1]
const prevSession = nextProjectSessions[index - 1]
if (offset > 0) { if (offset > 0) {
if (nextSession) prefetchSession(nextSession, "high") if (next) prefetchSession(next, "high")
if (prev) prefetchSession(prev)
} }
if (offset < 0) { if (offset < 0) {
if (prevSession) prefetchSession(prevSession, "high") if (prev) prefetchSession(prev, "high")
if (next) prefetchSession(next)
} }
if (import.meta.env.DEV) { if (import.meta.env.DEV) {
navStart({ navStart({
dir: base64Encode(targetSession.directory), dir: base64Encode(session.directory),
from: params.id, from: params.id,
to: targetSession.id, to: session.id,
trigger: offset > 0 ? "alt+arrowdown" : "alt+arrowup", trigger: offset > 0 ? "alt+arrowdown" : "alt+arrowup",
}) })
} }
navigateToSession(targetSession) navigateToSession(session)
queueMicrotask(() => scrollToSession(targetSession.id)) queueMicrotask(() => scrollToSession(session.id))
} }
async function archiveSession(session: Session) { async function archiveSession(session: Session) {