react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h

@@ -16,6 +16,7 @@
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -31,17 +32,18 @@ struct AndroidTextInputSelectionStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputSelectionStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto start = map.find("start");
   if (start != map.end()) {
-    fromRawValue(start->second, result.start);
+    fromRawValue(context, start->second, result.start);
   }
   auto end = map.find("end");
   if (end != map.end()) {
-    fromRawValue(end->second, result.end);
+    fromRawValue(context, end->second, result.end);
   }
 }
 
@@ -56,17 +58,18 @@ struct AndroidTextInputTextShadowOffsetStruct {
 };
 
 static inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AndroidTextInputTextShadowOffsetStruct &result) {
   auto map = (better::map<std::string, RawValue>)value;
 
   auto width = map.find("width");
   if (width != map.end()) {
-    fromRawValue(width->second, result.width);
+    fromRawValue(context, width->second, result.width);
   }
   auto height = map.find("height");
   if (height != map.end()) {
-    fromRawValue(height->second, result.height);
+    fromRawValue(context, height->second, result.height);
   }
 }
 
@@ -96,6 +99,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
  public:
   AndroidTextInputProps() = default;
   AndroidTextInputProps(
+      const PropsParserContext &context,
       const AndroidTextInputProps &sourceProps,
       const RawProps &rawProps);
 
@@ -103,7 +107,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
 
 #pragma mark - Props
 
-  const std::string autoCompleteType{};
+  const std::string autoComplete{};
   const std::string returnKeyLabel{};
   const int numberOfLines{0};
   const bool disableFullscreenUI{false};
@@ -141,7 +145,7 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps {
   const AndroidTextInputTextShadowOffsetStruct textShadowOffset{};
   const Float lineHeight{0.0};
   const std::string textTransform{};
-  const int color{0};
+  const SharedColor color{0};
   const Float letterSpacing{0.0};
   const Float fontSize{0.0};
   const std::string textAlign{};

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp

@@ -16,48 +16,80 @@ namespace facebook {
 namespace react {
 
 TextInputProps::TextInputProps(
+    const PropsParserContext &context,
     TextInputProps const &sourceProps,
     RawProps const &rawProps)
-    : ViewProps(sourceProps, rawProps),
-      BaseTextProps(sourceProps, rawProps),
-      traits(convertRawProp(rawProps, sourceProps.traits, {})),
-      paragraphAttributes(
-          convertRawProp(rawProps, sourceProps.paragraphAttributes, {})),
+    : ViewProps(context, sourceProps, rawProps),
+      BaseTextProps(context, sourceProps, rawProps),
+      traits(convertRawProp(context, rawProps, sourceProps.traits, {})),
+      paragraphAttributes(convertRawProp(
+          context,
+          rawProps,
+          sourceProps.paragraphAttributes,
+          {})),
       defaultValue(convertRawProp(
+          context,
           rawProps,
           "defaultValue",
           sourceProps.defaultValue,
           {})),
-      placeholder(
-          convertRawProp(rawProps, "placeholder", sourceProps.placeholder, {})),
+      placeholder(convertRawProp(
+          context,
+          rawProps,
+          "placeholder",
+          sourceProps.placeholder,
+          {})),
       placeholderTextColor(convertRawProp(
+          context,
           rawProps,
           "placeholderTextColor",
           sourceProps.placeholderTextColor,
           {})),
-      maxLength(
-          convertRawProp(rawProps, "maxLength", sourceProps.maxLength, {})),
-      cursorColor(
-          convertRawProp(rawProps, "cursorColor", sourceProps.cursorColor, {})),
+      maxLength(convertRawProp(
+          context,
+          rawProps,
+          "maxLength",
+          sourceProps.maxLength,
+          {})),
+      cursorColor(convertRawProp(
+          context,
+          rawProps,
+          "cursorColor",
+          sourceProps.cursorColor,
+          {})),
       selectionColor(convertRawProp(
+          context,
           rawProps,
           "selectionColor",
           sourceProps.selectionColor,
           {})),
       underlineColorAndroid(convertRawProp(
+          context,
           rawProps,
           "underlineColorAndroid",
           sourceProps.underlineColorAndroid,
           {})),
-      text(convertRawProp(rawProps, "text", sourceProps.text, {})),
+      text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
       mostRecentEventCount(convertRawProp(
+          context,
           rawProps,
           "mostRecentEventCount",
           sourceProps.mostRecentEventCount,
           {})),
-      autoFocus(
-          convertRawProp(rawProps, "autoFocus", sourceProps.autoFocus, {})),
+      autoFocus(convertRawProp(
+          context,
+          rawProps,
+          "autoFocus",
+          sourceProps.autoFocus,
+          {})),
+      selection(convertRawProp(
+          context,
+          rawProps,
+          "selection",
+          sourceProps.selection,
+          better::optional<Selection>())),
       inputAccessoryViewID(convertRawProp(
+          context,
           rawProps,
           "inputAccessoryViewID",
           sourceProps.inputAccessoryViewID,
@@ -89,13 +121,5 @@ ParagraphAttributes TextInputProps::getEffectiveParagraphAttributes() const {
   return result;
 }
 
-#ifdef ANDROID
-folly::dynamic TextInputProps::getDynamic() const {
-  folly::dynamic props = folly::dynamic::object();
-  props["value"] = value;
-  return props;
-}
-#endif
-
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h

@@ -14,6 +14,7 @@
 #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/Props.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/imagemanager/primitives.h>
@@ -25,7 +26,10 @@ namespace react {
 class TextInputProps final : public ViewProps, public BaseTextProps {
  public:
   TextInputProps() = default;
-  TextInputProps(TextInputProps const &sourceProps, RawProps const &rawProps);
+  TextInputProps(
+      const PropsParserContext &context,
+      TextInputProps const &sourceProps,
+      RawProps const &rawProps);
 
 #pragma mark - Props
 
@@ -54,6 +58,7 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
   int const mostRecentEventCount{0};
 
   bool autoFocus{false};
+  better::optional<Selection> selection{};
 
   std::string const inputAccessoryViewID{};
 
@@ -62,10 +67,6 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
    */
   TextAttributes getEffectiveTextAttributes(Float fontSizeMultiplier) const;
   ParagraphAttributes getEffectiveParagraphAttributes() const;
-
-#ifdef ANDROID
-  folly::dynamic getDynamic() const;
-#endif
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h

@@ -8,12 +8,14 @@
 #pragma once
 
 #include <react/renderer/components/iostextinput/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     AutocapitalizationType &result) {
   auto string = (std::string)value;
@@ -36,7 +38,10 @@ inline void fromRawValue(
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, KeyboardAppearance &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    KeyboardAppearance &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = KeyboardAppearance::Default;
@@ -53,7 +58,10 @@ inline void fromRawValue(const RawValue &value, KeyboardAppearance &result) {
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, ReturnKeyType &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    ReturnKeyType &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = ReturnKeyType::Default;
@@ -119,6 +127,7 @@ inline void fromRawValue(const RawValue &value, ReturnKeyType &result) {
 }
 
 inline void fromRawValue(
+    const PropsParserContext &context,
     const RawValue &value,
     TextInputAccessoryVisibilityMode &result) {
   auto string = (std::string)value;
@@ -141,7 +150,10 @@ inline void fromRawValue(
   abort();
 }
 
-inline void fromRawValue(const RawValue &value, KeyboardType &result) {
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    KeyboardType &result) {
   auto string = (std::string)value;
   if (string == "default") {
     result = KeyboardType::Default;
@@ -163,6 +175,10 @@ inline void fromRawValue(const RawValue &value, KeyboardType &result) {
     result = KeyboardType::NumberPad;
     return;
   }
+  if (string == "url") {
+    result = KeyboardType::URL;
+    return;
+  }
   if (string == "decimal-pad") {
     result = KeyboardType::DecimalPad;
     return;
@@ -177,10 +193,6 @@ inline void fromRawValue(const RawValue &value, KeyboardType &result) {
     result = KeyboardType::NumbersAndPunctuation;
     return;
   }
-  if (string == "url") {
-    result = KeyboardType::URL;
-    return;
-  }
   if (string == "name-phone-pad") {
     result = KeyboardType::NamePhonePad;
     return;

package/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h

@@ -77,6 +77,12 @@ enum class KeyboardType {
   VisiblePassword,
 };
 
+class Selection final {
+ public:
+  int start{0};
+  int end{0};
+};
+
 /*
  * Controls features of text inputs.
  */

package/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h

@@ -8,107 +8,135 @@
 #pragma once
 
 #include <react/renderer/components/iostextinput/primitives.h>
+#include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {
 
 static TextInputTraits convertRawProp(
+    const PropsParserContext &context,
     RawProps const &rawProps,
     TextInputTraits const &sourceTraits,
     TextInputTraits const &defaultTraits) {
   auto traits = TextInputTraits{};
 
   traits.multiline = convertRawProp(
-      rawProps, "multiline", sourceTraits.multiline, defaultTraits.multiline);
+      context,
+      rawProps,
+      "multiline",
+      sourceTraits.multiline,
+      defaultTraits.multiline);
   traits.autocapitalizationType = convertRawProp(
+      context,
       rawProps,
       "autoCapitalize",
       sourceTraits.autocapitalizationType,
       defaultTraits.autocapitalizationType);
   traits.autoCorrect = convertRawProp(
+      context,
       rawProps,
       "autoCorrect",
       sourceTraits.autoCorrect,
       defaultTraits.autoCorrect);
   traits.contextMenuHidden = convertRawProp(
+      context,
       rawProps,
       "contextMenuHidden",
       sourceTraits.contextMenuHidden,
       defaultTraits.contextMenuHidden);
   traits.editable = convertRawProp(
-      rawProps, "editable", sourceTraits.editable, defaultTraits.editable);
+      context,
+      rawProps,
+      "editable",
+      sourceTraits.editable,
+      defaultTraits.editable);
   traits.enablesReturnKeyAutomatically = convertRawProp(
+      context,
       rawProps,
       "enablesReturnKeyAutomatically",
       sourceTraits.enablesReturnKeyAutomatically,
       defaultTraits.enablesReturnKeyAutomatically);
   traits.keyboardAppearance = convertRawProp(
+      context,
       rawProps,
       "keyboardAppearance",
       sourceTraits.keyboardAppearance,
       defaultTraits.keyboardAppearance);
   traits.spellCheck = convertRawProp(
+      context,
       rawProps,
       "spellCheck",
       sourceTraits.spellCheck,
       defaultTraits.spellCheck);
   traits.caretHidden = convertRawProp(
+      context,
       rawProps,
       "caretHidden",
       sourceTraits.caretHidden,
       defaultTraits.caretHidden);
   traits.clearButtonMode = convertRawProp(
+      context,
       rawProps,
       "clearButtonMode",
       sourceTraits.clearButtonMode,
       defaultTraits.clearButtonMode);
   traits.scrollEnabled = convertRawProp(
+      context,
       rawProps,
       "scrollEnabled",
       sourceTraits.scrollEnabled,
       defaultTraits.scrollEnabled);
   traits.secureTextEntry = convertRawProp(
+      context,
       rawProps,
       "secureTextEntry",
       sourceTraits.secureTextEntry,
       defaultTraits.secureTextEntry);
   traits.blurOnSubmit = convertRawProp(
+      context,
       rawProps,
       "blurOnSubmit",
       sourceTraits.blurOnSubmit,
       defaultTraits.blurOnSubmit);
   traits.clearTextOnFocus = convertRawProp(
+      context,
       rawProps,
       "clearTextOnFocus",
       sourceTraits.clearTextOnFocus,
       defaultTraits.clearTextOnFocus);
   traits.keyboardType = convertRawProp(
+      context,
       rawProps,
       "keyboardType",
       sourceTraits.keyboardType,
       defaultTraits.keyboardType);
   traits.showSoftInputOnFocus = convertRawProp(
+      context,
       rawProps,
       "showSoftInputOnFocus",
       sourceTraits.showSoftInputOnFocus,
       defaultTraits.showSoftInputOnFocus);
   traits.returnKeyType = convertRawProp(
+      context,
       rawProps,
       "returnKeyType",
       sourceTraits.returnKeyType,
       defaultTraits.returnKeyType);
   traits.selectTextOnFocus = convertRawProp(
+      context,
       rawProps,
       "selectTextOnFocus",
       sourceTraits.selectTextOnFocus,
       defaultTraits.selectTextOnFocus);
   traits.textContentType = convertRawProp(
+      context,
       rawProps,
       "textContentType",
       sourceTraits.textContentType,
       defaultTraits.textContentType);
   traits.passwordRules = convertRawProp(
+      context,
       rawProps,
       "passwordRules",
       sourceTraits.passwordRules,
@@ -117,5 +145,38 @@ static TextInputTraits convertRawProp(
   return traits;
 }
 
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    Selection &result) {
+  if (value.hasType<better::map<std::string, int>>()) {
+    auto map = (better::map<std::string, int>)value;
+    for (const auto &pair : map) {
+      if (pair.first == "start") {
+        result.start = pair.second;
+      } else if (pair.first == "end") {
+        result.end = pair.second;
+      } else {
+        LOG(ERROR) << "Unsupported Selection map key: " << pair.first;
+        react_native_assert(false);
+      }
+    }
+    return;
+  }
+
+  react_native_assert(value.hasType<std::vector<int>>());
+  if (value.hasType<std::vector<int>>()) {
+    auto array = (std::vector<int>)value;
+    react_native_assert(array.size() == 2);
+    if (array.size() >= 2) {
+      result = {array.at(0), array.at(1)};
+    } else {
+      result = {0, 0};
+      LOG(ERROR) << "Unsupported Selection vector size: " << array.size();
+    }
+  } else {
+    LOG(ERROR) << "Unsupported Selection type";
+  }
+}
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/components/unimplementedview/Android.mk

@@ -21,7 +21,7 @@ LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall
 
 LOCAL_STATIC_LIBRARIES :=
 
-LOCAL_SHARED_LIBRARIES := libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
+LOCAL_SHARED_LIBRARIES := libjsi libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp

@@ -22,19 +22,21 @@ ComponentName UnimplementedViewComponentDescriptor::getComponentName() const {
 }
 
 Props::Shared UnimplementedViewComponentDescriptor::cloneProps(
+    PropsParserContext const &context,
     Props::Shared const &props,
     RawProps const &rawProps) const {
   auto clonedProps =
       ConcreteComponentDescriptor<UnimplementedViewShadowNode>::cloneProps(
-          props, rawProps);
+          context, props, rawProps);
   react_native_assert(
       std::dynamic_pointer_cast<UnimplementedViewProps const>(clonedProps));
 
   // We have to clone `Props` object one more time to make sure that we have
   // an unshared (and non-`const`) copy of it which we can mutate.
   RawProps emptyRawProps{};
-  emptyRawProps.parse(rawPropsParser_);
+  emptyRawProps.parse(rawPropsParser_, context);
   auto unimplementedViewProps = std::make_shared<UnimplementedViewProps>(
+      context,
       *std::static_pointer_cast<UnimplementedViewProps const>(clonedProps),
       emptyRawProps);
 

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h

@@ -9,6 +9,7 @@
 
 #include <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {
@@ -32,8 +33,10 @@ class UnimplementedViewComponentDescriptor final
    * In addtion to base implementation, stores a component name inside cloned
    * `Props` object.
    */
-  Props::Shared cloneProps(Props::Shared const &props, RawProps const &rawProps)
-      const override;
+  Props::Shared cloneProps(
+      PropsParserContext const &context,
+      Props::Shared const &props,
+      RawProps const &rawProps) const override;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewProps.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
 namespace facebook {
 namespace react {

package/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h

@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include <better/optional.h>
 #include <cinttypes>
+#include <string>
 
 namespace facebook {
 namespace react {
@@ -31,6 +33,7 @@ enum class AccessibilityTraits : uint32_t {
   CausesPageTurn = (1 << 14),
   Header = (1 << 15),
   Switch = (1 << 16),
+  TabBar = (1 << 17),
 };
 
 constexpr enum AccessibilityTraits operator|(
@@ -45,6 +48,11 @@ constexpr enum AccessibilityTraits operator&(
   return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
 }
 
+struct AccessibilityAction {
+  std::string name{""};
+  better::optional<std::string> label{};
+};
+
 struct AccessibilityState {
   bool disabled{false};
   bool selected{false};
@@ -67,6 +75,26 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
+struct AccessibilityValue {
+  better::optional<int> min;
+  better::optional<int> max;
+  better::optional<int> now;
+  better::optional<std::string> text{};
+};
+
+constexpr bool operator==(
+    AccessibilityValue const &lhs,
+    AccessibilityValue const &rhs) {
+  return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now &&
+      lhs.text == rhs.text;
+}
+
+constexpr bool operator!=(
+    AccessibilityValue const &lhs,
+    AccessibilityValue const &rhs) {
+  return !(rhs == lhs);
+}
+
 enum class ImportantForAccessibility {
   Auto,
   Yes,