Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle resetting boxShadow prop (#45829)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/45829

`ReadableArray` here should be nullable, according to https://reactnative.dev/docs/next/native-components-android#3-expose-view-property-setters-using-reactprop-or-reactpropgroup-annotation

Filter is doing this correctly already.

That form will be used to reset state, back to no box shadows.

Changelog: [Internal]

Reviewed By: joevilches

Differential Revision: D60465486

fbshipit-source-id: b8024ad02a0eabc0da8dfca141d51387983cc031
This commit is contained in:
Nick Gerleman
2024-07-31 23:49:48 -07:00
committed by Facebook GitHub Bot
parent 92dca53702
commit b988e1cb58
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt
+13 -7
View File
@@ -131,16 +131,22 @@ public object BackgroundStyleApplicator {
}
@JvmStatic
public fun setBoxShadow(view: View, shadows: ReadableArray): Unit {
public fun setBoxShadow(view: View, shadows: ReadableArray?): Unit {
if (Build.VERSION.SDK_INT < 31) {
FLog.w("BackgroundStyleApplicator", "\"boxShadow\" requires Android 12 or later")
} else {
val shadowStyles = mutableListOf<BoxShadow>()
for (i in 0..<shadows.size()) {
shadowStyles.add(checkNotNull(BoxShadow.parse(shadows.getMap(i))))
}
BackgroundStyleApplicator.setBoxShadow(view, shadowStyles)
return
}
if (shadows == null) {
BackgroundStyleApplicator.setBoxShadow(view, emptyList())
return
}
val shadowStyles = mutableListOf<BoxShadow>()
for (i in 0..<shadows.size()) {
shadowStyles.add(checkNotNull(BoxShadow.parse(shadows.getMap(i))))
}
BackgroundStyleApplicator.setBoxShadow(view, shadowStyles)
}
@JvmStatic
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.kt
+1 -1
View File
@@ -262,7 +262,7 @@ public constructor(
}
@ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
public fun setBoxShadow(view: ReactImageView, shadows: ReadableArray): Unit {
public fun setBoxShadow(view: ReactImageView, shadows: ReadableArray?): Unit {
if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
BackgroundStyleApplicator.setBoxShadow(view, shadows)
}
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
+1 -1
View File
@@ -392,7 +392,7 @@ public class ReactHorizontalScrollViewManager extends ViewGroupManager<ReactHori
}
@ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
public void setBoxShadow(ReactHorizontalScrollView view, ReadableArray shadows) {
public void setBoxShadow(ReactHorizontalScrollView view, @Nullable ReadableArray shadows) {
if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
BackgroundStyleApplicator.setBoxShadow(view, shadows);
}
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
+1 -1
View File
@@ -374,7 +374,7 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
}
@ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
public void setBoxShadow(ReactScrollView view, ReadableArray shadows) {
public void setBoxShadow(ReactScrollView view, @Nullable ReadableArray shadows) {
if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
BackgroundStyleApplicator.setBoxShadow(view, shadows);
}