second attempt

facebook · Apr 6, 2020 · fbe283f · fbe283f
1 parent 33d16d0
commit fbe283f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Libraries/Components/Pressable/useAndroidRippleForView.js b/Libraries/Components/Pressable/useAndroidRippleForView.js
@@ -47,13 +47,10 @@ export default function useAndroidRippleForView(
   |}>,
 |}> {
   const {color, borderless, radius} = rippleConfig ?? {};
+  const normalizedBorderless = borderless === true;
 
   return useMemo(() => {
-    if (
-      Platform.OS === 'android' &&
-      Platform.Version >= 21 &&
-      (color != null || borderless != null || radius != null)
-    ) {
+    if (Platform.OS === 'android' && Platform.Version >= 21) {
       const processedColor = processColor(color);
       invariant(
         processedColor == null || typeof processedColor === 'number',
@@ -66,7 +63,7 @@ export default function useAndroidRippleForView(
           nativeBackgroundAndroid: {
             type: 'RippleAndroid',
             color: processedColor,
-            borderless: borderless === true,
+            borderless: normalizedBorderless,
             rippleRadius: radius,
           },
         },
@@ -100,5 +97,5 @@ export default function useAndroidRippleForView(
       };
     }
     return null;
-  }, [color, borderless, radius, viewRef]);
+  }, [color, normalizedBorderless, radius, viewRef]);
 }
diff --git a/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/RNTester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -50,7 +50,7 @@ public void onCreate() {
     ReactFontManager.getInstance().addCustomFont(this, "Rubik", R.font.rubik);
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+//    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
 
   @Override