Update for React Native 0.78+ Compatibility: Enforce Stricter Kotlin Checks & Migrate to setViewTreeLifecycleOwner API V2

__tests__/__mocks__/react-native.mock.js

@@ -16,17 +16,21 @@ jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
   };
 });
 
+
 jest.mock('react-native/Libraries/Utilities/Platform', () => ({
-  OS: 'ios', // or 'android'
-  select: (x) => {
-    if (x.android) {
-      return x.android;
-    } else if (x.native) {
-      return x.native;
-    } else if (x.default) {
-      return x.default;
-    }
-  },
+  __esModule: true,
+  default: {
+    OS: 'ios', // or 'android'
+    select: (x) => {
+      if (x.android) {
+        return x.android;
+      } else if (x.native) {
+        return x.native;
+      } else if (x.default) {
+        return x.default;
+      }
+    },
+  }
 }));
 
 jest.mock('react-native/src/private/animated/NativeAnimatedHelper', () => ({

__tests__/components/BackgroundLayer.test.js

@@ -5,13 +5,11 @@ import BackgroundLayer from '../../src/components/BackgroundLayer';
 
 describe('BackgroundLayer', () => {
   test('renders correctly with default props', () => {
-    const { UNSAFE_root: backgroundLayer } = render(
+    const { root: backgroundLayer } = render(
       <BackgroundLayer id="requiredBackgroundLayerID" />,
     );
 
-    const { props } = backgroundLayer;
-
-    expect(props.sourceID).toStrictEqual('DefaultSourceID');
+    expect(backgroundLayer).toHaveProp('sourceID', 'DefaultSourceID');
   });
 
   test('renders correctly with custom props', () => {

__tests__/components/Callout.test.js

@@ -30,16 +30,16 @@ describe('Callout', () => {
         tipStyle: { height: 4 },
         textStyle: { height: 5 },
       };
-      const { UNSAFE_getByType, UNSAFE_getAllByType } = render(
+      const result = render(
         <Callout {...testProps} />,
       );
-
+      const { UNSAFE_getByType, UNSAFE_getAllByType } = result
       const callout = UNSAFE_getByType('RNMBXCallout');
       const views = UNSAFE_getAllByType(View);
       const text = UNSAFE_getByType(Text);
 
       const calloutWrapperTestStyle = callout.props.style[1].height;
-      const animatedViewTestStyle = views[0].props.style.height;
+      const animatedViewTestStyle = views[0].props.style[1].height;
       const wrapperViewTestStyle = views[1].props.style[1].height;
       const tipViewTestStyle = views[2].props.style[1].height;
       const textTestStyle = text.props.style[1].height;

__tests__/components/CircleLayer.test.js

@@ -5,12 +5,10 @@ import CircleLayer from '../../src/components/CircleLayer';
 
 describe('CircleLayer', () => {
   test('renders correctly with default props', () => {
-    const { UNSAFE_root: circleLayer } = render(
+    const { root: circleLayer } = render(
       <CircleLayer id="requiredCircleLayerID" />,
     );
-    const { props } = circleLayer;
-
-    expect(props.sourceID).toStrictEqual('DefaultSourceID');
+    expect(circleLayer).toHaveProp('sourceID', 'DefaultSourceID');
   });
 
   test('renders correctly with custom props', () => {

__tests__/components/HeatmapLayer.test.js

@@ -5,11 +5,10 @@ import HeatmapLayer from '../../src/components/HeatmapLayer';
 
 describe('HeatmapLayer', () => {
   test('renders correctly with default props', () => {
-    const { UNSAFE_root: heatmapLayer } = render(
+    const { root: heatmapLayer } = render(
       <HeatmapLayer id="requiredHeatmapLayerID" />,
     );
-    const { props } = heatmapLayer;
-    expect(props.sourceID).toStrictEqual('DefaultSourceID');
+    expect(heatmapLayer).toHaveProp('sourceID', 'DefaultSourceID');
   });
 
   test('renders correctly with custom props', () => {

__tests__/components/UserLocation.test.js

@@ -93,18 +93,20 @@
 
       render(<UserLocation onUpdate={onUpdateCallback} />);
 
-      locationManager._onUpdate({
-        coords: {
-          accuracy: 9.977999687194824,
-          altitude: 44.64373779296875,
-          heading: 251.5358428955078,
-          latitude: 51.5462244,
-          longitude: 4.1036916,
-          speed: 0.08543474227190018,
-          course: 251.5358428955078,
-        },
-        timestamp: 1573730357879,
-      });
+      act(() => {
+        locationManager._onUpdate({
+          coords: {
+            accuracy: 9.977999687194824,
+            altitude: 44.64373779296875,
+            heading: 251.5358428955078,
+            latitude: 51.5462244,
+            longitude: 4.1036916,
+            speed: 0.08543474227190018,
+            course: 251.5358428955078,
+          },
+          timestamp: 1573730357879,
+        });
+      })
 
       expect(onUpdateCallback).toHaveBeenCalled();
     });
@@ -168,7 +170,7 @@
       expect(ul.locationManagerRunning).toStrictEqual(false);
     });
 
     // TODO: replace object { running: boolean } argument with simple boolean
     describe('#setLocationManager', () => {
       test('called with "running" true', async () => {
         const lastKnownLocation = [4.1036916, 51.5462244];
@@ -176,7 +178,9 @@
 
         expect(ul.locationManagerRunning).toStrictEqual(false);
 
-        await ul.setLocationManager({ running: true });
+        await act(async () => {
+          await ul.setLocationManager({ running: true });
+        })
 
         expect(ul.locationManagerRunning).toStrictEqual(true);
         expect(locationManager.start).toHaveBeenCalledTimes(1);
@@ -192,11 +196,16 @@
       test('called with "running" false', async () => {
         // start
         expect(ul.locationManagerRunning).toStrictEqual(false);
-        await ul.setLocationManager({ running: true });
+        await act(async () => {
+          await ul.setLocationManager({ running: true });
+        })
+
         expect(ul.locationManagerRunning).toStrictEqual(true);
 
         // stop
-        await ul.setLocationManager({ running: false });
+        await act(async () => {
+          await ul.setLocationManager({ running: false });
+        })
 
         expect(ul.locationManagerRunning).toStrictEqual(false);
         // only once from start

__tests__/utils/animated/AnimatedCoordinatesArray.test.js

@@ -1,6 +1,7 @@
 import FakeTimers from '@sinonjs/fake-timers';
 import { Animated, Easing } from 'react-native';
 import TestRenderer from 'react-test-renderer';
+import { act } from '@testing-library/react-native';
 import React from 'react';
 
 import { AnimatedShape, AnimatedCoordinatesArray } from '../../../src/classes';
@@ -47,13 +48,15 @@ describe('AnimatedShapeSource', () => {
     ]);
 
     let shapeSourceRef;
-    // eslint-disable-next-line no-unused-vars
-    const testRenderer = TestRenderer.create(
-      <AnimatedShapeSource
-        shape={new AnimatedShape({ type: 'LineString', coordinates })}
-        ref={(ref) => (shapeSourceRef = ref)}
-      />,
-    );
+    act(() => {
+      // eslint-disable-next-line no-unused-vars
+      const testRenderer = TestRenderer.create(
+        <AnimatedShapeSource
+          shape={new AnimatedShape({ type: 'LineString', coordinates })}
+          ref={(ref) => (shapeSourceRef = ref)}
+        />,
+      );
+    });
     const setNativeProps = jest.fn();
     _nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
 
@@ -96,13 +99,15 @@ describe('AnimatedShapeSource', () => {
     ]);
 
     let shapeSourceRef;
-    // eslint-disable-next-line no-unused-vars
-    const testRenderer = TestRenderer.create(
-      <AnimatedShapeSource
-        shape={new AnimatedShape({ type: 'LineString', coordinates })}
-        ref={(ref) => (shapeSourceRef = ref)}
-      />,
-    );
+    act(() => {
+      // eslint-disable-next-line no-unused-vars
+      const testRenderer = TestRenderer.create(
+        <AnimatedShapeSource
+          shape={new AnimatedShape({ type: 'LineString', coordinates })}
+          ref={(ref) => (shapeSourceRef = ref)}
+        />,
+      );
+    })
     const setNativeProps = jest.fn();
     _nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
 
@@ -148,13 +153,15 @@ describe('AnimatedShapeSource', () => {
     ]);
 
     let shapeSourceRef;
-    // eslint-disable-next-line no-unused-vars
-    const testRenderer = TestRenderer.create(
-      <AnimatedShapeSource
-        shape={new AnimatedShape({ type: 'LineString', coordinates })}
-        ref={(ref) => (shapeSourceRef = ref)}
-      />,
-    );
+    act(() => {
+      // eslint-disable-next-line no-unused-vars
+      const testRenderer = TestRenderer.create(
+        <AnimatedShapeSource
+          shape={new AnimatedShape({ type: 'LineString', coordinates })}
+          ref={(ref) => (shapeSourceRef = ref)}
+        />,
+      );
+    })
     const setNativeProps = jest.fn();
     _nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
 

android/build.gradle

@@ -77,6 +77,16 @@ android {
                     java.srcDirs += 'src/main/mapbox-v11-compat/v10'
                 }
                 java.srcDirs += 'src/main/rn-compat/rn75'
+
+                // Add lifecycle compatibility source sets
+                // Apps targeting SDK 35+ typically use Lifecycle 2.6+ which changed from getLifecycle() to lifecycle property
+                def targetSdk = safeExtGet("targetSdkVersion", 28)
+                if (targetSdk >= 35) {
+                    java.srcDirs += 'src/main/lifecycle-compat/v26'
+                } else {
+                    java.srcDirs += 'src/main/lifecycle-compat/v25'
+                }
+
                 if (safeExtGet("RNMapboxMapsUseV11", false)) {
                     logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
                 }

android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt

@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.view.View
 import com.facebook.react.bridge.*
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.viewmanagers.RNMBXImagesManagerInterface
@@ -15,7 +14,6 @@ import com.mapbox.maps.ImageStretches
 import com.rnmapbox.rnmbx.components.AbstractEventEmitter
 import com.rnmapbox.rnmbx.events.constants.EventKeys
 import com.rnmapbox.rnmbx.events.constants.eventMapOf
-import com.rnmapbox.rnmbx.rncompat.dynamic.*
 import com.rnmapbox.rnmbx.utils.ImageEntry
 import com.rnmapbox.rnmbx.utils.Logger
 import com.rnmapbox.rnmbx.utils.ResourceUtils
@@ -249,10 +247,14 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
                     Logger.e("RNMBXImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
                 } else {
                     val pair = array.getArray(i)
-                    if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
-                        Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                    if (pair != null) {
+                        if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
+                            Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                        } 
+                        result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
+                    } else {
+                        Logger.e("RNMBXImages", "each element of stretch should be an array but was null")
                     }
-                    result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
                 }
             }
             return result;

android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt

@@ -13,9 +13,6 @@ import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewTreeLifecycleOwner
 import com.facebook.react.bridge.*
 import com.mapbox.android.gestures.*
 import com.mapbox.bindgen.Value
@@ -76,6 +73,7 @@ import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
 import org.json.JSONException
 import org.json.JSONObject
 
+
 fun <T> MutableList<T>.removeIf21(predicate: (T) -> Boolean): Boolean {
     var removed = false
     val iterator = this.iterator()
@@ -99,86 +97,11 @@ enum class MapGestureType {
     Move,Scale,Rotate,Fling,Shove
 }
 
-/***
- * Mapbox's MapView observers lifecycle events see MapboxLifecyclePluginImpl - (ON_START, ON_STOP, ON_DESTROY)
- * We need to emulate those.
- */
-interface RNMBXLifeCycleOwner : LifecycleOwner {
-    fun handleLifecycleEvent(event: Lifecycle.Event)
-}
-
 fun interface Cancelable {
     fun cancel()
 }
 
-class RNMBXLifeCycle {
-    private var lifecycleOwner : RNMBXLifeCycleOwner? = null
-
-    fun onAttachedToWindow(view: View) {
-        if (lifecycleOwner == null) {
-            lifecycleOwner = object : RNMBXLifeCycleOwner {
-                private lateinit var lifecycleRegistry: LifecycleRegistry
-                init {
-                    lifecycleRegistry = LifecycleRegistry(this)
-                    lifecycleRegistry.currentState = Lifecycle.State.CREATED
-                }
-
-                override fun handleLifecycleEvent(event: Lifecycle.Event) {
-                    try {
-                        lifecycleRegistry.handleLifecycleEvent(event)
-                    } catch (e: RuntimeException) {
-                        Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
-                    }
-                }
-
-                override fun getLifecycle(): Lifecycle {
-                    return lifecycleRegistry
-                }
-            }
-            ViewTreeLifecycleOwner.set(view, lifecycleOwner);
-        }
-        lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
-    }
-
-    fun onDetachedFromWindow() {
-        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
-            return
-        }
-        lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
-    }
-
-    fun onDestroy() {
-        if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
-            lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
-        }
-        if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
-            lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_DESTROY)
-        }
-    }
-
-    fun getState() : Lifecycle.State {
-        return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED;
-    }
-
-    var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
-
-    fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
-        if (getState() == Lifecycle.State.STARTED) {
-            callback()
-            return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
-        } else {
-            attachedToWindowWaiters.add(callback)
-            return com.rnmapbox.rnmbx.components.mapview.Cancelable {
-                attachedToWindowWaiters.removeIf21 { it === callback }
-            }
-        }
-    }
-
-    fun afterAttachFromLooper() {
-        attachedToWindowWaiters.forEach { it() }
-        attachedToWindowWaiters.clear()
-    }
-}
+// RNMBXLifeCycle is now provided by lifecycle-compat layer
 
 data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var addedToMap: Boolean = false) {