-
-
{options?.message}
+
+
+ {options?.variant === "error" && (
+ 
+ )}
+
+
+
{options?.message}
- {options?.detail &&{options.detail}
} + {options?.detail && ( + +{options.detail}
+ + )} +
diff --git a/src/renderer/components/bars/Title.tsx b/src/renderer/components/bars/Title.tsx
index 2c70049..493a885 100644
--- a/src/renderer/components/bars/Title.tsx
+++ b/src/renderer/components/bars/Title.tsx
@@ -28,7 +28,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
WebkitAppRegion: "drag",
} as CSSProperties
}
- onDoubleClick={() => window.api.window.toggleMaximize()}
+ onDoubleClick={() => window.api.windows.toggleMaximize()}
>
{icon && !window.api.platform.isMacOS && (
@@ -48,7 +48,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
size="sm"
square
aria-label="Minimize"
- onClick={() => window.api.window.minimize()}
+ onClick={() => window.api.windows.minimize()}
className="w-6! h-5.5! min-w-0!"
>
@@ -57,7 +57,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
size="sm"
square
aria-label="Maximize"
- onClick={() => window.api.window.toggleMaximize()}
+ onClick={() => window.api.windows.toggleMaximize()}
className="w-6! h-5.5! min-w-0!"
>
@@ -69,7 +69,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
size="sm"
square
aria-label="Close"
- onClick={() => (onClose ? onClose() : window.api.window.close())}
+ onClick={() => (onClose ? onClose() : window.api.windows.close())}
className="w-6! h-5.5! min-w-0! ml-1"
>
diff --git a/src/renderer/components/contexts/Tree.tsx b/src/renderer/components/contexts/FileTree.tsx
similarity index 53%
rename from src/renderer/components/contexts/Tree.tsx
rename to src/renderer/components/contexts/FileTree.tsx
index 0127b0a..52e6d0a 100644
--- a/src/renderer/components/contexts/Tree.tsx
+++ b/src/renderer/components/contexts/FileTree.tsx
@@ -1,18 +1,18 @@
import { useProjectContext } from "@renderer/components/contexts/Project"
import { useStatusContext } from "@renderer/components/contexts/Status"
import { createContext, type ReactNode, useCallback, useContext, useEffect, useState } from "react"
-import type { LfsLock, LfsLockResult } from "@/main/types/lfs"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
+import type { LfsLock, LfsLockResult } from "@/main/types/lfsCommands"
+import { reportError } from "@/renderer/lib/utils/errors"
import { indexLocks } from "@/renderer/lib/utils/lockStates"
/**
* The type for the tree context.
*/
-export type TreeContextType = {
+export type FileTreeContextType = {
fileTree: FileTreeNode[]
locksByPath: Map
isLoading: boolean
- error: Error | null
refresh: () => Promise
lock: (paths: string[]) => Promise
unlock: (paths: string[], force?: boolean) => Promise
@@ -22,20 +22,19 @@ export type TreeContextType = {
* The `Tree` context, providing the current repository's file tree and its Git
* LFS lock state.
*/
-export const TreeContext = createContext(undefined)
+export const FileTreeContext = createContext(undefined)
/**
- * The props for the `TreeProvider` component.
+ * The props for the `FileTreeProvider` component.
*/
-type TreeProviderProps = {
+type FileTreeProviderProps = {
children: ReactNode
}
-export default function TreeProvider({ children }: TreeProviderProps) {
+export default function FileTreeProvider({ children }: FileTreeProviderProps) {
const [fileTree, setFileTree] = useState([])
const [locksByPath, setLocksByPath] = useState>(new Map())
const [isLoading, setIsLoading] = useState(false)
- const [error, setError] = useState(null)
const { currentProject } = useProjectContext()
const { runTask } = useStatusContext()
@@ -50,18 +49,18 @@ export default function TreeProvider({ children }: TreeProviderProps) {
}
try {
- setLocksByPath(indexLocks(await window.api.lfs.listLocks(currentProject?.path ?? null)))
+ setLocksByPath(indexLocks(await window.api.lfsCommands.listLocks(currentProject.path)))
} catch (err) {
- setError(err instanceof Error ? err : new Error(String(err)))
+ reportError("Failed to load LFS locks", err)
}
}, [currentProject?.path])
/**
- * Reloads the file tree and the LFS locks for the current project.
+ * Reloads the file tree and the LFS locks for the current project,
+ * migrating any locks held on staged renames to their new path so a locked
+ * file keeps its lock after being renamed.
*/
const refresh = useCallback(async () => {
- setError(null)
-
if (!currentProject?.path) {
setFileTree([])
setLocksByPath(new Map())
@@ -72,20 +71,31 @@ export default function TreeProvider({ children }: TreeProviderProps) {
// Sets the cached locks immediately if available
try {
- setLocksByPath(indexLocks(await window.api.lfs.getCachedLocks(currentProject?.path ?? null)))
+ setLocksByPath(indexLocks(await window.api.lfsCommands.getCachedLocks(currentProject.path)))
} catch {
// A cache miss is expected on first-ever open and must not block refresh
}
// The tree and the locks load in parallel so a slow git-lfs call does not
// delay the tree render, and each surfaces as soon as it is ready
- const treePromise = window.api.tree
- .getFileTree(currentProject?.path ?? null)
+ const treePromise = window.api.fileTree
+ .get(currentProject.path)
.then(setFileTree)
- .catch(err => setError(err instanceof Error ? err : new Error(String(err))))
+ .catch(err => reportError("Failed to load file tree", err))
await Promise.all([treePromise, refreshLocks()])
+ // Carries locks across staged renames, then re-reads the locks if any
+ // migration actually moved a lock so the tree overlays the new paths
+ try {
+ const migrations = await window.api.lfsCommands.migrateLocks(currentProject.path)
+ if (migrations.some(m => m.status === "migrated" || m.status === "failed-unlock")) {
+ await refreshLocks()
+ }
+ } catch (err) {
+ reportError("Failed to migrate LFS locks", err)
+ }
+
setIsLoading(false)
}, [refreshLocks, currentProject?.path])
@@ -97,16 +107,27 @@ export default function TreeProvider({ children }: TreeProviderProps) {
async (paths: string[]): Promise => {
if (!currentProject?.path) return []
- const label = `Locking ${paths.length} ${paths.length === 1 ? "file" : "files"}...`
-
try {
- return await runTask(label, async () => {
- const results = await window.api.lfs.lockPaths(currentProject?.path ?? null, paths)
+ return await runTask("Locking...", async handle => {
+ const results = await window.api.lfsCommands.lockPaths(
+ currentProject?.path ?? null,
+ paths,
+ (done, total) => {
+ if (total <= 1) {
+ handle.setLabel(`Locking ${total} ${total === 1 ? "file" : "files"}...`)
+ return
+ }
+
+ handle.setLabel(`Locking ${done}/${total} files...`)
+ handle.setProgress((done / total) * 100)
+ },
+ )
+
await refreshLocks()
return results
})
} catch (err) {
- setError(err instanceof Error ? err : new Error(String(err)))
+ reportError("Failed to lock files", err)
return []
}
},
@@ -123,16 +144,28 @@ export default function TreeProvider({ children }: TreeProviderProps) {
if (!currentProject?.path) return []
const verb = force ? "Force-unlocking" : "Unlocking"
- const label = `${verb} ${paths.length} ${paths.length === 1 ? "file" : "files"}...`
try {
- return await runTask(label, async () => {
- const results = await window.api.lfs.unlockPaths(currentProject?.path ?? null, paths, force)
+ return await runTask(`${verb}...`, async handle => {
+ const results = await window.api.lfsCommands.unlockPaths(
+ currentProject?.path ?? null,
+ paths,
+ force,
+ (done, total) => {
+ if (total <= 1) {
+ handle.setLabel(`${verb} ${total} ${total === 1 ? "file" : "files"}...`)
+ return
+ }
+
+ handle.setLabel(`${verb} ${done}/${total} files...`)
+ handle.setProgress((done / total) * 100)
+ },
+ )
await refreshLocks()
return results
})
} catch (err) {
- setError(err instanceof Error ? err : new Error(String(err)))
+ reportError(force ? "Failed to force-unlock files" : "Failed to unlock files", err)
return []
}
},
@@ -145,28 +178,27 @@ export default function TreeProvider({ children }: TreeProviderProps) {
}, [refresh])
return (
-
{children}
-
+
)
}
/**
- * A custom hook to access the repository file tree and lock state from the `TreeContext`.
+ * A custom hook to access the repository file tree and lock state from the `FileTreeContext`.
* @returns The tree context value.
*/
-export function useTreeContext() {
- const ctx = useContext(TreeContext)
- if (ctx === undefined) throw new Error("'useTreeContext' must be used within a 'TreeProvider'")
+export function useFileTreeContext() {
+ const ctx = useContext(FileTreeContext)
+ if (ctx === undefined) throw new Error("'useFileTreeContext' must be used within a 'FileTreeProvider'")
return ctx
}
diff --git a/src/renderer/components/contexts/Project.tsx b/src/renderer/components/contexts/Project.tsx
index a579c48..ae4cdef 100644
--- a/src/renderer/components/contexts/Project.tsx
+++ b/src/renderer/components/contexts/Project.tsx
@@ -1,7 +1,6 @@
import type { ReactNode } from "react"
import { createContext, useCallback, useContext, useEffect, useState } from "react"
-import type { OpenProjectResult } from "@/main/types/project"
-import type { Project } from "@/main/types/store"
+import type { OpenProjectResult, Project } from "@/main/types/projects"
/**
* The type for the project context.
@@ -34,7 +33,7 @@ type ProjectProviderProps = {
/**
* Provides the current project and recent projects to the component tree, backed
- * by the `window.api.project` bridge.
+ * by the `window.api.projects` bridge.
*/
export default function ProjectProvider({ children }: ProjectProviderProps) {
const [currentProject, setCurrentProject] = useState(null)
@@ -47,7 +46,7 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
* Refreshes the recent projects list from the store.
*/
const refreshRecentProjects = useCallback(async () => {
- setRecentProjects(await window.api.project.getRecent())
+ setRecentProjects(await window.api.projects.getRecent())
}, [])
/**
@@ -78,13 +77,13 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
/**
* Prompts the user to pick a local folder and opens it as the current project.
*/
- const addLocalProject = useCallback(() => runOpen(() => window.api.project.addLocal()), [runOpen])
+ const addLocalProject = useCallback(() => runOpen(() => window.api.projects.addLocal()), [runOpen])
/**
* Opens an existing project by path (e.g. from the recent projects list).
* @param dir The absolute repository path to open.
*/
- const openProject = useCallback((dir: string) => runOpen(() => window.api.project.open(dir)), [runOpen])
+ const openProject = useCallback((dir: string) => runOpen(() => window.api.projects.open(dir)), [runOpen])
/**
* Removes a project from the recent projects list, closing it if it is the
@@ -92,7 +91,7 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
* @param dir The absolute repository path to forget.
*/
const removeRecentProject = useCallback(async (dir: string) => {
- setRecentProjects(await window.api.project.removeRecent(dir))
+ setRecentProjects(await window.api.projects.removeRecent(dir))
setCurrentProject(current => (current?.path === dir ? null : current))
}, [])
@@ -100,7 +99,7 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
* Clears every entry from the recent projects list.
*/
const clearRecentProjects = useCallback(async () => {
- setRecentProjects(await window.api.project.clearRecent())
+ setRecentProjects(await window.api.projects.clearRecent())
}, [])
/**
@@ -119,7 +118,7 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
let cancelled = false
- window.api.git
+ window.api.gitCommands
.getRemoteUrl(currentProject.path)
.then(url => {
if (cancelled) return
@@ -143,8 +142,8 @@ export default function ProjectProvider({ children }: ProjectProviderProps) {
try {
const [projects, preferences] = await Promise.all([
- window.api.project.getRecent(),
- window.api.project.getPreferences(),
+ window.api.projects.getRecent(),
+ window.api.projects.getPreferences(),
])
setRecentProjects(projects)
diff --git a/src/renderer/components/contexts/TreeView.tsx b/src/renderer/components/contexts/TreeView.tsx
index a4e5d11..0dec225 100644
--- a/src/renderer/components/contexts/TreeView.tsx
+++ b/src/renderer/components/contexts/TreeView.tsx
@@ -1,5 +1,5 @@
+import { useFileTreeContext } from "@renderer/components/contexts/FileTree"
import { useProjectContext } from "@renderer/components/contexts/Project"
-import { useTreeContext } from "@renderer/components/contexts/Tree"
import WORKSPACE_CONFIG from "@renderer/config/workspace"
import useDebouncedValue from "@renderer/hooks/useDebouncedValue"
import {
@@ -32,7 +32,7 @@ import {
useMemo,
useState,
} from "react"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
/**
* The state of an open context menu, anchored to a right-clicked node and
@@ -111,7 +111,7 @@ type TreeViewProviderProps = {
export default function TreeViewProvider({ children }: TreeViewProviderProps) {
const { currentProject } = useProjectContext()
- const { fileTree, locksByPath, lock, unlock } = useTreeContext()
+ const { fileTree, locksByPath, lock, unlock } = useFileTreeContext()
const [expandedPaths, setExpandedPaths] = useState([])
const [selectedPath, setSelectedPath] = useState(undefined)
@@ -137,7 +137,7 @@ export default function TreeViewProvider({ children }: TreeViewProviderProps) {
useEffect(() => {
let cancelled = false
- window.api.project
+ window.api.projects
.getPreferences()
.then(preferences => {
if (cancelled) return
@@ -361,7 +361,7 @@ export default function TreeViewProvider({ children }: TreeViewProviderProps) {
dismissMenu()
- const confirmed = await window.api.dialog.confirm({
+ const confirmed = await window.api.dialogs.confirm({
title: "Force unlock",
message: `Force unlock ${menu.othersPaths.length} file${menu.othersPaths.length === 1 ? "" : "s"} locked by other users?`,
detail: "Forcing may discard work the lock owner has not pushed yet.",
diff --git a/src/renderer/components/menus/TreeViewContext.tsx b/src/renderer/components/menus/TreeViewContextMenu.tsx
similarity index 100%
rename from src/renderer/components/menus/TreeViewContext.tsx
rename to src/renderer/components/menus/TreeViewContextMenu.tsx
diff --git a/src/renderer/components/panes/Details.tsx b/src/renderer/components/panes/Details.tsx
index 3588cbd..4b1d8a2 100644
--- a/src/renderer/components/panes/Details.tsx
+++ b/src/renderer/components/panes/Details.tsx
@@ -1,8 +1,8 @@
import { cn } from "@cybearl/cypack/frontend"
import lockIcon from "@react95-icons/Lock_16x16_4.png"
import refreshIcon from "@react95-icons/Refresh_16x16_4.png"
+import { useFileTreeContext } from "@renderer/components/contexts/FileTree"
import { useProjectContext } from "@renderer/components/contexts/Project"
-import { useTreeContext } from "@renderer/components/contexts/Tree"
import { useTreeViewContext } from "@renderer/components/contexts/TreeView"
import Tooltip from "@renderer/components/ui/Tooltip"
import { useCallback, useMemo } from "react"
@@ -16,7 +16,7 @@ type DetailsPaneProps = {
export default function DetailsPane({ className }: DetailsPaneProps) {
const { currentProject } = useProjectContext()
- const { locksByPath, refresh, lock, unlock } = useTreeContext()
+ const { locksByPath, refresh, lock, unlock } = useFileTreeContext()
const { selectedNode } = useTreeViewContext()
/**
@@ -100,7 +100,7 @@ export default function DetailsPane({ className }: DetailsPaneProps) {
* users, after native confirmation.
*/
const handleForceUnlock = useCallback(async () => {
- const confirmed = await window.api.dialog.confirm({
+ const confirmed = await window.api.dialogs.confirm({
title: "Force unlock",
message: `Force unlock ${othersPaths.length} file${othersPaths.length === 1 ? "" : "s"} locked by other users?`,
detail: "Forcing may discard work the lock owner has not pushed yet.",
diff --git a/src/renderer/components/panes/Files.tsx b/src/renderer/components/panes/Files.tsx
index 247cb0a..047b82c 100644
--- a/src/renderer/components/panes/Files.tsx
+++ b/src/renderer/components/panes/Files.tsx
@@ -3,7 +3,7 @@ import lockIcon from "@react95-icons/Lock_16x16_4.png"
import { useTreeViewContext } from "@renderer/components/contexts/TreeView"
import { type ChangeEvent, type CSSProperties, useCallback } from "react"
import { Button, TextInput } from "react95"
-import TreeView from "@/renderer/components/views/Tree"
+import TreeView from "@/renderer/components/views/TreeView"
type FilesPaneProps = {
className?: string
diff --git a/src/renderer/components/rows/FlatResults.tsx b/src/renderer/components/rows/FlatResults.tsx
index e689b81..3e4a47a 100644
--- a/src/renderer/components/rows/FlatResults.tsx
+++ b/src/renderer/components/rows/FlatResults.tsx
@@ -1,10 +1,10 @@
import { cn } from "@cybearl/cypack/frontend"
-import { useTreeContext } from "@renderer/components/contexts/Tree"
+import { useFileTreeContext } from "@renderer/components/contexts/FileTree"
import { useTreeViewContext } from "@renderer/components/contexts/TreeView"
import { renderLockIcon, renderTypeIcon } from "@renderer/lib/utils/treeView"
import { useMemo } from "react"
import type { RowComponentProps } from "react-window"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
/**
* The shared per-row data forwarded to every virtualized row by react-window's
@@ -16,7 +16,7 @@ export type FlatResultsRowData = {
}
export default function FlatResultsRow({ index, style, matches }: RowComponentProps) {
- const { locksByPath } = useTreeContext()
+ const { locksByPath } = useFileTreeContext()
const { selectedPath, lockStates, lockOwners, select, openMenu } = useTreeViewContext()
/**
diff --git a/src/renderer/components/spaces/Workspace.tsx b/src/renderer/components/spaces/Workspace.tsx
index cfabb78..e2ce2ab 100644
--- a/src/renderer/components/spaces/Workspace.tsx
+++ b/src/renderer/components/spaces/Workspace.tsx
@@ -11,7 +11,7 @@ export default function Workspace() {
* @param finalWidth The width to persist, in pixels.
*/
const persistWidth = useCallback((finalWidth: number) => {
- window.api.project.setPreferences({ filesPaneWidth: finalWidth })
+ window.api.projects.setPreferences({ filesPaneWidth: finalWidth })
}, [])
const { width, setWidth, handleDragStart } = useResizablePaneWidth({
@@ -25,7 +25,7 @@ export default function Workspace() {
useEffect(() => {
let cancelled = false
- window.api.project.getPreferences().then(preferences => {
+ window.api.projects.getPreferences().then(preferences => {
if (cancelled) return
setWidth(preferences.filesPaneWidth)
})
diff --git a/src/renderer/components/views/Tree.tsx b/src/renderer/components/views/TreeView.tsx
similarity index 95%
rename from src/renderer/components/views/Tree.tsx
rename to src/renderer/components/views/TreeView.tsx
index fdf69b7..bc5889f 100644
--- a/src/renderer/components/views/Tree.tsx
+++ b/src/renderer/components/views/TreeView.tsx
@@ -1,15 +1,15 @@
-import { useTreeContext } from "@renderer/components/contexts/Tree"
+import { useFileTreeContext } from "@renderer/components/contexts/FileTree"
import { useTreeViewContext } from "@renderer/components/contexts/TreeView"
import { type MouseEvent, useCallback, useEffect, useMemo, useRef } from "react"
import { TreeView as React95TreeView, ScrollView } from "react95"
import FlatResultsList from "@/renderer/components/lists/FlatResults"
-import TreeViewContextMenu from "@/renderer/components/menus/TreeViewContext"
+import TreeViewContextMenu from "@/renderer/components/menus/TreeViewContextMenu"
import { buildTree, findNodeByPath, resolveNode } from "@/renderer/lib/utils/treeView"
export default function TreeView() {
const containerRef = useRef(null)
- const { fileTree, locksByPath } = useTreeContext()
+ const { fileTree, locksByPath } = useFileTreeContext()
const {
expandedPaths,
selectedPath,
diff --git a/src/renderer/config/menus.ts b/src/renderer/config/menus.ts
index ecdba6c..0694682 100644
--- a/src/renderer/config/menus.ts
+++ b/src/renderer/config/menus.ts
@@ -1,4 +1,4 @@
-import type { Project } from "@/main/types/store"
+import type { Project } from "@/main/types/projects"
/**
* A dispatchable menu action.
@@ -10,6 +10,9 @@ export type MenuAction =
| { type: "window:close" }
| { type: "view:reload" }
| { type: "shell:open-external"; url: string }
+ | { type: "devtools:test-confirm" }
+ | { type: "devtools:test-error" }
+ | { type: "devtools:test-error-with-detail" }
/**
* External resources opened from the `Help` menu.
@@ -99,6 +102,27 @@ export function buildTopLevelMenus(
currentProject: Project | null,
remoteBrowsableUrl: string | null,
): TopLevelMenu[] {
+ const devToolsMenu: TopLevelMenu = {
+ label: "Dev Tools",
+ items: [
+ {
+ type: "item",
+ label: "Test Confirm Dialog",
+ action: { type: "devtools:test-confirm" },
+ },
+ {
+ type: "item",
+ label: "Test Error Dialog",
+ action: { type: "devtools:test-error" },
+ },
+ {
+ type: "item",
+ label: "Test Error Dialog with Detail",
+ action: { type: "devtools:test-error-with-detail" },
+ },
+ ],
+ }
+
return [
{
label: "File",
@@ -342,6 +366,7 @@ export function buildTopLevelMenus(
},
],
},
+ ...(import.meta.env.DEV ? [devToolsMenu] : []),
{
label: "Help",
items: [
diff --git a/src/renderer/hooks/useWindowStates.tsx b/src/renderer/hooks/useWindowStates.tsx
index 259a619..8a5ca36 100644
--- a/src/renderer/hooks/useWindowStates.tsx
+++ b/src/renderer/hooks/useWindowStates.tsx
@@ -9,11 +9,11 @@ export default function useWindowStates() {
useEffect(() => {
let cancelled = false
- window.api.window.getState().then(state => {
+ window.api.windows.getState().then(state => {
if (!cancelled) setStates(state)
})
- const unsubscribe = window.api.window.onStateChange(setStates)
+ const unsubscribe = window.api.windows.onStateChange(setStates)
return () => {
cancelled = true
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 18e7b78..2234be8 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -3,7 +3,7 @@
-
+
GitGame
diff --git a/src/renderer/lib/utils/errors.ts b/src/renderer/lib/utils/errors.ts
new file mode 100644
index 0000000..7a2f5b5
--- /dev/null
+++ b/src/renderer/lib/utils/errors.ts
@@ -0,0 +1,11 @@
+/**
+ * Surfaces an unexpected operation failure in a native error dialog, extracting
+ * a plain message from an unknown thrown value so callers can pass the raw
+ * `catch` binding without narrowing it first.
+ * @param title The dialog title, describing what the app was trying to do.
+ * @param err The thrown value, typically the argument of a `catch` clause.
+ */
+export function reportError(title: string, err: unknown) {
+ const message = err instanceof Error ? err.message : String(err)
+ window.api.dialogs.error(title, message)
+}
diff --git a/src/renderer/lib/utils/lockStates.ts b/src/renderer/lib/utils/lockStates.ts
index 6796212..f259f17 100644
--- a/src/renderer/lib/utils/lockStates.ts
+++ b/src/renderer/lib/utils/lockStates.ts
@@ -1,5 +1,5 @@
-import type { LfsLock } from "@/main/types/lfs"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
+import type { LfsLock } from "@/main/types/lfsCommands"
/**
* The lock state of a tree node:
diff --git a/src/renderer/lib/utils/search.ts b/src/renderer/lib/utils/search.ts
index a5f8731..bd6a8d9 100644
--- a/src/renderer/lib/utils/search.ts
+++ b/src/renderer/lib/utils/search.ts
@@ -1,6 +1,6 @@
import picomatch from "picomatch"
+import type { FileTreeNode } from "@/main/types/fileTree"
import type { AppPreferences } from "@/main/types/store"
-import type { FileTreeNode } from "@/main/types/tree"
/**
* The user-facing search filters applied on top of the file tree.
@@ -108,7 +108,7 @@ export function collectMatchingFiles(nodes: FileTreeNode[], filters: SearchFilte
* @param patch The preference fields to persist.
*/
export function persistSearchPreferences(patch: Partial) {
- window.api.project.setPreferences(patch).catch(error => {
+ window.api.projects.setPreferences(patch).catch(error => {
console.error("Failed to persist search preferences:", error)
})
}
diff --git a/src/renderer/lib/utils/treeView.tsx b/src/renderer/lib/utils/treeView.tsx
index 09fc70a..16c2c01 100644
--- a/src/renderer/lib/utils/treeView.tsx
+++ b/src/renderer/lib/utils/treeView.tsx
@@ -4,8 +4,8 @@ import folderIcon from "@react95-icons/Folder_16x16_4.png"
import lockIcon from "@react95-icons/Lock_16x16_4.png"
import Tooltip from "@renderer/components/ui/Tooltip"
import type { TreeLeaf } from "react95"
-import type { LfsLock, LfsLockResult } from "@/main/types/lfs"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
+import type { LfsLock, LfsLockResult } from "@/main/types/lfsCommands"
import type { LockOwnerCount, NodeLockState } from "@/renderer/lib/utils/lockStates"
/**
@@ -16,9 +16,10 @@ export function reportLockFailures(results: LfsLockResult[]) {
const failed = results.filter(result => !result.ok)
if (failed.length === 0) return
+ const message = `${failed.length} file${failed.length === 1 ? "" : "s"} could not be updated.`
const detail = failed.map(result => (result.error ? `${result.path}: ${result.error}` : result.path)).join("\n")
- window.api.dialog.error("Some files could not be updated", detail)
+ window.api.dialogs.error("Some files could not be updated", message, detail)
}
/**
diff --git a/src/renderer/styles/react95.css b/src/renderer/styles/react95.css
index d9daf37..4bd5246 100644
--- a/src/renderer/styles/react95.css
+++ b/src/renderer/styles/react95.css
@@ -1,5 +1,4 @@
@layer base {
-
/*
* Inlined from `react95`'s `styleReset` so the renderer no longer needs a
* styled-components `createGlobalStyle` wrapper just to inject these rules.
@@ -195,7 +194,6 @@ details > summary::before {
transform: translateX(-10%);
}
-
/**
* Emphasizes the currently selected tree item without cascading into descendants
* of a selected folder. Uses `text-shadow` to simulate bold so the pixel-font
@@ -216,4 +214,4 @@ details > summary::before {
background-position: bottom right;
background-size: 16px 16px;
background-repeat: no-repeat;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/types/assets.d.ts b/src/renderer/types/assets.d.ts
index aa27514..13fe9e8 100644
--- a/src/renderer/types/assets.d.ts
+++ b/src/renderer/types/assets.d.ts
@@ -14,6 +14,14 @@ declare module "*.woff2" {
export default src
}
+/**
+ * Ambient declaration for static MP3 asset imports resolved by Vite at build time.
+ */
+declare module "*.mp3" {
+ const src: string
+ export default src
+}
+
/**
* Ambient declaration for direct PNG imports through the `@react95-icons/*` alias (for React95).
*/
diff --git a/src/renderer/types/env.d.ts b/src/renderer/types/env.d.ts
new file mode 100644
index 0000000..11f02fe
--- /dev/null
+++ b/src/renderer/types/env.d.ts
@@ -0,0 +1 @@
+///
@@ -57,7 +57,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
size="sm"
square
aria-label="Maximize"
- onClick={() => window.api.window.toggleMaximize()}
+ onClick={() => window.api.windows.toggleMaximize()}
className="w-6! h-5.5! min-w-0!"
>
@@ -69,7 +69,7 @@ export default function TitleBar({ title, icon, mode = "full", onClose }: TitleB
size="sm"
square
aria-label="Close"
- onClick={() => (onClose ? onClose() : window.api.window.close())}
+ onClick={() => (onClose ? onClose() : window.api.windows.close())}
className="w-6! h-5.5! min-w-0! ml-1"
>
diff --git a/src/renderer/components/contexts/Tree.tsx b/src/renderer/components/contexts/FileTree.tsx
similarity index 53%
rename from src/renderer/components/contexts/Tree.tsx
rename to src/renderer/components/contexts/FileTree.tsx
index 0127b0a..52e6d0a 100644
--- a/src/renderer/components/contexts/Tree.tsx
+++ b/src/renderer/components/contexts/FileTree.tsx
@@ -1,18 +1,18 @@
import { useProjectContext } from "@renderer/components/contexts/Project"
import { useStatusContext } from "@renderer/components/contexts/Status"
import { createContext, type ReactNode, useCallback, useContext, useEffect, useState } from "react"
-import type { LfsLock, LfsLockResult } from "@/main/types/lfs"
-import type { FileTreeNode } from "@/main/types/tree"
+import type { FileTreeNode } from "@/main/types/fileTree"
+import type { LfsLock, LfsLockResult } from "@/main/types/lfsCommands"
+import { reportError } from "@/renderer/lib/utils/errors"
import { indexLocks } from "@/renderer/lib/utils/lockStates"
/**
* The type for the tree context.
*/
-export type TreeContextType = {
+export type FileTreeContextType = {
fileTree: FileTreeNode[]
locksByPath: Map