- Add git_resolve_conflict and git_commit_conflict_resolution Rust commands - Create useConflictResolver hook for per-file resolution state management - Create ConflictResolverModal with keyboard shortcuts (K/T/O/Enter/Esc) - Make StatusBar conflict chip clickable to open resolver modal - Add 'Resolve Conflicts' command to command palette (conditional) - Pause auto-pull while conflict resolver modal is open - Tests: 5 new Rust tests, 10 new hook tests, 1 new auto-sync test Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
40 lines
2.1 KiB
TypeScript
40 lines
2.1 KiB
TypeScript
import { useState, useCallback } from 'react'
|
|
|
|
export function useDialogs() {
|
|
const [showCreateTypeDialog, setShowCreateTypeDialog] = useState(false)
|
|
const [showQuickOpen, setShowQuickOpen] = useState(false)
|
|
const [showCommandPalette, setShowCommandPalette] = useState(false)
|
|
const [showAIChat, setShowAIChat] = useState(false)
|
|
const [showSettings, setShowSettings] = useState(false)
|
|
const [showGitHubVault, setShowGitHubVault] = useState(false)
|
|
const [showSearch, setShowSearch] = useState(false)
|
|
const [showConflictResolver, setShowConflictResolver] = useState(false)
|
|
|
|
const openCreateType = useCallback(() => setShowCreateTypeDialog(true), [])
|
|
const closeCreateType = useCallback(() => setShowCreateTypeDialog(false), [])
|
|
const openQuickOpen = useCallback(() => setShowQuickOpen(true), [])
|
|
const closeQuickOpen = useCallback(() => setShowQuickOpen(false), [])
|
|
const openCommandPalette = useCallback(() => setShowCommandPalette(true), [])
|
|
const closeCommandPalette = useCallback(() => setShowCommandPalette(false), [])
|
|
const openSettings = useCallback(() => setShowSettings(true), [])
|
|
const closeSettings = useCallback(() => setShowSettings(false), [])
|
|
const openGitHubVault = useCallback(() => setShowGitHubVault(true), [])
|
|
const closeGitHubVault = useCallback(() => setShowGitHubVault(false), [])
|
|
const toggleAIChat = useCallback(() => setShowAIChat((c) => !c), [])
|
|
const openSearch = useCallback(() => setShowSearch(true), [])
|
|
const closeSearch = useCallback(() => setShowSearch(false), [])
|
|
const openConflictResolver = useCallback(() => setShowConflictResolver(true), [])
|
|
const closeConflictResolver = useCallback(() => setShowConflictResolver(false), [])
|
|
|
|
return {
|
|
showCreateTypeDialog, openCreateType, closeCreateType,
|
|
showQuickOpen, openQuickOpen, closeQuickOpen,
|
|
showCommandPalette, openCommandPalette, closeCommandPalette,
|
|
showAIChat, toggleAIChat,
|
|
showSettings, openSettings, closeSettings,
|
|
showGitHubVault, openGitHubVault, closeGitHubVault,
|
|
showSearch, openSearch, closeSearch,
|
|
showConflictResolver, openConflictResolver, closeConflictResolver,
|
|
}
|
|
}
|