Fabric: Removing SharedAccessibilityProps and some code style changes

Summary: Trivial.

Reviewed By: sammy-SC

Differential Revision: D16139594

fbshipit-source-id: 300b7a2cd24c56dc5b9dee4a0248dda1b388589e
This commit is contained in:
Valentin Shergin
2019-07-10 19:26:50 -07:00
committed by Facebook Github Bot
parent 45b0907f61
commit 2ec8ec050f
2 changed files with 16 additions and 20 deletions
@@ -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),
};
@@ -15,33 +15,29 @@
namespace facebook {
namespace react {
class AccessibilityProps;
typedef std::shared_ptr<const AccessibilityProps> 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<std::string> 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<std::string> 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
};