up

clientIO · Geliogabalus · Feb 19, 2025 · Feb 21, 2025 · Feb 23, 2025 · Feb 23, 2025
commit bb09418401e5cc5100853fc7ce9d1798f2e6ba7c
diff --git a/packages/joint-core/src/dia/Cell.mjs b/packages/joint-core/src/dia/Cell.mjs
@@ -261,7 +261,7 @@ export const Cell = Model.extend({
 
             const sortedCells = opt.foregroundEmbeds ? cells : sortBy(cells, cell => cell.z());
 
-            const maxZ = graph.maxZIndex();
+            const maxZ = graph.maxZIndex(this.layer());
             let z = maxZ - cells.length + 1;
 
             const collection = graph.get('cells');
@@ -304,7 +304,7 @@ export const Cell = Model.extend({
 
             const sortedCells = opt.foregroundEmbeds ? cells : sortBy(cells, cell => cell.z());
 
-            let z = graph.minZIndex();
+            let z = graph.minZIndex(this.layer());
 
             var collection = graph.get('cells');
 

diff --git a/packages/joint-core/src/dia/Graph.mjs b/packages/joint-core/src/dia/Graph.mjs
@@ -366,18 +366,26 @@ export const Graph = Model.extend({
         return cell;
     },
 
-    minZIndex: function(layer) {
+    minZIndex: function(layerName) {
+        layerName = layerName || this.defaultLayerName;
+
         const layers = this.get('layers');
-        layer = layer || this.defaultLayerName;
+        const embeddingLayers = this.get('embeddingLayers');
+
+        const layer = layers[layerName] || embeddingLayers[layerName];
 
-        return layers[layer].minZIndex();
+        return layer.minZIndex();
     },
 
-    maxZIndex: function(layer) {
+    maxZIndex: function(layerName) {
+        layerName = layerName || this.defaultLayerName;
+
         const layers = this.get('layers');
-        layer = layer || this.defaultLayerName;
+        const embeddingLayers = this.get('embeddingLayers');
+
+        const layer = layers[layerName] || embeddingLayers[layerName];
 
-        return layers[layer].maxZIndex();
+        return layer.maxZIndex();
     },
 
     addCell: function(cell, opt) {