mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Reland: Wire native CSS parsing for fontVariant (#55881)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55881 ## Reland No changes. This was on the same stack as D95032494 which was backed out due to bug. ## Original Gate `processFontVariant` behind `enableNativeCSSParsing()`. When the flag is on, CSS font-variant strings like `"small-caps oldstyle-nums"` are parsed natively using the existing CSS font-variant parser instead of being preprocessed in JS. Also removes `react_native_expect(false)` hard error on unknown font variant values, replacing it with a graceful skip. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D95021048 fbshipit-source-id: e75ce199565c7de3b883a95c61e5e534c2018cba
This commit is contained in:
1 parent
fecd8e3923
commit
2f6c744f01
3 files changed
+135
-3
No files matched your search
+5
-1
@@ -67,6 +67,10 @@ export const transformOriginAttribute: AnyAttributeType = nativeCSSParsing
|
||||
? true
|
||||
: {process: processTransformOrigin};
|
||||
|
||||
export const fontVariantAttribute: AnyAttributeType = nativeCSSParsing
|
||||
? true
|
||||
: {process: processFontVariant};
|
||||
|
||||
const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
|
||||
/**
|
||||
* Layout
|
||||
@@ -248,7 +252,7 @@ const ReactNativeStyleAttributes: {[string]: AnyAttributeType, ...} = {
|
||||
fontFamily: true,
|
||||
fontSize: true,
|
||||
fontStyle: true,
|
||||
fontVariant: {process: processFontVariant},
|
||||
fontVariant: fontVariantAttribute,
|
||||
fontWeight: true,
|
||||
includeFontPadding: true,
|
||||
letterSpacing: true,
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <folly/dynamic.h>
|
||||
#include <react/debug/react_native_expect.h>
|
||||
#include <react/featureflags/ReactNativeFeatureFlags.h>
|
||||
#include <react/renderer/attributedstring/AttributedString.h>
|
||||
#include <react/renderer/attributedstring/ParagraphAttributes.h>
|
||||
#include <react/renderer/attributedstring/TextAttributes.h>
|
||||
@@ -21,6 +22,8 @@
|
||||
#include <react/renderer/core/conversions.h>
|
||||
#include <react/renderer/core/graphicsConversions.h>
|
||||
#include <react/renderer/core/propsConversions.h>
|
||||
#include <react/renderer/css/CSSFontVariant.h>
|
||||
#include <react/renderer/css/CSSValueParser.h>
|
||||
#include <unordered_map>
|
||||
|
||||
#ifdef RN_SERIALIZABLE_STATE
|
||||
@@ -317,7 +320,73 @@ inline std::string toString(const FontStyle &fontStyle)
|
||||
return "normal";
|
||||
}
|
||||
|
||||
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, FontVariant &result)
|
||||
inline std::optional<FontVariant> fontVariantFromCSSFontVariant(CSSFontVariant cssVariant)
|
||||
{
|
||||
switch (cssVariant) {
|
||||
case CSSFontVariant::SmallCaps:
|
||||
return FontVariant::SmallCaps;
|
||||
case CSSFontVariant::OldstyleNums:
|
||||
return FontVariant::OldstyleNums;
|
||||
case CSSFontVariant::LiningNums:
|
||||
return FontVariant::LiningNums;
|
||||
case CSSFontVariant::TabularNums:
|
||||
return FontVariant::TabularNums;
|
||||
case CSSFontVariant::ProportionalNums:
|
||||
return FontVariant::ProportionalNums;
|
||||
case CSSFontVariant::StylisticOne:
|
||||
return FontVariant::StylisticOne;
|
||||
case CSSFontVariant::StylisticTwo:
|
||||
return FontVariant::StylisticTwo;
|
||||
case CSSFontVariant::StylisticThree:
|
||||
return FontVariant::StylisticThree;
|
||||
case CSSFontVariant::StylisticFour:
|
||||
return FontVariant::StylisticFour;
|
||||
case CSSFontVariant::StylisticFive:
|
||||
return FontVariant::StylisticFive;
|
||||
case CSSFontVariant::StylisticSix:
|
||||
return FontVariant::StylisticSix;
|
||||
case CSSFontVariant::StylisticSeven:
|
||||
return FontVariant::StylisticSeven;
|
||||
case CSSFontVariant::StylisticEight:
|
||||
return FontVariant::StylisticEight;
|
||||
case CSSFontVariant::StylisticNine:
|
||||
return FontVariant::StylisticNine;
|
||||
case CSSFontVariant::StylisticTen:
|
||||
return FontVariant::StylisticTen;
|
||||
case CSSFontVariant::StylisticEleven:
|
||||
return FontVariant::StylisticEleven;
|
||||
case CSSFontVariant::StylisticTwelve:
|
||||
return FontVariant::StylisticTwelve;
|
||||
case CSSFontVariant::StylisticThirteen:
|
||||
return FontVariant::StylisticThirteen;
|
||||
case CSSFontVariant::StylisticFourteen:
|
||||
return FontVariant::StylisticFourteen;
|
||||
case CSSFontVariant::StylisticFifteen:
|
||||
return FontVariant::StylisticFifteen;
|
||||
case CSSFontVariant::StylisticSixteen:
|
||||
return FontVariant::StylisticSixteen;
|
||||
case CSSFontVariant::StylisticSeventeen:
|
||||
return FontVariant::StylisticSeventeen;
|
||||
case CSSFontVariant::StylisticEighteen:
|
||||
return FontVariant::StylisticEighteen;
|
||||
case CSSFontVariant::StylisticNineteen:
|
||||
return FontVariant::StylisticNineteen;
|
||||
case CSSFontVariant::StylisticTwenty:
|
||||
return FontVariant::StylisticTwenty;
|
||||
case CSSFontVariant::CommonLigatures:
|
||||
case CSSFontVariant::NoCommonLigatures:
|
||||
case CSSFontVariant::DiscretionaryLigatures:
|
||||
case CSSFontVariant::NoDiscretionaryLigatures:
|
||||
case CSSFontVariant::HistoricalLigatures:
|
||||
case CSSFontVariant::NoHistoricalLigatures:
|
||||
case CSSFontVariant::Contextual:
|
||||
case CSSFontVariant::NoContextual:
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
|
||||
inline void
|
||||
parseProcessedFontVariant(const PropsParserContext & /*context*/, const RawValue &value, FontVariant &result)
|
||||
{
|
||||
result = FontVariant::Default;
|
||||
react_native_expect(value.hasType<std::vector<std::string>>());
|
||||
@@ -376,7 +445,6 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
|
||||
result = (FontVariant)((int)result | (int)FontVariant::StylisticTwenty);
|
||||
} else {
|
||||
LOG(ERROR) << "Unsupported FontVariant value: " << item;
|
||||
react_native_expect(false);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -384,6 +452,40 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
|
||||
}
|
||||
}
|
||||
|
||||
inline void parseUnprocessedFontVariantString(const std::string &value, FontVariant &result)
|
||||
{
|
||||
auto fontVariantList = parseCSSProperty<CSSFontVariantList>(value);
|
||||
if (!std::holds_alternative<CSSFontVariantList>(fontVariantList)) {
|
||||
result = FontVariant::Default;
|
||||
return;
|
||||
}
|
||||
|
||||
result = FontVariant::Default;
|
||||
for (const auto &cssVariant : std::get<CSSFontVariantList>(fontVariantList)) {
|
||||
if (auto fv = fontVariantFromCSSFontVariant(cssVariant)) {
|
||||
result = (FontVariant)((int)result | (int)*fv);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inline void parseUnprocessedFontVariant(const PropsParserContext &context, const RawValue &value, FontVariant &result)
|
||||
{
|
||||
if (value.hasType<std::string>()) {
|
||||
parseUnprocessedFontVariantString((std::string)value, result);
|
||||
} else {
|
||||
parseProcessedFontVariant(context, value, result);
|
||||
}
|
||||
}
|
||||
|
||||
inline void fromRawValue(const PropsParserContext &context, const RawValue &value, FontVariant &result)
|
||||
{
|
||||
if (ReactNativeFeatureFlags::enableNativeCSSParsing()) {
|
||||
parseUnprocessedFontVariant(context, value, result);
|
||||
} else {
|
||||
parseProcessedFontVariant(context, value, result);
|
||||
}
|
||||
}
|
||||
|
||||
inline std::string toString(const FontVariant &fontVariant)
|
||||
{
|
||||
auto result = std::string{};
|
||||
|
||||
+26
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <react/renderer/attributedstring/conversions.h>
|
||||
#include <react/renderer/components/view/BoxShadowPropsConversions.h>
|
||||
#include <react/renderer/components/view/FilterPropsConversions.h>
|
||||
#include <react/renderer/components/view/conversions.h>
|
||||
@@ -454,4 +455,29 @@ TEST(ConversionsTest, unprocessed_transform_origin_rawvalue_string_with_z) {
|
||||
EXPECT_EQ(result.z, 15.0f);
|
||||
}
|
||||
|
||||
TEST(ConversionsTest, unprocessed_font_variant_string_single) {
|
||||
FontVariant result{};
|
||||
parseUnprocessedFontVariantString("small-caps", result);
|
||||
|
||||
EXPECT_EQ((int)result, (int)FontVariant::SmallCaps);
|
||||
}
|
||||
|
||||
TEST(ConversionsTest, unprocessed_font_variant_string_multiple) {
|
||||
FontVariant result{};
|
||||
parseUnprocessedFontVariantString(
|
||||
"small-caps oldstyle-nums tabular-nums", result);
|
||||
|
||||
EXPECT_EQ(
|
||||
(int)result,
|
||||
(int)FontVariant::SmallCaps | (int)FontVariant::OldstyleNums |
|
||||
(int)FontVariant::TabularNums);
|
||||
}
|
||||
|
||||
TEST(ConversionsTest, unprocessed_font_variant_string_invalid) {
|
||||
FontVariant result{};
|
||||
parseUnprocessedFontVariantString("not-a-variant", result);
|
||||
|
||||
EXPECT_EQ((int)result, (int)FontVariant::Default);
|
||||
}
|
||||
|
||||
} // namespace facebook::react
|
||||
Reference in new issue
Block a user