mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-02 11:40:00 +00:00
## Summary Fixes https://github.com/Comfy-Org/ComfyUI_frontend/issues/5680 by allowing Vue nodes to properly synchronize color changes with LiteGraph nodes, implementing header darkening and light theme adjustments. <img width="2496" height="1512" alt="Screenshot from 2025-09-21 20-00-36" src="https://github.com/user-attachments/assets/e3bdf645-1e0b-4d11-9ae5-9401f43e8e96" /> ## Changes - **What**: Implemented color property synchronization between LiteGraph and Vue node rendering systems - **Core Fix**: Added `nodeData.color` and `nodeData.bgcolor` to [v-memo dependencies](https://vuejs.org/api/built-in-directives.html#v-memo) to trigger re-renders on color changes - **Color Logic**: Added header darkening using [memoized color adjustments](https://github.com/Comfy-Org/ComfyUI_frontend/blob/main/src/utils/colorUtil.ts) to match LiteGraph's ColorOption system - **Event System**: Enhanced property change instrumentation in LGraphNode.setColorOption to emit color/bgcolor events ## Review Focus Vue component reactivity timing - the v-memo fix was critical for immediate color updates. Verify light theme color adjustments match the drawNode monkey patch behavior in app.ts. ## Technical Details ```mermaid graph TD A[User Sets Color] --> B[LGraphNode.setColorOption] B --> C[Sets node.color & node.bgcolor] C --> D[Triggers property:changed events] D --> E[Vue Node Manager Updates] E --> F[v-memo Detects Change] F --> G[NodeHeader Re-renders] G --> H[Header Darkening Applied] style A fill:#f9f9f9,stroke:#333,color:#000 style H fill:#f9f9f9,stroke:#333,color:#000 ``` ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5720-Allow-Vue-nodes-to-have-their-colors-changed-from-selection-toolbox-2766d73d36508123b441d126a74a54b2) by [Unito](https://www.unito.io) --------- Co-authored-by: Myestery <Myestery@users.noreply.github.com> Co-authored-by: DrJKL <DrJKL@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com>
216 lines
5.9 KiB
Vue
216 lines
5.9 KiB
Vue
<template>
|
|
<div v-if="renderError" class="node-error p-4 text-red-500 text-sm">
|
|
{{ $t('Node Header Error') }}
|
|
</div>
|
|
<div
|
|
v-else
|
|
class="lg-node-header p-4 rounded-t-2xl w-full cursor-move"
|
|
:style="headerStyle"
|
|
:data-testid="`node-header-${nodeData?.id || ''}`"
|
|
@dblclick="handleDoubleClick"
|
|
>
|
|
<div class="flex items-center justify-between relative">
|
|
<!-- Collapse/Expand Button -->
|
|
<button
|
|
v-show="!readonly"
|
|
class="bg-transparent border-transparent flex items-center lod-toggle"
|
|
data-testid="node-collapse-button"
|
|
@click.stop="handleCollapse"
|
|
@dblclick.stop
|
|
>
|
|
<i
|
|
:class="collapsed ? 'pi pi-chevron-right' : 'pi pi-chevron-down'"
|
|
class="text-xs leading-none relative top-px text-stone-200 dark-theme:text-slate-300"
|
|
></i>
|
|
</button>
|
|
|
|
<!-- Node Title -->
|
|
<div
|
|
v-tooltip.top="tooltipConfig"
|
|
class="text-sm font-bold truncate flex-1 lod-toggle flex items-center gap-2"
|
|
data-testid="node-title"
|
|
>
|
|
<EditableText
|
|
:model-value="displayTitle"
|
|
:is-editing="isEditing"
|
|
:input-attrs="{ 'data-testid': 'node-title-input' }"
|
|
@edit="handleTitleEdit"
|
|
@cancel="handleTitleCancel"
|
|
/>
|
|
<i-lucide:pin
|
|
v-if="isPinned"
|
|
class="w-5 h-5 text-stone-200 dark-theme:text-slate-300"
|
|
data-testid="node-pin-indicator"
|
|
/>
|
|
</div>
|
|
<LODFallback />
|
|
</div>
|
|
|
|
<!-- Title Buttons -->
|
|
<div v-if="!readonly" class="flex items-center lod-toggle">
|
|
<IconButton
|
|
v-if="isSubgraphNode"
|
|
size="sm"
|
|
type="transparent"
|
|
class="text-stone-200 dark-theme:text-slate-300"
|
|
data-testid="subgraph-enter-button"
|
|
title="Enter Subgraph"
|
|
@click.stop="handleEnterSubgraph"
|
|
@dblclick.stop
|
|
>
|
|
<i class="pi pi-external-link"></i>
|
|
</IconButton>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { type Ref, computed, inject, onErrorCaptured, ref, watch } from 'vue'
|
|
|
|
import IconButton from '@/components/button/IconButton.vue'
|
|
import EditableText from '@/components/common/EditableText.vue'
|
|
import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
|
|
import { useErrorHandling } from '@/composables/useErrorHandling'
|
|
import { st } from '@/i18n'
|
|
import { useSettingStore } from '@/platform/settings/settingStore'
|
|
import { useNodeTooltips } from '@/renderer/extensions/vueNodes/composables/useNodeTooltips'
|
|
import { applyLightThemeColor } from '@/renderer/extensions/vueNodes/utils/nodeStyleUtils'
|
|
import { app } from '@/scripts/app'
|
|
import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
|
|
import { normalizeI18nKey } from '@/utils/formatUtil'
|
|
import {
|
|
getLocatorIdFromNodeData,
|
|
getNodeByLocatorId
|
|
} from '@/utils/graphTraversalUtil'
|
|
|
|
import LODFallback from './LODFallback.vue'
|
|
|
|
interface NodeHeaderProps {
|
|
nodeData?: VueNodeData
|
|
readonly?: boolean
|
|
collapsed?: boolean
|
|
}
|
|
|
|
const { nodeData, readonly, collapsed } = defineProps<NodeHeaderProps>()
|
|
|
|
const emit = defineEmits<{
|
|
collapse: []
|
|
'update:title': [newTitle: string]
|
|
'enter-subgraph': []
|
|
}>()
|
|
|
|
// Error boundary implementation
|
|
const renderError = ref<string | null>(null)
|
|
const { toastErrorHandler } = useErrorHandling()
|
|
|
|
onErrorCaptured((error) => {
|
|
renderError.value = error.message
|
|
toastErrorHandler(error)
|
|
return false
|
|
})
|
|
|
|
// Editing state
|
|
const isEditing = ref(false)
|
|
|
|
const tooltipContainer =
|
|
inject<Ref<HTMLElement | undefined>>('tooltipContainer')
|
|
const { getNodeDescription, createTooltipConfig } = useNodeTooltips(
|
|
nodeData?.type || '',
|
|
tooltipContainer
|
|
)
|
|
|
|
const tooltipConfig = computed(() => {
|
|
if (readonly || isEditing.value) {
|
|
return { value: '', disabled: true }
|
|
}
|
|
const description = getNodeDescription.value
|
|
return createTooltipConfig(description)
|
|
})
|
|
|
|
const headerStyle = computed(() => {
|
|
const colorPaletteStore = useColorPaletteStore()
|
|
|
|
const opacity = useSettingStore().get('Comfy.Node.Opacity') ?? 1
|
|
|
|
if (!nodeData?.color) {
|
|
return { backgroundColor: '', opacity }
|
|
}
|
|
|
|
const headerColor = applyLightThemeColor(
|
|
nodeData.color,
|
|
Boolean(colorPaletteStore.completedActivePalette.light_theme)
|
|
)
|
|
|
|
return { backgroundColor: headerColor, opacity }
|
|
})
|
|
|
|
const resolveTitle = (info: VueNodeData | undefined) => {
|
|
const title = (info?.title ?? '').trim()
|
|
if (title.length > 0) return title
|
|
|
|
const nodeType = (info?.type ?? '').trim() || 'Untitled'
|
|
const key = `nodeDefs.${normalizeI18nKey(nodeType)}.display_name`
|
|
return st(key, nodeType)
|
|
}
|
|
|
|
// Local state for title to provide immediate feedback
|
|
const displayTitle = ref(resolveTitle(nodeData))
|
|
|
|
// Watch for external changes to the node title or type
|
|
watch(
|
|
() => [nodeData?.title, nodeData?.type] as const,
|
|
() => {
|
|
const next = resolveTitle(nodeData)
|
|
if (next !== displayTitle.value) {
|
|
displayTitle.value = next
|
|
}
|
|
}
|
|
)
|
|
|
|
const isPinned = computed(() => Boolean(nodeData?.flags?.pinned))
|
|
|
|
// Subgraph detection
|
|
const isSubgraphNode = computed(() => {
|
|
if (!nodeData?.id) return false
|
|
|
|
// Get the underlying LiteGraph node
|
|
const graph = app.graph?.rootGraph || app.graph
|
|
if (!graph) return false
|
|
|
|
const locatorId = getLocatorIdFromNodeData(nodeData)
|
|
|
|
const litegraphNode = getNodeByLocatorId(graph, locatorId)
|
|
|
|
// Use the official type guard method
|
|
return litegraphNode?.isSubgraphNode() ?? false
|
|
})
|
|
|
|
// Event handlers
|
|
const handleCollapse = () => {
|
|
emit('collapse')
|
|
}
|
|
|
|
const handleDoubleClick = () => {
|
|
if (!readonly) {
|
|
isEditing.value = true
|
|
}
|
|
}
|
|
|
|
const handleTitleEdit = (newTitle: string) => {
|
|
isEditing.value = false
|
|
const trimmedTitle = newTitle.trim()
|
|
if (trimmedTitle && trimmedTitle !== displayTitle.value) {
|
|
// Emit for litegraph sync
|
|
emit('update:title', trimmedTitle)
|
|
}
|
|
}
|
|
|
|
const handleTitleCancel = () => {
|
|
isEditing.value = false
|
|
}
|
|
|
|
const handleEnterSubgraph = () => {
|
|
emit('enter-subgraph')
|
|
}
|
|
</script>
|