mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Pass context through to all prop parser (props structs changes)
Summary: See previous diffs for context. This updates all of the relevant props structs. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D29855426 fbshipit-source-id: 30177c3380ef82ecf8f2a4321f128cfbe8a576e0
This commit is contained in:
committed by
Facebook GitHub Bot
parent
09b9422516
commit
5d33e65694
@@ -16,6 +16,7 @@ namespace facebook {
|
||||
namespace react {
|
||||
|
||||
static TextAttributes convertRawProp(
|
||||
const PropsParserContext &context,
|
||||
const RawProps &rawProps,
|
||||
const TextAttributes sourceTextAttributes,
|
||||
const TextAttributes defaultTextAttributes) {
|
||||
@@ -23,16 +24,19 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Color
|
||||
textAttributes.foregroundColor = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"color",
|
||||
sourceTextAttributes.foregroundColor,
|
||||
defaultTextAttributes.foregroundColor);
|
||||
textAttributes.backgroundColor = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"backgroundColor",
|
||||
sourceTextAttributes.backgroundColor,
|
||||
defaultTextAttributes.backgroundColor);
|
||||
textAttributes.opacity = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"opacity",
|
||||
sourceTextAttributes.opacity,
|
||||
@@ -40,46 +44,55 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Font
|
||||
textAttributes.fontFamily = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontFamily",
|
||||
sourceTextAttributes.fontFamily,
|
||||
defaultTextAttributes.fontFamily);
|
||||
textAttributes.fontSize = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontSize",
|
||||
sourceTextAttributes.fontSize,
|
||||
defaultTextAttributes.fontSize);
|
||||
textAttributes.fontSizeMultiplier = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontSizeMultiplier",
|
||||
sourceTextAttributes.fontSizeMultiplier,
|
||||
defaultTextAttributes.fontSizeMultiplier);
|
||||
textAttributes.fontWeight = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontWeight",
|
||||
sourceTextAttributes.fontWeight,
|
||||
defaultTextAttributes.fontWeight);
|
||||
textAttributes.fontStyle = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontStyle",
|
||||
sourceTextAttributes.fontStyle,
|
||||
defaultTextAttributes.fontStyle);
|
||||
textAttributes.fontVariant = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"fontVariant",
|
||||
sourceTextAttributes.fontVariant,
|
||||
defaultTextAttributes.fontVariant);
|
||||
textAttributes.allowFontScaling = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"allowFontScaling",
|
||||
sourceTextAttributes.allowFontScaling,
|
||||
defaultTextAttributes.allowFontScaling);
|
||||
textAttributes.letterSpacing = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"letterSpacing",
|
||||
sourceTextAttributes.letterSpacing,
|
||||
defaultTextAttributes.letterSpacing);
|
||||
textAttributes.textTransform = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textTransform",
|
||||
sourceTextAttributes.textTransform,
|
||||
@@ -87,16 +100,19 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Paragraph
|
||||
textAttributes.lineHeight = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"lineHeight",
|
||||
sourceTextAttributes.lineHeight,
|
||||
defaultTextAttributes.lineHeight);
|
||||
textAttributes.alignment = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textAlign",
|
||||
sourceTextAttributes.alignment,
|
||||
defaultTextAttributes.alignment);
|
||||
textAttributes.baseWritingDirection = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"baseWritingDirection",
|
||||
sourceTextAttributes.baseWritingDirection,
|
||||
@@ -104,21 +120,25 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Decoration
|
||||
textAttributes.textDecorationColor = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textDecorationColor",
|
||||
sourceTextAttributes.textDecorationColor,
|
||||
defaultTextAttributes.textDecorationColor);
|
||||
textAttributes.textDecorationLineType = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textDecorationLine",
|
||||
sourceTextAttributes.textDecorationLineType,
|
||||
defaultTextAttributes.textDecorationLineType);
|
||||
textAttributes.textDecorationLineStyle = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textDecorationLineStyle",
|
||||
sourceTextAttributes.textDecorationLineStyle,
|
||||
defaultTextAttributes.textDecorationLineStyle);
|
||||
textAttributes.textDecorationLinePattern = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textDecorationLinePattern",
|
||||
sourceTextAttributes.textDecorationLinePattern,
|
||||
@@ -126,16 +146,19 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Shadow
|
||||
textAttributes.textShadowOffset = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textShadowOffset",
|
||||
sourceTextAttributes.textShadowOffset,
|
||||
defaultTextAttributes.textShadowOffset);
|
||||
textAttributes.textShadowRadius = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textShadowRadius",
|
||||
sourceTextAttributes.textShadowRadius,
|
||||
defaultTextAttributes.textShadowRadius);
|
||||
textAttributes.textShadowColor = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"textShadowColor",
|
||||
sourceTextAttributes.textShadowColor,
|
||||
@@ -143,12 +166,14 @@ static TextAttributes convertRawProp(
|
||||
|
||||
// Special
|
||||
textAttributes.isHighlighted = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"isHighlighted",
|
||||
sourceTextAttributes.isHighlighted,
|
||||
defaultTextAttributes.isHighlighted);
|
||||
|
||||
textAttributes.accessibilityRole = convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
"accessibilityRole",
|
||||
sourceTextAttributes.accessibilityRole,
|
||||
@@ -158,9 +183,11 @@ static TextAttributes convertRawProp(
|
||||
}
|
||||
|
||||
BaseTextProps::BaseTextProps(
|
||||
const PropsParserContext &context,
|
||||
const BaseTextProps &sourceProps,
|
||||
const RawProps &rawProps)
|
||||
: textAttributes(convertRawProp(
|
||||
context,
|
||||
rawProps,
|
||||
sourceProps.textAttributes,
|
||||
TextAttributes{})){};
|
||||
|
||||
Reference in New Issue
Block a user