react-native-maps 1.21.0-alpha.115 → 1.21.0-alpha.117

package/ios/AirMaps/FabricPlaceholders/PlaceHolderGoogleMapView.mm

@@ -0,0 +1,68 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <react/renderer/components/RNMapsSpecs/ComponentDescriptors.h>
+#import <react/renderer/components/RNMapsSpecs/EventEmitters.h>
+#import <react/renderer/components/RNMapsSpecs/Props.h>
+#import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderGoogleMapView.h"
+
+using namespace facebook::react;
+
+
+@implementation RNMapsGoogleMapView
+
+
+#pragma mark - JS Commands
+- (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration{
+}
+- (void)setCamera:(NSString *)cameraJSON{
+}
+
+- (void)animateCamera:(NSString *)cameraJSON duration:(NSInteger)duration{
+}
+
+- (void)fitToElements:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+
+- (void)fitToSuppliedMarkers:(NSString *)markersJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+}
+- (void)fitToCoordinates:(NSString *)coordinatesJSON edgePaddingJSON:(NSString *)edgePaddingJSON animated:(BOOL)animated {
+
+}
+- (void) setIndoorActiveLevelIndex:(NSInteger)activeLevelIndex
+{
+
+}
+
+#pragma mark - Native commands
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+}
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNMapsGoogleMapViewComponentDescriptor>();
+}
+
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGoogleMapViewCls(void)
+{
+    return RNMapsGoogleMapView.class;
+}
+
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.h

@@ -0,0 +1,25 @@
+//
+//  RNMapsGoogleMapView.h
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+
+NS_ASSUME_NONNULL_BEGIN
+@interface RNMapsGooglePolygonView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+#endif

package/ios/AirMaps/FabricPlaceholders/PlaceHolderPolygonView.mm

@@ -0,0 +1,43 @@
+//
+//  RNMapsGoogleMapView.mm
+//
+//
+//  Created by Salah Ghanim on 23.11.24.
+//  Copyright © 2024 react-native-maps. All rights reserved.
+//
+#include "RNMapsDefines.h"
+
+#if HAVE_GOOGLE_MAPS == 0
+
+#import <react/renderer/components/RNMapsSpecs/ComponentDescriptors.h>
+#import <react/renderer/components/RNMapsSpecs/EventEmitters.h>
+#import <react/renderer/components/RNMapsSpecs/Props.h>
+#import <react/renderer/components/RNMapsSpecs/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTConversions.h>
+#import "PlaceHolderPolygonView.h"
+
+using namespace facebook::react;
+
+
+@interface RNMapsGooglePolygonView () <RCTRNMapsGooglePolygonViewProtocol>
+@end
+
+@implementation RNMapsGooglePolygonView
+
+
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<RNMapsGooglePolygonComponentDescriptor>();
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RNMapsGooglePolygonCls(void)
+{
+    return RNMapsGooglePolygonView.class;
+}
+
+#endif

package/ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h

@@ -13,10 +13,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol RCTRNMapsCircleViewProtocol <NSObject>
-
-@end
-
 @protocol RCTRNMapsGoogleMapViewViewProtocol <NSObject>
 - (void)animateToRegion:(NSString *)regionJSON duration:(NSInteger)duration;
 - (void)setCamera:(NSString *)cameraJSON;
@@ -592,12 +588,4 @@ if ([commandName isEqualToString:@"redraw"]) {
 #endif
 }
 
-@protocol RCTRNMapsOverlayViewProtocol <NSObject>
-
-@end
-
-@protocol RCTRNMapsPolylineViewProtocol <NSObject>
-
-@end
-
 NS_ASSUME_NONNULL_END

package/ios/generated/ReactAppDependencyProvider.podspec

@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-version = "0.77.1"
+version = "0.77.2"
 source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.

package/package.json

@@ -2,10 +2,10 @@
   "name": "react-native-maps",
   "description": "React Native Mapview component for iOS + Android",
   "source": "src/index",
-  "main": "lib/index.js",
+  "main": "src/index.ts",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.115",
+  "version": "1.21.0-alpha.117",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -17,11 +17,10 @@
     "release": "semantic-release",
     "bundle-install": "cd example && bundle install",
     "pod-install": "cd example/ios && bundle exec pod install",
-    "bootstrap": "yarn --cwd example && yarn && yarn bundle-install && yarn pod-install",
-    "prepack": "node updateCodegenConfig.js"
+    "bootstrap": "yarn --cwd example && yarn && yarn bundle-install && yarn pod-install"
   },
   "files": [
-    "lib",
+    "src",
     "android",
     "ios",
     "react-native-maps-generated.podspec",
@@ -48,7 +47,7 @@
   ],
   "peerDependencies": {
     "react": ">= 18.3.1",
-    "react-native": ">= 0.77.1",
+    "react-native": ">= 0.76.0",
     "react-native-web": ">= 0.11"
   },
   "peerDependenciesMeta": {
@@ -57,22 +56,21 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.26.9",
-    "@babel/preset-env": "^7.26.9",
-    "@babel/runtime": "^7.26.9",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/runtime": "^7.25.0",
     "@commitlint/cli": "17.6.1",
     "@commitlint/config-conventional": "17.6.1",
-    "@react-native-community/cli": "15.1.3",
-    "@react-native/babel-preset": "0.77.1",
-    "@react-native/eslint-config": "0.77.1",
-    "@react-native/metro-config": "0.77.1",
-    "@react-native/typescript-config": "0.77.1",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native/babel-preset": "0.76.8",
+    "@react-native/eslint-config": "0.76.8",
+    "@react-native/metro-config": "0.76.8",
+    "@react-native/typescript-config": "0.76.8",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@types/jest": "29.5.14",
     "@types/react": "^18.2.6",
-    "@types/react-native": "0.73.0",
     "@types/react-test-renderer": "^18.0.0",
+    "babel-jest": "^29.6.3",
     "eslint": "^8.19.0",
     "husky": "8.0.3",
     "jest": "^29.6.3",
@@ -96,10 +94,10 @@
   "codegenConfig": {
     "name": "RNMapsSpecs",
     "type": "all",
-    "jsSrcsDir": "./lib/specs",
+    "jsSrcsDir": "./src/specs",
     "outputDir": {
       "ios": "ios/generated",
-      "android": "android/generated"
+      "android": "android/src/generated"
     },
     "includesGeneratedCode": true,
     "android": {

package/react-native-google-maps.podspec

@@ -22,4 +22,33 @@ Pod::Spec.new do |s|
   s.dependency 'Google-Maps-iOS-Utils', '6.1.0'
   s.dependency 'react-native-maps-generated'
   install_modules_dependencies(s)
+
+   # Add script phase to detect Google Maps
+   s.script_phases = [
+      {
+        :name => 'Check react-native-google-maps Availability',
+        :script => %(
+          GOOGLE_MAPS_HEADER_PATH="$PODS_ROOT/Headers/Public/react-native-google-maps/GoogleMaps.h"
+          DEFINES_FILE="$CONFIGURATION_BUILD_DIR/react-native-maps/RNMapsDefines.h"
+
+          # Ensure the defines file directory exists
+          mkdir -p "$(dirname "$DEFINES_FILE")"
+
+          # Check if Google Maps header exists
+          if [ -f "$GOOGLE_MAPS_HEADER_PATH" ]; then
+            echo "#define HAVE_GOOGLE_MAPS 1" > "$DEFINES_FILE"
+            echo "Google Maps detected. HAVE_GOOGLE_MAPS defined."
+          else
+            echo "#define HAVE_GOOGLE_MAPS 0" > "$DEFINES_FILE"
+            echo "Google Maps not detected."
+          fi
+        ),
+        :execution_position => :before_compile
+      }
+    ]
+
+    # Add the generated defines header to the header search path
+    s.pod_target_xcconfig = {
+      'HEADER_SEARCH_PATHS' => '$(CONFIGURATION_BUILD_DIR)/react-native-maps'
+    }
 end

package/src/AnimatedRegion.ts

@@ -0,0 +1,169 @@
+import {Animated} from 'react-native';
+import {Region} from './sharedTypes';
+
+const AnimatedWithChildren = Object.getPrototypeOf(Animated.ValueXY);
+if (__DEV__) {
+  if (AnimatedWithChildren.name !== 'AnimatedWithChildren') {
+    console.error(
+      'AnimatedRegion could not obtain AnimatedWithChildren base class',
+    );
+  }
+}
+
+const configTypes: (keyof Region)[] = [
+  'latitude',
+  'longitude',
+  'latitudeDelta',
+  'longitudeDelta',
+];
+
+const defaultValues = {
+  // probably want to come up with better defaults
+  latitude: 0,
+  longitude: 0,
+  latitudeDelta: 0,
+  longitudeDelta: 0,
+};
+
+let _uniqueId = 1;
+
+type TValueIn = number | Animated.Value | undefined;
+
+type Props = Partial<Region> | undefined;
+
+const getAnimatedValue = (valueIn: TValueIn, fallback: number) => {
+  if (valueIn instanceof Animated.Value) {
+    return valueIn;
+  } else if (typeof valueIn === 'number') {
+    return new Animated.Value(valueIn);
+  }
+  return new Animated.Value(fallback);
+};
+
+export default class AnimatedMapRegion extends AnimatedWithChildren {
+  constructor(valueIn: Props = {}) {
+    super();
+    this.latitude = getAnimatedValue(valueIn.latitude, defaultValues.latitude);
+    this.longitude = getAnimatedValue(
+      valueIn.longitude,
+      defaultValues.longitude,
+    );
+    this.latitudeDelta = getAnimatedValue(
+      valueIn.latitudeDelta,
+      defaultValues.latitudeDelta,
+    );
+    this.longitudeDelta = getAnimatedValue(
+      valueIn.longitudeDelta,
+      defaultValues.longitudeDelta,
+    );
+    this._regionListeners = {};
+  }
+
+  setValue(value: Region) {
+    this.latitude._value = value.latitude;
+    this.longitude._value = value.longitude;
+    this.latitudeDelta._value = value.latitudeDelta;
+    this.longitudeDelta._value = value.longitudeDelta;
+  }
+
+  setOffset(offset: Region) {
+    this.latitude.setOffset(offset.latitude);
+    this.longitude.setOffset(offset.longitude);
+    this.latitudeDelta.setOffset(offset.latitudeDelta);
+    this.longitudeDelta.setOffset(offset.longitudeDelta);
+  }
+
+  flattenOffset() {
+    this.latitude.flattenOffset();
+    this.longitude.flattenOffset();
+    this.latitudeDelta.flattenOffset();
+    this.longitudeDelta.flattenOffset();
+  }
+
+  private __getValue() {
+    return {
+      latitude: this.latitude.__getValue(),
+      longitude: this.longitude.__getValue(),
+      latitudeDelta: this.latitudeDelta.__getValue(),
+      longitudeDelta: this.longitudeDelta.__getValue(),
+    };
+  }
+
+  private __attach() {
+    this.latitude.__addChild(this);
+    this.longitude.__addChild(this);
+    this.latitudeDelta.__addChild(this);
+    this.longitudeDelta.__addChild(this);
+  }
+
+  private __detach() {
+    this.latitude.__removeChild(this);
+    this.longitude.__removeChild(this);
+    this.latitudeDelta.__removeChild(this);
+    this.longitudeDelta.__removeChild(this);
+  }
+
+  stopAnimation(callback: (region: Region) => void) {
+    this.latitude.stopAnimation();
+    this.longitude.stopAnimation();
+    this.latitudeDelta.stopAnimation();
+    this.longitudeDelta.stopAnimation();
+    callback && callback(this.__getValue());
+  }
+
+  addListener(callback: (region: Region) => void) {
+    const id = String(_uniqueId++);
+    const jointCallback = () => /*{value}*/ callback(this.__getValue());
+    this._regionListeners[id] = {
+      latitude: this.latitude.addListener(jointCallback),
+      longitude: this.longitude.addListener(jointCallback),
+      latitudeDelta: this.latitudeDelta.addListener(jointCallback),
+      longitudeDelta: this.longitudeDelta.addListener(jointCallback),
+    };
+    return id;
+  }
+
+  removeListener(id: string) {
+    this.latitude.removeListener(this._regionListeners[id].latitude);
+    this.longitude.removeListener(this._regionListeners[id].longitude);
+    this.latitudeDelta.removeListener(this._regionListeners[id].latitudeDelta);
+    this.longitudeDelta.removeListener(
+      this._regionListeners[id].longitudeDelta,
+    );
+    delete this._regionListeners[id];
+  }
+
+  spring(config: Animated.SpringAnimationConfig & Region) {
+    const animations = [];
+    for (const type of configTypes) {
+      if (config.hasOwnProperty(type)) {
+        animations.push(
+          Animated.spring(this[type], {
+            ...config,
+            toValue: config[type],
+            // may help to eliminate some dev warnings and perf issues
+            useNativeDriver: !!config?.useNativeDriver,
+          }),
+        );
+      }
+    }
+    return Animated.parallel(animations);
+  }
+
+  timing(config: Animated.TimingAnimationConfig & Region) {
+    const animations = [];
+    for (const type of configTypes) {
+      if (config.hasOwnProperty(type)) {
+        animations.push(
+          Animated.timing(this[type], {
+            ...config,
+            toValue: config[type],
+            // may help to eliminate some dev warnings and perf issues
+            useNativeDriver: !!config?.useNativeDriver,
+          }),
+        );
+      }
+    }
+    return Animated.parallel(animations);
+  }
+}