maplibre-gl-layer-control 0.17.0 → 0.17.1

package/dist/index.cjs

@@ -3743,22 +3743,33 @@ class LayerControl {
     const style = this.map.getStyle();
     if (!(style == null ? void 0 : style.layers)) return [];
     const mapLayerIds = style.layers.map((l) => l.id);
+    const indexById = new Map(mapLayerIds.map((id, i) => [id, i]));
     const userLayerIds = Object.keys(this.state.layerStates).filter(
       (id) => id !== "Background"
     );
-    const mapLibreLayers = userLayerIds.filter(
-      (id) => mapLayerIds.includes(id)
-    );
-    const customLayers = userLayerIds.filter(
-      (id) => {
-        var _a;
-        return ((_a = this.state.layerStates[id]) == null ? void 0 : _a.isCustomLayer) && !mapLayerIds.includes(id);
+    const mapIndexOf = (id) => {
+      var _a;
+      const direct = indexById.get(id);
+      if (direct !== void 0) return direct;
+      const nativeIds = (_a = this.customLayerRegistry) == null ? void 0 : _a.getNativeLayerIds(id);
+      if (nativeIds && nativeIds.length > 0) {
+        let best = -1;
+        for (const nativeId of nativeIds) {
+          const idx = indexById.get(nativeId);
+          if (idx !== void 0 && idx > best) best = idx;
+        }
+        if (best !== -1) return best;
       }
-    );
-    const sortedMapLibreLayers = mapLibreLayers.sort(
-      (a, b) => mapLayerIds.indexOf(b) - mapLayerIds.indexOf(a)
-    );
-    return [...customLayers, ...sortedMapLibreLayers];
+      return Number.POSITIVE_INFINITY;
+    };
+    return userLayerIds.map((id, insertionIndex) => ({
+      id,
+      insertionIndex,
+      mapIndex: mapIndexOf(id)
+    })).sort((a, b) => {
+      if (a.mapIndex !== b.mapIndex) return a.mapIndex > b.mapIndex ? -1 : 1;
+      return a.insertionIndex - b.insertionIndex;
+    }).map((entry) => entry.id);
   }
   /**
    * Check if a layer is a MapLibre layer (not a custom layer)