Skip to content

Fix shadowColor and outline prop defaults in BaseViewManagerDelegate #59423

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
meta-codesync merged 1 commit into from
Oct 28, 2026
Merged

Fix shadowColor and outline prop defaults in BaseViewManagerDelegate #59423

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
16 changes: 7 additions & 9 deletions ...native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManagerDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

package com.facebook.react.uimanager

import android.graphics.Color
import android.view.View
import com.facebook.react.bridge.ColorPropConverter
import com.facebook.react.bridge.Dynamic
Expand Down Expand Up @@ -89,7 +90,10 @@ public abstract class BaseViewManagerDelegate<
ViewProps.MIX_BLEND_MODE -> mViewManager.setMixBlendMode(view, value as String?)

ViewProps.SHADOW_COLOR ->
mViewManager.setShadowColor(view, ColorPropConverter.getColor(value, view.context, 0))
mViewManager.setShadowColor(
view,
ColorPropConverter.getColor(value, view.context, Color.BLACK),
)

ViewProps.IMPORTANT_FOR_ACCESSIBILITY ->
mViewManager.setImportantForAccessibility(view, value as String?)
Expand All @@ -113,18 +117,12 @@ public abstract class BaseViewManagerDelegate<
)

ViewProps.OUTLINE_OFFSET ->
mViewManager.setOutlineOffset(
view,
(value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED,
)
mViewManager.setOutlineOffset(view, (value as Double?)?.toFloat() ?: 0.0f)

ViewProps.OUTLINE_STYLE -> mViewManager.setOutlineStyle(view, value as String?)

ViewProps.OUTLINE_WIDTH ->
mViewManager.setOutlineWidth(
view,
(value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED,
)
mViewManager.setOutlineWidth(view, (value as Double?)?.toFloat() ?: 0.0f)

ViewProps.RENDER_TO_HARDWARE_TEXTURE ->
mViewManager.setRenderToHardwareTexture(view, value as Boolean? ?: false)
Expand Down
22 changes: 22 additions & 0 deletions .../ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerDelegateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import android.graphics.Color;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactTestHelper;
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
Expand Down Expand Up @@ -60,4 +61,25 @@ public void setOutlineColorPreservesNull() {

verify(viewManager).setOutlineColor(view, null);
}

@Test
public void setShadowColorResetsToBlack() {
delegate.setProperty(view, ViewProps.SHADOW_COLOR, null);

verify(viewManager).setShadowColor(view, Color.BLACK);
}

@Test
public void setOutlineOffsetResetsToZero() {
delegate.setProperty(view, ViewProps.OUTLINE_OFFSET, null);

verify(viewManager).setOutlineOffset(view, 0f);
}

@Test
public void setOutlineWidthResetsToZero() {
delegate.setProperty(view, ViewProps.OUTLINE_WIDTH, null);

verify(viewManager).setOutlineWidth(view, 0f);
}
}
Loading