Skip to content

fix: datatype mismatch causes crash #4143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
g4rb4g3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: datatype mismatch causes crash #4143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ios/RNMBX/RNMBXCamera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,14 +595,14 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
return super.removeFromMap(map, mapView: mapView, reason: reason)
}

@objc public func moveBy(x: Double, y: Double, animationMode: NSNumber?, animationDuration: NSNumber?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
@objc public func moveBy(x: Double, y: Double, animationMode: Double, animationDuration: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
withMapView { mapView in
let contentFrame = mapView.bounds.inset(by: mapView.safeAreaInsets)
let centerPoint = CGPoint(x: contentFrame.midX, y: contentFrame.midY)
let endCameraPoint = CGPoint(x: centerPoint.x + x, y: centerPoint.y + y)
let cameraOptions = mapView.mapboxMap.dragCameraOptions(from: centerPoint, to: endCameraPoint)

let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
let duration = animationDuration / 1000

if (duration == 0.0) {
mapView.mapboxMap.setCamera(to: cameraOptions)
Expand All @@ -611,7 +611,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
}

var curve: UIView.AnimationCurve = .linear
if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
if let m = CameraMode(rawValue: Int(animationMode)) {
curve = m == CameraMode.ease ? .easeInOut : .linear
}

Expand All @@ -622,18 +622,18 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
@objc public func scaleBy(
x: Double,
y: Double,
scaleFactor: NSNumber,
animationMode: NSNumber?,
animationDuration: NSNumber?,
scaleFactor: Double,
animationMode: Double,
animationDuration: Double,
resolve: @escaping RCTPromiseResolveBlock,
reject: @escaping RCTPromiseRejectBlock
) {
withMapView { mapView in
let currentZoom = mapView.cameraState.zoom
let newZoom = currentZoom + log2(scaleFactor.doubleValue)
let newZoom = currentZoom + log2(scaleFactor)
let anchor = CGPoint(x: x, y: y)
let cameraOptions = CameraOptions(anchor: anchor, zoom: newZoom)
let duration = (animationDuration?.doubleValue ?? 0.0) / 1000
let duration = animationDuration / 1000

if (duration == 0.0) {
mapView.mapboxMap.setCamera(to: cameraOptions)
Expand All @@ -642,7 +642,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
}

var curve: UIView.AnimationCurve = .linear
if let m = animationMode?.intValue, let m = CameraMode(rawValue: m) {
if let m = CameraMode(rawValue: Int(animationMode)) {
curve = m == CameraMode.ease ? .easeInOut : .linear
}

Expand Down
10 changes: 5 additions & 5 deletions ios/RNMBX/RNMBXCameraModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))blo
RCT_EXPORT_METHOD(moveBy:(nonnull NSNumber *)viewRef
x:(double)x
y:(double)y
animationMode:(nonnull NSNumber *)animationMode
animationDuration:(nonnull NSNumber *)animationDuration
animationMode:(double)animationMode
animationDuration:(double)animationDuration
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject) {
[self withCamera:viewRef block:^(RNMBXCamera *camera) {
Expand All @@ -65,9 +65,9 @@ - (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))blo
RCT_EXPORT_METHOD(scaleBy:(nonnull NSNumber *)viewRef
x:(double)x
y:(double)y
animationMode:(nonnull NSNumber *)animationMode
animationDuration:(nonnull NSNumber *)animationDuration
scaleFactor:(nonnull NSNumber *)scaleFactor
animationMode:(double)animationMode
animationDuration:(double)animationDuration
scaleFactor:(double)scaleFactor
resolve:(RCTPromiseResolveBlock)resolve
reject:(RCTPromiseRejectBlock)reject) {
[self withCamera:viewRef block:^(RNMBXCamera *camera) {
Expand Down
Loading