From dd5f3396d12d90f1f029a9769e4a563bc43f3117 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 24 Nov 2025 16:11:02 +0100 Subject: [PATCH] :bug: Fix problem with layout z-index --- frontend/src/app/render_wasm/api.cljs | 2 +- render-wasm/src/render.rs | 6 +++--- render-wasm/src/shapes/modifiers.rs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/render_wasm/api.cljs b/frontend/src/app/render_wasm/api.cljs index dcae37fd02..6646fdc0b1 100644 --- a/frontend/src/app/render_wasm/api.cljs +++ b/frontend/src/app/render_wasm/api.cljs @@ -739,7 +739,7 @@ (d/nilv align-self 0) is-absolute - (d/nilv z-index)))) + (d/nilv z-index 0)))) (defn clear-layout [] diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index d7fc7b30af..3875da7f00 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -1641,9 +1641,9 @@ impl RenderState { } children_ids.sort_by(|id1, id2| { - let z1 = tree.get(id1).map_or_else(|| 0, |s| s.z_index()); - let z2 = tree.get(id2).map_or_else(|| 0, |s| s.z_index()); - z1.cmp(&z2) + let z1 = tree.get(id1).map(|s| s.z_index()).unwrap_or(0); + let z2 = tree.get(id2).map(|s| s.z_index()).unwrap_or(0); + z2.cmp(&z1) }); } diff --git a/render-wasm/src/shapes/modifiers.rs b/render-wasm/src/shapes/modifiers.rs index c7ca3e5484..f090cf98a7 100644 --- a/render-wasm/src/shapes/modifiers.rs +++ b/render-wasm/src/shapes/modifiers.rs @@ -332,6 +332,7 @@ fn propagate_reflow( } _ => { // Other shapes don't have to be reflown + reflow_parent = true; } }