From eb65b045a24faf0f9a3cd16dbd08b1881b512d60 Mon Sep 17 00:00:00 2001 From: Grant Sisson <109109647+grantsisson@users.noreply.github.com> Date: Sun, 28 Jul 2024 22:14:51 -0600 Subject: [PATCH] fix(android): keep layer reference when reordering --- .../com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt index e8f727fe0..be1a597f6 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXLayer.kt @@ -309,7 +309,9 @@ abstract class RNMBXLayer(protected var mContext: Context) : Abstrac val layer = mLayer if (layer != null) { it.removeStyleLayer(layer.layerId) - mLayer = null // see https://github.com/rnmapbox/maps/pull/3392 + if (reason != RemovalReason.REORDER) { + mLayer = null // see https://github.com/rnmapbox/maps/pull/3392 + } } else { Logger.e("RNMBXLayer","mLayer is null on removal layer from map") }