Drag/drop support for linear mode

Causes some border woes which need fixing
This commit is contained in:
Austin Mroz
2025-12-30 21:09:05 -08:00
parent 09021b605c
commit 1151350ee4
2 changed files with 50 additions and 5 deletions

View File

@@ -0,0 +1,37 @@
<script setup lang="ts">
import { ref } from 'vue'
import { cn } from '@/utils/tailwindUtil'
defineProps<{
onDragOver?: (e: DragEvent) => boolean
onDragDrop?: (e: DragEvent) => Promise<boolean> | boolean
dropIndicator?: { label?: string; iconClass?: string }
}>()
const canAcceptDrop = ref(false)
</script>
<template>
<drop-wrapper
v-if="onDragOver && onDragDrop"
:class="cn(canAcceptDrop && 'ring-1 ring-primary-500 bg-primary-500/10')"
@dragover.prevent="(e: DragEvent) => (canAcceptDrop = onDragOver!(e))"
@dragleave="canAcceptDrop = false"
@drop.stop.prevent="
(e: DragEvent) => {
onDragDrop!(e)
canAcceptDrop = false
}
"
>
<slot />
<div
v-if="dropIndicator"
class="flex flex-col items-center align-center border-dashed rounded-lg border grow-1 w-full border-border-subtle my-3"
>
<span v-if="dropIndicator.label" v-text="dropIndicator.label" />
<i v-if="dropIndicator.iconClass" :class="dropIndicator.iconClass" />
</div>
</drop-wrapper>
<slot v-else />
</template>

View File

@@ -35,6 +35,7 @@ import { useTelemetry } from '@/platform/telemetry'
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
import DropZone from '@/renderer/extensions/linearMode/DropZone.vue'
import NodeWidgets from '@/renderer/extensions/vueNodes/components/NodeWidgets.vue'
import WidgetInputNumberInput from '@/renderer/extensions/vueNodes/widgets/components/WidgetInputNumber.vue'
import { app } from '@/scripts/app'
@@ -84,7 +85,9 @@ const nodeDatas = computed(() => {
mode: 0,
selected: false,
executing: false,
widgets
widgets,
onDragOver: node.onDragOver,
onDragDrop: node.onDragDrop
}
}
return graphNodes.value
@@ -573,12 +576,17 @@ onKeyStroke('ArrowUp', gotoPreviousOutput)
<linear-widgets
class="grow-1 justify-start flex-col overflow-y-auto contain-size *:max-h-100 flex"
>
<NodeWidgets
<DropZone
v-for="nodeData of nodeDatas"
:key="nodeData.id"
:node-data
class="border-b-1 border-node-component-border pt-1 pb-2 last:border-none **:[.col-span-2]:grid-cols-1 not-has-[textarea]:flex-0"
/>
:on-drag-over="nodeData.onDragOver"
:on-drag-drop="nodeData.onDragDrop"
>
<NodeWidgets
:node-data
class="border-b-1 border-node-component-border pt-1 pb-2 last:border-none **:[.col-span-2]:grid-cols-1 not-has-[textarea]:flex-0"
/>
</DropZone>
</linear-widgets>
<linear-run-button
class="p-4 pb-6 border-t border-node-component-border"