migrate whole library to new arch

android/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLMarkerViewManager.kt

@@ -9,34 +9,51 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.MBXMapViewManagerDelegate
+import com.facebook.react.viewmanagers.MBXMarkerViewManagerDelegate
+import com.facebook.react.viewmanagers.MBXMarkerViewManagerInterface
 import com.mapbox.maps.ScreenCoordinate
 import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener
 import com.mapbox.maps.viewannotation.ViewAnnotationManager
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager
 
 class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLMarkerView?>(reactApplicationContext) {
+    AbstractEventEmitter<RCTMGLMarkerView>(reactApplicationContext), MBXMarkerViewManagerInterface<RCTMGLMarkerView> {
+    private val mDelegate: ViewManagerDelegate<RCTMGLMarkerView>
+
+    init {
+        mDelegate = MBXMarkerViewManagerDelegate<RCTMGLMarkerView, RCTMGLMarkerViewManager>(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RCTMGLMarkerView> {
+        return mDelegate
+    }
+
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @ReactProp(name = "coordinate")
-    fun setCoordinate(markerView: RCTMGLMarkerView, geoJSONStr: String?) {
+    override fun setCoordinate(markerView: RCTMGLMarkerView, geoJSONStr: String?) {
         markerView.setCoordinate(toPointGeometry(geoJSONStr))
     }
 
     @ReactProp(name = "anchor")
-    fun setAnchor(markerView: RCTMGLMarkerView, map: ReadableMap) {
-        markerView.setAnchor(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
+    override fun setAnchor(markerView: RCTMGLMarkerView, map: ReadableMap?) {
+        if (map != null) {
+            markerView.setAnchor(map.getDouble("x").toFloat(), map.getDouble("y").toFloat())
+        }
     }
 
     @ReactProp(name = "allowOverlap")
-    fun setAllowOverlap(markerView: RCTMGLMarkerView, allowOverlap: Boolean) {
+    override fun setAllowOverlap(markerView: RCTMGLMarkerView, allowOverlap: Boolean) {
         markerView.setAllowOverlap(allowOverlap)
     }
 
     @ReactProp(name = "isSelected")
-    fun setIsSelected(markerView: RCTMGLMarkerView, isSelected: Boolean) {
+    override fun setIsSelected(markerView: RCTMGLMarkerView, isSelected: Boolean) {
         markerView.setIsSelected(isSelected)
     }
 
@@ -50,7 +67,7 @@ class RCTMGLMarkerViewManager(reactApplicationContext: ReactApplicationContext)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLMarkerView"
+        const val REACT_CLASS = "MBXMarkerView"
 
         fun markerViewContainerSizeFixer(mapView: RCTMGLMapView, viewAnnotationManager: ViewAnnotationManager) {
             // see https://github.com/rnmapbox/maps/issues/2376

android/src/main/old-arch/com/facebook/react/viewmanagers/MBXMarkerViewManagerDelegate.java

@@ -0,0 +1,40 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXMarkerViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class MBXMarkerViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & MBXMarkerViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public MBXMarkerViewManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "coordinate":
+        mViewManager.setCoordinate(view, value == null ? null : (String) value);
+        break;
+      case "anchor":
+        mViewManager.setAnchor(view, (ReadableMap) value);
+        break;
+      case "allowOverlap":
+        mViewManager.setAllowOverlap(view, value == null ? false : (boolean) value);
+        break;
+      case "isSelected":
+        mViewManager.setIsSelected(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

android/src/main/old-arch/com/facebook/react/viewmanagers/MBXMarkerViewManagerInterface.java

@@ -0,0 +1,20 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* This file should be updated after modifying `MBXMarkerViewNativeComponent.ts`.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReadableMap;
+
+public interface MBXMarkerViewManagerInterface<T extends View> {
+  void setCoordinate(T view, @Nullable String value);
+  void setAnchor(T view, @Nullable ReadableMap value);
+  void setAllowOverlap(T view, boolean value);
+  void setIsSelected(T view, boolean value);
+}

docs/Images.md

@@ -41,15 +41,6 @@ any of the `Images` component of the Map.
 
 
 
-### id
-
-```tsx
-string
-```
-FIX ME NO DESCRIPTION
-
-
-
 ### children
 
 ```tsx

docs/docs.json

@@ -2114,13 +2114,6 @@
         "default": "none",
         "description": "Gets called when a Layer is trying to render an image whose key is not present in\nany of the `Images` component of the Map.\n*signature:*`(imageKey:string) => void`"
       },
-      {
-        "name": "id",
-        "required": false,
-        "type": "string",
-        "default": "none",
-        "description": "FIX ME NO DESCRIPTION"
-      },
       {
         "name": "children",
         "required": false,

example/ios/Podfile.lock

@@ -426,15 +426,14 @@ PODS:
     - React-perflogger (= 0.71.7)
   - RNCAsyncStorage (1.19.2):
     - React-Core
-
-  - rnmapbox-maps (10.0.14):
-    - MapboxMaps (~> 10.16.0)
+  - rnmapbox-maps (10.0.13-rc.1):
+    - MapboxMaps (~> 10.15.0)
     - React
     - React-Core
-    - rnmapbox-maps/DynamicLibrary (= 10.0.14)
+    - rnmapbox-maps/DynamicLibrary (= 10.0.13-rc.1)
     - Turf
-  - rnmapbox-maps/DynamicLibrary (10.0.14):
-    - MapboxMaps (~> 10.16.0)
+  - rnmapbox-maps/DynamicLibrary (10.0.13-rc.1):
+    - MapboxMaps (~> 10.15.0)
     - React
     - React-Core
     - Turf
@@ -676,7 +675,7 @@ SPEC CHECKSUMS:
   React-runtimeexecutor: c5c89f8f543842dd864b63ded1b0bbb9c9445328
   ReactCommon: dbfbe2f7f3c5ce4ce44f43f2fd0d5950d1eb67c5
   RNCAsyncStorage: f57e929cd7757f2cb3dd8186d123c09e8281a1ad
-  rnmapbox-maps: c778f0cb59634946d44dfaa354de4e63552d10ff
+  rnmapbox-maps: 52784eea1f6d2d4e19c5040e600ac351beba3c33
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8

fabricexample/index.js

@@ -4,7 +4,7 @@
 
 import {AppRegistry} from 'react-native';
 
-import App from './App';
+import App from './src/App';
 import {name as appName} from './app.json';
 
 AppRegistry.registerComponent(appName, () => App);

fabricexample/ios/Podfile

@@ -7,7 +7,7 @@ require Pod::Executable.execute_command('node', ['-p',
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 
-platform :ios, min_ios_version_supported
+platform :ios, '13.4'
 prepare_react_native_project!
 
 # If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
@@ -30,8 +30,6 @@ end
 
 ENV['RCT_NEW_ARCH_ENABLED'] = '1'
 
-use_modular_headers!
-
 target 'fabricexample' do
   config = use_native_modules!