Skip to content

Commit d904d73

Browse files
authored
Merge branch 'dev' into fix/android-scrollview
2 parents 419cb4a + 21adddb commit d904d73

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ class RNGoogleMapsPlusView(
451451
val current = view.currentCamera
452452
view.setCamera(
453453
camera.toCameraPosition(current),
454-
animated == true,
454+
animated ?: false,
455455
durationMs?.toInt() ?: 3000,
456456
)
457457
}
@@ -465,7 +465,7 @@ class RNGoogleMapsPlusView(
465465
view.setCameraToCoordinates(
466466
coordinates,
467467
padding = padding ?: RNMapPadding(0.0, 0.0, 0.0, 0.0),
468-
animated == true,
468+
animated ?: false,
469469
durationMs?.toInt() ?: 3000,
470470
)
471471
}

expoConfig/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"skipLibCheck": true,
66
"esModuleInterop": true,
77
"resolveJsonModule": true,
8-
"allowSyntheticDefaultImports": true
8+
"allowSyntheticDefaultImports": true,
9+
"types": ["node"]
910
},
1011
"include": ["src"]
1112
}

ios/RNGoogleMapsPlusView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
391391
let cam = camera.toGMSCameraPosition(current: self.impl.currentCamera)
392392
self.impl.setCamera(
393393
camera: cam,
394-
animated: animated ?? true,
394+
animated: animated ?? false,
395395
durationMs: durationMs ?? 3000
396396
)
397397
}
@@ -406,7 +406,7 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
406406
impl.setCameraToCoordinates(
407407
coordinates: coordinates,
408408
padding: padding ?? RNMapPadding(0, 0, 0, 0),
409-
animated: animated ?? true,
409+
animated: animated ?? false,
410410
durationMs: durationMs ?? 3000
411411
)
412412
}

0 commit comments

Comments
 (0)