Skip to content

fix(Android, FormSheet): Add fallback for undefined corner radius #3291

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
wants to merge 3 commits into
base: main
Choose a base branch
from
+4 −2
Open

fix(Android, FormSheet): Add fallback for undefined corner radius #3291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd112e8
Fallback to 0 with undefined corner radius
t0maboro Oct 10, 2025
625e6f2
Add another fallback
t0maboro Oct 13, 2025
e25661f
Cleanup
t0maboro Oct 13, 2025
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
3 changes: 2 additions & 1 deletion android/src/main/java/com/swmansion/rnscreens/Screen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.swmansion.rnscreens.events.SheetDetentChangedEvent
import com.swmansion.rnscreens.ext.asScreenStackFragment
import com.swmansion.rnscreens.ext.parentAsViewGroup
import com.swmansion.rnscreens.gamma.common.FragmentProviding
import kotlin.math.max

@SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
class Screen(
Expand Down Expand Up @@ -518,7 +519,7 @@ class Screen(
return
}
(background as? MaterialShapeDrawable?)?.let {
val resolvedCornerRadius = PixelUtil.toDIPFromPixel(sheetCornerRadius)
val resolvedCornerRadius = max(PixelUtil.toDIPFromPixel(sheetCornerRadius), 0f)
it.shapeAppearanceModel =
ShapeAppearanceModel
.Builder()
Expand Down
3 changes: 2 additions & 1 deletion android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import com.swmansion.rnscreens.stack.views.ScreensCoordinatorLayout
import com.swmansion.rnscreens.transition.ExternalBoundaryValuesEvaluator
import com.swmansion.rnscreens.utils.DeviceUtils
import com.swmansion.rnscreens.utils.resolveBackgroundColor
import kotlin.math.max

sealed class KeyboardState

Expand Down Expand Up @@ -367,7 +368,7 @@ class ScreenStackFragment :
}

private fun attachShapeToScreen(screen: Screen) {
val cornerSize = PixelUtil.toPixelFromDIP(screen.sheetCornerRadius)
val cornerSize = max(PixelUtil.toPixelFromDIP(screen.sheetCornerRadius), 0f)
val shapeAppearanceModel =
ShapeAppearanceModel
.Builder()
Expand Down
Loading