Repository navigation
Conversation
|
@jasozh has exported this pull request. If you are a Meta employee, you can view the originating Diff in D123816883. |
meta-cla
Bot
added
the
CLA Signed
meta-codesync
Bot
changed the title
jasozh
added a commit
to jasozh/react-native
that referenced
this pull request
Oct 12, 2026
Summary: Fixes [react#34553](react#34553), where the ripple effect is a square even if the underlying Pressable is rounded. ### Root Cause For bounded ripples, ReactDrawableHelper creates a RippleDrawable with a ColorDrawable mask. This mask is rectangular and remains that way when added to CompositeBackgroundDrawable as a feedback layer, even if a border radius is configured. ### This PR Modify ReactDrawableHelper to replace the RippleDrawable's rectangular ColorDrawable mask with a BackgroundDrawable. If border radius is set, `getOpacity()` returns `PixelFormat.TRANSLUCENT` which makes RippleDrawable draw the mask into an alpha-only bitmap so the ripple respects the border radius. Otherwise, it returns `PixelFormat.OPAQUE` to avoid the cost of creating the bitmap and match the original ColorDrawable behavior. Modify BackgroundStyleApplicator to update the ripple mask's border radius during `setFeedbackUnderlay()`, `setFeedbackOverlay()`, and `setBorderRadius()`. Also make `ReactViewGroup.applyNativeForeground()` call `setFeedbackOverlay()` so that foreground ripples are properly clipped. Changelog: [Android][Fixed] - Fix Pressable ripple leaking past rounded corners Differential Revision: D123816883
jasozh
force-pushed
the
export-D123816883
branch
from
October 12, 2026 22:19
01dd796 to
8ea2c7a
Compare
jasozh
added a commit
to jasozh/react-native
that referenced
this pull request
Oct 12, 2026
Summary: Pull Request resolved: react#58945 Fixes [react#34553](react#34553), where the ripple effect is a square even if the underlying Pressable is rounded. ### Root Cause For bounded ripples, ReactDrawableHelper creates a RippleDrawable with a ColorDrawable mask. This mask is rectangular and remains that way when added to CompositeBackgroundDrawable as a feedback layer, even if a border radius is configured. ### This PR Modify ReactDrawableHelper to replace the RippleDrawable's rectangular ColorDrawable mask with a BackgroundDrawable. If border radius is set, `getOpacity()` returns `PixelFormat.TRANSLUCENT` which makes RippleDrawable draw the mask into an alpha-only bitmap so the ripple respects the border radius. Otherwise, it returns `PixelFormat.OPAQUE` to avoid the cost of creating the bitmap and match the original ColorDrawable behavior. Modify BackgroundStyleApplicator to update the ripple mask's border radius during `setFeedbackUnderlay()`, `setFeedbackOverlay()`, and `setBorderRadius()`. Also make `ReactViewGroup.applyNativeForeground()` call `setFeedbackOverlay()` so that foreground ripples are properly clipped. Changelog: [Android][Fixed] - Fix Pressable ripple leaking past rounded corners Differential Revision: D123816883
jasozh
force-pushed
the
export-D123816883
branch
from
October 12, 2026 22:22
8ea2c7a to
c6dd234
Compare
Summary: Add a new RNTester example in PressableExample that reproduces the issue where ripple effects don't clip to the Pressable's border radius. Changelog: [Internal] Differential Revision: D123816852
jasozh
force-pushed
the
export-D123816883
branch
from
October 21, 2026 22:44
c6dd234 to
e9a4572
Compare
jasozh
added a commit
to jasozh/react-native
that referenced
this pull request
Oct 21, 2026
Summary: Fixes [react#34553](react#34553), where the ripple effect is a square even if the underlying Pressable is rounded. ### Root Cause For bounded ripples, ReactDrawableHelper creates a RippleDrawable with a ColorDrawable mask. This mask is rectangular and remains that way when added to CompositeBackgroundDrawable as a feedback layer, even if a border radius is configured. ### This PR Modify ReactDrawableHelper to replace the RippleDrawable's rectangular ColorDrawable mask with a BackgroundDrawable. If border radius is set, `getOpacity()` returns `PixelFormat.TRANSLUCENT` which makes RippleDrawable draw the mask into an alpha-only bitmap so the ripple respects the border radius. Otherwise, it returns `PixelFormat.OPAQUE` to avoid the cost of creating the bitmap and match the original ColorDrawable behavior. Modify BackgroundStyleApplicator to update the ripple mask's border radius during `setFeedbackUnderlay()`, `setFeedbackOverlay()`, and `setBorderRadius()`. Also make `ReactViewGroup.applyNativeForeground()` call `setFeedbackOverlay()` so that foreground ripples are properly clipped. Changelog: [Android][Fixed] - Fix Pressable ripple leaking past rounded corners Differential Revision: D123816883
Summary: Pull Request resolved: react#58945 Fixes [react#34553](react#34553), where the ripple effect is a square even if the underlying Pressable is rounded. ### Root Cause For bounded ripples, ReactDrawableHelper creates a RippleDrawable with a ColorDrawable mask. This mask is rectangular and remains that way when added to CompositeBackgroundDrawable as a feedback layer, even if a border radius is configured. ### This PR Modify ReactDrawableHelper to replace the RippleDrawable's rectangular ColorDrawable mask with a BackgroundDrawable. If border radius is set, `getOpacity()` returns `PixelFormat.TRANSLUCENT` which makes RippleDrawable draw the mask into an alpha-only bitmap so the ripple respects the border radius. Otherwise, it returns `PixelFormat.OPAQUE` to avoid the cost of creating the bitmap and match the original ColorDrawable behavior. Modify BackgroundStyleApplicator to update the ripple mask's border radius during `setFeedbackUnderlay()`, `setFeedbackOverlay()`, and `setBorderRadius()`. Also make `ReactViewGroup.applyNativeForeground()` call `setFeedbackOverlay()` so that foreground ripples are properly clipped. Changelog: [Android][Fixed] - Fix Pressable ripple leaking past rounded corners Differential Revision: D123816883
jasozh
force-pushed
the
export-D123816883
branch
from
October 21, 2026 22:48
e9a4572 to
6570029
Compare
cortinico
requested changes
Oct 22, 2026
| import kotlin.math.roundToInt | ||
|
|
||
| internal class BackgroundDrawable( | ||
| internal open class BackgroundDrawable( |
Contributor
There was a problem hiding this comment.
Let's not make this please. Can we use composition here instead of inheritance?
Comment on lines
+165
to
+175
| private class RippleMaskDrawable(context: Context) : BackgroundDrawable(context) { | ||
| init { | ||
| backgroundColor = Color.WHITE | ||
| } | ||
|
|
||
| @Deprecated("Deprecated in Java") | ||
| override fun getOpacity(): Int = | ||
| // RippleDrawable clips to an opaque mask's bounds, but renders a translucent mask into a | ||
| // bitmap to clip to its shape. Only pay for the bitmap when there are corners to round. | ||
| if (borderRadius?.hasRoundedBorders() == true) PixelFormat.TRANSLUCENT else PixelFormat.OPAQUE | ||
| } |
Contributor
There was a problem hiding this comment.
This should be refactored or moved to its own class
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary:
Fixes #34553, where the ripple effect is a square even if the underlying Pressable is rounded.
Root Cause
For bounded ripples, ReactDrawableHelper creates a RippleDrawable with a ColorDrawable mask. This mask is rectangular and remains that way when added to CompositeBackgroundDrawable as a feedback layer, even if a border radius is configured.
This PR
Modify ReactDrawableHelper to replace the RippleDrawable's rectangular ColorDrawable mask with a BackgroundDrawable. If border radius is set,
getOpacity()returnsPixelFormat.TRANSLUCENTwhich makes RippleDrawable draw the mask into an alpha-only bitmap so the ripple respects the border radius. Otherwise, it returnsPixelFormat.OPAQUEto avoid the cost of creating the bitmap and match the original ColorDrawable behavior.Modify BackgroundStyleApplicator to update the ripple mask's border radius during
setFeedbackUnderlay(),setFeedbackOverlay(), andsetBorderRadius(). Also makeReactViewGroup.applyNativeForeground()callsetFeedbackOverlay()so that foreground ripples are properly clipped.Changelog: [Android][Fixed] - Fix Pressable ripple leaking past rounded corners
Differential Revision: D123816883