mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Joshua Gross
5bc7f0441d
Summary:
Motivation: in Marketplace, there's a TextInput in JS that sends { lineHeight: null } to C++. In Paper this was correctly handled as a default value, which just causes that property to not be set. In C++ in Fabric, it was being parsed incorrectly as 0 (because of incorrect defaults being passed into `convertRawProp`), causing the text to not be visible at all. The solution is to make sure that its default value is NaN, which is handled correctly, and causes the Text to render again.
Changelog: [Internal]
Reviewed By: shergin
Differential Revision: D19128049
fbshipit-source-id: fe985428f3ed8b90d56cfa387fbc2d1476d19d36
167 lines
5.1 KiB
C++
167 lines
5.1 KiB
C++
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#include "BaseTextProps.h"
|
|
|
|
#include <react/attributedstring/conversions.h>
|
|
#include <react/core/propsConversions.h>
|
|
#include <react/debug/DebugStringConvertibleItem.h>
|
|
#include <react/graphics/conversions.h>
|
|
|
|
namespace facebook {
|
|
namespace react {
|
|
|
|
static TextAttributes convertRawProp(
|
|
const RawProps &rawProps,
|
|
const TextAttributes sourceTextAttributes,
|
|
const TextAttributes defaultTextAttributes) {
|
|
auto textAttributes = TextAttributes{};
|
|
|
|
// Color
|
|
textAttributes.foregroundColor = convertRawProp(
|
|
rawProps,
|
|
"color",
|
|
sourceTextAttributes.foregroundColor,
|
|
defaultTextAttributes.foregroundColor);
|
|
textAttributes.backgroundColor = convertRawProp(
|
|
rawProps,
|
|
"backgroundColor",
|
|
sourceTextAttributes.backgroundColor,
|
|
defaultTextAttributes.backgroundColor);
|
|
textAttributes.opacity = convertRawProp(
|
|
rawProps,
|
|
"opacity",
|
|
sourceTextAttributes.opacity,
|
|
defaultTextAttributes.opacity);
|
|
|
|
// Font
|
|
textAttributes.fontFamily = convertRawProp(
|
|
rawProps,
|
|
"fontFamily",
|
|
sourceTextAttributes.fontFamily,
|
|
defaultTextAttributes.fontFamily);
|
|
textAttributes.fontSize = convertRawProp(
|
|
rawProps,
|
|
"fontSize",
|
|
sourceTextAttributes.fontSize,
|
|
defaultTextAttributes.fontSize);
|
|
textAttributes.fontSizeMultiplier = convertRawProp(
|
|
rawProps,
|
|
"fontSizeMultiplier",
|
|
sourceTextAttributes.fontSizeMultiplier,
|
|
defaultTextAttributes.fontSizeMultiplier);
|
|
textAttributes.fontWeight = convertRawProp(
|
|
rawProps,
|
|
"fontWeight",
|
|
sourceTextAttributes.fontWeight,
|
|
defaultTextAttributes.fontWeight);
|
|
textAttributes.fontStyle = convertRawProp(
|
|
rawProps,
|
|
"fontStyle",
|
|
sourceTextAttributes.fontStyle,
|
|
defaultTextAttributes.fontStyle);
|
|
textAttributes.fontVariant = convertRawProp(
|
|
rawProps,
|
|
"fontVariant",
|
|
sourceTextAttributes.fontVariant,
|
|
defaultTextAttributes.fontVariant);
|
|
textAttributes.allowFontScaling = convertRawProp(
|
|
rawProps,
|
|
"allowFontScaling",
|
|
sourceTextAttributes.allowFontScaling,
|
|
defaultTextAttributes.allowFontScaling);
|
|
textAttributes.letterSpacing = convertRawProp(
|
|
rawProps,
|
|
"letterSpacing",
|
|
sourceTextAttributes.letterSpacing,
|
|
defaultTextAttributes.letterSpacing);
|
|
|
|
// Paragraph
|
|
textAttributes.lineHeight = convertRawProp(
|
|
rawProps,
|
|
"lineHeight",
|
|
sourceTextAttributes.lineHeight,
|
|
defaultTextAttributes.lineHeight);
|
|
textAttributes.alignment = convertRawProp(
|
|
rawProps,
|
|
"textAlign",
|
|
sourceTextAttributes.alignment,
|
|
defaultTextAttributes.alignment);
|
|
textAttributes.baseWritingDirection = convertRawProp(
|
|
rawProps,
|
|
"baseWritingDirection",
|
|
sourceTextAttributes.baseWritingDirection,
|
|
defaultTextAttributes.baseWritingDirection);
|
|
|
|
// Decoration
|
|
textAttributes.textDecorationColor = convertRawProp(
|
|
rawProps,
|
|
"textDecorationColor",
|
|
sourceTextAttributes.textDecorationColor,
|
|
defaultTextAttributes.textDecorationColor);
|
|
textAttributes.textDecorationLineType = convertRawProp(
|
|
rawProps,
|
|
"textDecorationLine",
|
|
sourceTextAttributes.textDecorationLineType,
|
|
defaultTextAttributes.textDecorationLineType);
|
|
textAttributes.textDecorationLineStyle = convertRawProp(
|
|
rawProps,
|
|
"textDecorationLineStyle",
|
|
sourceTextAttributes.textDecorationLineStyle,
|
|
defaultTextAttributes.textDecorationLineStyle);
|
|
textAttributes.textDecorationLinePattern = convertRawProp(
|
|
rawProps,
|
|
"textDecorationLinePattern",
|
|
sourceTextAttributes.textDecorationLinePattern,
|
|
defaultTextAttributes.textDecorationLinePattern);
|
|
|
|
// Shadow
|
|
textAttributes.textShadowOffset = convertRawProp(
|
|
rawProps,
|
|
"textShadowOffset",
|
|
sourceTextAttributes.textShadowOffset,
|
|
defaultTextAttributes.textShadowOffset);
|
|
textAttributes.textShadowRadius = convertRawProp(
|
|
rawProps,
|
|
"textShadowRadius",
|
|
sourceTextAttributes.textShadowRadius,
|
|
defaultTextAttributes.textShadowRadius);
|
|
textAttributes.textShadowColor = convertRawProp(
|
|
rawProps,
|
|
"textShadowColor",
|
|
sourceTextAttributes.textShadowColor,
|
|
defaultTextAttributes.textShadowColor);
|
|
|
|
// Special
|
|
textAttributes.isHighlighted = convertRawProp(
|
|
rawProps,
|
|
"isHighlighted",
|
|
sourceTextAttributes.isHighlighted,
|
|
defaultTextAttributes.isHighlighted);
|
|
|
|
return textAttributes;
|
|
}
|
|
|
|
BaseTextProps::BaseTextProps(
|
|
const BaseTextProps &sourceProps,
|
|
const RawProps &rawProps)
|
|
: textAttributes(convertRawProp(
|
|
rawProps,
|
|
sourceProps.textAttributes,
|
|
TextAttributes{})){};
|
|
|
|
#pragma mark - DebugStringConvertible
|
|
|
|
#if RN_DEBUG_STRING_CONVERTIBLE
|
|
SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
|
|
return textAttributes.getDebugProps();
|
|
}
|
|
#endif
|
|
|
|
} // namespace react
|
|
} // namespace facebook
|