Skip to content

fix(android): defer initial camera events until defaults apply #4354

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

Closed
RobJacobson wants to merge 1 commit into from
+20 −2
Closed

fix(android): defer initial camera events until defaults apply #4354

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
22 changes: 20 additions & 2 deletions android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie

private var wasGestureActive = false
private var isGestureActive = false
private var cameraEventsReady = false
private var hasPendingCameraChange = false

var mapViewImpl: String? = null

Expand Down Expand Up @@ -260,8 +262,7 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
val _this = this

map.addOnCameraChangeListener(OnCameraChangeListener { cameraChangedEventData ->
handleMapChangedEvent(EventTypes.REGION_IS_CHANGING)
handleMapChangedEvent(EventTypes.CAMERA_CHANGED)
sendCameraChangedEvents()
})

map.addOnMapIdleListener(OnMapIdleListener { mapIdleEventData ->
Expand Down Expand Up @@ -856,6 +857,16 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie

// region Events

private fun sendCameraChangedEvents() {
if (!cameraEventsReady) {
hasPendingCameraChange = true
return
}
hasPendingCameraChange = false
handleMapChangedEvent(EventTypes.REGION_IS_CHANGING)
handleMapChangedEvent(EventTypes.CAMERA_CHANGED)
}

fun sendRegionDidChangeEvent() {
handleMapChangedEvent(EventTypes.REGION_DID_CHANGE)
mCameraChangeTracker.setReason(CameraChangeReason.NONE)
Expand Down Expand Up @@ -1622,6 +1633,13 @@ open class RNMBXMapView(private val mContext: Context, var mManager: RNMBXMapVie
super.onAttachedToWindow()
Handler(Looper.getMainLooper()).post {
lifecycle.afterAttachFromLooper()
// Camera.addToMap applies defaultSettings in these attachment callbacks.
// Forward the current camera only after they finish, rather than the
// SDK's earlier startup positions. Maps without a Camera also become ready.
cameraEventsReady = true
if (hasPendingCameraChange) {
sendCameraChangedEvents()
}
}
}

Expand Down
Loading