From b5d0b6fc2a7d98e0c83d3598ed87e5f38c2ad979 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Mon, 6 May 2019 17:01:14 -0700 Subject: [PATCH] Fabric: Fixed parsing of `backfaceVisibility` prop Summary: I have noticed that `backfaceVisibility` example crashes (because actual value is a string/enum, not a boolean), so I fixed it. Reviewed By: JoshuaGross, mdvacca Differential Revision: D15219261 fbshipit-source-id: 27f76cd10903794d597adacb9da7300a42813f8e --- .../View/RCTViewComponentView.mm | 2 +- ReactCommon/fabric/components/view/ViewProps.h | 2 +- .../fabric/components/view/conversions.h | 18 ++++++++++++++++++ .../fabric/components/view/primitives.h | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm index 235ebf0f96d..a10f8c063c9 100644 --- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm +++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm @@ -159,7 +159,7 @@ using namespace facebook::react; // `backfaceVisibility` if (oldViewProps.backfaceVisibility != newViewProps.backfaceVisibility) { - self.layer.doubleSided = newViewProps.backfaceVisibility; + self.layer.doubleSided = newViewProps.backfaceVisibility == BackfaceVisibility::Visible; } // `shouldRasterize` diff --git a/ReactCommon/fabric/components/view/ViewProps.h b/ReactCommon/fabric/components/view/ViewProps.h index 4ca4cd75831..c5f74d772f1 100644 --- a/ReactCommon/fabric/components/view/ViewProps.h +++ b/ReactCommon/fabric/components/view/ViewProps.h @@ -51,7 +51,7 @@ class ViewProps : public Props, // Transform Transform transform{}; - bool const backfaceVisibility{}; + BackfaceVisibility const backfaceVisibility{}; bool const shouldRasterize{}; int const zIndex{}; diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h index fd1969d62f3..b71e44ad28e 100644 --- a/ReactCommon/fabric/components/view/conversions.h +++ b/ReactCommon/fabric/components/view/conversions.h @@ -475,6 +475,24 @@ inline void fromRawValue(const RawValue &value, PointerEventsMode &result) { LOG(FATAL) << "Could not parse PointerEventsMode:" << stringValue; } +inline void fromRawValue(const RawValue &value, BackfaceVisibility &result) { + assert(value.hasType()); + auto stringValue = (std::string)value; + if (stringValue == "auto") { + result = BackfaceVisibility::Auto; + return; + } + if (stringValue == "visible") { + result = BackfaceVisibility::Visible; + return; + } + if (stringValue == "hidden") { + result = BackfaceVisibility::Hidden; + return; + } + LOG(FATAL) << "Could not parse BackfaceVisibility:" << stringValue; +} + inline void fromRawValue(const RawValue &value, BorderStyle &result) { assert(value.hasType()); auto stringValue = (std::string)value; diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h index bdfd018c061..1bcb70ba48a 100644 --- a/ReactCommon/fabric/components/view/primitives.h +++ b/ReactCommon/fabric/components/view/primitives.h @@ -18,6 +18,8 @@ namespace react { enum class PointerEventsMode { Auto, None, BoxNone, BoxOnly }; +enum class BackfaceVisibility { Auto, Visible, Hidden }; + enum class BorderStyle { Solid, Dotted, Dashed }; template