refactor(on-before-delete): async

This commit is contained in:
moklick
2023-12-23 15:19:32 +01:00
parent 84147be699
commit a75f461a5c
9 changed files with 21 additions and 19 deletions
+2 -2
View File
@@ -118,7 +118,7 @@ export default function useReactFlow<NodeType extends Node = Node, EdgeType exte
}, []);
const deleteElements = useCallback<Instance.DeleteElements>(
({ nodes: nodesToRemove = [], edges: edgesToRemove = [], onBeforeDelete }) => {
async ({ nodes: nodesToRemove = [], edges: edgesToRemove = [], onBeforeDelete }) => {
const {
nodes,
edges,
@@ -130,7 +130,7 @@ export default function useReactFlow<NodeType extends Node = Node, EdgeType exte
onEdgesChange,
onDelete,
} = store.getState();
const { nodes: matchingNodes, edges: matchingEdges } = getElementsToRemove({
const { nodes: matchingNodes, edges: matchingEdges } = await getElementsToRemove({
nodesToRemove,
edgesToRemove,
nodes,
+2 -2
View File
@@ -32,10 +32,10 @@ export namespace Instance {
NodeType,
EdgeType
>;
export type DeleteElements = (params: DeleteElementsOptions) => {
export type DeleteElements = (params: DeleteElementsOptions) => Promise<{
deletedNodes: Node[];
deletedEdges: Edge[];
};
}>;
export type GetIntersectingNodes<NodeType extends Node = Node> = (
node: NodeType | { id: Node['id'] } | Rect,
partially?: boolean,
@@ -51,7 +51,7 @@ export function useSvelteFlow(): {
nodesToRemove?: (Node | { id: Node['id'] })[],
edgesToRemove?: (Edge | { id: Edge['id'] })[],
onBeforeDelete?: OnBeforeDelete
) => { deletedNodes: Node[]; deletedEdges: Edge[] };
) => Promise<{ deletedNodes: Node[]; deletedEdges: Edge[] }>;
screenToFlowPosition: (position: XYPosition) => XYPosition;
flowToScreenPosition: (position: XYPosition) => XYPosition;
viewport: Writable<Viewport>;
@@ -201,12 +201,12 @@ export function useSvelteFlow(): {
return partiallyVisible || overlappingArea >= nodeRect.width * nodeRect.height;
},
deleteElements: (
deleteElements: async (
nodesToRemove: (Node | { id: Node['id'] })[] = [],
edgesToRemove: (Edge | { id: Edge['id'] })[] = [],
onBeforeDelete?: OnBeforeDelete
) => {
const { nodes: matchingNodes, edges: matchingEdges } = getElementsToRemove({
const { nodes: matchingNodes, edges: matchingEdges } = await getElementsToRemove({
nodesToRemove,
edgesToRemove,
nodes: get(nodes),
+2 -2
View File
@@ -208,14 +208,14 @@ export function createStore({
}
}
store.deleteKeyPressed.subscribe((deleteKeyPressed) => {
store.deleteKeyPressed.subscribe(async (deleteKeyPressed) => {
if (deleteKeyPressed) {
const nodes = get(store.nodes);
const edges = get(store.edges);
const selectedNodes = nodes.filter((node) => node.selected);
const selectedEdges = edges.filter((edge) => edge.selected);
const { nodes: matchingNodes, edges: matchingEdges } = getElementsToRemove({
const { nodes: matchingNodes, edges: matchingEdges } = await getElementsToRemove({
nodesToRemove: selectedNodes,
edgesToRemove: selectedEdges,
nodes,
+1 -1
View File
@@ -148,4 +148,4 @@ export type OnBeforeDelete = <NodeType extends NodeBase = NodeBase, EdgeType ext
}: {
nodes: NodeType[];
edges: EdgeType[];
}) => boolean | { nodes: NodeType[]; edges: EdgeType[] };
}) => Promise<boolean | { nodes: NodeType[]; edges: EdgeType[] }>;
+4 -4
View File
@@ -336,7 +336,7 @@ export function calcNextPosition<NodeType extends NodeBase>(
* @param param.onBeforeDelete - Callback to check which nodes and edges can be deleted
* @returns nodes: nodes that can be deleted, edges: edges that can be deleted
*/
export function getElementsToRemove<NodeType extends NodeBase = NodeBase, EdgeType extends EdgeBase = EdgeBase>({
export async function getElementsToRemove<NodeType extends NodeBase = NodeBase, EdgeType extends EdgeBase = EdgeBase>({
nodesToRemove = [],
edgesToRemove = [],
nodes,
@@ -348,10 +348,10 @@ export function getElementsToRemove<NodeType extends NodeBase = NodeBase, EdgeTy
nodes: NodeType[];
edges: EdgeType[];
onBeforeDelete?: OnBeforeDelete;
}): {
}): Promise<{
nodes: NodeType[];
edges: EdgeType[];
} {
}> {
const nodeIds = nodesToRemove.map((node) => node.id);
const matchingNodes: NodeType[] = [];
@@ -388,7 +388,7 @@ export function getElementsToRemove<NodeType extends NodeBase = NodeBase, EdgeTy
};
}
const onBeforeDeleteResult = onBeforeDelete({
const onBeforeDeleteResult = await onBeforeDelete({
nodes: matchingNodes,
edges: matchingEdges,
});