react-native-maps 1.23.2 → 1.23.4

package/package.json

@@ -5,7 +5,7 @@
   "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.23.2",
+  "version": "1.23.4",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -25,8 +25,6 @@
     "ios",
     "app.plugin.js",
     "plugin/build",
-    "react-native-maps-generated.podspec",
-    "react-native-google-maps.podspec",
     "react-native-maps.podspec",
     "react-native.config.js",
     "!android/build",

package/plugin/build/ios.js

@@ -62,7 +62,7 @@ var withMapsIOS = function (config, props) {
     });
     // Adds/Removes AppDelegate setup for Google Maps API on iOS
     config = withGoogleMapsAppDelegate(config, {
-        apiKey: props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey,
+        apiKey: (props === null || props === void 0 ? void 0 : props.iosGoogleMapsApiKey) || null,
     });
     return config;
 };
@@ -111,14 +111,14 @@ function removeGoogleMapsAppDelegateInit(src) {
 exports.removeGoogleMapsAppDelegateInit = removeGoogleMapsAppDelegateInit;
 /**
  * @param src The contents of the Podfile.
+ * @param useGoogleMaps if GoogleMaps for iOS is used
  * @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/Google', :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,

package/src/createFabricMap.tsx

@@ -41,213 +41,217 @@ export interface FabricMapHandle {
 }
 
 const createFabricMap = (ViewComponent: React.ComponentType, Commands: any) => {
-  return forwardRef<FabricMapHandle, FabricMapViewProps>((props, ref) => {
-    const fabricRef = useRef<React.ElementRef<typeof ViewComponent>>(null);
+  return forwardRef<FabricMapHandle | null, FabricMapViewProps>(
+    (props, ref) => {
+      const fabricRef = useRef<React.ElementRef<typeof ViewComponent>>(null);
 
-    useImperativeHandle(ref, () => ({
-      async getMarkersFrames(onlyVisible: boolean) {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getMarkersFrames(
-            findNodeHandle(fabricRef.current) ?? -1,
-            onlyVisible,
-          );
-        } else {
-          throw new Error(
-            'getMarkersFrames is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      async getCoordinateForPoint(point: Point) {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getCoordinateForPoint(
-            findNodeHandle(fabricRef.current) ?? -1,
-            point,
-          );
-        } else {
-          throw new Error(
-            'getCoordinateForPoint is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      async getPointForCoordinate(coordinate: LatLng) {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getPointForCoordinate(
-            findNodeHandle(fabricRef.current) ?? -1,
-            coordinate,
-          );
-        } else {
-          throw new Error(
-            'getPointForCoordinate is not supported on this platform.',
-          );
-        }
-      },
-      async getAddressFromCoordinates(coordinate: LatLng) {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getAddressFromCoordinates(
-            findNodeHandle(fabricRef.current) ?? -1,
-            coordinate,
-          );
-        } else {
-          throw new Error(
-            'getAddressFromCoordinates is not supported on this platform',
-          );
-        }
-      },
-      async takeSnapshot(config: SnapshotOptions) {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.takeSnapshot(
-            findNodeHandle(fabricRef.current) ?? -1,
-            JSON.stringify(config),
-          );
-        } else {
-          throw new Error('takeSnapshot is only supported on iOS with Fabric.');
-        }
-      },
-      async getCamera() {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getCamera(
-            findNodeHandle(fabricRef.current) ?? -1,
-          );
-        } else {
-          throw new Error('getCamera is only supported on iOS with Fabric.');
-        }
-      },
-      async getMapBoundaries() {
-        if (fabricRef.current) {
-          return NativeAirMapsModule.getMapBoundaries(
-            findNodeHandle(fabricRef.current) ?? -1,
-          );
-        } else {
-          throw new Error(
-            'getMapBoundaries is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      animateToRegion(region: Region, duration: number) {
-        if (fabricRef.current) {
-          try {
-            Commands.animateToRegion(
-              fabricRef.current,
-              JSON.stringify(region),
-              duration,
-            );
-          } catch (error) {
-            throw new Error('Failed to animateToRegion');
+      useImperativeHandle(ref, () => ({
+        async getMarkersFrames(onlyVisible: boolean) {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getMarkersFrames(
+              findNodeHandle(fabricRef.current) ?? -1,
+              onlyVisible,
+            );
+          } else {
+            throw new Error(
+              'getMarkersFrames is only supported on iOS with Fabric.',
+            );
           }
-        } else {
-          throw new Error(
-            'animateToRegion is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      fitToElements(edgePadding: EdgePadding, animated: boolean) {
-        if (fabricRef.current) {
-          try {
-            Commands.fitToElements(
-              fabricRef.current,
-              JSON.stringify(edgePadding),
-              animated,
-            );
-          } catch (error) {
-            throw new Error('Failed to fitToElements');
+        },
+        async getCoordinateForPoint(point: Point) {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getCoordinateForPoint(
+              findNodeHandle(fabricRef.current) ?? -1,
+              point,
+            );
+          } else {
+            throw new Error(
+              'getCoordinateForPoint is only supported on iOS with Fabric.',
+            );
           }
-        } else {
-          throw new Error(
-            'fitToElements is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      fitToSuppliedMarkers(
-        markers: string[],
-        edgePadding: EdgePadding,
-        animated: boolean,
-      ) {
-        if (fabricRef.current) {
-          try {
-            Commands.fitToSuppliedMarkers(
-              fabricRef.current,
-              JSON.stringify(markers),
-              JSON.stringify(edgePadding),
-              animated,
-            );
-          } catch (error) {
-            throw new Error('Failed to fitToSuppliedMarkers');
+        },
+        async getPointForCoordinate(coordinate: LatLng) {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getPointForCoordinate(
+              findNodeHandle(fabricRef.current) ?? -1,
+              coordinate,
+            );
+          } else {
+            throw new Error(
+              'getPointForCoordinate is not supported on this platform.',
+            );
           }
-        } else {
-          throw new Error(
-            'fitToSuppliedMarkers is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      animateCamera(camera: Partial<Camera>, duration: number) {
-        if (fabricRef.current) {
-          try {
-            Commands.animateCamera(
-              fabricRef.current,
-              JSON.stringify(camera),
-              duration,
-            );
-          } catch (error) {
-            throw new Error('Failed to animateCamera');
+        },
+        async getAddressFromCoordinates(coordinate: LatLng) {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getAddressFromCoordinates(
+              findNodeHandle(fabricRef.current) ?? -1,
+              coordinate,
+            );
+          } else {
+            throw new Error(
+              'getAddressFromCoordinates is not supported on this platform',
+            );
+          }
+        },
+        async takeSnapshot(config: SnapshotOptions) {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.takeSnapshot(
+              findNodeHandle(fabricRef.current) ?? -1,
+              JSON.stringify(config),
+            );
+          } else {
+            throw new Error(
+              'takeSnapshot is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        async getCamera() {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getCamera(
+              findNodeHandle(fabricRef.current) ?? -1,
+            );
+          } else {
+            throw new Error('getCamera is only supported on iOS with Fabric.');
           }
-        } else {
-          throw new Error(
-            'animateCamera is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      fitToCoordinates(
-        coordinates: LatLng[],
-        edgePadding: EdgePadding,
-        animated: boolean,
-      ) {
-        if (fabricRef.current) {
-          try {
-            Commands.fitToCoordinates(
-              fabricRef.current,
-              JSON.stringify(coordinates),
-              JSON.stringify(edgePadding),
-              animated,
-            );
-          } catch (error) {
-            throw new Error('Failed to fitToCoordinates');
+        },
+        async getMapBoundaries() {
+          if (fabricRef.current) {
+            return NativeAirMapsModule.getMapBoundaries(
+              findNodeHandle(fabricRef.current) ?? -1,
+            );
+          } else {
+            throw new Error(
+              'getMapBoundaries is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        animateToRegion(region: Region, duration: number) {
+          if (fabricRef.current) {
+            try {
+              Commands.animateToRegion(
+                fabricRef.current,
+                JSON.stringify(region),
+                duration,
+              );
+            } catch (error) {
+              throw new Error('Failed to animateToRegion');
+            }
+          } else {
+            throw new Error(
+              'animateToRegion is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        fitToElements(edgePadding: EdgePadding, animated: boolean) {
+          if (fabricRef.current) {
+            try {
+              Commands.fitToElements(
+                fabricRef.current,
+                JSON.stringify(edgePadding),
+                animated,
+              );
+            } catch (error) {
+              throw new Error('Failed to fitToElements');
+            }
+          } else {
+            throw new Error(
+              'fitToElements is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        fitToSuppliedMarkers(
+          markers: string[],
+          edgePadding: EdgePadding,
+          animated: boolean,
+        ) {
+          if (fabricRef.current) {
+            try {
+              Commands.fitToSuppliedMarkers(
+                fabricRef.current,
+                JSON.stringify(markers),
+                JSON.stringify(edgePadding),
+                animated,
+              );
+            } catch (error) {
+              throw new Error('Failed to fitToSuppliedMarkers');
+            }
+          } else {
+            throw new Error(
+              'fitToSuppliedMarkers is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        animateCamera(camera: Partial<Camera>, duration: number) {
+          if (fabricRef.current) {
+            try {
+              Commands.animateCamera(
+                fabricRef.current,
+                JSON.stringify(camera),
+                duration,
+              );
+            } catch (error) {
+              throw new Error('Failed to animateCamera');
+            }
+          } else {
+            throw new Error(
+              'animateCamera is only supported on iOS with Fabric.',
+            );
+          }
+        },
+        fitToCoordinates(
+          coordinates: LatLng[],
+          edgePadding: EdgePadding,
+          animated: boolean,
+        ) {
+          if (fabricRef.current) {
+            try {
+              Commands.fitToCoordinates(
+                fabricRef.current,
+                JSON.stringify(coordinates),
+                JSON.stringify(edgePadding),
+                animated,
+              );
+            } catch (error) {
+              throw new Error('Failed to fitToCoordinates');
+            }
+          } else {
+            throw new Error(
+              'fitToCoordinates is only supported on iOS with Fabric.',
+            );
           }
-        } else {
-          throw new Error(
-            'fitToCoordinates is only supported on iOS with Fabric.',
-          );
-        }
-      },
-      setIndoorActiveLevelIndex(activeLevelIndex: number) {
-        if (fabricRef.current) {
-          try {
-            Commands.setIndoorActiveLevelIndex(
-              fabricRef.current,
-              activeLevelIndex,
-            );
-          } catch (error) {
-            console.error('Failed to set camera:', error);
+        },
+        setIndoorActiveLevelIndex(activeLevelIndex: number) {
+          if (fabricRef.current) {
+            try {
+              Commands.setIndoorActiveLevelIndex(
+                fabricRef.current,
+                activeLevelIndex,
+              );
+            } catch (error) {
+              console.error('Failed to set camera:', error);
+            }
+          } else {
+            console.warn('setIndoorActiveLevelIndex is not supported.');
           }
-        } else {
-          console.warn('setIndoorActiveLevelIndex is not supported.');
-        }
-      },
-      setCamera(camera: Partial<Camera>) {
-        if (fabricRef.current) {
-          try {
-            Commands.setCamera(fabricRef.current, JSON.stringify(camera));
-          } catch (error) {
-            console.error('Failed to set camera:', error);
+        },
+        setCamera(camera: Partial<Camera>) {
+          if (fabricRef.current) {
+            try {
+              Commands.setCamera(fabricRef.current, JSON.stringify(camera));
+            } catch (error) {
+              console.error('Failed to set camera:', error);
+            }
+          } else {
+            console.warn('setCamera is not supported');
           }
-        } else {
-          console.warn('setCamera is not supported');
-        }
-      },
-    }));
+        },
+      }));
 
-    // @ts-ignore
-    return <ViewComponent {...props} ref={fabricRef} />;
-  });
+      // @ts-ignore
+      return <ViewComponent {...props} ref={fabricRef} />;
+    },
+  );
 };
 
 export default createFabricMap;

package/src/decorateMapComponent.ts

@@ -126,8 +126,12 @@ export default function decorateMapComponent<Type extends Component>(
         return components[key];
       }
 
-      // @ts-ignore
+      if (!provider) {
+        throw new Error('react-native-maps: provider is not set');
+      }
+
       const providerInfo = providers[provider];
+
       // quick fix. Previous code assumed android | ios
       if (Platform.OS !== 'android' && Platform.OS !== 'ios') {
         throw new Error(`react-native-maps doesn't support ${Platform.OS}`);