Skip to content

Adding cornerRadius to Pressable RippleConfig #21

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

Merged
merged 5 commits into from
Jul 6, 2022
Merged

Adding cornerRadius to Pressable RippleConfig #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ab34e7
Ripple radius now applies to corner radius instead of circular radius
Flewp Jun 30, 2022
e307d5c
Piping new prop: cornerRadius
Flewp Jul 5, 2022
fc90f7c
using new prop in Java
Flewp Jul 5, 2022
e6b45dc
cleanup
Flewp Jul 5, 2022
460c1c3
Prop name
Flewp Jul 5, 2022
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
6 changes: 5 additions & 1 deletion Libraries/Components/Pressable/useAndroidRippleForView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ type NativeBackgroundProp = $ReadOnly<{|
color: ?number,
borderless: boolean,
rippleRadius: ?number,
rippleCornerRadius: ?number,
|}>;

export type RippleConfig = {|
color?: ColorValue,
borderless?: boolean,
radius?: number,
cornerRadius?: number,
foreground?: boolean,
|};

Expand All @@ -45,7 +47,8 @@ export default function useAndroidRippleForView(
| $ReadOnly<{|nativeBackgroundAndroid: NativeBackgroundProp|}>
| $ReadOnly<{|nativeForegroundAndroid: NativeBackgroundProp|}>,
|}> {
const {color, borderless, radius, foreground} = rippleConfig ?? {};
const {color, borderless, radius, cornerRadius, foreground} =
rippleConfig ?? {};

return useMemo(() => {
if (
Expand All @@ -64,6 +67,7 @@ export default function useAndroidRippleForView(
color: processedColor,
borderless: borderless === true,
rippleRadius: radius,
rippleCornerRadius: cornerRadius,
};

return {
Expand Down
1 change: 1 addition & 0 deletions Libraries/Components/View/ViewPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ type AndroidDrawableRipple = $ReadOnly<{|
color?: ?number,
borderless?: ?boolean,
rippleRadius?: ?number,
rippleCornerRadius?: ?number,
|}>;

type AndroidDrawable = AndroidDrawableThemeAttr | AndroidDrawableRipple;
Expand Down
17 changes: 12 additions & 5 deletions ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.RippleDrawable;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.RoundRectShape;
import android.os.Build;
import android.util.TypedValue;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -106,11 +108,16 @@ private static int getColor(Context context, ReadableMap drawableDescriptionDict
}

private static @Nullable Drawable getMask(ReadableMap drawableDescriptionDict) {
if (!drawableDescriptionDict.hasKey("borderless")
|| drawableDescriptionDict.isNull("borderless")
|| !drawableDescriptionDict.getBoolean("borderless")) {
return new ColorDrawable(Color.WHITE);
if (drawableDescriptionDict.hasKey("borderless") && drawableDescriptionDict.getBoolean("borderless")) {
// Borderless ripples don't have masks.
return null;
}
return null;

if (drawableDescriptionDict.hasKey("rippleCornerRadius")) {
float rippleRadius = PixelUtil.toPixelFromDIP(drawableDescriptionDict.getDouble("rippleCornerRadius"));
return new ShapeDrawable(new RoundRectShape(new float[] {rippleRadius, rippleRadius, rippleRadius, rippleRadius, rippleRadius, rippleRadius, rippleRadius, rippleRadius}, null, null));
}

return new ColorDrawable(Color.WHITE);
}
}