react-native-maps 1.25.6 → 1.26.1

package/ios/generated/RNMapsSpecs/States.h

@@ -8,130 +8,31 @@
  */
 #pragma once
 
-#ifdef ANDROID
+#include <react/renderer/core/StateData.h>
+#ifdef RN_SERIALIZABLE_STATE
 #include <folly/dynamic.h>
 #endif
 
 namespace facebook::react {
 
-class RNMapsCalloutState {
-public:
-  RNMapsCalloutState() = default;
+using RNMapsCalloutState = StateData;
 
-#ifdef ANDROID
-  RNMapsCalloutState(RNMapsCalloutState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
-
-class RNMapsCircleState {
-public:
-  RNMapsCircleState() = default;
-
-#ifdef ANDROID
-  RNMapsCircleState(RNMapsCircleState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
-
-class RNMapsGoogleMapViewState {
-public:
-  RNMapsGoogleMapViewState() = default;
-
-#ifdef ANDROID
-  RNMapsGoogleMapViewState(RNMapsGoogleMapViewState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
-
-class RNMapsGooglePolygonState {
-public:
-  RNMapsGooglePolygonState() = default;
-
-#ifdef ANDROID
-  RNMapsGooglePolygonState(RNMapsGooglePolygonState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
+using RNMapsCircleState = StateData;
 
-class RNMapsMapViewState {
-public:
-  RNMapsMapViewState() = default;
+using RNMapsGoogleMapViewState = StateData;
 
-#ifdef ANDROID
-  RNMapsMapViewState(RNMapsMapViewState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
-
-class RNMapsMarkerState {
-public:
-  RNMapsMarkerState() = default;
-
-#ifdef ANDROID
-  RNMapsMarkerState(RNMapsMarkerState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
-
-class RNMapsOverlayState {
-public:
-  RNMapsOverlayState() = default;
+using RNMapsGooglePolygonState = StateData;
 
-#ifdef ANDROID
-  RNMapsOverlayState(RNMapsOverlayState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
+using RNMapsMapViewState = StateData;
 
-class RNMapsPolylineState {
-public:
-  RNMapsPolylineState() = default;
+using RNMapsMarkerState = StateData;
 
-#ifdef ANDROID
-  RNMapsPolylineState(RNMapsPolylineState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
+using RNMapsOverlayState = StateData;
 
-class RNMapsUrlTileState {
-public:
-  RNMapsUrlTileState() = default;
+using RNMapsPolylineState = StateData;
 
-#ifdef ANDROID
-  RNMapsUrlTileState(RNMapsUrlTileState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
+using RNMapsUrlTileState = StateData;
 
-class RNMapsWMSTileState {
-public:
-  RNMapsWMSTileState() = default;
-
-#ifdef ANDROID
-  RNMapsWMSTileState(RNMapsWMSTileState const &previousState, folly::dynamic data){};
-  folly::dynamic getDynamic() const {
-    return {};
-  };
-#endif
-};
+using RNMapsWMSTileState = StateData;
 
 } // namespace facebook::react

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.2"
+version = "0.81.1"
 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/ios/generated/ReactCodegen.podspec

@@ -0,0 +1,120 @@
+# 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.
+
+version = "0.81.1"
+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.
+  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
+else
+  source[:tag] = "v#{version}"
+end
+
+use_frameworks = ENV['USE_FRAMEWORKS'] != nil
+folly_compiler_flags = Helpers::Constants.folly_config[:compiler_flags]
+boost_compiler_flags = Helpers::Constants.boost_config[:compiler_flags]
+
+header_search_paths = []
+framework_search_paths = []
+
+header_search_paths = [
+  "\"$(PODS_ROOT)/ReactNativeDependencies\"",
+  "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
+  "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
+  "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
+  "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
+  "\"$(PODS_TARGET_SRCROOT)\"",
+]
+
+if use_frameworks
+  ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"])
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricImage", "React_FabricImage", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"]))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-runtimeexecutor", "React_runtimeexecutor", ["platform/ios"]))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-RCTFabric", "RCTFabric", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-debug", "React_debug", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-rendererdebug", "React_rendererdebug", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-utils", "React_utils", []))
+    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-featureflags", "React_featureflags", []))
+    .each { |search_path|
+      header_search_paths << "\"#{search_path}\""
+    }
+  end
+
+Pod::Spec.new do |s|
+  s.name                = "ReactCodegen"
+  s.version             = version
+  s.summary             = 'Temp pod for generated files for React Native'
+  s.homepage            = 'https://facebook.com/'
+  s.license             = 'Unlicense'
+  s.authors             = 'Facebook'
+  s.compiler_flags      = "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++20"
+  s.source              = { :git => '' }
+  s.header_mappings_dir = './'
+  s.platforms           = min_supported_versions
+  s.source_files        = "**/*.{h,mm,cpp}"
+  s.exclude_files       = "RCTAppDependencyProvider.{h,mm}" # these files are generated in the same codegen path but needs to belong to a different pod
+  s.pod_target_xcconfig = {
+    "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
+    "FRAMEWORK_SEARCH_PATHS" => framework_search_paths,
+    "OTHER_CPLUSPLUSFLAGS" => "$(inherited) #{folly_compiler_flags} #{boost_compiler_flags}"
+  }
+
+  s.dependency "React-jsiexecutor"
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency "React-Core"
+  s.dependency "React-jsi"
+  s.dependency "ReactCommon/turbomodule/bridging"
+  s.dependency "ReactCommon/turbomodule/core"
+  s.dependency "React-NativeModulesApple"
+  s.dependency 'React-graphics'
+  s.dependency 'React-rendererdebug'
+  s.dependency 'React-Fabric'
+  s.dependency 'React-FabricImage'
+  s.dependency 'React-debug'
+  s.dependency 'React-utils'
+  s.dependency 'React-featureflags'
+  s.dependency 'React-RCTAppDelegate'
+
+  depend_on_js_engine(s)
+  add_rn_third_party_dependencies(s)
+  add_rncore_dependency(s)
+
+  s.script_phases = {
+    'name' => 'Generate Specs',
+    'execution_position' => :before_compile,
+    'input_files' => ["${PODS_ROOT}/../../../src/specs/NativeAirMapsModule.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentCallout.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentCircle.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentGoogleMapView.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentGooglePolygon.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentMapView.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentMarker.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentOverlay.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentPolyline.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentUrlTile.ts",
+"${PODS_ROOT}/../../../src/specs/NativeComponentWMSTile.ts"],
+    'show_env_vars_in_log' => true,
+    'output_files' => ["${DERIVED_FILE_DIR}/react-codegen.log"],
+    'script': <<-SCRIPT
+pushd "$PODS_ROOT/../" > /dev/null
+RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
+popd >/dev/null
+
+export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/../../node_modules/react-native"
+export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/../.."
+export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT"
+export RCT_SCRIPT_TYPE="withCodegenDiscovery"
+
+export SCRIPT_PHASES_SCRIPT="$RCT_SCRIPT_RN_DIR/scripts/react_native_pods_utils/script_phases.sh"
+export WITH_ENVIRONMENT="$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh"
+/bin/sh -c '"$WITH_ENVIRONMENT" "$SCRIPT_PHASES_SCRIPT"'
+SCRIPT
+  }
+
+end

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.25.6",
+  "version": "1.26.1",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",
@@ -63,25 +63,25 @@
     "@commitlint/cli": "19.8.0",
     "@commitlint/config-conventional": "19.8.0",
     "@expo/config-plugins": "^9.0.17",
-    "@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",
+    "@react-native-community/cli": "20.0.0",
+    "@react-native/babel-preset": "0.81.0",
+    "@react-native/eslint-config": "0.81.0",
+    "@react-native/metro-config": "0.81.0",
+    "@react-native/typescript-config": "0.81.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@types/react": "^18.2.6",
-    "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.6.3",
+    "@types/react": "^19.1.0",
+    "@types/react-test-renderer": "^19.1.0",
+    "@types/jest": "^29.5.13",
     "eslint": "^8.19.0",
     "husky": "9.1.7",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
-    "react": "^18.3.1",
-    "react-native": "^0.77.1",
-    "react-test-renderer": "18.3.1",
+    "react": "19.1.0",
+    "react-native": "^0.81.1",
+    "react-test-renderer": "19.1.0",
     "semantic-release": "24.2.3",
-    "typescript": "5.0.4"
+    "typescript": "^5.8.3"
   },
   "dependencies": {
     "@types/geojson": "^7946.0.13"
@@ -120,6 +120,6 @@
     }
   },
   "engines": {
-    "node": ">=18"
+    "node": ">= 20.19.4"
   }
 }

package/plugin/build/android.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");

package/plugin/build/ios.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -36,7 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMapsCocoapods = exports.removeGoogleMapsAppDelegateInit = exports.addGoogleMapsAppDelegateInit = exports.removeGoogleMapsAppDelegateImport = exports.addGoogleMapsAppDelegateImport = exports.withMapsIOS = exports.MATCH_INIT = void 0;
+exports.withMapsIOS = exports.MATCH_INIT = void 0;
+exports.addGoogleMapsAppDelegateImport = addGoogleMapsAppDelegateImport;
+exports.removeGoogleMapsAppDelegateImport = removeGoogleMapsAppDelegateImport;
+exports.addGoogleMapsAppDelegateInit = addGoogleMapsAppDelegateInit;
+exports.removeGoogleMapsAppDelegateInit = removeGoogleMapsAppDelegateInit;
+exports.addMapsCocoapods = addMapsCocoapods;
 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;
@@ -78,14 +83,12 @@ function addGoogleMapsAppDelegateImport(src) {
         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)',
@@ -101,14 +104,12 @@ function addGoogleMapsAppDelegateInit(src, apiKey) {
         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.
  * @param useGoogleMaps if GoogleMaps for iOS is used
@@ -128,7 +129,6 @@ function addMapsCocoapods(src, useGoogleMaps) {
         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 () {

package/react-native-maps.podspec

@@ -22,6 +22,10 @@ Pod::Spec.new do |s|
   s.subspec 'Generated' do |ss|
     ss.source_files = "ios/generated/**/*.{h,m,mm,cpp,swift}"
     ss.exclude_files = [
+      "ios/generated/RCTModuleProviders.h",
+      "ios/generated/RCTModuleProviders.mm",
+      "ios/generated/RCTUnstableModulesRequiringMainQueueSetupProvider.h",
+      "ios/generated/RCTUnstableModulesRequiringMainQueueSetupProvider.mm",
       "ios/generated/RCTAppDependencyProvider.h",
       "ios/generated/RCTAppDependencyProvider.mm",
       "ios/generated/RCTThirdPartyComponentsProvider.h",

package/src/MapMarkerNativeComponent.ts

@@ -1,5 +1,5 @@
 import type {HostComponent} from 'react-native';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeCommands} from 'react-native';
 import type {NativeProps} from './MapMarker';
 import type {LatLng} from './sharedTypes';
 

package/src/MapView.tsx

@@ -27,6 +27,7 @@ import type {
   Point,
   Provider,
   Region,
+  MKPointOfInterestCategoryType,
 } from './sharedTypes';
 import type {
   ActiveIndoorLevel,
@@ -587,6 +588,20 @@ export type MapViewProps = ViewProps & {
    */
   showsMyLocationButton?: boolean;
 
+  /**
+   * A Boolean indicating whether points of interest should be displayed.
+   * Use `pointsOfInterestFilter` for more granular control.
+   * @see pointsOfInterestFilter
+   */
+  showsPointsOfInterests?: boolean;
+
+  /**
+   * An array of category strings to show on the map.
+   * If this is set, it takes precedence over `showsPointsOfInterests`.
+   * @see showsPointsOfInterests
+   */
+  pointsOfInterestFilter?: MKPointOfInterestCategoryType[];
+
   /**
    * A Boolean indicating whether the map shows scale information.
    *
@@ -1166,6 +1181,8 @@ class MapView extends React.Component<MapViewProps, State> {
       // @ts-ignore
       onIndoorLevelActivated: this.handleIndoorLevelActivated,
       onLongPress: this.handleLongPress,
+      showsPointsOfInterests: this.props.showsPointsOfInterests,
+      pointsOfInterestFilter: this.props.pointsOfInterestFilter,
       ...restProps,
     };
     if (this.props.region) {

package/src/MapViewNativeComponent.ts

@@ -1,5 +1,5 @@
 import type {HostComponent} from 'react-native';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeCommands} from 'react-native';
 import type {NativeProps} from './MapView';
 import type {Camera, EdgePadding} from './MapView.types';
 import type {LatLng, Region} from './sharedTypes';

package/src/sharedTypes.ts

@@ -99,3 +99,94 @@ export type MarkerPressEvent = NativeSyntheticEvent<{
    */
   position?: Point;
 }>;
+
+/**
+ * Represents the available categories for points of interest on the Apple Maps.
+ * Use an array of these strings for the `pointsOfInterestFilter` prop.
+ * More: https://developer.apple.com/documentation/mapkit/mkpointofinterestcategory
+ */
+export type MKPointOfInterestCategoryType =
+  // Arts and culture
+  | 'museum'
+  | 'musicVenue'
+  | 'theater'
+  // Education
+  | 'library'
+  | 'planetarium'
+  | 'school'
+  | 'university'
+  // Entertainment
+  | 'movieTheater'
+  | 'nightlife'
+  // Health and safety
+  | 'fireStation'
+  | 'hospital'
+  | 'pharmacy'
+  | 'police'
+  // Historical and cultural landmarks
+  | 'castle'
+  | 'fortress'
+  | 'landmark'
+  | 'nationalMonument'
+  // Food and drink
+  | 'bakery'
+  | 'brewery'
+  | 'cafe'
+  | 'distillery'
+  | 'foodMarket'
+  | 'restaurant'
+  | 'winery'
+  // Personal services
+  | 'animalService'
+  | 'atm'
+  | 'automotiveRepair'
+  | 'bank'
+  | 'beauty'
+  | 'evCharger'
+  | 'fitnessCenter'
+  | 'laundry'
+  | 'mailbox'
+  | 'postOffice'
+  | 'restroom'
+  | 'spa'
+  | 'store'
+  // Parks and recreation
+  | 'amusementPark'
+  | 'aquarium'
+  | 'beach'
+  | 'campground'
+  | 'fairground'
+  | 'marina'
+  | 'nationalPark'
+  | 'park'
+  | 'rvPark'
+  | 'zoo'
+  // Sports
+  | 'baseball'
+  | 'basketball'
+  | 'bowling'
+  | 'goKart'
+  | 'golf'
+  | 'hiking'
+  | 'miniGolf'
+  | 'rockClimbing'
+  | 'skatePark'
+  | 'skating'
+  | 'skiing'
+  | 'soccer'
+  | 'stadium'
+  | 'tennis'
+  | 'volleyball'
+  // Travel
+  | 'airport'
+  | 'carRental'
+  | 'conventionCenter'
+  | 'gasStation'
+  | 'hotel'
+  | 'parking'
+  | 'publicTransport'
+  // Water sports
+  | 'fishing'
+  | 'kayaking'
+  | 'surfing'
+  | 'swimming';

package/src/specs/NativeComponentCallout.ts

@@ -1,6 +1,6 @@
 import type {HostComponent, ViewProps} from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {
   Double,
   BubblingEventHandler,

package/src/specs/NativeComponentCircle.ts

@@ -1,6 +1,6 @@
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {
   Double,
   Float,

package/src/specs/NativeComponentGoogleMapView.ts

@@ -1,8 +1,7 @@
 // @ts-nocheck
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
 import type {
   Double,
   Int32,
@@ -728,16 +727,6 @@ export interface MapFabricNativeProps extends ViewProps {
    */
   showsMyLocationButton?: boolean;
 
-  /**
-   * If `false` points of interest won't be displayed on the map.
-   * TODO: DEPRECATED? Doesn't seem to do anything
-   *
-   * @default true
-   * @platform iOS: Maybe Apple Maps?
-   * @platform Android: Not supported
-   */
-  showsPointsOfInterest?: boolean;
-
   /**
    * A Boolean indicating whether the map shows scale information.
    *

package/src/specs/NativeComponentGooglePolygon.ts

@@ -1,6 +1,6 @@
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {
   Double,
   BubblingEventHandler,

package/src/specs/NativeComponentMapView.ts

@@ -1,8 +1,7 @@
 // @ts-nocheck
 import type {HostComponent, ViewProps, ColorValue} from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
 import type {
   Double,
   Int32,
@@ -869,6 +868,25 @@ export interface MapFabricNativeProps extends ViewProps {
    */
   showsIndoors?: WithDefault<boolean, true>;
 
+  /**
+   * A Boolean indicating whether points of interest should be displayed.
+   * Use `pointsOfInterestFilter` for more granular control.
+   *
+   * @default true
+   * @platform iOS: Apple Maps
+   * @platform Android: Not supported
+   */
+  showsPointsOfInterests?: WithDefault<boolean, true>;
+
+  /**
+   * An array of category strings to show on the map.
+   * If this is set, it takes precedence over `showsPointsOfInterests`.
+   *
+   * @platform iOS: Apple Maps
+   * @platform Android: Not supported
+   */
+  pointsOfInterestFilter?: ReadonlyArray<string>;
+
   /**
    * If `false` hide the button to move map to the current user's location.
    *

package/src/specs/NativeComponentMarker.ts

@@ -6,8 +6,7 @@ import type {
   ImageSourcePropType as ImageSource,
 } from 'react-native';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
 import type {
   Int32,
   Double,