Skip to content

Commit 77ccc7e

Browse files
committed
chore(core): cleanup
1 parent 74cc767 commit 77ccc7e

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

packages/core/src/store/actions.ts

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -307,25 +307,27 @@ export function useActions(
307307
return elementSelectionHandler([], false)
308308
}
309309

310-
const { changedNodes, changedEdges } = elements.reduce(
311-
(acc, curr) => {
310+
const changes = elements.reduce(
311+
(changes, curr) => {
312312
const selectionChange = createSelectionChange(curr.id, false)
313+
313314
if (isNode(curr)) {
314-
acc.changedNodes.push(selectionChange)
315+
changes.nodes.push(selectionChange)
315316
} else {
316-
acc.changedEdges.push(selectionChange)
317+
changes.edges.push(selectionChange)
317318
}
318319

319-
return acc
320+
return changes
320321
},
321-
{ changedNodes: [] as NodeSelectionChange[], changedEdges: [] as EdgeSelectionChange[] },
322+
{ nodes: [] as NodeSelectionChange[], edges: [] as EdgeSelectionChange[] },
322323
)
323324

324-
if (changedNodes.length) {
325-
state.hooks.nodesChange.trigger(changedNodes)
325+
if (changes.nodes.length) {
326+
state.hooks.nodesChange.trigger(changes.nodes)
326327
}
327-
if (changedEdges.length) {
328-
state.hooks.edgesChange.trigger(changedEdges)
328+
329+
if (changes.edges.length) {
330+
state.hooks.edgesChange.trigger(changes.edges)
329331
}
330332
}
331333

@@ -456,7 +458,7 @@ export function useActions(
456458
)
457459
: nextEdges
458460

459-
const changes = validEdges.reduce((acc, param) => {
461+
const changes = validEdges.reduce((edgeChanges, param) => {
460462
const edge = addEdgeToStore(
461463
{
462464
...param,
@@ -475,21 +477,23 @@ export function useActions(
475477

476478
if (missingSource && missingTarget) {
477479
state.hooks.error.trigger(new VueFlowError(ErrorCode.EDGE_SOURCE_TARGET_MISSING, edge.id, edge.source, edge.target))
478-
} else {
479-
if (missingSource) {
480-
state.hooks.error.trigger(new VueFlowError(ErrorCode.EDGE_SOURCE_MISSING, edge.id, edge.source))
481-
}
482480

483-
if (missingTarget) {
484-
state.hooks.error.trigger(new VueFlowError(ErrorCode.EDGE_TARGET_MISSING, edge.id, edge.target))
485-
}
481+
return edgeChanges
486482
}
487483

488-
if (missingSource || missingTarget) {
489-
return acc
484+
if (missingSource) {
485+
state.hooks.error.trigger(new VueFlowError(ErrorCode.EDGE_SOURCE_MISSING, edge.id, edge.source))
486+
487+
return edgeChanges
490488
}
491489

492-
acc.push(
490+
if (missingTarget) {
491+
state.hooks.error.trigger(new VueFlowError(ErrorCode.EDGE_TARGET_MISSING, edge.id, edge.target))
492+
493+
return edgeChanges
494+
}
495+
496+
edgeChanges.push(
493497
createAdditionChange<GraphEdge>({
494498
...edge,
495499
sourceNode,
@@ -498,7 +502,7 @@ export function useActions(
498502
)
499503
}
500504

501-
return acc
505+
return edgeChanges
502506
}, [] as EdgeChange[])
503507

504508
if (changes.length) {
@@ -514,12 +518,7 @@ export function useActions(
514518
const edgeChanges: EdgeRemoveChange[] = []
515519

516520
function createEdgeRemovalChanges(nodes: Node[]) {
517-
const connections = getConnectedEdges(nodes, state.edges).filter((edge) => {
518-
if (isDef(edge.deletable)) {
519-
return edge.deletable
520-
}
521-
return true
522-
})
521+
const connections = getConnectedEdges(nodes, state.edges).filter((edge) => (isDef(edge.deletable) ? edge.deletable : true))
523522

524523
edgeChanges.push(...connections.map((connection) => createRemoveChange(connection.id)))
525524
}

0 commit comments

Comments
 (0)