Skip to content

Conversation

@mfazekas
Copy link
Contributor

Description

This PR removes the #ifdef RNMBX_11 conditionals from iOS code, keeping only the v11 implementation as part of the 1.3.0 migration.

Changes include:

  • Remove v10 code from offline module and legacy offline module
  • Clean up layer files (Circle, Fill, Line, Symbol, Heatmap, Raster, Model, Background, FillExtrusion, RasterParticle)
  • Clean up source files (Vector, Shape, Raster, RasterDem, Image, RasterArray)
  • Update style value helpers for v11-only types
  • Remove v10 location module, rename v11 version to main
  • Update component views (RasterParticle, RasterArraySource)
  • Clean up core components (Light, Atmosphere, Viewport, CustomHttpHeaders, MapViewManager, SnapshotModule)
  • Update code generation template for layer common options

This is part of the v11-only migration for @rnmapbox/maps 1.3.0. Note: Some files still have RNMBX_11 conditionals that require manual review (MapView, Camera, Layer base class, etc).

Checklist

  • I've read CONTRIBUTING.md
  • I updated the doc/other generated code with running yarn generate in the root folder
  • I have tested the new feature on /example app.
    • In V11 mode/ios
    • In New Architecture mode/ios
    • In V11 mode/android
    • In New Architecture mode/android
  • I added/updated a sample - if a new feature was implemented (/example)

Screenshot OR Video

Component to reproduce the issue you're fixing

This PR removes the #ifdef RNMBX_11 conditionals from iOS code,
keeping only the v11 implementation as part of the 1.3.0 migration.

Changes include:
- Remove v10 code from offline module and legacy offline module
- Clean up layer files (Circle, Fill, Line, Symbol, Heatmap, Raster, Model, Background, FillExtrusion, RasterParticle)
- Clean up source files (Vector, Shape, Raster, RasterDem, Image, RasterArray)
- Update style value helpers for v11-only types
- Remove v10 location module, rename v11 version to main
- Update component views (RasterParticle, RasterArraySource)
- Clean up core components (Light, Atmosphere, Viewport, CustomHttpHeaders, MapViewManager, SnapshotModule)
- Update code generation template (RNMBXStyle.swift.ejs) to not emit v11 conditionals
- Update LayerPropsCommon.codepart-swift.ejs to not emit v11 conditionals

This is part of the v11-only migration for @rnmapbox/maps 1.3.0.
Note: Some files still have RNMBX_11 conditionals that require manual review (MapView, Camera, Layer base class, etc).
@mfazekas mfazekas force-pushed the claude/remove-ios-legacy-code-nSSl7 branch from fa8c1e6 to db09734 Compare December 21, 2025 09:19
claude and others added 2 commits December 21, 2025 09:27
Continue the v10 to v11-only migration by removing all remaining
#if RNMBX_11 conditionals and keeping only the v11 implementations.

Files updated:
- RNMBXMapView.swift: Remove v10 event handlers, feature state API, cancelables
- RNMBXCamera.swift: Remove v10 NSNumber extension guard, bounds API, location auth
- RNMBXLayer.swift: Remove v10 styleLayerExists, slot handling, setOptions
- RNMBXCameraGestureObserver.swift: Remove v10 conditional gesture handling
- RNMBXCustomLocationProvider.swift: Remove v10 location provider implementation
- RNMBXImages.swift: Remove v10 hasImage implementation
- RNMBXMarkerView.swift: Remove v10 ViewAnnotationOptions conditionals
- RNMBXModels.swift: Remove v10 removeStyleModel conditional
- RNMBXModule.swift: Remove v10 accessToken and clearData implementations
- RNMBXSource.swift: Remove v10 addSource signature
- RNMBXStyleImport.swift: Remove v10 setStyleImportConfigProperties guard

This is part of the 1.3.0 migration that only supports Mapbox v11.
@mfazekas mfazekas merged commit 934b096 into main Dec 21, 2025
7 checks passed
@mfazekas mfazekas deleted the claude/remove-ios-legacy-code-nSSl7 branch December 21, 2025 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants