Files
Rick Hanlon e7cf870e31 Fix textDecorationLine property
Summary:
This diff fixes a style property that was incorrectly mapped as `textDecorationLineType` in Fabric

This was correctly mapped in classic here: diffusion/FBS/browse/master/xplat/js/react-native-github/Libraries/Text/BaseText/RCTBaseTextViewManager.m;10b92f1847cdec8a3f0a996f218989766516f805$48

Reviewed By: mdvacca

Differential Revision: D13443921

fbshipit-source-id: 7fafaf2492d8c3b938f2e433a983303958e5c578
2018-12-13 14:02:15 -08:00

107 lines
3.8 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 defaultTextAttributes) {
auto textAttributes = TextAttributes{};
// Color
textAttributes.foregroundColor =
convertRawProp(rawProps, "color", defaultTextAttributes.foregroundColor);
textAttributes.backgroundColor = convertRawProp(
rawProps, "backgroundColor", defaultTextAttributes.backgroundColor);
textAttributes.opacity =
convertRawProp(rawProps, "opacity", defaultTextAttributes.opacity);
// Font
textAttributes.fontFamily =
convertRawProp(rawProps, "fontFamily", defaultTextAttributes.fontFamily);
textAttributes.fontSize =
convertRawProp(rawProps, "fontSize", defaultTextAttributes.fontSize);
textAttributes.fontSizeMultiplier = convertRawProp(
rawProps, "fontSizeMultiplier", defaultTextAttributes.fontSizeMultiplier);
textAttributes.fontWeight =
convertRawProp(rawProps, "fontWeight", defaultTextAttributes.fontWeight);
textAttributes.fontStyle =
convertRawProp(rawProps, "fontStyle", defaultTextAttributes.fontStyle);
textAttributes.fontVariant = convertRawProp(
rawProps, "fontVariant", defaultTextAttributes.fontVariant);
textAttributes.allowFontScaling = convertRawProp(
rawProps, "allowFontScaling", defaultTextAttributes.allowFontScaling);
textAttributes.letterSpacing = convertRawProp(
rawProps, "letterSpacing", defaultTextAttributes.letterSpacing);
// Paragraph
textAttributes.lineHeight =
convertRawProp(rawProps, "lineHeight", defaultTextAttributes.lineHeight);
textAttributes.alignment =
convertRawProp(rawProps, "alignment", defaultTextAttributes.alignment);
textAttributes.baseWritingDirection = convertRawProp(
rawProps,
"baseWritingDirection",
defaultTextAttributes.baseWritingDirection);
// Decoration
textAttributes.textDecorationColor = convertRawProp(
rawProps,
"textDecorationColor",
defaultTextAttributes.textDecorationColor);
textAttributes.textDecorationLineType = convertRawProp(
rawProps,
"textDecorationLine",
defaultTextAttributes.textDecorationLineType);
textAttributes.textDecorationLineStyle = convertRawProp(
rawProps,
"textDecorationLineStyle",
defaultTextAttributes.textDecorationLineStyle);
textAttributes.textDecorationLinePattern = convertRawProp(
rawProps,
"textDecorationLinePattern",
defaultTextAttributes.textDecorationLinePattern);
// Shadow
textAttributes.textShadowOffset = convertRawProp(
rawProps, "textShadowOffset", defaultTextAttributes.textShadowOffset);
textAttributes.textShadowRadius = convertRawProp(
rawProps, "textShadowRadius", defaultTextAttributes.textShadowRadius);
textAttributes.textShadowColor = convertRawProp(
rawProps, "textShadowColor", defaultTextAttributes.textShadowColor);
// Special
textAttributes.isHighlighted = convertRawProp(
rawProps, "isHighlighted", defaultTextAttributes.isHighlighted);
return textAttributes;
}
BaseTextProps::BaseTextProps(
const BaseTextProps &sourceProps,
const RawProps &rawProps)
: textAttributes(convertRawProp(rawProps, sourceProps.textAttributes)){};
#pragma mark - DebugStringConvertible
#if RN_DEBUG_STRING_CONVERTIBLE
SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
return textAttributes.getDebugProps();
}
#endif
} // namespace react
} // namespace facebook