Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
/**
* BackgroundImage
*/
experimental_backgroundImage: backgroundImageAttribute,
backgroundImage: backgroundImageAttribute,

/**
* BackgroundSize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,12 @@ describe('<View>', () => {
<>
<View
style={{
experimental_backgroundImage:
'radial-gradient(#e66465, #9198e5)',
backgroundImage: 'radial-gradient(#e66465, #9198e5)',
}}
/>
<View
style={{
experimental_backgroundImage: [
backgroundImage: [
{
type: 'radial-gradient',
shape: 'ellipse',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ const validAttributesForNonEventProps = {
backgroundColor: colorAttribute,
transform: true,
transformOrigin: true,
experimental_backgroundImage: backgroundImageAttribute,
backgroundImage: backgroundImageAttribute,
experimental_backgroundSize: backgroundSizeAttribute,
experimental_backgroundPosition: backgroundPositionAttribute,
experimental_backgroundRepeat: backgroundRepeatAttribute,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,10 +517,7 @@ export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
filter?: ReadonlyArray<FilterFunction> | string | undefined;

mixBlendMode?: BlendMode | undefined;
experimental_backgroundImage?:
| ReadonlyArray<BackgroundImageValue>
| string
| undefined;
backgroundImage?: ReadonlyArray<BackgroundImageValue> | string | undefined;
experimental_backgroundSize?:
| ReadonlyArray<BackgroundSizeValue>
| string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ export type ____ViewStyle_InternalBase = Readonly<{
boxShadow?: ReadonlyArray<BoxShadowValue> | string,
filter?: ReadonlyArray<FilterFunction> | string,
mixBlendMode?: ____BlendMode_Internal,
experimental_backgroundImage?: ReadonlyArray<BackgroundImageValue> | string,
backgroundImage?: ReadonlyArray<BackgroundImageValue> | string,
experimental_backgroundSize?: ReadonlyArray<BackgroundSizeValue> | string,
experimental_backgroundPosition?:
| ReadonlyArray<BackgroundPositionValue>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public object ViewProps {
// Props that affect more than just layout
public const val ENABLED: String = "enabled"
public const val BACKGROUND_COLOR: String = "backgroundColor"
public const val BACKGROUND_IMAGE: String = "experimental_backgroundImage"
public const val BACKGROUND_IMAGE: String = "backgroundImage"
public const val BACKGROUND_SIZE: String = "experimental_backgroundSize"
public const val BACKGROUND_POSITION: String = "experimental_backgroundPosition"
public const val BACKGROUND_REPEAT: String = "experimental_backgroundRepeat"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ BaseViewProps::BaseViewProps(
: convertRawProp(
context,
rawProps,
"experimental_backgroundImage",
"backgroundImage",
sourceProps.backgroundImage,
{})),
backgroundSize(
Expand Down Expand Up @@ -403,7 +403,7 @@ void BaseViewProps::setProp(
switch (hash) {
RAW_SET_PROP_SWITCH_CASE_BASIC(opacity);
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundColor);
RAW_SET_PROP_SWITCH_CASE(backgroundImage, "experimental_backgroundImage");
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundImage);
RAW_SET_PROP_SWITCH_CASE(backgroundSize, "experimental_backgroundSize");
RAW_SET_PROP_SWITCH_CASE(
backgroundPosition, "experimental_backgroundPosition");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ folly::dynamic HostPlatformViewProps::getDiffProps(
}

if (backgroundImage != oldProps->backgroundImage) {
result["experimental_backgroundImage"] = toDynamic(backgroundImage);
result["backgroundImage"] = toDynamic(backgroundImage);
}

if (mixBlendMode != oldProps->mixBlendMode) {
Expand Down
Loading
Loading