mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 06:20:11 +00:00
This pull request improves the selection toolbox behavior during node dragging by ensuring that it correctly responds to both LiteGraph and Vue node drag events. The main changes introduce a reactive drag state for Vue nodes in the layout store and update the selection toolbox composable and Vue node component to use this state. **Selection toolbox behavior improvements:** * Added a helper function and separate watchers in `useSelectionToolboxPosition.ts` to hide the selection toolbox when either LiteGraph or Vue nodes are being dragged. This ensures consistent UI feedback regardless of node type. [[1]](diffhunk://#diff-57a51ac5e656e64ae7fd276d71b115058631621755de33b1eb8e8a4731d48713L171-R172) [[2]](diffhunk://#diff-57a51ac5e656e64ae7fd276d71b115058631621755de33b1eb8e8a4731d48713R212-R224) **Vue node drag state management:** * Added a reactive `isDraggingVueNodes` property to the `LayoutStoreImpl` class, along with getter and setter methods to manage Vue node drag state. This allows other components to reactively track when Vue nodes are being dragged. [[1]](diffhunk://#diff-80d32fe0fb72730c16cf7259adef8b20732ff214df240b1d39ae516737beaf3bR133-R135) [[2]](diffhunk://#diff-80d32fe0fb72730c16cf7259adef8b20732ff214df240b1d39ae516737beaf3bR354-R367) * Updated `LGraphNode.vue` to set and clear the Vue node dragging state in the layout store during pointer down and up events, ensuring the selection toolbox is hidden while dragging Vue nodes. [[1]](diffhunk://#diff-a7744614cf842e54416047326db79ad81f7c7ab7bfb66ae2b46f5c73ac7d47f2R357-R360) [[2]](diffhunk://#diff-a7744614cf842e54416047326db79ad81f7c7ab7bfb66ae2b46f5c73ac7d47f2R376-R378) **Dependency updates:** * Imported the `layoutStore` in `LGraphNode.vue` to access the new drag state management methods. * Added missing `ref` import in `layoutStore.ts` to support the new reactive property. https://github.com/user-attachments/assets/d6e9c15e-63b5-4de2-9688-ebbc6a3be545 --------- Co-authored-by: GitHub Action <action@github.com>
259 lines
7.7 KiB
TypeScript
259 lines
7.7 KiB
TypeScript
import { computed, onUnmounted, ref, watch } from 'vue'
|
|
import type { Ref } from 'vue'
|
|
|
|
import { useCanvasTransformSync } from '@/composables/canvas/useCanvasTransformSync'
|
|
import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems'
|
|
import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
|
|
import type { ReadOnlyRect } from '@/lib/litegraph/src/interfaces'
|
|
import { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
|
|
import { isLGraphGroup, isLGraphNode } from '@/utils/litegraphUtil'
|
|
import { computeUnionBounds } from '@/utils/mathUtil'
|
|
|
|
/**
|
|
* Manages the position of the selection toolbox independently.
|
|
* Uses CSS custom properties for performant transform updates.
|
|
*/
|
|
|
|
// Shared signals for auxiliary UI (e.g., MoreOptions) to coordinate hide/restore
|
|
export const moreOptionsOpen = ref(false)
|
|
export const forceCloseMoreOptionsSignal = ref(0)
|
|
export const restoreMoreOptionsSignal = ref(0)
|
|
export const moreOptionsRestorePending = ref(false)
|
|
let moreOptionsWasOpenBeforeDrag = false
|
|
let moreOptionsSelectionSignature: string | null = null
|
|
|
|
function buildSelectionSignature(
|
|
store: ReturnType<typeof useCanvasStore>
|
|
): string | null {
|
|
const c = store.canvas
|
|
if (!c) return null
|
|
const items = Array.from(c.selectedItems)
|
|
if (items.length !== 1) return null
|
|
const item = items[0]
|
|
if (isLGraphNode(item)) return `N:${item.id}`
|
|
if (isLGraphGroup(item)) return `G:${item.id}`
|
|
return null
|
|
}
|
|
|
|
function currentSelectionMatchesSignature(
|
|
store: ReturnType<typeof useCanvasStore>
|
|
) {
|
|
if (!moreOptionsSelectionSignature) return false
|
|
return buildSelectionSignature(store) === moreOptionsSelectionSignature
|
|
}
|
|
|
|
export function useSelectionToolboxPosition(
|
|
toolboxRef: Ref<HTMLElement | undefined>
|
|
) {
|
|
const canvasStore = useCanvasStore()
|
|
const lgCanvas = canvasStore.getCanvas()
|
|
const { getSelectableItems } = useSelectedLiteGraphItems()
|
|
const { shouldRenderVueNodes } = useVueFeatureFlags()
|
|
|
|
// World position of selection center
|
|
const worldPosition = ref({ x: 0, y: 0 })
|
|
|
|
const visible = ref(false)
|
|
|
|
/**
|
|
* Update position based on selection
|
|
*/
|
|
const updateSelectionBounds = () => {
|
|
const selectableItems = getSelectableItems()
|
|
|
|
if (!selectableItems.size) {
|
|
visible.value = false
|
|
return
|
|
}
|
|
|
|
visible.value = true
|
|
|
|
// Get bounds for all selected items
|
|
const allBounds: ReadOnlyRect[] = []
|
|
for (const item of selectableItems) {
|
|
// Skip items without valid IDs
|
|
if (item.id == null) continue
|
|
|
|
if (shouldRenderVueNodes.value && typeof item.id === 'string') {
|
|
// Use layout store for Vue nodes (only works with string IDs)
|
|
const layout = layoutStore.getNodeLayoutRef(item.id).value
|
|
if (layout) {
|
|
allBounds.push([
|
|
layout.bounds.x,
|
|
layout.bounds.y,
|
|
layout.bounds.width,
|
|
layout.bounds.height
|
|
])
|
|
}
|
|
} else {
|
|
// Fallback to LiteGraph bounds for regular nodes or non-string IDs
|
|
if (item instanceof LGraphNode) {
|
|
const bounds = item.getBounding()
|
|
allBounds.push([bounds[0], bounds[1], bounds[2], bounds[3]] as const)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Compute union bounds
|
|
const unionBounds = computeUnionBounds(allBounds)
|
|
if (!unionBounds) return
|
|
|
|
worldPosition.value = {
|
|
x: unionBounds.x + unionBounds.width / 2,
|
|
// createBounds() applied a default padding of 10px
|
|
// so adjust Y to maintain visual consistency
|
|
y: unionBounds.y - 10
|
|
}
|
|
|
|
updateTransform()
|
|
}
|
|
|
|
const updateTransform = () => {
|
|
if (!visible.value) return
|
|
|
|
const { scale, offset } = lgCanvas.ds
|
|
const canvasRect = lgCanvas.canvas.getBoundingClientRect()
|
|
|
|
const screenX =
|
|
(worldPosition.value.x + offset[0]) * scale + canvasRect.left
|
|
const screenY = (worldPosition.value.y + offset[1]) * scale + canvasRect.top
|
|
|
|
// Update CSS custom properties directly for best performance
|
|
if (toolboxRef.value) {
|
|
toolboxRef.value.style.setProperty('--tb-x', `${screenX}px`)
|
|
toolboxRef.value.style.setProperty('--tb-y', `${screenY}px`)
|
|
}
|
|
}
|
|
|
|
// Sync with canvas transform
|
|
const { startSync, stopSync } = useCanvasTransformSync(updateTransform, {
|
|
autoStart: false
|
|
})
|
|
|
|
// Watch for selection changes
|
|
watch(
|
|
() => canvasStore.getCanvas().state.selectionChanged,
|
|
(changed) => {
|
|
if (changed) {
|
|
if (moreOptionsRestorePending.value || moreOptionsSelectionSignature) {
|
|
moreOptionsRestorePending.value = false
|
|
moreOptionsWasOpenBeforeDrag = false
|
|
if (!moreOptionsOpen.value) {
|
|
moreOptionsSelectionSignature = null
|
|
} else {
|
|
moreOptionsSelectionSignature = buildSelectionSignature(canvasStore)
|
|
}
|
|
}
|
|
updateSelectionBounds()
|
|
canvasStore.getCanvas().state.selectionChanged = false
|
|
if (visible.value) {
|
|
startSync()
|
|
} else {
|
|
stopSync()
|
|
}
|
|
}
|
|
},
|
|
{ immediate: true }
|
|
)
|
|
watch(
|
|
() => moreOptionsOpen.value,
|
|
(v) => {
|
|
if (v) {
|
|
moreOptionsSelectionSignature = buildSelectionSignature(canvasStore)
|
|
} else if (!canvasStore.canvas?.state?.draggingItems) {
|
|
moreOptionsSelectionSignature = null
|
|
if (moreOptionsRestorePending.value)
|
|
moreOptionsRestorePending.value = false
|
|
}
|
|
}
|
|
)
|
|
|
|
const handleDragStateChange = (dragging: boolean) => {
|
|
if (dragging) {
|
|
handleDragStart()
|
|
return
|
|
}
|
|
|
|
handleDragEnd()
|
|
}
|
|
|
|
const handleDragStart = () => {
|
|
visible.value = false
|
|
|
|
// Early return if more options wasn't open
|
|
if (!moreOptionsOpen.value) {
|
|
moreOptionsRestorePending.value = false
|
|
moreOptionsWasOpenBeforeDrag = false
|
|
return
|
|
}
|
|
|
|
// Handle more options cleanup
|
|
const currentSig = buildSelectionSignature(canvasStore)
|
|
const selectionChanged = currentSig !== moreOptionsSelectionSignature
|
|
|
|
if (selectionChanged) {
|
|
moreOptionsSelectionSignature = null
|
|
}
|
|
moreOptionsOpen.value = false
|
|
moreOptionsWasOpenBeforeDrag = true
|
|
moreOptionsRestorePending.value = !!moreOptionsSelectionSignature
|
|
|
|
if (moreOptionsRestorePending.value) {
|
|
forceCloseMoreOptionsSignal.value++
|
|
return
|
|
}
|
|
|
|
moreOptionsWasOpenBeforeDrag = false
|
|
}
|
|
|
|
const handleDragEnd = () => {
|
|
requestAnimationFrame(() => {
|
|
updateSelectionBounds()
|
|
|
|
const selectionMatches = currentSelectionMatchesSignature(canvasStore)
|
|
const shouldRestore =
|
|
moreOptionsWasOpenBeforeDrag &&
|
|
visible.value &&
|
|
moreOptionsRestorePending.value &&
|
|
selectionMatches
|
|
|
|
// Single point of assignment for each ref
|
|
moreOptionsRestorePending.value =
|
|
shouldRestore && moreOptionsRestorePending.value
|
|
moreOptionsWasOpenBeforeDrag = false
|
|
|
|
if (shouldRestore) {
|
|
restoreMoreOptionsSignal.value++
|
|
}
|
|
})
|
|
}
|
|
|
|
// Unified dragging state - combines both LiteGraph and Vue node dragging
|
|
const isDragging = computed((): boolean => {
|
|
const litegraphDragging = canvasStore.canvas?.state?.draggingItems ?? false
|
|
const vueNodeDragging =
|
|
shouldRenderVueNodes.value && layoutStore.isDraggingVueNodes.value
|
|
return litegraphDragging || vueNodeDragging
|
|
})
|
|
|
|
watch(isDragging, handleDragStateChange)
|
|
|
|
onUnmounted(() => {
|
|
resetMoreOptionsState()
|
|
})
|
|
|
|
return {
|
|
visible
|
|
}
|
|
}
|
|
|
|
// External cleanup utility to be called when SelectionToolbox component unmounts
|
|
function resetMoreOptionsState() {
|
|
moreOptionsOpen.value = false
|
|
moreOptionsRestorePending.value = false
|
|
moreOptionsWasOpenBeforeDrag = false
|
|
moreOptionsSelectionSignature = null
|
|
}
|