Skip to content

Fix BoxShadow support for platform colors #46753

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

Closed
javache wants to merge 1 commit into from
Closed

Fix BoxShadow support for platform colors #46753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6125,12 +6125,12 @@ public final class com/facebook/react/uimanager/style/BoxShadow {
public final fun getOffsetY ()F
public final fun getSpreadDistance ()Ljava/lang/Float;
public fun hashCode ()I
public static final fun parse (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/uimanager/style/BoxShadow;
public static final fun parse (Lcom/facebook/react/bridge/ReadableMap;Landroid/content/Context;)Lcom/facebook/react/uimanager/style/BoxShadow;
public fun toString ()Ljava/lang/String;
}

public final class com/facebook/react/uimanager/style/BoxShadow$Companion {
public final fun parse (Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/uimanager/style/BoxShadow;
public final fun parse (Lcom/facebook/react/bridge/ReadableMap;Landroid/content/Context;)Lcom/facebook/react/uimanager/style/BoxShadow;
}

public final class com/facebook/react/uimanager/style/ComputedBorderRadius {
Expand Down
2 changes: 1 addition & 1 deletion ...tive/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public object BackgroundStyleApplicator {

val shadowStyles = mutableListOf<BoxShadow>()
for (i in 0..<shadows.size()) {
shadowStyles.add(checkNotNull(BoxShadow.parse(shadows.getMap(i))))
shadowStyles.add(checkNotNull(BoxShadow.parse(shadows.getMap(i), view.context)))
}
BackgroundStyleApplicator.setBoxShadow(view, shadowStyles)
}
Expand Down
15 changes: 13 additions & 2 deletions ...s/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/style/BoxShadow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@

package com.facebook.react.uimanager.style

import android.content.Context
import androidx.annotation.ColorInt
import com.facebook.react.bridge.ColorPropConverter
import com.facebook.react.bridge.JSApplicationCausedNativeException
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.ReadableType

/** Represents all logical properties and shorthands for border radius. */
public data class BoxShadow(
Expand All @@ -21,15 +25,22 @@ public data class BoxShadow(
) {
public companion object {
@JvmStatic
public fun parse(boxShadow: ReadableMap): BoxShadow? {
public fun parse(boxShadow: ReadableMap, context: Context): BoxShadow? {
if (!(boxShadow.hasKey("offsetX") && boxShadow.hasKey("offsetY"))) {
return null
}

val offsetX = boxShadow.getDouble("offsetX").toFloat()
val offsetY = boxShadow.getDouble("offsetY").toFloat()

val color = if (boxShadow.hasKey("color")) boxShadow.getInt("color") else null
val color =
if (boxShadow.hasKey("color")) {
when (val type = boxShadow.getType("color")) {
ReadableType.Number -> boxShadow.getInt("color")
ReadableType.Map -> ColorPropConverter.getColor(boxShadow.getMap("color"), context)
else -> throw JSApplicationCausedNativeException("Unsupported color type ${type}")
}
} else null
val blurRadius =
if (boxShadow.hasKey("blurRadius")) boxShadow.getDouble("blurRadius").toFloat() else null
val spreadDistance =
Expand Down