@rnmapbox/maps 10.3.2-rc.1 → 10.3.2

package/rnmapbox-maps.podspec

@@ -199,7 +199,19 @@ end
 
 $rnMapboxMapsTargetsToChangeToDynamic = rnMapboxMapsTargetsToChangeToDynamic
 
+def $RNMapboxMaps._expo_precompiled_pipeline?
+  # Expo SDK 56+ precompiled iOS pipeline (prebuilt React core) downgrades every
+  # framework-style pod back to a static library after the podspec is evaluated.
+  # Flipping the Mapbox pods to dynamic here fights that and leaves an inconsistent
+  # graph (MapboxMaps stays dynamic while its deps get forced static). See #4242.
+  ENV['EXPO_USE_PRECOMPILED_MODULES'] == '1'
+end
+
 def $RNMapboxMaps.pre_install(installer)
+  if $RNMapboxMaps._expo_precompiled_pipeline?
+    Pod::UI.puts "[RNMapbox] Expo precompiled modules pipeline detected (EXPO_USE_PRECOMPILED_MODULES=1) — skipping the Mapbox dynamic-framework flip so all Mapbox pods stay consistently static."
+    return
+  end
   installer.aggregate_targets.each do |target|
     target.pod_targets.select { |p| $rnMapboxMapsTargetsToChangeToDynamic.include?(p.name) }.each do |mobile_events_target|
       mobile_events_target.instance_variable_set(:@build_type,Pod::BuildType.dynamic_framework)
@@ -286,9 +298,6 @@ Pod::Spec.new do |s|
           $RNMapboxMaps._add_compiler_flags(sp, "-DRNMBX_RN_72=1")
         end
       end
-      if ENV['USE_FRAMEWORKS'] || $RNMapboxMapsUseFrameworks
-        $RNMapboxMaps._add_compiler_flags(sp, "-DRNMBX_USE_FRAMEWORKS=1")
-      end
     else
       fail "$RNMapboxMapsImpl should be mapbox but was: $RNMapboxMapsImpl"
     end

package/src/Mapbox.native.ts

@@ -18,9 +18,11 @@ export {
 } from './components/MapView';
 export { default as Light } from './components/Light';
 export { default as PointAnnotation } from './components/PointAnnotation';
+export { default as PointAnnotationManager } from './components/PointAnnotationManager';
 export { default as Annotation } from './components/Annotation';
 export { default as Callout } from './components/Callout';
 export { default as StyleImport } from './components/StyleImport';
+export type { StandardStyleConfig } from './components/StyleImport';
 export {
   default as UserLocation,
   UserLocationRenderMode,

package/src/components/PointAnnotationManager.tsx

@@ -0,0 +1,97 @@
+import React, { type ReactNode } from 'react';
+
+import NativePointAnnotationManager from '../specs/RNMBXPointAnnotationManagerNativeComponent';
+
+import PointAnnotation from './PointAnnotation';
+
+type Slot = 'bottom' | 'middle' | 'top';
+
+type Props = {
+  /**
+   * A stable Mapbox layer id for this manager's annotation layer.
+   * When omitted, the SDK generates a unique id automatically.
+   */
+  id?: string;
+
+  /**
+   * Marks this as the default manager. PointAnnotations that are not wrapped in a
+   * PointAnnotationManager attach to the default manager, so this lets you configure
+   * the slot and properties used by those bare annotations. Only one default manager
+   * is allowed per MapView.
+   */
+  default?: boolean;
+
+  /**
+   * The slot in the style layer stack to position the annotation layer.
+   * Use with Mapbox Standard style to control layer ordering.
+   */
+  slot?: Slot | (string & {});
+
+  /**
+   * If true, the icon will be visible even if it collides with other previously drawn symbols.
+   */
+  iconAllowOverlap?: boolean;
+
+  /**
+   * If true, other symbols can be visible even if they collide with the icon.
+   */
+  iconIgnorePlacement?: boolean;
+
+  /**
+   * If true, text will display without their corresponding icons when the icon collides
+   * with other symbols and the text does not.
+   */
+  iconOptional?: boolean;
+
+  /**
+   * If true, the text will be visible even if it collides with other previously drawn symbols.
+   */
+  textAllowOverlap?: boolean;
+
+  /**
+   * If true, other symbols can be visible even if they collide with the text.
+   */
+  textIgnorePlacement?: boolean;
+
+  /**
+   * If true, icons will display without their corresponding text when the text collides
+   * with other symbols and the icon does not.
+   */
+  textOptional?: boolean;
+
+  children?: ReactNode;
+};
+
+/**
+ * Configures a PointAnnotation manager. Each PointAnnotationManager owns its own
+ * annotation layer, so multiple managers can be placed in different `slot`s of the
+ * Mapbox Standard style. Wrap PointAnnotation components as children.
+ *
+ * PointAnnotations that are not wrapped in a PointAnnotationManager attach to a
+ * default manager. Use `default` to configure that manager.
+ */
+const PointAnnotationManager = (props: Props) => {
+  const { children, default: isDefault, slot, ...rest } = props;
+
+  if (__DEV__) {
+    React.Children.forEach(children, (child) => {
+      if (React.isValidElement(child) && child.type !== PointAnnotation) {
+        console.warn(
+          'PointAnnotationManager: only PointAnnotation components should be direct children.',
+        );
+      }
+    });
+  }
+
+  return (
+    <NativePointAnnotationManager
+      {...rest}
+      isDefault={isDefault}
+      slot={slot as Slot | undefined}
+    >
+      {children}
+    </NativePointAnnotationManager>
+  );
+};
+
+export default PointAnnotationManager;

package/src/components/StyleImport.tsx

@@ -2,6 +2,67 @@ import { memo } from 'react';
 
 import NativeStyleImport from '../specs/RNMBXStyleImportNativeComponent';
 
+/**
+ * Configuration options for the Mapbox Standard style.
+ *
+ * These options are available when using `StyleImport` with `id="basemap"` and
+ * a Standard style URL (e.g., `mapbox://styles/mapbox/standard`).
+ */
+export type StandardStyleConfig = {
+  /** Light preset: controls time-of-day lighting */
+  lightPreset?: 'dawn' | 'day' | 'dusk' | 'night';
+  /** Color theme */
+  theme?: 'default' | 'faded' | 'monochrome';
+  /** Font family for labels (e.g., 'Montserrat') */
+  font?: string;
+  /** Show generic 3D objects */
+  show3dObjects?: boolean;
+  /** Show extruded 3D buildings */
+  show3dBuildings?: boolean;
+  /** Show 3D building facades (v11.16+) */
+  show3dFacades?: boolean;
+  /** Show 3D landmarks (v11.16+) */
+  show3dLandmarks?: boolean;
+  /** Show 3D trees (v11.17+) */
+  show3dTrees?: boolean;
+  /** Show point of interest labels */
+  showPointOfInterestLabels?: boolean;
+  /** Show transit labels */
+  showTransitLabels?: boolean;
+  /** Show place labels */
+  showPlaceLabels?: boolean;
+  /** Show road labels */
+  showRoadLabels?: boolean;
+  /** Show pedestrian roads */
+  showPedestrianRoads?: boolean;
+  /** Color override for buildings (v11.18+) */
+  colorBuildings?: string;
+  /** Color override for commercial areas (v11.18+) */
+  colorCommercial?: string;
+  /** Color override for education areas (v11.18+) */
+  colorEducation?: string;
+  /** Color override for industrial areas (v11.18+) */
+  colorIndustrial?: string;
+  /** Color override for land (v11.18+) */
+  colorLand?: string;
+  /** Color override for medical areas (v11.18+) */
+  colorMedical?: string;
+  /** Color override for roads (v11.18+) */
+  colorRoads?: string;
+  /** Color override for motorways (v11.18+) */
+  colorMotorways?: string;
+  /** Color override for water (v11.18+) */
+  colorWater?: string;
+  /** Color override for greenspaces (v11.18+) */
+  colorGreenspaces?: string;
+  /** Color override for boundaries (v11.18+) */
+  colorBoundaries?: string;
+};
+
+type StyleImportConfig = StandardStyleConfig & {
+  [key: string]: string | boolean | undefined;
+};
+
 type Props = {
   /**
    * id of the style import (eg. basemap)
@@ -16,11 +77,12 @@ type Props = {
   /**
    * config is a dictionary of configuration options for the style import.
    *
+   * When using the Mapbox Standard style with `id="basemap"`, use `StandardStyleConfig`
+   * keys for autocomplete. Arbitrary keys are also accepted for forward compatibility.
+   *
    * See https://github.com/mapbox/mapbox-maps-ios/blob/main/Sources/MapboxMaps/Documentation.docc/Migrate%20to%20v11.md#21-the-mapbox-standard-style
    */
-  config: {
-    [key: string]: string;
-  };
+  config: StyleImportConfig;
 };
 
 /**
@@ -29,5 +91,10 @@ type Props = {
  * See https://github.com/mapbox/mapbox-maps-ios/blob/main/Sources/MapboxMaps/Documentation.docc/Migrate%20to%20v11.md#21-the-mapbox-standard-style
  */
 export default memo((props: Props) => {
-  return <NativeStyleImport {...props} />;
+  return (
+    <NativeStyleImport
+      {...props}
+      config={props.config as unknown as { [key: string]: string }}
+    />
+  );
 });

package/src/specs/RNMBXPointAnnotationManagerNativeComponent.ts

@@ -0,0 +1,28 @@
+import type { HostComponent, ViewProps } from 'react-native';
+import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+
+import type { UnsafeMixed } from './codegenUtils';
+
+// see https://github.com/rnmapbox/maps/wiki/FabricOptionalProp
+type OptionalProp<T> = UnsafeMixed<T>;
+
+type Slot = 'bottom' | 'middle' | 'top';
+
+export interface NativeProps extends ViewProps {
+  /** Stable Mapbox layer id for this manager. When omitted the SDK generates one. */
+  id?: OptionalProp<string>;
+  /** Marks this as the manager used by PointAnnotations not wrapped in a manager. */
+  isDefault?: OptionalProp<boolean>;
+  slot?: OptionalProp<Slot>;
+  iconAllowOverlap?: OptionalProp<boolean>;
+  iconIgnorePlacement?: OptionalProp<boolean>;
+  iconOptional?: OptionalProp<boolean>;
+  textAllowOverlap?: OptionalProp<boolean>;
+  textIgnorePlacement?: OptionalProp<boolean>;
+  textOptional?: OptionalProp<boolean>;
+}
+
+// @ts-ignore-error - Codegen requires single cast but TypeScript prefers double cast
+export default codegenNativeComponent<NativeProps>(
+  'RNMBXPointAnnotationManager',
+) as HostComponent<NativeProps>;