react-native 0.66.0-rc.4 → 0.67.0-rc.1

package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include "AndroidProgressBarMeasurementsManager.h"
 #include "AndroidProgressBarShadowNode.h"
@@ -31,8 +30,6 @@ class AndroidProgressBarComponentDescriptor final
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    react_native_assert(
-        std::dynamic_pointer_cast<AndroidProgressBarShadowNode>(shadowNode));
     auto androidProgressBarShadowNode =
         std::static_pointer_cast<AndroidProgressBarShadowNode>(shadowNode);
 

package/ReactCommon/react/renderer/components/root/BUCK

@@ -29,12 +29,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/root",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     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"],

package/ReactCommon/react/renderer/components/safeareaview/BUCK

@@ -24,12 +24,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/safeareaview",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/components/scrollview/BUCK

@@ -32,12 +32,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/scrollview",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),
     ],

package/ReactCommon/react/renderer/components/slider/BUCK

@@ -33,12 +33,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/slider",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),

package/ReactCommon/react/renderer/components/slider/SliderComponentDescriptor.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/slider/SliderMeasurementsManager.h>
 #include <react/renderer/components/slider/SliderShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
@@ -32,8 +31,6 @@ class SliderComponentDescriptor final
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    react_native_assert(
-        std::dynamic_pointer_cast<SliderShadowNode>(shadowNode));
     auto sliderShadowNode =
         std::static_pointer_cast<SliderShadowNode>(shadowNode);
 

package/ReactCommon/react/renderer/components/switch/BUCK

@@ -34,12 +34,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/androidswitch",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),

package/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h

@@ -10,7 +10,6 @@
 #include "AndroidSwitchMeasurementsManager.h"
 #include "AndroidSwitchShadowNode.h"
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
@@ -31,8 +30,6 @@ class AndroidSwitchComponentDescriptor final
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    react_native_assert(
-        std::dynamic_pointer_cast<AndroidSwitchShadowNode>(shadowNode));
     auto androidSwitchShadowNode =
         std::static_pointer_cast<AndroidSwitchShadowNode>(shadowNode);
 

package/ReactCommon/react/renderer/components/text/BUCK

@@ -36,12 +36,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/text",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),

package/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h

@@ -7,11 +7,7 @@
 
 #pragma once
 
-#include "ParagraphShadowNode.h"
-
-#include <react/config/ReactNativeConfig.h>
-#include <react/debug/react_native_assert.h>
-#include <react/renderer/components/view/ViewPropsInterpolation.h>
+#include <react/renderer/components/text/ParagraphShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 #include <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #include <react/utils/ContextContainer.h>
@@ -32,25 +28,10 @@ class ParagraphComponentDescriptor final
     textLayoutManager_ = std::make_shared<TextLayoutManager>(contextContainer_);
   }
 
-  virtual SharedProps interpolateProps(
-      const PropsParserContext &context,
-      float animationProgress,
-      const SharedProps &props,
-      const SharedProps &newProps) const override {
-    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
-
-    interpolateViewProps(
-        animationProgress, props, newProps, interpolatedPropsShared);
-
-    return interpolatedPropsShared;
-  };
-
  protected:
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    react_native_assert(
-        std::dynamic_pointer_cast<ParagraphShadowNode>(shadowNode));
     auto paragraphShadowNode =
         std::static_pointer_cast<ParagraphShadowNode>(shadowNode);
 

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

@@ -33,12 +33,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/androidtextinput",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_tests = [":tests"],
     fbandroid_deps = [
         react_native_xplat_target("react/renderer/mapbuffer:mapbuffer"),

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

@@ -15,7 +15,6 @@
 #include <yoga/YGEnums.h>
 #include <yoga/YGValue.h>
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
@@ -88,8 +87,6 @@ class AndroidTextInputComponentDescriptor final
 
  protected:
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
-    react_native_assert(
-        std::dynamic_pointer_cast<AndroidTextInputShadowNode>(shadowNode));
     auto textInputShadowNode =
         std::static_pointer_cast<AndroidTextInputShadowNode>(shadowNode);
 

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

@@ -7,6 +7,8 @@
 
 #pragma once
 
+// foo bar 2
+
 // #include <react/renderer/components/text/BaseTextProps.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/graphics/Color.h>

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

@@ -33,12 +33,6 @@ rn_xplat_cxx_library(
         # TODO(shergin) T26519801 Figure out better directories structure
         prefix = "react/renderer/components/iostextinput",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     cxx_tests = [":tests"],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),

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

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <react/debug/react_native_assert.h>
 #include <react/renderer/components/iostextinput/TextInputShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
 
@@ -30,8 +29,6 @@ class TextInputComponentDescriptor final
   void adopt(ShadowNode::Unshared const &shadowNode) const override {
     ConcreteComponentDescriptor::adopt(shadowNode);
 
-    react_native_assert(
-        std::dynamic_pointer_cast<TextInputShadowNode>(shadowNode));
     auto concreteShadowNode =
         std::static_pointer_cast<TextInputShadowNode>(shadowNode);
 

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

@@ -29,12 +29,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/unimplementedview",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     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"],

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

@@ -7,8 +7,6 @@
 
 #include "UnimplementedViewComponentDescriptor.h"
 
-#include <react/debug/react_native_assert.h>
-
 namespace facebook {
 namespace react {
 
@@ -28,8 +26,6 @@ Props::Shared UnimplementedViewComponentDescriptor::cloneProps(
   auto clonedProps =
       ConcreteComponentDescriptor<UnimplementedViewShadowNode>::cloneProps(
           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.

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

@@ -11,7 +11,7 @@ LOCAL_MODULE := rrc_view
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../
 
 LOCAL_CFLAGS := \

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

@@ -35,12 +35,6 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/view",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

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

@@ -52,38 +52,7 @@ struct Touch {
   Float force;
 
   /*
-   * The time in seconds (with fractional milliseconds) when the touch occurred
-   * or when it was last mutated.
-   *
-   * Whenever possible this should be computed as:
-   * 1. Pick MONO_CLOCK_NOW, a monotonic system clock. Generally, something like
-   * `systemUptimeMillis`.
-   * 2. BASIS_TIME = unix timestamp from unix epoch (ms) - MONO_CLOCK_NOW
-   * 3. Then assign timestamp = BASIS_TIME + MONO_CLOCK_NOW
-   *
-   * The effect should be UNIX timestamp from UNIX epoch, but as a monotonic
-   * clock (if you just assign to current system time, it can move backwards due
-   * to clock adjustements, leap seconds, etc etc). So the vast majority of the
-   * time it will look identical to current UNIX time, but there are some
-   * edge-cases where it can drift.
-   *
-   * If you are not able to use the scheme above for some reason, prefer to use
-   * a monotonic clock. This timestamp MUST be monotonic. Do NOT just pass along
-   * system time.
-   *
-   * The goal is to allow touch latency to be computed in JS. JS does not have
-   * access to something like `systemUptimeMillis`, it generally can only access
-   * the current system time. This *does* mean that the touch latency could be
-   * computed incorrectly in cases of clock drift, so you should only use this
-   * as telemetry to get a decent, but not totally perfect, idea of performance.
-   * Do not use this latency information for anything "mission critical". You
-   * can assume it's probably reasonably accurate 99% of the time.
-   *
-   * Note that we attempt to adhere to the spec of timestamp here:
-   * https://dom.spec.whatwg.org/#dom-event-timestamp
-   * Notably, since `global` is not a Window object in React Native, we have
-   * some flexibility in how we define the time origin:
-   * https://w3c.github.io/hr-time/#dfn-time-origin
+   * The time in seconds when the touch occurred or when it was last mutated.
    */
   Float timestamp;
 

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

@@ -9,8 +9,6 @@
 
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include "ViewProps.h"
-#include "ViewPropsInterpolation.h"
 
 namespace facebook {
 namespace react {
@@ -20,27 +18,6 @@ class ViewComponentDescriptor
  public:
   ViewComponentDescriptor(ComponentDescriptorParameters const &parameters)
       : ConcreteComponentDescriptor<ViewShadowNode>(parameters) {}
-
-  virtual SharedProps interpolateProps(
-      const PropsParserContext &context,
-      float animationProgress,
-      const SharedProps &props,
-      const SharedProps &newProps) const override {
-#ifdef ANDROID
-    // On Android only, the merged props should have the same RawProps as the
-    // final props struct
-    SharedProps interpolatedPropsShared =
-        (newProps != nullptr ? cloneProps(context, newProps, newProps->rawProps)
-                             : cloneProps(context, newProps, {}));
-#else
-    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
-#endif
-
-    interpolateViewProps(
-        animationProgress, props, newProps, interpolatedPropsShared);
-
-    return interpolatedPropsShared;
-  };
 };
 
 } // namespace react

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

@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include "ViewProps.h"
-
-#include <react/debug/react_native_assert.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/graphics/Transform.h>
 
 namespace facebook {
 namespace react {

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

@@ -42,16 +42,16 @@ void ViewShadowNode::initialize() noexcept {
       viewProps.getClipsContentToBounds() ||
       isColorMeaningful(viewProps.shadowColor) ||
       viewProps.accessibilityElementsHidden ||
+      viewProps.accessibilityViewIsModal ||
       viewProps.importantForAccessibility != ImportantForAccessibility::Auto ||
       viewProps.removeClippedSubviews;
 
-  bool formsView = isColorMeaningful(viewProps.backgroundColor) ||
+  bool formsView = formsStackingContext ||
+      isColorMeaningful(viewProps.backgroundColor) ||
       isColorMeaningful(viewProps.foregroundColor) ||
       !(viewProps.yogaStyle.border() == YGStyle::Edges{}) ||
       !viewProps.testId.empty();
 
-  formsView = formsView || formsStackingContext;
-
   if (formsView) {
     traits_.set(ShadowNodeTraits::Trait::FormsView);
   } else {

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

@@ -24,7 +24,7 @@ class ViewShadowNode final : public ConcreteViewShadowNode<
                                  ViewEventEmitter> {
  public:
   static ShadowNodeTraits BaseTraits() {
-    auto traits = BaseShadowNode::BaseTraits();
+    auto traits = ConcreteViewShadowNode::BaseTraits();
     traits.set(ShadowNodeTraits::Trait::View);
     return traits;
   }

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

@@ -98,6 +98,10 @@ inline void fromString(const std::string &string, AccessibilityTraits &result) {
     result = AccessibilityTraits::TabBar;
     return;
   }
+  if (string == "progressbar") {
+    result = AccessibilityTraits::UpdatesFrequently;
+    return;
+  }
   result = AccessibilityTraits::None;
 }
 

package/ReactCommon/react/renderer/core/BUCK

@@ -32,12 +32,8 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/core",
     ),
-    compiler_flags = [
-        "-fexceptions",
-        "-frtti",
-        "-std=c++17",
-        "-Wall",
-    ],
+    compiler_flags_enable_exceptions = True,
+    compiler_flags_enable_rtti = True,  # Needed for DebugStringConvertible - need to find a non-RTTI way to do this / enable RTTI for debug builds only
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,

package/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h

@@ -11,6 +11,7 @@
 #include <memory>
 
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/components/view/ViewPropsInterpolation.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/EventDispatcher.h>
 #include <react/renderer/core/Props.h>
@@ -65,9 +66,6 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
   ShadowNode::Shared createShadowNode(
       const ShadowNodeFragment &fragment,
       ShadowNodeFamily::Shared const &family) const override {
-    react_native_assert(
-        std::dynamic_pointer_cast<const ConcreteProps>(fragment.props));
-
     auto shadowNode =
         std::make_shared<ShadowNodeT>(fragment, family, getTraits());
 
@@ -113,21 +111,28 @@ class ConcreteComponentDescriptor : public ComponentDescriptor {
     return ShadowNodeT::Props(context, rawProps, props);
   };
 
-  virtual SharedProps interpolateProps(
+  SharedProps interpolateProps(
       const PropsParserContext &context,
       float animationProgress,
       const SharedProps &props,
       const SharedProps &newProps) const override {
-    // By default, this does nothing.
 #ifdef ANDROID
     // On Android only, the merged props should have the same RawProps as the
     // final props struct
-    if (newProps != nullptr) {
-      return cloneProps(context, newProps, newProps->rawProps);
-    }
+    SharedProps interpolatedPropsShared =
+        (newProps != nullptr ? cloneProps(context, newProps, newProps->rawProps)
+                             : cloneProps(context, newProps, {}));
+#else
+    SharedProps interpolatedPropsShared = cloneProps(context, newProps, {});
 #endif
 
-    return cloneProps(context, newProps, {});
+    if (ConcreteShadowNode::BaseTraits().check(
+            ShadowNodeTraits::Trait::ViewKind)) {
+      interpolateViewProps(
+          animationProgress, props, newProps, interpolatedPropsShared);
+    }
+
+    return interpolatedPropsShared;
   };
 
   virtual State::Shared createInitialState(

package/ReactCommon/react/renderer/core/ConcreteShadowNode.h

@@ -11,6 +11,7 @@
 #include <react/renderer/core/ConcreteState.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/StateData.h>
 
@@ -98,9 +99,6 @@ class ConcreteShadowNode : public BaseShadowNodeT {
   ConcreteProps const &getConcreteProps() const {
     react_native_assert(
         BaseShadowNodeT::props_ && "Props must not be `nullptr`.");
-    react_native_assert(
-        std::dynamic_pointer_cast<ConcreteProps const>(props_) &&
-        "Props must be an instance of ConcreteProps class.");
     return static_cast<ConcreteProps const &>(*props_);
   }
 
@@ -109,10 +107,6 @@ class ConcreteShadowNode : public BaseShadowNodeT {
    * Thread-safe after the node is sealed.
    */
   ConcreteEventEmitter const &getConcreteEventEmitter() const {
-    react_native_assert(
-        std::dynamic_pointer_cast<ConcreteEventEmitter const>(
-            BaseShadowNodeT::getEventEmitter()) &&
-        "EventEmitter must be an instance of ConcreteEventEmitter class.");
     return static_cast<ConcreteEventEmitter const &>(
         *BaseShadowNodeT::getEventEmitter());
   }
@@ -123,9 +117,6 @@ class ConcreteShadowNode : public BaseShadowNodeT {
    */
   ConcreteStateData const &getStateData() const {
     react_native_assert(state_ && "State must not be `nullptr`.");
-    react_native_assert(
-        std::dynamic_pointer_cast<ConcreteState const>(state_) &&
-        "State must be an instance of ConcreteState class.");
     return static_cast<ConcreteState const *>(state_.get())->getData();
   }
 

package/ReactCommon/react/renderer/core/EventEmitter.cpp

@@ -52,10 +52,15 @@ EventEmitter::EventEmitter(
 void EventEmitter::dispatchEvent(
     const std::string &type,
     const folly::dynamic &payload,
-    EventPriority priority) const {
-  dispatchEvent(type, [payload](jsi::Runtime &runtime) {
-    return valueFromDynamic(runtime, payload);
-  });
+    EventPriority priority,
+    RawEvent::Category category) const {
+  dispatchEvent(
+      type,
+      [payload](jsi::Runtime &runtime) {
+        return valueFromDynamic(runtime, payload);
+      },
+      priority,
+      category);
 }
 
 void EventEmitter::dispatchUniqueEvent(

package/ReactCommon/react/renderer/core/EventEmitter.h

@@ -77,7 +77,8 @@ class EventEmitter {
   void dispatchEvent(
       const std::string &type,
       const folly::dynamic &payload,
-      EventPriority priority = EventPriority::AsynchronousBatched) const;
+      EventPriority priority = EventPriority::AsynchronousBatched,
+      RawEvent::Category category = RawEvent::Category::Unspecified) const;
 
   void dispatchUniqueEvent(
       const std::string &type,

package/ReactCommon/react/renderer/core/Props.h

@@ -10,6 +10,7 @@
 #include <folly/dynamic.h>
 
 #include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/RawProps.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/Sealable.h>
 #include <react/renderer/debug/DebugStringConvertible.h>

package/ReactCommon/react/renderer/core/PropsParserContext.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/renderer/core/ReactPrimitives.h>
 #include <react/utils/ContextContainer.h>
 
 namespace facebook {
@@ -20,8 +21,8 @@ struct PropsParserContext {
   PropsParserContext(const PropsParserContext &) = delete;
   PropsParserContext &operator=(const PropsParserContext &) = delete;
 
-  int surfaceId; // TODO: use SurfaceId type
-  const ContextContainer &contextContainer;
+  SurfaceId const surfaceId;
+  ContextContainer const &contextContainer;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/core/RawEvent.h

@@ -23,17 +23,19 @@ struct RawEvent {
   /*
    * Defines category of a native platform event. This is used to deduce types
    * of events for Concurrent Mode.
+   * This enum is duplicated for JNI access in `EventCategoryDef.java`, keep in
+   * sync.
    */
   enum class Category {
     /*
      * Start of a continuous event. To be used with touchStart.
      */
-    ContinuousStart,
+    ContinuousStart = 0,
 
     /*
      * End of a continuous event. To be used with touchEnd.
      */
-    ContinuousEnd,
+    ContinuousEnd = 1,
 
     /*
      * Priority for this event will be determined from other events in the
@@ -41,19 +43,19 @@ struct RawEvent {
      * default. If it is not triggered by continuous event, its priority will be
      * discrete.
      */
-    Unspecified,
+    Unspecified = 2,
 
     /*
      * Forces discrete type for the event. Regardless if continuous event is
      * ongoing.
      */
-    Discrete,
+    Discrete = 3,
 
     /*
      * Forces continuous type for the event. Regardless if continuous event
      * isn't ongoing.
      */
-    Continuous
+    Continuous = 4
   };
 
   RawEvent(