react-native 0.68.2 → 0.69.0-rc.2

package/ReactCommon/react/renderer/components/textinput/CMakeLists.txt

@@ -0,0 +1,40 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB rrc_textinput_SRC CONFIGURE_DEPENDS androidtextinput/react/renderer/components/androidtextinput/*.cpp)
+add_library(rrc_textinput SHARED ${rrc_textinput_SRC})
+
+target_include_directories(rrc_textinput
+        PUBLIC
+          ${CMAKE_CURRENT_SOURCE_DIR}/androidtextinput/
+)
+
+target_link_libraries(rrc_textinput
+        glog
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_attributedstring
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_imagemanager
+        react_render_mapbuffer
+        react_render_mounting
+        react_render_textlayoutmanager
+        react_render_uimanager
+        react_utils
+        rrc_image
+        rrc_text
+        rrc_view
+        yoga
+)

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

@@ -266,7 +266,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["numberOfLines"] = numberOfLines;
   props["disableFullscreenUI"] = disableFullscreenUI;
   props["textBreakStrategy"] = textBreakStrategy;
-  props["underlineColorAndroid"] = toDynamic(underlineColorAndroid);
+  props["underlineColorAndroid"] = toAndroidRepr(underlineColorAndroid);
   props["inlineImageLeft"] = inlineImageLeft;
   props["inlineImagePadding"] = inlineImagePadding;
   props["importantForAutofill"] = importantForAutofill;
@@ -282,9 +282,9 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["maxLength"] = maxLength;
   props["multiline"] = multiline;
   props["placeholder"] = placeholder;
-  props["placeholderTextColor"] = toDynamic(placeholderTextColor);
+  props["placeholderTextColor"] = toAndroidRepr(placeholderTextColor);
   props["secureTextEntry"] = secureTextEntry;
-  props["selectionColor"] = toDynamic(selectionColor);
+  props["selectionColor"] = toAndroidRepr(selectionColor);
   props["selection"] = toDynamic(selection);
   props["value"] = value;
   props["defaultValue"] = defaultValue;
@@ -292,14 +292,14 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["blurOnSubmit"] = blurOnSubmit;
   props["caretHidden"] = caretHidden;
   props["contextMenuHidden"] = contextMenuHidden;
-  props["textShadowColor"] = toDynamic(textShadowColor);
+  props["textShadowColor"] = toAndroidRepr(textShadowColor);
   props["textShadowRadius"] = textShadowRadius;
   props["textDecorationLine"] = textDecorationLine;
   props["fontStyle"] = fontStyle;
   props["textShadowOffset"] = toDynamic(textShadowOffset);
   props["lineHeight"] = lineHeight;
   props["textTransform"] = textTransform;
-  props["color"] = toDynamic(color);
+  props["color"] = toAndroidRepr(color);
   props["letterSpacing"] = letterSpacing;
   props["fontSize"] = fontSize;
   props["textAlign"] = textAlign;
@@ -307,7 +307,7 @@ folly::dynamic AndroidTextInputProps::getDynamic() const {
   props["fontWeight"] = fontWeight;
   props["fontFamily"] = fontFamily;
   props["textAlignVertical"] = textAlignVertical;
-  props["cursorColor"] = toDynamic(cursorColor);
+  props["cursorColor"] = toAndroidRepr(cursorColor);
   props["mostRecentEventCount"] = mostRecentEventCount;
   props["text"] = text;
 

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

@@ -81,7 +81,7 @@ class AndroidTextInputShadowNode final : public ConcreteViewShadowNode<
    * Cached attributed string that represents the content of the subtree started
    * from the node.
    */
-  mutable butter::optional<AttributedString> cachedAttributedString_{};
+  mutable std::optional<AttributedString> cachedAttributedString_{};
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK

@@ -37,7 +37,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

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

@@ -87,7 +87,7 @@ TextInputProps::TextInputProps(
           rawProps,
           "selection",
           sourceProps.selection,
-          butter::optional<Selection>())),
+          std::optional<Selection>())),
       inputAccessoryViewID(convertRawProp(
           context,
           rawProps,

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

@@ -58,7 +58,7 @@ class TextInputProps final : public ViewProps, public BaseTextProps {
   int const mostRecentEventCount{0};
 
   bool autoFocus{false};
-  butter::optional<Selection> selection{};
+  std::optional<Selection> selection{};
 
   std::string const inputAccessoryViewID{};
 

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

@@ -7,10 +7,9 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 
-#include <butter/optional.h>
-
 namespace facebook {
 namespace react {
 
@@ -106,7 +105,7 @@ class TextInputTraits final {
    * iOS & Android
    * Default value: `empty` (`null`).
    */
-  butter::optional<bool> autoCorrect{};
+  std::optional<bool> autoCorrect{};
 
   /*
    * iOS & Android
@@ -141,7 +140,7 @@ class TextInputTraits final {
    * Can be empty (`null` in JavaScript) which means `default`.
    * Default value: `empty` (`null`).
    */
-  butter::optional<bool> spellCheck{};
+  std::optional<bool> spellCheck{};
 
   /*
    * iOS & Android

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

@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/unimplementedview/BUCK

@@ -31,7 +31,10 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/components/unimplementedview/CMakeLists.txt

@@ -0,0 +1,27 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB rrc_unimplementedview_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_unimplementedview SHARED ${rrc_unimplementedview_SRC})
+
+target_include_directories(rrc_unimplementedview PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_unimplementedview
+        glog
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        rrc_view
+        yoga
+)

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

@@ -7,9 +7,10 @@
 
 #pragma once
 
-#include <butter/optional.h>
 #include <cinttypes>
+#include <optional>
 #include <string>
+#include <vector>
 
 namespace facebook {
 namespace react {
@@ -50,9 +51,21 @@ constexpr enum AccessibilityTraits operator&(
 
 struct AccessibilityAction {
   std::string name{""};
-  butter::optional<std::string> label{};
+  std::optional<std::string> label{};
 };
 
+inline static bool operator==(
+    AccessibilityAction const &lhs,
+    AccessibilityAction const &rhs) {
+  return lhs.name == rhs.name && lhs.label == rhs.label;
+}
+
+inline static bool operator!=(
+    AccessibilityAction const &lhs,
+    AccessibilityAction const &rhs) {
+  return !(rhs == lhs);
+}
+
 struct AccessibilityState {
   bool disabled{false};
   bool selected{false};
@@ -75,11 +88,27 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
+struct AccessibilityLabelledBy {
+  std::vector<std::string> value{};
+};
+
+inline static bool operator==(
+    AccessibilityLabelledBy const &lhs,
+    AccessibilityLabelledBy const &rhs) {
+  return lhs.value == rhs.value;
+}
+
+inline static bool operator!=(
+    AccessibilityLabelledBy const &lhs,
+    AccessibilityLabelledBy const &rhs) {
+  return !(lhs == rhs);
+}
+
 struct AccessibilityValue {
-  butter::optional<int> min;
-  butter::optional<int> max;
-  butter::optional<int> now;
-  butter::optional<std::string> text{};
+  std::optional<int> min;
+  std::optional<int> max;
+  std::optional<int> now;
+  std::optional<std::string> text{};
 };
 
 constexpr bool operator==(
@@ -102,5 +131,11 @@ enum class ImportantForAccessibility {
   NoHideDescendants,
 };
 
+enum class AccessibilityLiveRegion {
+  None,
+  Polite,
+  Assertive,
+};
+
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp

@@ -43,12 +43,36 @@ AccessibilityProps::AccessibilityProps(
           "accessibilityLabel",
           sourceProps.accessibilityLabel,
           "")),
+      accessibilityLabelledBy(convertRawProp(
+          context,
+          rawProps,
+          "accessibilityLabelledBy",
+          sourceProps.accessibilityLabelledBy,
+          {})),
+      accessibilityLiveRegion(convertRawProp(
+          context,
+          rawProps,
+          "accessibilityLiveRegion",
+          sourceProps.accessibilityLiveRegion,
+          AccessibilityLiveRegion::None)),
+      accessibilityRole(convertRawProp(
+          context,
+          rawProps,
+          "accessibilityRole",
+          sourceProps.accessibilityRole,
+          "")),
       accessibilityHint(convertRawProp(
           context,
           rawProps,
           "accessibilityHint",
           sourceProps.accessibilityHint,
           "")),
+      accessibilityLanguage(convertRawProp(
+          context,
+          rawProps,
+          "accessibilityLanguage",
+          sourceProps.accessibilityLanguage,
+          "")),
       accessibilityValue(convertRawProp(
           context,
           rawProps,

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

@@ -30,7 +30,12 @@ class AccessibilityProps {
   AccessibilityTraits accessibilityTraits{AccessibilityTraits::None};
   AccessibilityState accessibilityState;
   std::string accessibilityLabel{""};
+  AccessibilityLabelledBy accessibilityLabelledBy{};
+  AccessibilityLiveRegion accessibilityLiveRegion{
+      AccessibilityLiveRegion::None};
+  std::string accessibilityRole{""};
   std::string accessibilityHint{""};
+  std::string accessibilityLanguage{""};
   AccessibilityValue accessibilityValue;
   std::vector<AccessibilityAction> accessibilityActions{};
   bool accessibilityViewIsModal{false};

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

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/view/BUCK

@@ -35,12 +35,13 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/view",
     ),
-    compiler_flags_enable_exceptions = False,
-    compiler_flags_enable_rtti = False,  # YogaLayoutableShadowNode
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
@@ -60,6 +61,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/config:config"),
         react_native_xplat_target("logger:logger"),
     ],
 )

package/ReactCommon/react/renderer/components/view/CMakeLists.txt

@@ -0,0 +1,26 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB rrc_view_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_view SHARED ${rrc_view_SRC})
+
+target_include_directories(rrc_view PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_view
+        folly_runtime
+        glog
+        glog_init
+        jsi
+        logger
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        yoga)

package/ReactCommon/react/renderer/components/view/PointerEvent.cpp

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "PointerEvent.h"
+
+namespace facebook {
+namespace react {
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+std::string getDebugName(PointerEvent const &pointerEvent) {
+  return "PointerEvent";
+}
+
+std::vector<DebugStringConvertibleObject> getDebugProps(
+    PointerEvent const &pointerEvent,
+    DebugStringConvertibleOptions options) {
+  return {
+      {"pointerId", getDebugDescription(pointerEvent.pointerId, options)},
+      {"pressure", getDebugDescription(pointerEvent.pressure, options)},
+      {"pointerType", getDebugDescription(pointerEvent.pointerType, options)},
+      {"clientPoint", getDebugDescription(pointerEvent.clientPoint, options)},
+      {"target", getDebugDescription(pointerEvent.target, options)},
+      {"timestamp", getDebugDescription(pointerEvent.timestamp, options)},
+  };
+}
+
+#endif
+
+} // namespace react
+} // namespace facebook

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/graphics/Geometry.h>
+
+namespace facebook {
+namespace react {
+
+struct PointerEvent {
+  /*
+   * A unique identifier for the pointer causing the event.
+   */
+  int pointerId;
+  /*
+   * The normalized pressure of the pointer input in the range 0 to 1, where 0
+   * and 1 represent the minimum and maximum pressure the hardware is capable of
+   * detecting, respectively.
+   */
+  Float pressure;
+  /*
+   * Indicates the device type that caused the event (mouse, pen, touch, etc.)
+   */
+  std::string pointerType;
+  /*
+   * Point within the application's viewport at which the event occurred (as
+   * opposed to the coordinate within the page).
+   */
+  Point clientPoint;
+  /*
+   * A reference to the view to which the event was originally dispatched.
+   */
+  Tag target;
+  /*
+   * The time at which the event was created (in milliseconds). By
+   * specification, this value is time since epoch—but in reality, browsers'
+   * definitions vary.
+   */
+  Float timestamp;
+};
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+
+std::string getDebugName(PointerEvent const &pointerEvent);
+std::vector<DebugStringConvertibleObject> getDebugProps(
+    PointerEvent const &pointerEvent,
+    DebugStringConvertibleOptions options);
+
+#endif
+
+} // namespace react
+} // namespace facebook

package/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp

@@ -59,13 +59,27 @@ static jsi::Value touchEventPayload(
   return object;
 }
 
+static jsi::Value pointerEventPayload(
+    jsi::Runtime &runtime,
+    PointerEvent const &event) {
+  auto object = jsi::Object(runtime);
+  object.setProperty(runtime, "pointerId", event.pointerId);
+  object.setProperty(runtime, "pressure", event.pressure);
+  object.setProperty(runtime, "pointerType", event.pointerType);
+  object.setProperty(runtime, "clientX", event.clientPoint.x);
+  object.setProperty(runtime, "clientY", event.clientPoint.y);
+  object.setProperty(runtime, "target", event.target);
+  object.setProperty(runtime, "timestamp", event.timestamp * 1000);
+  return object;
+}
+
 void TouchEventEmitter::dispatchTouchEvent(
-    std::string const &type,
+    std::string type,
     TouchEvent const &event,
     EventPriority priority,
     RawEvent::Category category) const {
   dispatchEvent(
-      type,
+      std::move(type),
       [event](jsi::Runtime &runtime) {
         return touchEventPayload(runtime, event);
       },
@@ -73,6 +87,20 @@ void TouchEventEmitter::dispatchTouchEvent(
       category);
 }
 
+void TouchEventEmitter::dispatchPointerEvent(
+    std::string type,
+    PointerEvent const &event,
+    EventPriority priority,
+    RawEvent::Category category) const {
+  dispatchEvent(
+      std::move(type),
+      [event](jsi::Runtime &runtime) {
+        return pointerEventPayload(runtime, event);
+      },
+      priority,
+      category);
+}
+
 void TouchEventEmitter::onTouchStart(TouchEvent const &event) const {
   dispatchTouchEvent(
       "touchStart",
@@ -103,5 +131,51 @@ void TouchEventEmitter::onTouchCancel(TouchEvent const &event) const {
       RawEvent::Category::ContinuousEnd);
 }
 
+void TouchEventEmitter::onPointerCancel(const PointerEvent &event) const {
+  dispatchPointerEvent(
+      "pointerCancel",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousEnd);
+}
+
+void TouchEventEmitter::onPointerDown(const PointerEvent &event) const {
+  dispatchPointerEvent(
+      "pointerDown",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousStart);
+}
+
+void TouchEventEmitter::onPointerMove2(const PointerEvent &event) const {
+  dispatchUniqueEvent("pointerMove2", [event](jsi::Runtime &runtime) {
+    return pointerEventPayload(runtime, event);
+  });
+}
+
+void TouchEventEmitter::onPointerUp(const PointerEvent &event) const {
+  dispatchPointerEvent(
+      "pointerUp",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousEnd);
+}
+
+void TouchEventEmitter::onPointerEnter2(const PointerEvent &event) const {
+  dispatchPointerEvent(
+      "pointerEnter2",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousStart);
+}
+
+void TouchEventEmitter::onPointerLeave2(const PointerEvent &event) const {
+  dispatchPointerEvent(
+      "pointerLeave2",
+      event,
+      EventPriority::AsynchronousBatched,
+      RawEvent::Category::ContinuousEnd);
+}
+
 } // namespace react
 } // namespace facebook

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

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/renderer/components/view/PointerEvent.h>
 #include <react/renderer/components/view/TouchEvent.h>
 #include <react/renderer/core/EventEmitter.h>
 #include <react/renderer/core/LayoutMetrics.h>
@@ -29,12 +30,24 @@ class TouchEventEmitter : public EventEmitter {
   void onTouchEnd(TouchEvent const &event) const;
   void onTouchCancel(TouchEvent const &event) const;
 
+  void onPointerCancel(PointerEvent const &event) const;
+  void onPointerDown(PointerEvent const &event) const;
+  void onPointerMove2(PointerEvent const &event) const;
+  void onPointerUp(PointerEvent const &event) const;
+  void onPointerEnter2(PointerEvent const &event) const;
+  void onPointerLeave2(PointerEvent const &event) const;
+
  private:
   void dispatchTouchEvent(
-      std::string const &type,
+      std::string type,
       TouchEvent const &event,
       EventPriority priority,
       RawEvent::Category category) const;
+  void dispatchPointerEvent(
+      std::string type,
+      PointerEvent const &event,
+      EventPriority priority,
+      RawEvent::Category category) const;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp

@@ -12,7 +12,7 @@ namespace react {
 
 #pragma mark - Accessibility
 
-void ViewEventEmitter::onAccessibilityAction(const std::string &name) const {
+void ViewEventEmitter::onAccessibilityAction(std::string const &name) const {
   dispatchEvent("accessibilityAction", [name](jsi::Runtime &runtime) {
     auto payload = jsi::Object(runtime);
     payload.setProperty(runtime, "actionName", name);

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

@@ -28,7 +28,7 @@ class ViewEventEmitter : public TouchEventEmitter {
 
 #pragma mark - Accessibility
 
-  void onAccessibilityAction(const std::string &name) const;
+  void onAccessibilityAction(std::string const &name) const;
   void onAccessibilityTap() const;
   void onAccessibilityMagicTap() const;
   void onAccessibilityEscape() const;