react-native-maps 0.31.1 → 1.0.0-alpha.1

package/plugin/build/ios.js

@@ -0,0 +1,176 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMapsCocoapods = exports.removeGoogleMapsAppDelegateInit = exports.addGoogleMapsAppDelegateInit = exports.removeGoogleMapsAppDelegateImport = exports.addGoogleMapsAppDelegateImport = exports.withMapsIOS = exports.MATCH_INIT = void 0;
+var ios_plugins_1 = require("@expo/config-plugins/build/plugins/ios-plugins");
+var generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
+exports.MATCH_INIT = /\bsuper\.application\(\w+?, didFinishLaunchingWithOptions: \w+?\)/g;
+var withMapsIOS = function (config, props) {
+    // Set in Info.plist
+    if (props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey) {
+        config = (0, ios_plugins_1.withInfoPlist)(config, function (conf) { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (!conf.ios) {
+                    conf.ios = {};
+                }
+                if (!conf.ios.infoPlist) {
+                    conf.ios.infoPlist = {};
+                }
+                conf.ios.infoPlist.GMSApiKey = props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey;
+                return [2 /*return*/, conf];
+            });
+        }); });
+    }
+    // Technically adds react-native-maps (Apple maps) and google maps.
+    config = withMapsCocoaPods(config, {
+        useGoogleMaps: !!(props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey),
+    });
+    // Adds/Removes AppDelegate setup for Google Maps API on iOS
+    config = withGoogleMapsAppDelegate(config, {
+        apiKey: props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey,
+    });
+    return config;
+};
+exports.withMapsIOS = withMapsIOS;
+function addGoogleMapsAppDelegateImport(src) {
+    var newSrc = ['#if canImport(GoogleMaps)', 'import GoogleMaps', '#endif'];
+    return (0, generateCode_1.mergeContents)({
+        tag: 'react-native-maps-import',
+        src: src,
+        newSrc: newSrc.join('\n'),
+        anchor: /@UIApplicationMain/,
+        offset: 0,
+        comment: '//',
+    });
+}
+exports.addGoogleMapsAppDelegateImport = addGoogleMapsAppDelegateImport;
+function removeGoogleMapsAppDelegateImport(src) {
+    return (0, generateCode_1.removeContents)({
+        tag: 'react-native-maps-import',
+        src: src,
+    });
+}
+exports.removeGoogleMapsAppDelegateImport = removeGoogleMapsAppDelegateImport;
+function addGoogleMapsAppDelegateInit(src, apiKey) {
+    var newSrc = [
+        '#if canImport(GoogleMaps)',
+        "GMSServices.provideAPIKey(\"".concat(apiKey, "\")"),
+        '#endif',
+    ];
+    return (0, generateCode_1.mergeContents)({
+        tag: 'react-native-maps-init',
+        src: src,
+        newSrc: newSrc.join('\n'),
+        anchor: exports.MATCH_INIT,
+        offset: 0,
+        comment: '//',
+    });
+}
+exports.addGoogleMapsAppDelegateInit = addGoogleMapsAppDelegateInit;
+function removeGoogleMapsAppDelegateInit(src) {
+    return (0, generateCode_1.removeContents)({
+        tag: 'react-native-maps-init',
+        src: src,
+    });
+}
+exports.removeGoogleMapsAppDelegateInit = removeGoogleMapsAppDelegateInit;
+/**
+ * @param src The contents of the Podfile.
+ * @returns Podfile with react-native-maps integration configured.
+ */
+function addMapsCocoapods(src, useGoogleMaps) {
+    var newSrc = '  rn_maps_path = File.dirname(`node --print "require.resolve(\'react-native-maps/package.json\')"`) \n';
+    if (useGoogleMaps) {
+        newSrc += "  pod 'react-native-google-maps', :path => rn_maps_path \n";
+    }
+    newSrc += "  pod 'react-native-maps-generated', :path => rn_maps_path \n";
+    return (0, generateCode_1.mergeContents)({
+        tag: 'react-native-maps',
+        src: src,
+        newSrc: newSrc,
+        anchor: /use_native_modules/,
+        offset: 0,
+        comment: '#',
+    });
+}
+exports.addMapsCocoapods = addMapsCocoapods;
+var withMapsCocoaPods = function (config, _a) {
+    var useGoogleMaps = _a.useGoogleMaps;
+    return (0, ios_plugins_1.withPodfile)(config, function (conf) { return __awaiter(void 0, void 0, void 0, function () {
+        var results;
+        return __generator(this, function (_a) {
+            try {
+                results = addMapsCocoapods(conf.modResults.contents, useGoogleMaps);
+            }
+            catch (error) {
+                if (error.code === 'ERR_NO_MATCH') {
+                    throw new Error("Cannot add react-native-maps to the project's ios/Podfile because it's malformed. Please report this with a copy of your project Podfile.");
+                }
+                throw error;
+            }
+            if (results.didMerge || results.didClear) {
+                conf.modResults.contents = results.contents;
+            }
+            return [2 /*return*/, conf];
+        });
+    }); });
+};
+var withGoogleMapsAppDelegate = function (config, _a) {
+    var apiKey = _a.apiKey;
+    return (0, ios_plugins_1.withAppDelegate)(config, function (conf) {
+        if (!apiKey) {
+            conf.modResults.contents = removeGoogleMapsAppDelegateImport(conf.modResults.contents).contents;
+            conf.modResults.contents = removeGoogleMapsAppDelegateInit(conf.modResults.contents).contents;
+            return conf;
+        }
+        if (conf.modResults.language !== 'swift') {
+            throw new Error("Cannot setup Google Maps because the project AppDelegate is not a supported language: ".concat(conf.modResults.language));
+        }
+        try {
+            conf.modResults.contents = addGoogleMapsAppDelegateImport(conf.modResults.contents).contents;
+            conf.modResults.contents = addGoogleMapsAppDelegateInit(conf.modResults.contents, apiKey).contents;
+        }
+        catch (error) {
+            if (error.code === 'ERR_NO_MATCH') {
+                throw new Error("Cannot add Google Maps to the project's AppDelegate because it's malformed. Please report this with a copy of your project AppDelegate.");
+            }
+            throw error;
+        }
+        return conf;
+    });
+};

package/plugin/build/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/react-native-maps.podspec

@@ -1,19 +1,122 @@
 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::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']
-  s.summary      = "React Native Mapview component for iOS + Android"
+  s.name = "react-native-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}" }
+
+  # Set module_name at the root spec level
+  s.module_name = 'ReactNativeMaps'
+
+  # Generated code subspec
+  s.subspec 'Generated' do |ss|
+    ss.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
+    ss.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",
+    ]
+    ss.public_header_files = "ios/generated/**/*.h"
+    ss.compiler_flags = folly_compiler_flags
+    install_modules_dependencies(ss)
+  end
+
+  # Main maps component
+  s.subspec 'Maps' do |ss|
+    ss.source_files = "ios/AirMaps/**/*.{h,m,mm,swift}"
+    ss.public_header_files = [
+      'ios/AirMaps/UIView+AirMap.h',
+      'ios/AirMaps/RCTConvert+AirMap.h',
+    ]
+    ss.compiler_flags = folly_compiler_flags
+    ss.dependency 'react-native-maps/Generated'
+    install_modules_dependencies(ss)
+     # Add script phase to detect Google Maps
+    ss.script_phases = [
+       {
+         :name => 'react-native-maps patches',
+         :script => %(
+           set -x
+           echo "Running Google Maps detection script..."
+           DEFINES_DIR="${PODS_TARGET_SRCROOT}/ios/AirMaps"
+           DEFINES_FILE="${DEFINES_DIR}/RNMapsDefines.h"
+
+           mkdir -p "$DEFINES_DIR"
+
+           if [ -d "$PODS_ROOT/GoogleMaps" ] && [ -d "$PODS_ROOT/Google-Maps-iOS-Utils" ]; then
+             echo "#define HAVE_GOOGLE_MAPS 1" > "$DEFINES_FILE"
+             echo "✅ Google Maps libraries detected. HAVE_GOOGLE_MAPS defined."
+           else
+             echo "#define HAVE_GOOGLE_MAPS 0" > "$DEFINES_FILE"
+             echo "❌ Google Maps libraries NOT detected. HAVE_GOOGLE_MAPS set to 0."
+           fi
+
+           if [ -f "$DEFINES_FILE" ]; then
+             echo "✅ Successfully wrote to $DEFINES_FILE"
+             cat "$DEFINES_FILE"
+           else
+             echo "❌ ERROR: Failed to write to $DEFINES_FILE"
+           fi
+
+             set -e
+                 echo "🔧 Patching @import GoogleMaps..."
+
+                 FILES=(
+                   "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMSMarker+GMUClusteritem.h"
+                   "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUGeoJSONParser.h"
+                   "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUPolygon.h"
+                   "$PODS_ROOT/Google-Maps-iOS-Utils/Sources/GoogleMapsUtilsObjC/include/GMUWeightedLatLng.h"
+                   "$PODS_ROOT/GoogleMaps/Maps/Sources/GMSEmpty.h"
+                 )
+
+                 for file in "${FILES[@]}"; do
+                   if [ -f "$file" ]; then
+                     if grep -q "@import GoogleMaps;" "$file"; then
+                       sed -i '' 's/@import GoogleMaps;/#import <GoogleMaps\\/GoogleMaps.h>/' "$file"
+                       echo "✅ Patched: $file"
+                     else
+                       echo "ℹ️ No @import in: $file"
+                     fi
+                   else
+                     echo "⚠️ Not found: $file"
+                   fi
+                 done
+         ),
+         :execution_position => :before_compile
+        }
+      ]
+  end
 
-  s.authors      = { "intelligibabble" => "leland.m.richardson@gmail.com" }
-  s.homepage     = "https://github.com/react-native-maps/react-native-maps#readme"
-  s.license      = "MIT"
-  s.platform     = :ios, "11.0"
+  # Google Maps subspec
+  s.subspec 'Google' do |ss|
+    ss.source_files = "ios/AirGoogleMaps/**/*.{h,m,mm,swift}"
+    ss.resource_bundles = {
+      'GoogleMapsPrivacy' => ['ios/AirGoogleMaps/Resources/GoogleMapsPrivacy.bundle']
+    }
+    # Fixed compiler flags to avoid -Wno warnings
+    ss.compiler_flags = folly_compiler_flags + ' -DHAVE_GOOGLE_MAPS=1 -DHAVE_GOOGLE_MAPS_UTILS=1'
+    ss.dependency 'GoogleMaps', '9.3.0'
+    ss.dependency 'Google-Maps-iOS-Utils', '6.1.0'
+    ss.dependency 'react-native-maps/Generated'
+    ss.dependency 'react-native-maps/Maps'
+    install_modules_dependencies(ss)
+  end
 
-  s.source       = { :git => "https://github.com/react-native-maps/react-native-maps.git", :tag=> "v#{s.version}" }
-  s.source_files  = "ios/AirMaps/**/*.{h,m}"
+  # By default, use the Maps subspec
+  s.default_subspec = 'Maps'
 
-  s.dependency 'React-Core'
 end

package/react-native.config.js

@@ -0,0 +1,15 @@
+/**
+ * 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.js → AnimatedRegion.ts}

@@ -1,15 +1,16 @@
-import { Animated } from 'react-native';
+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'
+      'AnimatedRegion could not obtain AnimatedWithChildren base class',
     );
   }
 }
 
-const configTypes = [
+const configTypes: (keyof Region)[] = [
   'latitude',
   'longitude',
   'latitudeDelta',
@@ -26,7 +27,11 @@ const defaultValues = {
 
 let _uniqueId = 1;
 
-const getAnimatedValue = (valueIn, fallback) => {
+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') {
@@ -36,32 +41,32 @@ const getAnimatedValue = (valueIn, fallback) => {
 };
 
 export default class AnimatedMapRegion extends AnimatedWithChildren {
-  constructor(valueIn = {}) {
+  constructor(valueIn: Props = {}) {
     super();
     this.latitude = getAnimatedValue(valueIn.latitude, defaultValues.latitude);
     this.longitude = getAnimatedValue(
       valueIn.longitude,
-      defaultValues.longitude
+      defaultValues.longitude,
     );
     this.latitudeDelta = getAnimatedValue(
       valueIn.latitudeDelta,
-      defaultValues.latitudeDelta
+      defaultValues.latitudeDelta,
     );
     this.longitudeDelta = getAnimatedValue(
       valueIn.longitudeDelta,
-      defaultValues.longitudeDelta
+      defaultValues.longitudeDelta,
     );
     this._regionListeners = {};
   }
 
-  setValue(value) {
+  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) {
+  setOffset(offset: Region) {
     this.latitude.setOffset(offset.latitude);
     this.longitude.setOffset(offset.longitude);
     this.latitudeDelta.setOffset(offset.latitudeDelta);
@@ -75,7 +80,7 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     this.longitudeDelta.flattenOffset();
   }
 
-  __getValue() {
+  private __getValue() {
     return {
       latitude: this.latitude.__getValue(),
       longitude: this.longitude.__getValue(),
@@ -84,21 +89,21 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     };
   }
 
-  __attach() {
+  private __attach() {
     this.latitude.__addChild(this);
     this.longitude.__addChild(this);
     this.latitudeDelta.__addChild(this);
     this.longitudeDelta.__addChild(this);
   }
 
-  __detach() {
+  private __detach() {
     this.latitude.__removeChild(this);
     this.longitude.__removeChild(this);
     this.latitudeDelta.__removeChild(this);
     this.longitudeDelta.__removeChild(this);
   }
 
-  stopAnimation(callback) {
+  stopAnimation(callback: (region: Region) => void) {
     this.latitude.stopAnimation();
     this.longitude.stopAnimation();
     this.latitudeDelta.stopAnimation();
@@ -106,7 +111,7 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     callback && callback(this.__getValue());
   }
 
-  addListener(callback) {
+  addListener(callback: (region: Region) => void) {
     const id = String(_uniqueId++);
     const jointCallback = () => /*{value}*/ callback(this.__getValue());
     this._regionListeners[id] = {
@@ -118,17 +123,17 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
     return id;
   }
 
-  removeListener(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
+      this._regionListeners[id].longitudeDelta,
     );
     delete this._regionListeners[id];
   }
 
-  spring(config) {
+  spring(config: Animated.SpringAnimationConfig & Region) {
     const animations = [];
     for (const type of configTypes) {
       if (config.hasOwnProperty(type)) {
@@ -138,14 +143,14 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
             toValue: config[type],
             // may help to eliminate some dev warnings and perf issues
             useNativeDriver: !!config?.useNativeDriver,
-          })
+          }),
         );
       }
     }
     return Animated.parallel(animations);
   }
 
-  timing(config) {
+  timing(config: Animated.TimingAnimationConfig & Region) {
     const animations = [];
     for (const type of configTypes) {
       if (config.hasOwnProperty(type)) {
@@ -155,7 +160,7 @@ export default class AnimatedMapRegion extends AnimatedWithChildren {
             toValue: config[type],
             // may help to eliminate some dev warnings and perf issues
             useNativeDriver: !!config?.useNativeDriver,
-          })
+          }),
         );
       }
     }