mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-30 21:09:53 +00:00
* refactor: move settingStore to platform/settings Move src/stores/settingStore.ts to src/platform/settings/settingStore.ts to separate platform infrastructure from domain logic following DDD principles. Updates all import references across ~70 files to maintain compatibility. * fix: update remaining settingStore imports after rebase * fix: complete remaining settingStore import updates * fix: update vi.mock paths for settingStore in tests Update all test files to mock the new settingStore location at @/platform/settings/settingStore instead of @/stores/settingStore * fix: resolve remaining settingStore imports and unused imports after rebase * fix: update settingStore mock path in SelectionToolbox test Fix vi.mock path from @/stores/settingStore to @/platform/settings/settingStore to resolve failing Load3D viewer button test. * refactor: complete comprehensive settings migration to platform layer This commit completes the migration of all settings-related code to the platform layer as part of the Domain-Driven Design (DDD) architecture refactoring. - constants/coreSettings.ts → platform/settings/constants/coreSettings.ts - types/settingTypes.ts → platform/settings/types.ts - stores/settingStore.ts → platform/settings/settingStore.ts (already moved) - composables/setting/useSettingUI.ts → platform/settings/composables/useSettingUI.ts - composables/setting/useSettingSearch.ts → platform/settings/composables/useSettingSearch.ts - composables/useLitegraphSettings.ts → platform/settings/composables/useLitegraphSettings.ts - components/dialog/content/SettingDialogContent.vue → platform/settings/components/SettingDialogContent.vue - components/dialog/content/setting/SettingItem.vue → platform/settings/components/SettingItem.vue - components/dialog/content/setting/SettingGroup.vue → platform/settings/components/SettingGroup.vue - components/dialog/content/setting/SettingsPanel.vue → platform/settings/components/SettingsPanel.vue - components/dialog/content/setting/ColorPaletteMessage.vue → platform/settings/components/ColorPaletteMessage.vue - components/dialog/content/setting/ExtensionPanel.vue → platform/settings/components/ExtensionPanel.vue - components/dialog/content/setting/ServerConfigPanel.vue → platform/settings/components/ServerConfigPanel.vue - ~100+ import statements updated across the codebase - Test file imports corrected - Component imports fixed in dialog service and command menubar - Composable imports updated in GraphCanvas.vue ``` src/platform/settings/ ├── components/ # All settings UI components ├── composables/ # Settings-related composables ├── constants/ # Core settings definitions ├── types.ts # Settings type definitions └── settingStore.ts # Central settings state management ``` ✅ TypeScript compilation successful ✅ All tests passing (settings store, search functionality, UI components) ✅ Production build successful ✅ Domain boundaries properly established This migration consolidates all settings functionality into a cohesive platform domain, improving maintainability and following DDD principles for better code organization. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: format and lint after rebase conflict resolution * fix: update remaining import paths to platform settings - Fix browser test import: extensionAPI.spec.ts - Fix script import: collect-i18n-general.ts - Complete settings migration import path updates 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
203 lines
5.7 KiB
TypeScript
203 lines
5.7 KiB
TypeScript
import { createPinia, setActivePinia } from 'pinia'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { CORE_KEYBINDINGS } from '@/constants/coreKeybindings'
|
|
import { useKeybindingService } from '@/services/keybindingService'
|
|
import { useCommandStore } from '@/stores/commandStore'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
import {
|
|
KeyComboImpl,
|
|
KeybindingImpl,
|
|
useKeybindingStore
|
|
} from '@/stores/keybindingStore'
|
|
|
|
// Mock stores
|
|
vi.mock('@/platform/settings/settingStore', () => ({
|
|
useSettingStore: vi.fn(() => ({
|
|
get: vi.fn(() => [])
|
|
}))
|
|
}))
|
|
|
|
vi.mock('@/stores/dialogStore', () => ({
|
|
useDialogStore: vi.fn(() => ({
|
|
dialogStack: []
|
|
}))
|
|
}))
|
|
|
|
describe('keybindingService - Escape key handling', () => {
|
|
let keybindingService: ReturnType<typeof useKeybindingService>
|
|
let mockCommandExecute: ReturnType<typeof vi.fn>
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
setActivePinia(createPinia())
|
|
|
|
// Mock command store execute
|
|
mockCommandExecute = vi.fn()
|
|
const commandStore = useCommandStore()
|
|
commandStore.execute = mockCommandExecute
|
|
|
|
// Reset dialog store mock to empty
|
|
vi.mocked(useDialogStore).mockReturnValue({
|
|
dialogStack: []
|
|
} as any)
|
|
|
|
keybindingService = useKeybindingService()
|
|
keybindingService.registerCoreKeybindings()
|
|
})
|
|
|
|
it('should register Escape key for ExitSubgraph command', () => {
|
|
const keybindingStore = useKeybindingStore()
|
|
|
|
// Check that the Escape keybinding exists in core keybindings
|
|
const escapeKeybinding = CORE_KEYBINDINGS.find(
|
|
(kb) =>
|
|
kb.combo.key === 'Escape' && kb.commandId === 'Comfy.Graph.ExitSubgraph'
|
|
)
|
|
expect(escapeKeybinding).toBeDefined()
|
|
|
|
// Check that it was registered in the store
|
|
const registeredBinding = keybindingStore.getKeybinding(
|
|
new KeyComboImpl({ key: 'Escape' })
|
|
)
|
|
expect(registeredBinding).toBeDefined()
|
|
expect(registeredBinding?.commandId).toBe('Comfy.Graph.ExitSubgraph')
|
|
})
|
|
|
|
it('should execute ExitSubgraph command when Escape is pressed', async () => {
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
// Mock event methods
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [document.body])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(event.preventDefault).toHaveBeenCalled()
|
|
expect(mockCommandExecute).toHaveBeenCalledWith('Comfy.Graph.ExitSubgraph')
|
|
})
|
|
|
|
it('should not execute command when Escape is pressed with modifiers', async () => {
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
ctrlKey: true,
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [document.body])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(mockCommandExecute).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not execute command when typing in input field', async () => {
|
|
const inputElement = document.createElement('input')
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [inputElement])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(mockCommandExecute).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should close dialogs when no keybinding is registered', async () => {
|
|
// Remove the Escape keybinding
|
|
const keybindingStore = useKeybindingStore()
|
|
keybindingStore.unsetKeybinding(
|
|
new KeybindingImpl({
|
|
commandId: 'Comfy.Graph.ExitSubgraph',
|
|
combo: { key: 'Escape' }
|
|
})
|
|
)
|
|
|
|
// Create a mock dialog
|
|
const dialog = document.createElement('dialog')
|
|
dialog.open = true
|
|
dialog.close = vi.fn()
|
|
document.body.appendChild(dialog)
|
|
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
event.composedPath = vi.fn(() => [document.body])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(dialog.close).toHaveBeenCalled()
|
|
expect(mockCommandExecute).not.toHaveBeenCalled()
|
|
|
|
// Cleanup
|
|
document.body.removeChild(dialog)
|
|
})
|
|
|
|
it('should allow user to rebind Escape key to different command', async () => {
|
|
const keybindingStore = useKeybindingStore()
|
|
|
|
// Add a user keybinding for Escape to a different command
|
|
keybindingStore.addUserKeybinding(
|
|
new KeybindingImpl({
|
|
commandId: 'Custom.Command',
|
|
combo: { key: 'Escape' }
|
|
})
|
|
)
|
|
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [document.body])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
expect(event.preventDefault).toHaveBeenCalled()
|
|
expect(mockCommandExecute).toHaveBeenCalledWith('Custom.Command')
|
|
expect(mockCommandExecute).not.toHaveBeenCalledWith(
|
|
'Comfy.Graph.ExitSubgraph'
|
|
)
|
|
})
|
|
|
|
it('should not execute Escape keybinding when dialogs are open', async () => {
|
|
// Mock dialog store to have open dialogs
|
|
vi.mocked(useDialogStore).mockReturnValue({
|
|
dialogStack: [{ key: 'test-dialog' }]
|
|
} as any)
|
|
|
|
// Re-create keybinding service to pick up new mock
|
|
keybindingService = useKeybindingService()
|
|
|
|
const event = new KeyboardEvent('keydown', {
|
|
key: 'Escape',
|
|
bubbles: true,
|
|
cancelable: true
|
|
})
|
|
|
|
event.preventDefault = vi.fn()
|
|
event.composedPath = vi.fn(() => [document.body])
|
|
|
|
await keybindingService.keybindHandler(event)
|
|
|
|
// Should not call preventDefault or execute command
|
|
expect(event.preventDefault).not.toHaveBeenCalled()
|
|
expect(mockCommandExecute).not.toHaveBeenCalled()
|
|
})
|
|
})
|