mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-07 08:30:06 +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>
160 lines
5.0 KiB
TypeScript
160 lines
5.0 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { useCanvasInteractions } from '@/composables/graph/useCanvasInteractions'
|
|
import type { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
|
|
// Mock stores
|
|
vi.mock('@/renderer/core/canvas/canvasStore', () => {
|
|
const getCanvas = vi.fn()
|
|
const setCursorStyle = vi.fn()
|
|
return {
|
|
useCanvasStore: vi.fn(() => ({
|
|
getCanvas,
|
|
setCursorStyle
|
|
}))
|
|
}
|
|
})
|
|
vi.mock('@/platform/settings/settingStore', () => {
|
|
const getFn = vi.fn()
|
|
return { useSettingStore: vi.fn(() => ({ get: getFn })) }
|
|
})
|
|
vi.mock('@/scripts/app', () => ({
|
|
app: {
|
|
canvas: {
|
|
canvas: {
|
|
dispatchEvent: vi.fn()
|
|
}
|
|
}
|
|
}
|
|
}))
|
|
|
|
function createMockLGraphCanvas(read_only = true): LGraphCanvas {
|
|
const mockCanvas: Partial<LGraphCanvas> = { read_only }
|
|
return mockCanvas as LGraphCanvas
|
|
}
|
|
|
|
function createMockPointerEvent(
|
|
buttons: PointerEvent['buttons'] = 1
|
|
): PointerEvent {
|
|
const mockEvent: Partial<PointerEvent> = {
|
|
buttons,
|
|
preventDefault: vi.fn(),
|
|
stopPropagation: vi.fn()
|
|
}
|
|
return mockEvent as PointerEvent
|
|
}
|
|
|
|
function createMockWheelEvent(ctrlKey = false, metaKey = false): WheelEvent {
|
|
const mockEvent: Partial<WheelEvent> = {
|
|
ctrlKey,
|
|
metaKey,
|
|
preventDefault: vi.fn(),
|
|
stopPropagation: vi.fn()
|
|
}
|
|
return mockEvent as WheelEvent
|
|
}
|
|
|
|
describe('useCanvasInteractions', () => {
|
|
beforeEach(() => {
|
|
vi.resetAllMocks()
|
|
})
|
|
|
|
describe('handlePointer', () => {
|
|
it('should intercept left mouse events when canvas is read_only to enable space+drag navigation', () => {
|
|
const { getCanvas } = useCanvasStore()
|
|
const mockCanvas = createMockLGraphCanvas(true)
|
|
vi.mocked(getCanvas).mockReturnValue(mockCanvas)
|
|
|
|
const { handlePointer } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockPointerEvent(1) // Left Mouse Button
|
|
handlePointer(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).toHaveBeenCalled()
|
|
})
|
|
|
|
it('should forward middle mouse button events to canvas', () => {
|
|
const { getCanvas } = useCanvasStore()
|
|
const mockCanvas = createMockLGraphCanvas(false)
|
|
vi.mocked(getCanvas).mockReturnValue(mockCanvas)
|
|
const { handlePointer } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockPointerEvent(4) // Middle mouse button
|
|
handlePointer(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not prevent default when canvas is not in read_only mode and not middle button', () => {
|
|
const { getCanvas } = useCanvasStore()
|
|
const mockCanvas = createMockLGraphCanvas(false)
|
|
vi.mocked(getCanvas).mockReturnValue(mockCanvas)
|
|
const { handlePointer } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockPointerEvent(1)
|
|
handlePointer(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).not.toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('should return early when canvas is null', () => {
|
|
const { getCanvas } = useCanvasStore()
|
|
vi.mocked(getCanvas).mockReturnValue(null as unknown as LGraphCanvas) // TODO: Fix misaligned types
|
|
const { handlePointer } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockPointerEvent(1)
|
|
handlePointer(mockEvent)
|
|
|
|
expect(getCanvas).toHaveBeenCalled()
|
|
expect(mockEvent.preventDefault).not.toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).not.toHaveBeenCalled()
|
|
})
|
|
})
|
|
|
|
describe('handleWheel', () => {
|
|
it('should forward ctrl+wheel events to canvas in standard nav mode', () => {
|
|
const { get } = useSettingStore()
|
|
vi.mocked(get).mockReturnValue('standard')
|
|
|
|
const { handleWheel } = useCanvasInteractions()
|
|
|
|
// Ctrl key pressed
|
|
const mockEvent = createMockWheelEvent(true)
|
|
|
|
handleWheel(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).toHaveBeenCalled()
|
|
})
|
|
|
|
it('should forward all wheel events to canvas in legacy nav mode', () => {
|
|
const { get } = useSettingStore()
|
|
vi.mocked(get).mockReturnValue('legacy')
|
|
const { handleWheel } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockWheelEvent()
|
|
handleWheel(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).toHaveBeenCalled()
|
|
})
|
|
|
|
it('should not prevent default for regular wheel events in standard nav mode', () => {
|
|
const { get } = useSettingStore()
|
|
vi.mocked(get).mockReturnValue('standard')
|
|
const { handleWheel } = useCanvasInteractions()
|
|
|
|
const mockEvent = createMockWheelEvent()
|
|
handleWheel(mockEvent)
|
|
|
|
expect(mockEvent.preventDefault).not.toHaveBeenCalled()
|
|
expect(mockEvent.stopPropagation).not.toHaveBeenCalled()
|
|
})
|
|
})
|
|
})
|