react-native-maps 1.21.0-alpha.99 → 1.22.0

package/react-native-google-maps.podspec

@@ -0,0 +1,27 @@
+require 'json'
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+folly_config = get_folly_config()
+folly_compiler_flags = folly_config[:compiler_flags]
+
+Pod::Spec.new do |s|
+  s.name = "react-native-google-maps"
+  s.version = package['version']
+  s.summary = package["description"]
+  s.authors = package["author"]
+  s.homepage = package["homepage"]
+  s.license = package["license"]
+  s.platform = :ios, "15.1"
+  s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
+  s.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
+  s.resource_bundles = {
+   'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
+  }
+  s.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
+  s.dependency 'GoogleMaps', '9.3.0'
+  s.dependency 'Google-Maps-iOS-Utils', '6.1.0'
+  s.dependency 'react-native-maps-generated'
+  s.dependency 'react-native-maps'
+  install_modules_dependencies(s)
+
+end

package/react-native-maps-generated.podspec

@@ -0,0 +1,31 @@
+require 'json'
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+folly_config = get_folly_config()
+folly_compiler_flags = folly_config[:compiler_flags]
+
+Pod::Spec.new do |s|
+  s.name = "react-native-maps-generated"
+  s.version = package['version']
+  s.summary = package["description"]
+  s.authors = package["author"]
+  s.homepage = package["homepage"]
+  s.license = package["license"]
+  s.platform = :ios, "15.1"
+  s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
+  s.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
+  s.exclude_files = [
+    "ios/generated/RCTAppDependencyProvider.h",
+    "ios/generated/RCTAppDependencyProvider.mm",
+    "ios/generated/RCTThirdPartyComponentsProvider.h",
+    "ios/generated/RCTThirdPartyComponentsProvider.mm",
+    "ios/generated/RCTModulesConformingToProtocolsProvider.h",
+    "ios/generated/RCTModulesConformingToProtocolsProvider.mm",
+  ]
+  s.module_map = 'ios/generated/module.modulemap'
+  s.public_header_files = "ios/generated/**/*.h"
+  s.module_name = 'ReactNativeMapsGenerated'
+  s.compiler_flags = folly_compiler_flags
+  install_modules_dependencies(s)
+
+end

package/react-native-maps.podspec

@@ -4,6 +4,8 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 
+Pod::UI.puts "\e[32m[react-native-maps] Thank you for using react-native-maps ❤️! \n[react-native-maps] to help keep it maintained, please consider sponsoring at https://github.com/sponsors/salah-ghanim\e[0m"
+
 Pod::Spec.new do |s|
   s.name = "react-native-maps"
   s.version = package['version']
@@ -11,57 +13,61 @@ Pod::Spec.new do |s|
   s.authors = package["author"]
   s.homepage = package["homepage"]
   s.license = package["license"]
-  s.platform = :ios, "13.0"
+  s.platform = :ios, "15.1"
   s.source = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
 
-  # Define the default base subspec
-  s.default_subspec = 'base'
+  s.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
+  s.module_map = 'ios/AirMaps/module.modulemap'
+  s.public_header_files = [
+    'ios/AirMaps/UIView+AirMap.h',
+    'ios/AirMaps/RCTConvert+AirMap.h',
+  ]
+  s.module_name = 'ReactNativeMaps'
+  s.compiler_flags = folly_compiler_flags
+  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 => %(
+            set -x
+            echo "Running Google Maps detection script..."
+            DEFINES_DIR="${PODS_TARGET_SRCROOT}/ios/AirMaps"
+            DEFINES_FILE="${DEFINES_DIR}/RNMapsDefines.h"
+
+            # Standard path
+            GOOGLE_MAPS_STANDARD_PATH="$PODS_ROOT/Headers/Public/react-native-google-maps/AIRGoogleMap.h"
+
+            # Framework paths
+            GOOGLE_MAPS_FRAMEWORK_MODULE="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps.modulemap"
+            GOOGLE_MAPS_UMBRELLA_HEADER="$PODS_ROOT/Target Support Files/react-native-google-maps/react-native-google-maps-umbrella.h"
 
-  # Base subspec for standard maps
-  s.subspec 'base' do |sp|
-    sp.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
-    sp.dependency "React-Core"
-    sp.dependency "react-native-maps/generated"
-    sp.compiler_flags = folly_compiler_flags
-    install_modules_dependencies(sp)
-  end
+            echo "Checking standard path: $GOOGLE_MAPS_STANDARD_PATH"
+            echo "Checking framework module path: $GOOGLE_MAPS_FRAMEWORK_MODULE"
+            echo "Checking umbrella header path: $GOOGLE_MAPS_UMBRELLA_HEADER"
 
-  # Separate subspec for Google Maps support
-  s.subspec 'google-maps' do |sp|
-    sp.platform = :ios, "15.0"
-    sp.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
-    sp.resource_bundles = {
-      'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
-    }
-    sp.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
-    sp.dependency "react-native-maps/generated"
-    sp.dependency 'GoogleMaps', '9.3.0'
-    sp.dependency 'Google-Maps-iOS-Utils', '6.1.0'
-    install_modules_dependencies(sp)
-  end
+            # Check if Google Maps is available via any detection method
+            if [ -f "$GOOGLE_MAPS_STANDARD_PATH" ] || [ -f "$GOOGLE_MAPS_FRAMEWORK_MODULE" ] || [ -f "$GOOGLE_MAPS_UMBRELLA_HEADER" ]; 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
 
-  # Generated podspec as a subspec
-  s.subspec 'generated' do |sp|
-    sp.source_files = 'ios/generated/**/*.{h,m,mm,cpp}'
-    sp.exclude_files = [
-      'ios/generated/**/RCTAppDependencyProvider.{h,mm}',
-      'ios/generated/**/RCTThirdPartyComponentsProvider.{h,mm}',
-      'ios/generated/**/RCTModulesConformingToProtocolsProvider.{h,mm}'
-    ]
+            # Verify the file was written
+            if [ -f "$DEFINES_FILE" ]; then
+              echo "Successfully wrote to $DEFINES_FILE"
+              cat "$DEFINES_FILE"
+            else
+              echo "ERROR: Failed to write to $DEFINES_FILE"
+            fi
+          ),
+          :execution_position => :before_compile
+      }
+  ]
 
 
-    sp.public_header_files = [
-        'ios/generated/react-native-maps-generated-umbrella.h',
-        'ios/generated/RNMapsSpecs/ComponentDescriptors.h',
-        'ios/generated/RNMapsSpecs/EventEmitters.h',
-        'ios/generated/RNMapsSpecs/Props.h',
-        'ios/generated/RNMapsSpecs/RCTComponentViewHelpers.h',
-        'ios/generated/RNMapsSpecs/RNMapsSpecs.h'
-    ]
-    sp.header_mappings_dir = 'ios/generated'
-    sp.resource_bundles = {
-      'ReactNativeMapsPrivacy' => ['ios/PrivacyInfo.xcprivacy']
-    }
-    install_modules_dependencies(sp)
-  end
 end

package/react-native.config.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        cmakeListsPath: 'src/main/jni/CMakeLists.txt',
+      },
+    },
+  },
+};

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);
+  }
+}