Skip to content
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

Jump to bottom

fix: GoogleMap in preview early return breaking preview layout #213

Merged
merged 2 commits into from Oct 28, 2022
Merged

fix: GoogleMap in preview early return breaking preview layout #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e103f5
Fix `GoogleMap` in preview early return breaking preview layout
claytongreen Oct 18, 2022
c982b6a
Fix incorrect return
claytongreen Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ import android.content.ComponentCallbacks
import android.content.res.Configuration
import android.location.Location
import android.os.Bundle
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Composition
Expand Down Expand Up @@ -87,8 +88,9 @@ public fun GoogleMap(
contentPadding: PaddingValues = NoPadding,
content: (@Composable @GoogleMapComposable () -> Unit)? = null,
) {
// Early return if in preview
// When in preview, early return a Box with the received modifier preserving layout
if (LocalInspectionMode.current) {
Box(modifier = modifier)
return
}

Expand Down