mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +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>
146 lines
4.5 KiB
TypeScript
146 lines
4.5 KiB
TypeScript
import { CORE_KEYBINDINGS } from '@/constants/coreKeybindings'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { app } from '@/scripts/app'
|
|
import { useCommandStore } from '@/stores/commandStore'
|
|
import { useDialogStore } from '@/stores/dialogStore'
|
|
import {
|
|
KeyComboImpl,
|
|
KeybindingImpl,
|
|
useKeybindingStore
|
|
} from '@/stores/keybindingStore'
|
|
|
|
export const useKeybindingService = () => {
|
|
const keybindingStore = useKeybindingStore()
|
|
const commandStore = useCommandStore()
|
|
const settingStore = useSettingStore()
|
|
const dialogStore = useDialogStore()
|
|
|
|
// Helper function to determine if an event should be forwarded to canvas
|
|
const shouldForwardToCanvas = (event: KeyboardEvent): boolean => {
|
|
// Don't forward if modifier keys are pressed (except shift)
|
|
if (event.ctrlKey || event.altKey || event.metaKey) {
|
|
return false
|
|
}
|
|
|
|
// Keys that LiteGraph handles but aren't in core keybindings
|
|
const canvasKeys = ['Delete', 'Backspace']
|
|
|
|
return canvasKeys.includes(event.key)
|
|
}
|
|
|
|
const keybindHandler = async function (event: KeyboardEvent) {
|
|
const keyCombo = KeyComboImpl.fromEvent(event)
|
|
if (keyCombo.isModifier) {
|
|
return
|
|
}
|
|
|
|
// Ignore reserved or non-modifier keybindings if typing in input fields
|
|
const target = event.composedPath()[0] as HTMLElement
|
|
if (
|
|
keyCombo.isReservedByTextInput &&
|
|
(target.tagName === 'TEXTAREA' ||
|
|
target.tagName === 'INPUT' ||
|
|
target.contentEditable === 'true' ||
|
|
(target.tagName === 'SPAN' &&
|
|
target.classList.contains('property_value')))
|
|
) {
|
|
return
|
|
}
|
|
|
|
const keybinding = keybindingStore.getKeybinding(keyCombo)
|
|
if (keybinding && keybinding.targetElementId !== 'graph-canvas') {
|
|
// Special handling for Escape key - let dialogs handle it first
|
|
if (
|
|
event.key === 'Escape' &&
|
|
!event.ctrlKey &&
|
|
!event.altKey &&
|
|
!event.metaKey
|
|
) {
|
|
// If dialogs are open, don't execute the keybinding - let the dialog handle it
|
|
if (dialogStore.dialogStack.length > 0) {
|
|
return
|
|
}
|
|
}
|
|
|
|
// Prevent default browser behavior first, then execute the command
|
|
event.preventDefault()
|
|
await commandStore.execute(keybinding.commandId)
|
|
return
|
|
}
|
|
|
|
// Forward unhandled canvas-targeted events to LiteGraph
|
|
if (!keybinding && shouldForwardToCanvas(event)) {
|
|
const canvas = app.canvas
|
|
if (
|
|
canvas &&
|
|
canvas.processKey &&
|
|
typeof canvas.processKey === 'function'
|
|
) {
|
|
// Let LiteGraph handle the event
|
|
canvas.processKey(event)
|
|
return
|
|
}
|
|
}
|
|
|
|
// Only clear dialogs if not using modifiers
|
|
if (event.ctrlKey || event.altKey || event.metaKey) {
|
|
return
|
|
}
|
|
|
|
// Escape key: close the first open modal found, and all dialogs
|
|
if (event.key === 'Escape') {
|
|
const modals = document.querySelectorAll<HTMLElement>('.comfy-modal')
|
|
for (const modal of modals) {
|
|
const modalDisplay = window
|
|
.getComputedStyle(modal)
|
|
.getPropertyValue('display')
|
|
|
|
if (modalDisplay !== 'none') {
|
|
modal.style.display = 'none'
|
|
break
|
|
}
|
|
}
|
|
|
|
for (const d of document.querySelectorAll('dialog')) d.close()
|
|
}
|
|
}
|
|
|
|
const registerCoreKeybindings = () => {
|
|
for (const keybinding of CORE_KEYBINDINGS) {
|
|
keybindingStore.addDefaultKeybinding(new KeybindingImpl(keybinding))
|
|
}
|
|
}
|
|
|
|
function registerUserKeybindings() {
|
|
// Unset bindings first as new bindings might conflict with default bindings.
|
|
const unsetBindings = settingStore.get('Comfy.Keybinding.UnsetBindings')
|
|
for (const keybinding of unsetBindings) {
|
|
keybindingStore.unsetKeybinding(new KeybindingImpl(keybinding))
|
|
}
|
|
const newBindings = settingStore.get('Comfy.Keybinding.NewBindings')
|
|
for (const keybinding of newBindings) {
|
|
keybindingStore.addUserKeybinding(new KeybindingImpl(keybinding))
|
|
}
|
|
}
|
|
|
|
async function persistUserKeybindings() {
|
|
// TODO(https://github.com/Comfy-Org/ComfyUI_frontend/issues/1079):
|
|
// Allow setting multiple values at once in settingStore
|
|
await settingStore.set(
|
|
'Comfy.Keybinding.NewBindings',
|
|
Object.values(keybindingStore.getUserKeybindings())
|
|
)
|
|
await settingStore.set(
|
|
'Comfy.Keybinding.UnsetBindings',
|
|
Object.values(keybindingStore.getUserUnsetKeybindings())
|
|
)
|
|
}
|
|
|
|
return {
|
|
keybindHandler,
|
|
registerCoreKeybindings,
|
|
registerUserKeybindings,
|
|
persistUserKeybindings
|
|
}
|
|
}
|