github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-02-15 06:45:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): allow pasting of collapsed edges

Browse Source
This commit is contained in:
psychedelicious
2025-02-20 11:55:37 +10:00
parent 2a9f7b2e38
commit f1bc2ea962
2 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
invokeai/frontend/web/src/features/nodes/hooks/useNodeCopyPaste.ts
View File

@@ -16,8 +16,7 @@ import { findUnoccupiedPosition } from 'features/nodes/store/util/findUnoccupied
import { validateConnection } from 'features/nodes/store/util/validateConnection';
import type { AnyEdge, AnyNode } from 'features/nodes/types/invocation';
import { t } from 'i18next';
import { isEqual, isNil, uniqWith } from 'lodash-es';
import { assert } from 'tsafe';
import { isEqual, uniqWith } from 'lodash-es';
import { v4 as uuidv4 } from 'uuid';
const log = logger('workflows');
@@ -120,26 +119,54 @@ const _pasteSelection = (withEdgesToCopiedNodes?: boolean) => {
// Add new edges
copiedEdges.forEach((e) => {
const { source, sourceHandle, target, targetHandle } = e;
// We need a type guard here to work around reactflow types
assert(!isNil(sourceHandle));
assert(!isNil(targetHandle));
if (e.type === 'collapsed') {
const { type, source, target } = e;
// Our "collapsed" edges are between nodes and do not have handles, so we only need to validate that the source
// and target nodes exist.
if (
validationNodes.find((n) => n.id === e.source) === undefined ||
validationNodes.find((n) => n.id === e.target) === undefined
) {
log.warn(
{ edge: { type, source, target } },
`Invalid collapsed edge, cannot paste: ${t('nodes.missingSourceOrTargetNode')}`
);
return;
}
} else if (e.type === 'default') {
const { type, source, sourceHandle, target, targetHandle } = e;
// Validate the edge before adding it
const connectionErrorTKey = validateConnection(
{ source, sourceHandle, target, targetHandle },
validationNodes,
validationEdges,
templates,
null,
true
);
// If the edge is invalid, log a warning and skip it
if (connectionErrorTKey !== null) {
log.warn(
{ edge: { source, sourceHandle, target, targetHandle } },
`Invalid edge, cannot paste: ${t(connectionErrorTKey)}`
// Our "default" type edges always have handles, but the reactflow types don't seem to inherit this typing, so we
// need a type guard here. But these _should_ always be present.
if (!sourceHandle || !targetHandle) {
log.warn(
{ edge: { type, source, sourceHandle, target, targetHandle } },
`Invalid edge, cannot paste: ${t('nodes.missingSourceOrTargetHandle')}`
);
return;
}
// Validate the edge before adding it
const connectionErrorTKey = validateConnection(
{ source, sourceHandle, target, targetHandle },
validationNodes,
validationEdges,
templates,
null,
true
);
// If the edge is invalid, log a warning and skip it
if (connectionErrorTKey !== null) {
log.warn(
{ edge: { source, sourceHandle, target, targetHandle } },
`Invalid edge, cannot paste: ${t(connectionErrorTKey)}`
);
return;
}
} else {
// All our edges should be either "collapsed" or "default" type, so if we get here, something is wrong
const { type } = e;
log.warn({ edge: { type } }, `Invalid edge type, cannot paste`);
return;
}
edgeChanges.push({