From 2a53a6677709bf0a77a798723a4aebbb92a9992a Mon Sep 17 00:00:00 2001
From: g4rb4g3 <g4rb4g3@gmail.com>
Date: Sun, 1 Dec 2024 15:26:30 +0100
Subject: [PATCH 1/4] fix: memory not freed up when component mapview is
 unmounted

---
 ios/RNMBX/RNMBXMapView.swift | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ios/RNMBX/RNMBXMapView.swift b/ios/RNMBX/RNMBXMapView.swift
index 34248c843..5aa9db7d4 100644
--- a/ios/RNMBX/RNMBXMapView.swift
+++ b/ios/RNMBX/RNMBXMapView.swift
@@ -154,7 +154,23 @@ class RNMBXCameraChanged : RNMBXEvent, RCTEvent {
 }
 
 @objc(RNMBXMapView)
-open class RNMBXMapView: UIView {
+open class RNMBXMapView: UIView, RCTInvalidating {
+  
+  public func invalidate() {
+    self.removeAllFeaturesFromMap(reason: .ViewRemoval)
+
+#if RNMBX_11
+    cancelables.forEach { $0.cancel() }
+    cancelables.removeAll()
+#endif
+    
+    _mapView.gestures.delegate = nil
+    _mapView.removeFromSuperview()
+    _mapView = nil
+    
+    self.removeFromSuperview()
+  }
+  
   var imageManager: ImageManager = ImageManager()
 
   var tapDelegate: IgnoreRNMBXMakerViewGestureDelegate? = nil

From 8e3c897964192d68a1b5f76c3adf99c45a9c627b Mon Sep 17 00:00:00 2001
From: g4rb4g3 <g4rb4g3@gmail.com>
Date: Sun, 1 Dec 2024 16:40:21 +0100
Subject: [PATCH 2/4] add (un)mount to Show Map example

---
 example/src/examples/Map/ShowMap.tsx | 31 +++++++++++++++++++---------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/example/src/examples/Map/ShowMap.tsx b/example/src/examples/Map/ShowMap.tsx
index 3e0cea198..7c8db840d 100755
--- a/example/src/examples/Map/ShowMap.tsx
+++ b/example/src/examples/Map/ShowMap.tsx
@@ -15,9 +15,11 @@ const ShowMap = () => {
         data: (Mapbox.StyleURL as any)[key], // bad any, because enums
       };
     })
-    .sort(onSortOptions);
+    .sort(onSortOptions)
+    .concat({ data: 'mount', label: '(un)mount' });
 
   const [styleURL, setStyleURL] = useState({ styleURL: _mapOptions[0].data });
+  const [isMounted, setIsMounted] = useState(true);
 
   useEffect(() => {
     Mapbox.locationManager.start();
@@ -42,17 +44,26 @@ const ShowMap = () => {
         selectedIndex={_mapOptions.findIndex(
           (i) => i.data === styleURL.styleURL,
         )}
-        onPress={(index) => onMapChange(index, _mapOptions[index].data)}
+        onPress={(index) => {
+          const { data } = _mapOptions[index];
+          if (data === 'mount') {
+            setIsMounted((m) => !m);
+            return;
+          }
+          onMapChange(index, data);
+        }}
       />
-      <Mapbox.MapView
-        styleURL={styleURL.styleURL}
-        style={sheet.matchParent}
-        testID={'show-map'}
-      >
-        <Mapbox.Camera followZoomLevel={12} followUserLocation />
+      {isMounted ? (
+        <Mapbox.MapView
+          styleURL={styleURL.styleURL}
+          style={sheet.matchParent}
+          testID={'show-map'}
+        >
+          <Mapbox.Camera followZoomLevel={12} followUserLocation />
 
-        <Mapbox.UserLocation onPress={onUserMarkerPress} />
-      </Mapbox.MapView>
+          <Mapbox.UserLocation onPress={onUserMarkerPress} />
+        </Mapbox.MapView>
+      ) : null}
     </>
   );
 };

From e6cd84eda6289d755b028f57cbdac0ac5fc02c22 Mon Sep 17 00:00:00 2001
From: g4rb4g3 <g4rb4g3@gmail.com>
Date: Tue, 7 Jan 2025 10:03:44 +0100
Subject: [PATCH 3/4] update (un-)mount example

---
 example/src/examples/Map/MapUnMount.tsx | 51 +++++++++++++++++++++++++
 example/src/examples/Map/ShowMap.tsx    | 31 +++++----------
 example/src/examples/Map/index.js       |  1 +
 3 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100644 example/src/examples/Map/MapUnMount.tsx

diff --git a/example/src/examples/Map/MapUnMount.tsx b/example/src/examples/Map/MapUnMount.tsx
new file mode 100644
index 000000000..1d4882181
--- /dev/null
+++ b/example/src/examples/Map/MapUnMount.tsx
@@ -0,0 +1,51 @@
+import React, { useState, useEffect } from 'react';
+import Mapbox from '@rnmapbox/maps';
+import { Button } from '@rneui/base';
+
+import sheet from '../../styles/sheet';
+import { ExampleWithMetadata } from '../common/ExampleMetadata'; // exclude-from-doc
+
+const MapUnMount = () => {
+  const [isMounted, setIsMounted] = useState(true);
+
+  useEffect(() => {
+    Mapbox.locationManager.start();
+
+    return (): void => {
+      Mapbox.locationManager.stop();
+    };
+  }, []);
+
+  return (
+    <>
+      <Button
+        onPress={() => setIsMounted((mounted) => !mounted)}
+        title={isMounted ? 'unmount MapView' : 'mount MapView'}
+      />
+      {isMounted ? (
+        <Mapbox.MapView
+          styleURL={Mapbox.StyleURL.Dark}
+          style={sheet.matchParent}
+          testID={'show-map'}
+        >
+          <Mapbox.Camera followZoomLevel={12} followUserLocation />
+
+          <Mapbox.UserLocation />
+        </Mapbox.MapView>
+      ) : null}
+    </>
+  );
+};
+
+export default MapUnMount;
+
+/* end-example-doc */
+
+const metadata: ExampleWithMetadata['metadata'] = {
+  title: 'Map (un-)mount',
+  tags: [],
+  docs: `
+Showing and hiding the the map should not lead to increased memory consumption, use this example to check it on the profiler.
+`,
+};
+MapUnMount.metadata = metadata;
diff --git a/example/src/examples/Map/ShowMap.tsx b/example/src/examples/Map/ShowMap.tsx
index 7c8db840d..3e0cea198 100755
--- a/example/src/examples/Map/ShowMap.tsx
+++ b/example/src/examples/Map/ShowMap.tsx
@@ -15,11 +15,9 @@ const ShowMap = () => {
         data: (Mapbox.StyleURL as any)[key], // bad any, because enums
       };
     })
-    .sort(onSortOptions)
-    .concat({ data: 'mount', label: '(un)mount' });
+    .sort(onSortOptions);
 
   const [styleURL, setStyleURL] = useState({ styleURL: _mapOptions[0].data });
-  const [isMounted, setIsMounted] = useState(true);
 
   useEffect(() => {
     Mapbox.locationManager.start();
@@ -44,26 +42,17 @@ const ShowMap = () => {
         selectedIndex={_mapOptions.findIndex(
           (i) => i.data === styleURL.styleURL,
         )}
-        onPress={(index) => {
-          const { data } = _mapOptions[index];
-          if (data === 'mount') {
-            setIsMounted((m) => !m);
-            return;
-          }
-          onMapChange(index, data);
-        }}
+        onPress={(index) => onMapChange(index, _mapOptions[index].data)}
       />
-      {isMounted ? (
-        <Mapbox.MapView
-          styleURL={styleURL.styleURL}
-          style={sheet.matchParent}
-          testID={'show-map'}
-        >
-          <Mapbox.Camera followZoomLevel={12} followUserLocation />
+      <Mapbox.MapView
+        styleURL={styleURL.styleURL}
+        style={sheet.matchParent}
+        testID={'show-map'}
+      >
+        <Mapbox.Camera followZoomLevel={12} followUserLocation />
 
-          <Mapbox.UserLocation onPress={onUserMarkerPress} />
-        </Mapbox.MapView>
-      ) : null}
+        <Mapbox.UserLocation onPress={onUserMarkerPress} />
+      </Mapbox.MapView>
     </>
   );
 };
diff --git a/example/src/examples/Map/index.js b/example/src/examples/Map/index.js
index 2efafc53f..bb89c7d92 100644
--- a/example/src/examples/Map/index.js
+++ b/example/src/examples/Map/index.js
@@ -6,6 +6,7 @@ export { default as PointInMapView } from './PointInMapView';
 export { default as ShowAndHideLayer } from './ShowAndHideLayer';
 export { default as ShowClick } from './ShowClick';
 export { default as ShowMap } from './ShowMap';
+export { default as MapUnMount } from './MapUnMount';
 export { default as ShowMapLocalStyle } from './ShowMapLocalStyle';
 export { default as ShowRegionDidChange } from './ShowRegionDidChange';
 export { default as SourceLayerVisibility } from './SourceLayerVisibility';

From 7517b3423c6fc9ec702410c216ceb18add7a6a6f Mon Sep 17 00:00:00 2001
From: g4rb4g3 <g4rb4g3@gmail.com>
Date: Thu, 9 Jan 2025 15:38:29 +0100
Subject: [PATCH 4/4] generate

---
 docs/examples.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/examples.json b/docs/examples.json
index d0392162e..ccaf59dc8 100644
--- a/docs/examples.json
+++ b/docs/examples.json
@@ -260,6 +260,16 @@
         "relPath": "Map/MapAndRNNavigation.js",
         "name": "MapAndRNNavigation"
       },
+      {
+        "metadata": {
+          "title": "Map (un-)mount",
+          "tags": [],
+          "docs": "\nShowing and hiding the the map should not lead to increased memory consumption, use this example to check it on the profiler.\n"
+        },
+        "fullPath": "example/src/examples/Map/MapUnMount.tsx",
+        "relPath": "Map/MapUnMount.tsx",
+        "name": "MapUnMount"
+      },
       {
         "metadata": {
           "title": "Offline Example",