status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Rick Hanlon 2018-12-13 13:59:49 -08:00 committed by Facebook Github Bot
parent d0485b2f04
commit e7cf870e31
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ReactCommon/fabric/attributedstring/conversions.h
View File

@ -438,8 +438,7 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
}
if (textAttributes.textDecorationLineType.has_value()) {
_textAttributes(
"textDecorationLineType",
toString(*textAttributes.textDecorationLineType));
"textDecorationLine", toString(*textAttributes.textDecorationLineType));
}
if (textAttributes.textDecorationLineStyle.has_value()) {
_textAttributes(

2
ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
View File

@ -63,7 +63,7 @@ static TextAttributes convertRawProp(
defaultTextAttributes.textDecorationColor);
textAttributes.textDecorationLineType = convertRawProp(
rawProps,
"textDecorationLineType",
"textDecorationLine",
defaultTextAttributes.textDecorationLineType);
textAttributes.textDecorationLineStyle = convertRawProp(
rawProps,