Merge branch 'main' into next-release/v10.3
This commit is contained in:
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "react-flow-renderer",
|
"name": "react-flow-renderer",
|
||||||
"version": "10.2.3-next.3",
|
"version": "10.2.3",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "react-flow-renderer",
|
"name": "react-flow-renderer",
|
||||||
"version": "10.2.3-next.3",
|
"version": "10.2.3",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/runtime": "^7.17.9",
|
"@babel/runtime": "^7.17.9",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "react-flow-renderer",
|
"name": "react-flow-renderer",
|
||||||
"version": "10.2.3-next.3",
|
"version": "10.2.3",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14"
|
"node": ">=14"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,7 +2,16 @@ import { useCallback } from 'react';
|
|||||||
|
|
||||||
import useViewportHelper from './useViewportHelper';
|
import useViewportHelper from './useViewportHelper';
|
||||||
import { useStoreApi } from '../store';
|
import { useStoreApi } from '../store';
|
||||||
import { ReactFlowInstance, Instance, NodeAddChange, EdgeAddChange, NodeResetChange, EdgeResetChange } from '../types';
|
import {
|
||||||
|
ReactFlowInstance,
|
||||||
|
Instance,
|
||||||
|
NodeAddChange,
|
||||||
|
EdgeAddChange,
|
||||||
|
NodeResetChange,
|
||||||
|
EdgeResetChange,
|
||||||
|
NodeRemoveChange,
|
||||||
|
EdgeRemoveChange,
|
||||||
|
} from '../types';
|
||||||
|
|
||||||
export default function useReactFlow<NodeData = any, EdgeData = any>(): ReactFlowInstance<NodeData, EdgeData> {
|
export default function useReactFlow<NodeData = any, EdgeData = any>(): ReactFlowInstance<NodeData, EdgeData> {
|
||||||
const { initialized: viewportInitialized, ...viewportHelperFunctions } = useViewportHelper();
|
const { initialized: viewportInitialized, ...viewportHelperFunctions } = useViewportHelper();
|
||||||
@@ -37,7 +46,10 @@ export default function useReactFlow<NodeData = any, EdgeData = any>(): ReactFlo
|
|||||||
if (hasDefaultNodes) {
|
if (hasDefaultNodes) {
|
||||||
setNodes(nextNodes);
|
setNodes(nextNodes);
|
||||||
} else if (onNodesChange) {
|
} else if (onNodesChange) {
|
||||||
const changes = nextNodes.map((node) => ({ item: node, type: 'reset' } as NodeResetChange<NodeData>));
|
const changes =
|
||||||
|
nextNodes.length === 0
|
||||||
|
? nodes.map((node) => ({ type: 'remove', id: node.id } as NodeRemoveChange))
|
||||||
|
: nextNodes.map((node) => ({ item: node, type: 'reset' } as NodeResetChange<NodeData>));
|
||||||
onNodesChange(changes);
|
onNodesChange(changes);
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
@@ -49,7 +61,10 @@ export default function useReactFlow<NodeData = any, EdgeData = any>(): ReactFlo
|
|||||||
if (hasDefaultEdges) {
|
if (hasDefaultEdges) {
|
||||||
setEdges(nextEdges);
|
setEdges(nextEdges);
|
||||||
} else if (onEdgesChange) {
|
} else if (onEdgesChange) {
|
||||||
const changes = nextEdges.map((edge) => ({ item: edge, type: 'reset' } as EdgeResetChange<EdgeData>));
|
const changes =
|
||||||
|
nextEdges.length === 0
|
||||||
|
? edges.map((edge) => ({ type: 'remove', id: edge.id } as EdgeRemoveChange))
|
||||||
|
: nextEdges.map((edge) => ({ item: edge, type: 'reset' } as EdgeResetChange<EdgeData>));
|
||||||
onEdgesChange(changes);
|
onEdgesChange(changes);
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|||||||
Reference in New Issue
Block a user