Fix scaleBarEnabled on new arch (#3554)

rnmapbox · Jun 29, 2024 · 55216db · 55216db
1 parent bdb97cb
commit 55216db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ios/RNMBX/RNMBXFabricPropConvert.h b/ios/RNMBX/RNMBXFabricPropConvert.h
@@ -21,11 +21,13 @@ NSDictionary* RNMBXPropConvert_Optional_NSDictionary(const folly::dynamic &dyn,
     _view.name = RNMBXPropConvert_Optional_BOOL_NSNumber(newViewProps.name, @#name); \
   }
 
-#define RNMBX_OPTIONAL_PROP_BOOL(name) \
+#define RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, viewName) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
-    _view.name = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
+    _view.viewName = RNMBXPropConvert_Optional_BOOL(newViewProps.name, @#name); \
   }
 
+#define RNMBX_OPTIONAL_PROP_BOOL(name) RNMBX_REMAP_OPTIONAL_PROP_BOOL(name, name)
+
 #define RNMBX_OPTIONAL_PROP_NSString(name) \
   if ((!oldProps.get() || oldViewProps.name != newViewProps.name) && !newViewProps.name.isNull()) { \
     _view.name = RNMBXPropConvert_Optional_NSString(newViewProps.name, @#name); \

diff --git a/ios/RNMBX/RNMBXMapViewComponentView.mm b/ios/RNMBX/RNMBXMapViewComponentView.mm
@@ -181,10 +181,7 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
         _view.reactCompassImage = compassImage;
     }
 
-    id scaleBarEnabled = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarEnabled);
-    if (scaleBarEnabled != nil) {
-        _view.reactScaleBarEnabled = scaleBarEnabled;
-    }
+    RNMBX_REMAP_OPTIONAL_PROP_BOOL(scaleBarEnabled, reactScaleBarEnabled)
 
     id scaleBarPosition = RNMBXConvertFollyDynamicToId(newViewProps.scaleBarPosition);
     if (scaleBarPosition != nil) {