alighasami/xyflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(nodes-z): groups start with z=2

Browse Source
This commit is contained in:
moklick
2021-11-09 16:32:02 +01:00
parent 8a2ac1e31e
commit f0e79c634a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "react-flow-renderer", "name": "react-flow-renderer",
"version": "10.0.0-next.13", "version": "10.0.0-next.14",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "react-flow-renderer", "name": "react-flow-renderer",
"version": "10.0.0-next.13", "version": "10.0.0-next.14",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.15.4", "@babel/runtime": "^7.15.4",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "react-flow-renderer", "name": "react-flow-renderer",
"version": "10.0.0-next.13", "version": "10.0.0-next.14",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
}, },
src/store/utils.ts
+3 -2
View File
@@ -36,6 +36,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
const parentNodes: ParentNodes = {}; const parentNodes: ParentNodes = {};
nodes.forEach((node) => { nodes.forEach((node) => {
const z = node.zIndex ? node.zIndex : node.dragging || node.selected ? 1000 : 0;
const internals: NodeInternalsItem = { const internals: NodeInternalsItem = {
...nodeInternals.get(node.id), ...nodeInternals.get(node.id),
id: node.id, id: node.id,
@@ -43,7 +44,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
height: node.height || null, height: node.height || null,
position: node.position, position: node.position,
positionAbsolute: node.position, positionAbsolute: node.position,
z: node.dragging || node.selected ? 1000 : node.zIndex || 0, z,
}; };
if (node.parentNode) { if (node.parentNode) {
internals.parentNode = node.parentNode; internals.parentNode = node.parentNode;
@@ -59,7 +60,7 @@ export function createNodeInternals(nodes: Node[], nodeInternals: NodeInternals)
let startingZ = updatedInternals.z || 0; let startingZ = updatedInternals.z || 0;
if (!startingZ) { if (!startingZ) {
if (parentNodes[node.id] && node.parentNode) { if (parentNodes[node.id]) {
startingZ = 2; startingZ = 2;
} else if (node.parentNode) { } else if (node.parentNode) {
startingZ = 1; startingZ = 1;