diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp index 7e3d0275657..fbec7d61944 100644 --- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp +++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.cpp @@ -16,8 +16,8 @@ namespace facebook { namespace react { AccessibilityProps::AccessibilityProps( - const AccessibilityProps &sourceProps, - const RawProps &rawProps) + AccessibilityProps const &sourceProps, + RawProps const &rawProps) : accessible( convertRawProp(rawProps, "accessible", sourceProps.accessible)), accessibilityLabel(convertRawProp( @@ -50,7 +50,7 @@ AccessibilityProps::AccessibilityProps( #if RN_DEBUG_STRING_CONVERTIBLE SharedDebugStringConvertibleList AccessibilityProps::getDebugProps() const { - const auto &defaultProps = AccessibilityProps(); + auto const &defaultProps = AccessibilityProps(); return SharedDebugStringConvertibleList{ debugStringConvertibleItem("testId", testId, defaultProps.testId), }; diff --git a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h index 1253fc308f4..4583bba8fc5 100644 --- a/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h +++ b/ReactCommon/fabric/components/view/accessibility/AccessibilityProps.h @@ -15,33 +15,29 @@ namespace facebook { namespace react { -class AccessibilityProps; - -typedef std::shared_ptr SharedAccessibilityProps; - -class AccessibilityProps : public virtual DebugStringConvertible { +class AccessibilityProps { public: AccessibilityProps() = default; AccessibilityProps( - const AccessibilityProps &sourceProps, - const RawProps &rawProps); + AccessibilityProps const &sourceProps, + RawProps const &rawProps); #pragma mark - Props - const bool accessible{false}; - const AccessibilityTraits accessibilityTraits{AccessibilityTraits::None}; - const std::string accessibilityLabel{""}; - const std::string accessibilityHint{""}; - const std::vector accessibilityActions{}; - const bool accessibilityViewIsModal{false}; - const bool accessibilityElementsHidden{false}; - const bool accessibilityIgnoresInvertColors{false}; - const std::string testId{""}; + bool const accessible{false}; + AccessibilityTraits const accessibilityTraits{AccessibilityTraits::None}; + std::string const accessibilityLabel{""}; + std::string const accessibilityHint{""}; + std::vector const accessibilityActions{}; + bool const accessibilityViewIsModal{false}; + bool const accessibilityElementsHidden{false}; + bool const accessibilityIgnoresInvertColors{false}; + std::string const testId{""}; #pragma mark - DebugStringConvertible #if RN_DEBUG_STRING_CONVERTIBLE - SharedDebugStringConvertibleList getDebugProps() const override; + SharedDebugStringConvertibleList getDebugProps() const; #endif };