mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-03 14:54:37 +00:00
This pull request introduces several improvements to Vue reactivity and user experience in the graph node and widget system. The main focus is on ensuring that changes to node and widget data reliably trigger updates in Vue components, improving drag-and-drop support for nodes, and enhancing widget value handling for better compatibility and reactivity. **Vue Reactivity Improvements:** * In `useGraphNodeManager.ts`, node data updates now create a completely new object and add a timestamp (`_updateTs`) to force Vue's reactivity system to detect changes. Additionally, node data is re-set on the next tick to guarantee component updates. [[1]](diffhunk://#diff-f980db6f42cef913c3fe92669783b255d617e40b9ccef9a1ab9cc8e326ff1790L272-R280) [[2]](diffhunk://#diff-f980db6f42cef913c3fe92669783b255d617e40b9ccef9a1ab9cc8e326ff1790R326-R335) * Widget value composables (`useWidgetValue` and related helpers) now accept either a direct value or a getter function for `modelValue`, and always normalize it to a getter. Watches are updated to use this getter for more reliable reactivity. [[1]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911L13-R14) [[2]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911R49-R57) [[3]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911L82-R91) [[4]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911L100-R104) [[5]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911L117-R121) [[6]](diffhunk://#diff-92dc3c8b09ab57105e400e115196aae645214f305685044f62edc3338afa0911L140-R144) [[7]](diffhunk://#diff-0c43cefa9fb524ae86541c7ca851e97a22b3fd01f95795c83273c977be77468fL47-R47) * In `useImageUploadWidget.ts`, widget value updates now use a new array/object to ensure Vue detects the change, especially for batch uploads. **Drag-and-Drop Support for Nodes:** * The `LGraphNode.vue` component adds drag-and-drop event handlers (`dragover`, `dragleave`, `drop`) and visual feedback (`isDraggingOver` state and highlight ring) for improved user experience when dragging files onto nodes. Node callbacks (`onDragOver`, `onDragDrop`) are used for custom validation and handling. [[1]](diffhunk://#diff-a7744614cf842e54416047326db79ad81f7c7ab7bfb66ae2b46f5c73ac7d47f2L26-R27) [[2]](diffhunk://#diff-a7744614cf842e54416047326db79ad81f7c7ab7bfb66ae2b46f5c73ac7d47f2R47-R49) [[3]](diffhunk://#diff-a7744614cf842e54416047326db79ad81f7c7ab7bfb66ae2b46f5c73ac7d47f2R482-R521) **Widget and Audio Upload Handling:** * In `uploadAudio.ts`, after uploading an audio file, the widget's callback is manually triggered to ensure Vue nodes update. There is also a commented-out call to mark the canvas as dirty for potential future refresh logic. [[1]](diffhunk://#diff-796b36f2cafb906a5e95b5750ca5ddc1bf57a304d4a022e0bdaee04b4ee5bbc4R61-R65) [[2]](diffhunk://#diff-796b36f2cafb906a5e95b5750ca5ddc1bf57a304d4a022e0bdaee04b4ee5bbc4R190-R191) These changes collectively improve the reliability and responsiveness of UI updates in the graph node system, especially in scenarios involving external updates, drag-and-drop interactions, and batch widget value changes. https://github.com/user-attachments/assets/8e3194c9-196c-4e13-ad0b-a32177f2d062 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-6514-Drag-vuenodes-input-29e6d73d3650817da1b7ef96b61b752d) by [Unito](https://www.unito.io)
157 lines
4.3 KiB
TypeScript
157 lines
4.3 KiB
TypeScript
/**
|
|
* Composable for managing widget value synchronization between Vue and LiteGraph
|
|
* Provides consistent pattern for immediate UI updates and LiteGraph callbacks
|
|
*/
|
|
import { computed, toValue, ref, watch } from 'vue'
|
|
import type { Ref } from 'vue'
|
|
|
|
import type { SimplifiedWidget, WidgetValue } from '@/types/simplifiedWidget'
|
|
import type { MaybeRefOrGetter } from '@vueuse/core'
|
|
|
|
interface UseWidgetValueOptions<T extends WidgetValue = WidgetValue, U = T> {
|
|
/** The widget configuration from LiteGraph */
|
|
widget: SimplifiedWidget<T>
|
|
/** The current value from parent component (can be a value or a getter function) */
|
|
modelValue: MaybeRefOrGetter<T>
|
|
/** Default value if modelValue is null/undefined */
|
|
defaultValue: T
|
|
/** Emit function from component setup */
|
|
emit: (event: 'update:modelValue', value: T) => void
|
|
/** Optional value transformer before sending to LiteGraph */
|
|
transform?: (value: U) => T
|
|
}
|
|
|
|
interface UseWidgetValueReturn<T extends WidgetValue = WidgetValue, U = T> {
|
|
/** Local value for immediate UI updates */
|
|
localValue: Ref<T>
|
|
/** Handler for user interactions */
|
|
onChange: (newValue: U) => void
|
|
}
|
|
|
|
/**
|
|
* Manages widget value synchronization with LiteGraph
|
|
*
|
|
* @example
|
|
* ```vue
|
|
* const { localValue, onChange } = useWidgetValue({
|
|
* widget: props.widget,
|
|
* modelValue: props.modelValue,
|
|
* defaultValue: ''
|
|
* })
|
|
* ```
|
|
*/
|
|
export function useWidgetValue<T extends WidgetValue = WidgetValue, U = T>({
|
|
widget,
|
|
modelValue,
|
|
defaultValue,
|
|
emit,
|
|
transform
|
|
}: UseWidgetValueOptions<T, U>): UseWidgetValueReturn<T, U> {
|
|
// Ref for immediate UI feedback before value flows back through modelValue
|
|
const newProcessedValue = ref<T | null>(null)
|
|
|
|
// Computed that prefers the immediately processed value, then falls back to modelValue
|
|
const localValue = computed<T>(
|
|
() => newProcessedValue.value ?? toValue(modelValue) ?? defaultValue
|
|
)
|
|
|
|
// Clear newProcessedValue when modelValue updates (allowing external changes to flow through)
|
|
watch(
|
|
() => toValue(modelValue),
|
|
() => {
|
|
newProcessedValue.value = null
|
|
}
|
|
)
|
|
|
|
// Handle user changes
|
|
const onChange = (newValue: U) => {
|
|
// Handle different PrimeVue component signatures
|
|
let processedValue: T
|
|
if (transform) {
|
|
processedValue = transform(newValue)
|
|
} else {
|
|
// Ensure type safety - only cast when types are compatible
|
|
if (
|
|
typeof newValue === typeof defaultValue ||
|
|
newValue === null ||
|
|
newValue === undefined
|
|
) {
|
|
processedValue = (newValue ?? defaultValue) as T
|
|
} else {
|
|
console.warn(
|
|
`useWidgetValue: Type mismatch for widget ${widget.name}. Expected ${typeof defaultValue}, got ${typeof newValue}`
|
|
)
|
|
processedValue = defaultValue
|
|
}
|
|
}
|
|
|
|
// Set for immediate UI feedback
|
|
newProcessedValue.value = processedValue
|
|
|
|
// Emit to parent component
|
|
emit('update:modelValue', processedValue)
|
|
}
|
|
|
|
return {
|
|
localValue: localValue as Ref<T>,
|
|
onChange
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Type-specific helper for string widgets
|
|
*/
|
|
export function useStringWidgetValue(
|
|
widget: SimplifiedWidget<string>,
|
|
modelValue: string | (() => string),
|
|
emit: (event: 'update:modelValue', value: string) => void
|
|
) {
|
|
return useWidgetValue({
|
|
widget,
|
|
modelValue,
|
|
defaultValue: '',
|
|
emit,
|
|
transform: (value: string | undefined) => String(value || '') // Handle undefined from PrimeVue
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Type-specific helper for number widgets
|
|
*/
|
|
export function useNumberWidgetValue(
|
|
widget: SimplifiedWidget<number>,
|
|
modelValue: number | (() => number),
|
|
emit: (event: 'update:modelValue', value: number) => void
|
|
) {
|
|
return useWidgetValue({
|
|
widget,
|
|
modelValue,
|
|
defaultValue: 0,
|
|
emit,
|
|
transform: (value: number | number[]) => {
|
|
// Handle PrimeVue Slider which can emit number | number[]
|
|
if (Array.isArray(value)) {
|
|
return value.length > 0 ? (value[0] ?? 0) : 0
|
|
}
|
|
return Number(value) || 0
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Type-specific helper for boolean widgets
|
|
*/
|
|
export function useBooleanWidgetValue(
|
|
widget: SimplifiedWidget<boolean>,
|
|
modelValue: boolean | (() => boolean),
|
|
emit: (event: 'update:modelValue', value: boolean) => void
|
|
) {
|
|
return useWidgetValue({
|
|
widget,
|
|
modelValue,
|
|
defaultValue: false,
|
|
emit,
|
|
transform: (value: boolean) => Boolean(value)
|
|
})
|
|
}
|