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 @@ -200,17 +200,17 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
/**
* BackgroundSize
*/
experimental_backgroundSize: backgroundSizeAttribute,
backgroundSize: backgroundSizeAttribute,

/**
* BackgroundPosition
*/
experimental_backgroundPosition: backgroundPositionAttribute,
backgroundPosition: backgroundPositionAttribute,

/**
* BackgroundRepeat
*/
experimental_backgroundRepeat: backgroundRepeatAttribute,
backgroundRepeat: backgroundRepeatAttribute,

/**
* View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ const validAttributesForNonEventProps = {
transformOrigin: true,
backgroundImage: backgroundImageAttribute,
experimental_backgroundImage: backgroundImageAttribute,
experimental_backgroundSize: backgroundSizeAttribute,
experimental_backgroundPosition: backgroundPositionAttribute,
experimental_backgroundRepeat: backgroundRepeatAttribute,
backgroundSize: backgroundSizeAttribute,
backgroundPosition: backgroundPositionAttribute,
backgroundRepeat: backgroundRepeatAttribute,
boxShadow: boxShadowAttribute,
filter: filterAttribute,
mixBlendMode: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,10 @@ export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
backgroundImage?: ReadonlyArray<BackgroundImageValue> | string | undefined;
experimental_backgroundImage?:
ReadonlyArray<BackgroundImageValue> | string | undefined;
experimental_backgroundSize?:
ReadonlyArray<BackgroundSizeValue> | string | undefined;
experimental_backgroundPosition?:
backgroundSize?: ReadonlyArray<BackgroundSizeValue> | string | undefined;
backgroundPosition?:
ReadonlyArray<BackgroundPositionValue> | string | undefined;
experimental_backgroundRepeat?:
ReadonlyArray<BackgroundRepeatValue> | string | undefined;
backgroundRepeat?: ReadonlyArray<BackgroundRepeatValue> | string | undefined;
}

export type FontVariant =
Expand Down
7 changes: 3 additions & 4 deletions packages/react-native/Libraries/StyleSheet/StyleSheetTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -893,10 +893,9 @@ export type ____ViewStyle_InternalBase = Readonly<{
mixBlendMode?: ____BlendMode_Internal,
backgroundImage?: ReadonlyArray<BackgroundImageValue> | string,
experimental_backgroundImage?: ReadonlyArray<BackgroundImageValue> | string,
experimental_backgroundSize?: ReadonlyArray<BackgroundSizeValue> | string,
experimental_backgroundPosition?:
ReadonlyArray<BackgroundPositionValue> | string,
experimental_backgroundRepeat?: ReadonlyArray<BackgroundRepeatValue> | string,
backgroundSize?: ReadonlyArray<BackgroundSizeValue> | string,
backgroundPosition?: ReadonlyArray<BackgroundPositionValue> | string,
backgroundRepeat?: ReadonlyArray<BackgroundRepeatValue> | string,
isolation?: 'auto' | 'isolate',
}>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ public object ViewProps {
public const val BACKGROUND_IMAGE: String = "backgroundImage"
// Backwards-compatible alias for the original experimental_ prefixed prop name.
public const val EXPERIMENTAL_BACKGROUND_IMAGE: String = "experimental_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"
public const val BACKGROUND_SIZE: String = "backgroundSize"
public const val BACKGROUND_POSITION: String = "backgroundPosition"
public const val BACKGROUND_REPEAT: String = "backgroundRepeat"
public const val FOREGROUND_COLOR: String = "foregroundColor"
public const val COLOR: String = "color"
public const val FONT_SIZE: String = "fontSize"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,19 @@ BaseViewProps::BaseViewProps(
backgroundSize(convertRawProp(
context,
rawProps,
"experimental_backgroundSize",
"backgroundSize",
sourceProps.backgroundSize,
{})),
backgroundPosition(convertRawProp(
context,
rawProps,
"experimental_backgroundPosition",
"backgroundPosition",
sourceProps.backgroundPosition,
{})),
backgroundRepeat(convertRawProp(
context,
rawProps,
"experimental_backgroundRepeat",
"backgroundRepeat",
sourceProps.backgroundRepeat,
{})),
mixBlendMode(convertRawProp(
Expand Down Expand Up @@ -338,10 +338,9 @@ void BaseViewProps::setProp(
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundColor);
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundImage);
RAW_SET_PROP_SWITCH_CASE(backgroundImage, "experimental_backgroundImage");
RAW_SET_PROP_SWITCH_CASE(backgroundSize, "experimental_backgroundSize");
RAW_SET_PROP_SWITCH_CASE(
backgroundPosition, "experimental_backgroundPosition");
RAW_SET_PROP_SWITCH_CASE(backgroundRepeat, "experimental_backgroundRepeat");
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundSize);
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundPosition);
RAW_SET_PROP_SWITCH_CASE_BASIC(backgroundRepeat);
RAW_SET_PROP_SWITCH_CASE_BASIC(shadowColor);
RAW_SET_PROP_SWITCH_CASE_BASIC(shadowOffset);
RAW_SET_PROP_SWITCH_CASE_BASIC(shadowOpacity);
Expand Down
Loading
Loading