mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-08 09:00:05 +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>
236 lines
7.0 KiB
TypeScript
236 lines
7.0 KiB
TypeScript
import type { Positionable } from '@/lib/litegraph/src/interfaces'
|
|
import { LGraphGroup } from '@/lib/litegraph/src/litegraph'
|
|
import { LGraphCanvas } from '@/lib/litegraph/src/litegraph'
|
|
import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
|
|
import { app } from '../../scripts/app'
|
|
|
|
function setNodeMode(node: LGraphNode, mode: number) {
|
|
node.mode = mode
|
|
node.graph?.change()
|
|
}
|
|
|
|
function addNodesToGroup(group: LGraphGroup, items: Iterable<Positionable>) {
|
|
const padding = useSettingStore().get('Comfy.GroupSelectedNodes.Padding')
|
|
group.resizeTo([...group.children, ...items], padding)
|
|
}
|
|
|
|
app.registerExtension({
|
|
name: 'Comfy.GroupOptions',
|
|
setup() {
|
|
const orig = LGraphCanvas.prototype.getCanvasMenuOptions
|
|
// graph_mouse
|
|
LGraphCanvas.prototype.getCanvasMenuOptions = function (
|
|
this: LGraphCanvas
|
|
) {
|
|
// @ts-expect-error fixme ts strict error
|
|
const options = orig.apply(this, arguments)
|
|
// @ts-expect-error fixme ts strict error
|
|
const group = this.graph.getGroupOnPos(
|
|
this.graph_mouse[0],
|
|
this.graph_mouse[1]
|
|
)
|
|
if (!group) {
|
|
if (this.selectedItems.size > 0) {
|
|
options.push({
|
|
content: 'Add Group For Selected Nodes',
|
|
callback: () => {
|
|
const group = new LGraphGroup()
|
|
addNodesToGroup(group, this.selectedItems)
|
|
// @ts-expect-error fixme ts strict error
|
|
this.graph.add(group)
|
|
// @ts-expect-error fixme ts strict error
|
|
this.graph.change()
|
|
|
|
group.recomputeInsideNodes()
|
|
}
|
|
})
|
|
}
|
|
|
|
return options
|
|
}
|
|
|
|
// Group nodes aren't recomputed until the group is moved, this ensures the nodes are up-to-date
|
|
group.recomputeInsideNodes()
|
|
const nodesInGroup = group.nodes
|
|
|
|
options.push({
|
|
content: 'Add Selected Nodes To Group',
|
|
disabled: !this.selectedItems?.size,
|
|
callback: () => {
|
|
addNodesToGroup(group, this.selectedItems)
|
|
// @ts-expect-error fixme ts strict error
|
|
this.graph.change()
|
|
}
|
|
})
|
|
|
|
// No nodes in group, return default options
|
|
if (nodesInGroup.length === 0) {
|
|
return options
|
|
} else {
|
|
// Add a separator between the default options and the group options
|
|
// @ts-expect-error fixme ts strict error
|
|
options.push(null)
|
|
}
|
|
|
|
// Check if all nodes are the same mode
|
|
let allNodesAreSameMode = true
|
|
for (let i = 1; i < nodesInGroup.length; i++) {
|
|
if (nodesInGroup[i].mode !== nodesInGroup[0].mode) {
|
|
allNodesAreSameMode = false
|
|
break
|
|
}
|
|
}
|
|
|
|
options.push({
|
|
content: 'Fit Group To Nodes',
|
|
callback: () => {
|
|
group.recomputeInsideNodes()
|
|
const padding = useSettingStore().get(
|
|
'Comfy.GroupSelectedNodes.Padding'
|
|
)
|
|
group.resizeTo(group.children, padding)
|
|
// @ts-expect-error fixme ts strict error
|
|
this.graph.change()
|
|
}
|
|
})
|
|
|
|
options.push({
|
|
content: 'Select Nodes',
|
|
callback: () => {
|
|
this.selectNodes(nodesInGroup)
|
|
// @ts-expect-error fixme ts strict error
|
|
this.graph.change()
|
|
this.canvas.focus()
|
|
}
|
|
})
|
|
|
|
// Modes
|
|
// 0: Always
|
|
// 1: On Event
|
|
// 2: Never
|
|
// 3: On Trigger
|
|
// 4: Bypass
|
|
// If all nodes are the same mode, add a menu option to change the mode
|
|
if (allNodesAreSameMode) {
|
|
const mode = nodesInGroup[0].mode
|
|
switch (mode) {
|
|
case 0:
|
|
// All nodes are always, option to disable, and bypass
|
|
options.push({
|
|
content: 'Set Group Nodes to Never',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 2)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Bypass Group Nodes',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 4)
|
|
}
|
|
}
|
|
})
|
|
break
|
|
case 2:
|
|
// All nodes are never, option to enable, and bypass
|
|
options.push({
|
|
content: 'Set Group Nodes to Always',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 0)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Bypass Group Nodes',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 4)
|
|
}
|
|
}
|
|
})
|
|
break
|
|
case 4:
|
|
// All nodes are bypass, option to enable, and disable
|
|
options.push({
|
|
content: 'Set Group Nodes to Always',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 0)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Set Group Nodes to Never',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 2)
|
|
}
|
|
}
|
|
})
|
|
break
|
|
default:
|
|
// All nodes are On Trigger or On Event(Or other?), option to disable, set to always, or bypass
|
|
options.push({
|
|
content: 'Set Group Nodes to Always',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 0)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Set Group Nodes to Never',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 2)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Bypass Group Nodes',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 4)
|
|
}
|
|
}
|
|
})
|
|
break
|
|
}
|
|
} else {
|
|
// Nodes are not all the same mode, add a menu option to change the mode to always, never, or bypass
|
|
options.push({
|
|
content: 'Set Group Nodes to Always',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 0)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Set Group Nodes to Never',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 2)
|
|
}
|
|
}
|
|
})
|
|
options.push({
|
|
content: 'Bypass Group Nodes',
|
|
callback: () => {
|
|
for (const node of nodesInGroup) {
|
|
setNodeMode(node, 4)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
return options
|
|
}
|
|
}
|
|
})
|