Skip to content

Change type of shadows from array to LayerDrawable #46818

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
jorge-cab wants to merge 1 commit into from
Closed

Change type of shadows from array to LayerDrawable #46818

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
54 changes: 37 additions & 17 deletions ...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 @@ -13,6 +13,7 @@ import android.graphics.Path
import android.graphics.Rect
import android.graphics.RectF
import android.graphics.drawable.Drawable
import android.graphics.drawable.LayerDrawable
import android.os.Build
import android.view.View
import android.widget.ImageView
Expand Down Expand Up @@ -106,12 +107,13 @@ public object BackgroundStyleApplicator {
composite.borderInsets = composite.borderInsets ?: BorderInsets()
composite.borderInsets?.setBorderWidth(edge, width)
if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
composite.borderInsets = composite.borderInsets ?: BorderInsets()
composite.borderInsets?.setBorderWidth(edge, width)

for (shadow in composite.innerShadows) {
(shadow as InsetBoxShadowDrawable).borderInsets = composite.borderInsets
shadow.invalidateSelf()
val innerShadows = composite.innerShadows
if (innerShadows != null) {
for (i in 0 until innerShadows.numberOfLayers) {
val shadow = innerShadows.getDrawable(i)
(shadow as InsetBoxShadowDrawable).borderInsets = composite.borderInsets
shadow.invalidateSelf()
}
}
}
}
Expand Down Expand Up @@ -172,17 +174,29 @@ public object BackgroundStyleApplicator {
}

if (Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
for (shadow in compositeBackgroundDrawable.outerShadows) {
if (shadow is OutsetBoxShadowDrawable) {
shadow.borderRadius = compositeBackgroundDrawable.borderRadius
val outerShadows = compositeBackgroundDrawable.outerShadows
if (outerShadows != null) {
for (i in 0 until outerShadows.numberOfLayers) {
val shadow = outerShadows.getDrawable(i)
if (shadow is OutsetBoxShadowDrawable) {
shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
shadow.borderRadius?.set(corner, radius)
shadow.invalidateSelf()
}
}
}
}

if (Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
for (shadow in compositeBackgroundDrawable.innerShadows) {
if (shadow is InsetBoxShadowDrawable) {
shadow.borderRadius = compositeBackgroundDrawable.borderRadius
val innerShadows = compositeBackgroundDrawable.innerShadows
if (innerShadows != null) {
for (i in 0 until innerShadows.numberOfLayers) {
val shadow = innerShadows.getDrawable(i)
if (shadow is InsetBoxShadowDrawable) {
shadow.borderRadius = shadow.borderRadius ?: BorderRadiusStyle()
shadow.borderRadius?.set(corner, radius)
shadow.invalidateSelf()
}
}
}
}
Expand Down Expand Up @@ -277,14 +291,14 @@ public object BackgroundStyleApplicator {
return
}

val outerShadows = mutableListOf<OutsetBoxShadowDrawable>()
val innerShadows = mutableListOf<InsetBoxShadowDrawable>()
var innerShadows: LayerDrawable? = null
var outerShadows: LayerDrawable? = null

val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
val borderInsets = compositeBackgroundDrawable.borderInsets
val borderRadius = compositeBackgroundDrawable.borderRadius

for (boxShadow in shadows) {
for (boxShadow in shadows.asReversed()) {
val offsetX = boxShadow.offsetX
val offsetY = boxShadow.offsetY
val color = boxShadow.color ?: Color.BLACK
Expand All @@ -293,7 +307,10 @@ public object BackgroundStyleApplicator {
val inset = boxShadow.inset ?: false

if (inset && Build.VERSION.SDK_INT >= MIN_INSET_BOX_SHADOW_SDK_VERSION) {
innerShadows.add(
if (innerShadows == null) {
innerShadows = LayerDrawable(emptyArray())
}
innerShadows.addLayer(
InsetBoxShadowDrawable(
context = view.context,
borderRadius = borderRadius,
Expand All @@ -304,7 +321,10 @@ public object BackgroundStyleApplicator {
blurRadius = blurRadius,
spread = spreadDistance))
} else if (!inset && Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
outerShadows.add(
if (outerShadows == null) {
outerShadows = LayerDrawable(emptyArray())
}
outerShadows.addLayer(
OutsetBoxShadowDrawable(
context = view.context,
borderRadius = borderRadius,
Expand Down
15 changes: 7 additions & 8 deletions ...ndroid/src/main/java/com/facebook/react/uimanager/drawable/CompositeBackgroundDrawable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal class CompositeBackgroundDrawable(
public val originalBackground: Drawable? = null,

/** Non-inset box shadows */
public val outerShadows: List<Drawable> = emptyList(),
public val outerShadows: LayerDrawable? = null,

/**
* CSS background layer and border rendering
Expand All @@ -52,26 +52,25 @@ internal class CompositeBackgroundDrawable(
public val feedbackUnderlay: Drawable? = null,

/** Inset box-shadows */
public val innerShadows: List<Drawable> = emptyList(),
public val innerShadows: LayerDrawable? = null,

/** Outline */
public val outline: OutlineDrawable? = null,
) :
LayerDrawable(
listOfNotNull(
listOf(
originalBackground,
// z-ordering of user-provided shadow-list is opposite direction of LayerDrawable
// z-ordering
// https://drafts.csswg.org/css-backgrounds/#shadow-layers
*outerShadows.asReversed().toTypedArray(),
outerShadows,
cssBackground,
background,
border,
feedbackUnderlay,
*innerShadows.asReversed().toTypedArray(),
innerShadows,
outline)
.toTypedArray()) {

// Holder value for currently set insets
public var borderInsets: BorderInsets? = null
// Holder value for currently set border radius
Expand Down Expand Up @@ -121,8 +120,8 @@ internal class CompositeBackgroundDrawable(
}

public fun withNewShadows(
outerShadows: List<Drawable>,
innerShadows: List<Drawable>
outerShadows: LayerDrawable?,
innerShadows: LayerDrawable?
): CompositeBackgroundDrawable {
return CompositeBackgroundDrawable(
context,
Expand Down