react-native-windows 0.82.1 → 0.83.0-preview.0

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp

@@ -33,9 +33,9 @@ void ComponentDescriptorRegistry::add(
   std::unique_lock lock(mutex_);
 
   auto componentDescriptor = componentDescriptorProvider.constructor(
-      {parameters_.eventDispatcher,
-       parameters_.contextContainer,
-       componentDescriptorProvider.flavor});
+      {.eventDispatcher = parameters_.eventDispatcher,
+       .contextContainer = parameters_.contextContainer,
+       .flavor = componentDescriptorProvider.flavor});
   react_native_assert(
       componentDescriptor->getComponentHandle() ==
       componentDescriptorProvider.handle);

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/image/conversions.h

@@ -18,7 +18,8 @@
 
 namespace facebook::react {
 
-inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageSource &result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageSource &result)
+{
   if (value.hasType<std::string>()) {
     result = {
         /* .type = */ ImageSource::Type::Remote,
@@ -111,11 +112,13 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
   result.type = ImageSource::Type::Invalid;
 }
 
-inline std::string toString(const ImageSource &value) {
+inline std::string toString(const ImageSource &value)
+{
   return "{uri: " + value.uri + "}";
 }
 
-inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageResizeMode &result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageResizeMode &result)
+{
   react_native_expect(value.hasType<std::string>());
   if (!value.hasType<std::string>()) {
     LOG(ERROR) << "Unsupported ImageResizeMode type";
@@ -145,7 +148,8 @@ inline void fromRawValue(const PropsParserContext &context, const RawValue &valu
   }
 }
 
-inline std::string toString(const ImageResizeMode &value) {
+inline std::string toString(const ImageResizeMode &value)
+{
   switch (value) {
     case ImageResizeMode::Cover:
       return "cover";

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/text/ParagraphShadowNode.cpp

@@ -36,7 +36,7 @@
 namespace facebook::react {
 using Content = ParagraphShadowNode::Content;
 
-// NOLINTNEXTLINE(facebook-hte-CArray)
+// NOLINTNEXTLINE(facebook-hte-CArray, modernize-avoid-c-arrays)
 const char ParagraphComponentName[] = "Paragraph";
 
 void ParagraphShadowNode::initialize() noexcept {
@@ -158,11 +158,12 @@ void ParagraphShadowNode::updateStateIfNeeded(
     return;
   }
 
-  setStateData(ParagraphStateT{
-      content.attributedString,
-      content.paragraphAttributes,
-      textLayoutManager_,
-      layout});
+  setStateData(
+      ParagraphStateT{
+          content.attributedString,
+          content.paragraphAttributes,
+          textLayoutManager_,
+          layout});
 }
 
 void ParagraphShadowNode::updateStateIfNeeded(const Content& content) {
@@ -175,10 +176,11 @@ void ParagraphShadowNode::updateStateIfNeeded(const Content& content) {
     return;
   }
 
-  setStateData(ParagraphState{
-      content.attributedString,
-      content.paragraphAttributes,
-      textLayoutManager_});
+  setStateData(
+      ParagraphState{
+          content.attributedString,
+          content.paragraphAttributes,
+          textLayoutManager_});
 }
 
 MeasuredPreparedLayout* ParagraphShadowNode::findUsableLayout() {
@@ -249,12 +251,13 @@ Size ParagraphShadowNode::measureContent(
       auto measurement = tme.measurePreparedLayout(
           preparedLayout, textLayoutContext, layoutConstraints);
 
-      measuredLayouts_.push_back(MeasuredPreparedLayout{
-          .layoutConstraints = layoutConstraints,
-          .measurement = measurement,
-          // PreparedLayout is not trivially copyable on all platforms
-          // NOLINTNEXTLINE(performance-move-const-arg)
-          .preparedLayout = std::move(preparedLayout)});
+      measuredLayouts_.push_back(
+          MeasuredPreparedLayout{
+              .layoutConstraints = layoutConstraints,
+              .measurement = measurement,
+              // PreparedLayout is not trivially copyable on all platforms
+              // NOLINTNEXTLINE(performance-move-const-arg)
+              .preparedLayout = std::move(preparedLayout)});
       assert_valid_size(measurement.size, layoutConstraints);
       return measurement.size;
     }

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/text/platform/android/react/renderer/components/text/ParagraphState.h

@@ -65,22 +65,21 @@ class ParagraphState final {
       : attributedString(std::move(attributedString)),
         paragraphAttributes(std::move(paragraphAttributes)),
         layoutManager(std::move(layoutManager)),
-        measuredLayout(std::move(measuredLayout)) {}
+        measuredLayout(std::move(measuredLayout))
+  {
+  }
 
   ParagraphState(
       AttributedString attributedString,
       ParagraphAttributes paragraphAttributes,
       std::weak_ptr<const TextLayoutManager> layoutManager)
-      : ParagraphState(
-            std::move(attributedString),
-            std::move(paragraphAttributes),
-            std::move(layoutManager),
-            {}) {}
+      : ParagraphState(std::move(attributedString), std::move(paragraphAttributes), std::move(layoutManager), {})
+  {
+  }
 
   ParagraphState() = default;
-  ParagraphState(
-      const ParagraphState& /*previousState*/,
-      const folly::dynamic& /*data*/) {
+  ParagraphState(const ParagraphState & /*previousState*/, const folly::dynamic & /*data*/)
+  {
     react_native_assert(false && "Not supported");
   };
 

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

@@ -12,8 +12,6 @@
 #include <string>
 #include <vector>
 
-#include <react/renderer/debug/DebugStringConvertible.h>
-
 namespace facebook::react {
 
 enum class AccessibilityTraits : uint32_t {
@@ -38,15 +36,13 @@ enum class AccessibilityTraits : uint32_t {
   TabBar = (1 << 17),
 };
 
-constexpr enum AccessibilityTraits operator|(
-    const enum AccessibilityTraits lhs,
-    const enum AccessibilityTraits rhs) {
+constexpr enum AccessibilityTraits operator|(const enum AccessibilityTraits lhs, const enum AccessibilityTraits rhs)
+{
   return (enum AccessibilityTraits)((uint32_t)lhs | (uint32_t)rhs);
 }
 
-constexpr enum AccessibilityTraits operator&(
-    const enum AccessibilityTraits lhs,
-    const enum AccessibilityTraits rhs) {
+constexpr enum AccessibilityTraits operator&(const enum AccessibilityTraits lhs, const enum AccessibilityTraits rhs)
+{
   return (enum AccessibilityTraits)((uint32_t)lhs & (uint32_t)rhs);
 }
 
@@ -55,36 +51,13 @@ struct AccessibilityAction {
   std::optional<std::string> label{};
 };
 
-inline std::string toString(const AccessibilityAction& accessibilityAction) {
-  std::string result = accessibilityAction.name;
-  if (accessibilityAction.label.has_value()) {
-    result += ": '" + accessibilityAction.label.value() + "'";
-  }
-  return result;
-}
-
-inline std::string toString(
-    std::vector<AccessibilityAction> accessibilityActions) {
-  std::string result = "[";
-  for (size_t i = 0; i < accessibilityActions.size(); i++) {
-    result += toString(accessibilityActions[i]);
-    if (i < accessibilityActions.size() - 1) {
-      result += ", ";
-    }
-  }
-  result += "]";
-  return result;
-}
-
-inline static bool operator==(
-    const AccessibilityAction& lhs,
-    const AccessibilityAction& rhs) {
+inline static bool operator==(const AccessibilityAction &lhs, const AccessibilityAction &rhs)
+{
   return lhs.name == rhs.name && lhs.label == rhs.label;
 }
 
-inline static bool operator!=(
-    const AccessibilityAction& lhs,
-    const AccessibilityAction& rhs) {
+inline static bool operator!=(const AccessibilityAction &lhs, const AccessibilityAction &rhs)
+{
   return !(rhs == lhs);
 }
 
@@ -99,56 +72,28 @@ struct AccessibilityState {
   std::optional<bool> required{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionProvider Implementation
 };
 
-constexpr bool operator==(
-    const AccessibilityState& lhs,
-    const AccessibilityState& rhs) {
-  return lhs.disabled == rhs.disabled && lhs.selected == rhs.selected &&
-      lhs.checked == rhs.checked && lhs.busy == rhs.busy &&
-      lhs.expanded == rhs.expanded;
+constexpr bool operator==(const AccessibilityState &lhs, const AccessibilityState &rhs)
+{
+  return lhs.disabled == rhs.disabled && lhs.selected == rhs.selected && lhs.checked == rhs.checked &&
+      lhs.busy == rhs.busy && lhs.expanded == rhs.expanded;
 }
 
-constexpr bool operator!=(
-    const AccessibilityState& lhs,
-    const AccessibilityState& rhs) {
+constexpr bool operator!=(const AccessibilityState &lhs, const AccessibilityState &rhs)
+{
   return !(rhs == lhs);
 }
 
-#if RN_DEBUG_STRING_CONVERTIBLE
-inline std::string toString(AccessibilityState::CheckedState state) {
-  switch (state) {
-    case AccessibilityState::Unchecked:
-      return "Unchecked";
-    case AccessibilityState::Checked:
-      return "Checked";
-    case AccessibilityState::Mixed:
-      return "Mixed";
-    case AccessibilityState::None:
-      return "None";
-  }
-}
-
-inline std::string toString(const AccessibilityState& accessibilityState) {
-  return "{disabled:" + toString(accessibilityState.disabled) +
-      ",selected:" + toString(accessibilityState.selected) +
-      ",checked:" + toString(accessibilityState.checked) +
-      ",busy:" + toString(accessibilityState.busy) +
-      ",expanded:" + toString(accessibilityState.expanded) + "}";
-}
-#endif
-
 struct AccessibilityLabelledBy {
   std::vector<std::string> value{};
 };
 
-inline static bool operator==(
-    const AccessibilityLabelledBy& lhs,
-    const AccessibilityLabelledBy& rhs) {
+inline static bool operator==(const AccessibilityLabelledBy &lhs, const AccessibilityLabelledBy &rhs)
+{
   return lhs.value == rhs.value;
 }
 
-inline static bool operator!=(
-    const AccessibilityLabelledBy& lhs,
-    const AccessibilityLabelledBy& rhs) {
+inline static bool operator!=(const AccessibilityLabelledBy &lhs, const AccessibilityLabelledBy &rhs)
+{
   return !(lhs == rhs);
 }
 
@@ -159,16 +104,13 @@ struct AccessibilityValue {
   std::optional<std::string> text{};
 };
 
-constexpr bool operator==(
-    const AccessibilityValue& lhs,
-    const AccessibilityValue& rhs) {
-  return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now &&
-      lhs.text == rhs.text;
+constexpr bool operator==(const AccessibilityValue &lhs, const AccessibilityValue &rhs)
+{
+  return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now && lhs.text == rhs.text;
 }
 
-constexpr bool operator!=(
-    const AccessibilityValue& lhs,
-    const AccessibilityValue& rhs) {
+constexpr bool operator!=(const AccessibilityValue &lhs, const AccessibilityValue &rhs)
+{
   return !(rhs == lhs);
 }
 
@@ -185,19 +127,7 @@ enum class AccessibilityLiveRegion : uint8_t {
   Assertive,
 };
 
-inline std::string toString(
-    const AccessibilityLiveRegion& accessibilityLiveRegion) {
-  switch (accessibilityLiveRegion) {
-    case AccessibilityLiveRegion::None:
-      return "none";
-    case AccessibilityLiveRegion::Polite:
-      return "polite";
-    case AccessibilityLiveRegion::Assertive:
-      return "assertive";
-  }
-}
-
-enum class AccessibilityRole {
+enum class AccessibilityRole : uint8_t {
   None,
   Button,
   Dropdownlist,
@@ -240,7 +170,7 @@ enum class AccessibilityRole {
   Iconmenu,
 };
 
-enum class Role {
+enum class Role : uint8_t {
   Alert,
   Alertdialog,
   Application,

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

@@ -14,12 +14,14 @@
 #include <react/renderer/components/view/AccessibilityPrimitives.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
 
 #include <unordered_map>
 
 namespace facebook::react {
 
-inline void fromString(const std::string& string, AccessibilityTraits& result) {
+inline void fromString(const std::string &string, AccessibilityTraits &result)
+{
   if (string == "none") {
     result = AccessibilityTraits::None;
     return;
@@ -107,10 +109,8 @@ inline void fromString(const std::string& string, AccessibilityTraits& result) {
   result = AccessibilityTraits::None;
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityTraits& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityTraits &result)
+{
   if (value.hasType<std::string>()) {
     fromString((std::string)value, result);
     return;
@@ -121,7 +121,7 @@ inline void fromRawValue(
   react_native_expect(value.hasType<std::vector<std::string>>());
   if (value.hasType<std::vector<std::string>>()) {
     auto items = (std::vector<std::string>)value;
-    for (auto& item : items) {
+    for (auto &item : items) {
       AccessibilityTraits itemAccessibilityTraits;
       fromString(item, itemAccessibilityTraits);
       result = result | itemAccessibilityTraits;
@@ -131,10 +131,8 @@ inline void fromRawValue(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityState& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityState &result)
+{
   auto map = (std::unordered_map<std::string, RawValue>)value;
   auto selected = map.find("selected");
   if (selected != map.end()) {
@@ -186,8 +184,8 @@ inline void fromRawValue(
   // [Windows] - DO NOT REMOVE
 }
 
-inline std::string toString(
-    const ImportantForAccessibility& importantForAccessibility) {
+inline std::string toString(const ImportantForAccessibility &importantForAccessibility)
+{
   switch (importantForAccessibility) {
     case ImportantForAccessibility::Auto:
       return "auto";
@@ -200,10 +198,8 @@ inline std::string toString(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    ImportantForAccessibility& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImportantForAccessibility &result)
+{
   result = ImportantForAccessibility::Auto;
   react_native_expect(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
@@ -225,10 +221,8 @@ inline void fromRawValue(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityAction& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityAction &result)
+{
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto name = map.find("name");
@@ -245,10 +239,8 @@ inline void fromRawValue(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext&,
-    const RawValue& value,
-    AccessibilityValue& result) {
+inline void fromRawValue(const PropsParserContext & /*unused*/, const RawValue &value, AccessibilityValue &result)
+{
   auto map = (std::unordered_map<std::string, RawValue>)value;
 
   auto min = map.find("min");
@@ -280,10 +272,8 @@ inline void fromRawValue(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityLabelledBy& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityLabelledBy &result)
+{
   if (value.hasType<std::string>()) {
     result.value.push_back((std::string)value);
   } else if (value.hasType<std::vector<std::string>>()) {
@@ -291,10 +281,8 @@ inline void fromRawValue(
   }
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityLiveRegion& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityLiveRegion &result)
+{
   result = AccessibilityLiveRegion::None;
   react_native_expect(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
@@ -314,7 +302,8 @@ inline void fromRawValue(
   }
 }
 
-inline std::string toString(const AccessibilityRole& accessibilityRole) {
+inline std::string toString(const AccessibilityRole &accessibilityRole)
+{
   switch (accessibilityRole) {
     case AccessibilityRole::None:
       return "none";
@@ -404,10 +393,8 @@ inline std::string toString(const AccessibilityRole& accessibilityRole) {
   return "none";
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    AccessibilityRole& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, AccessibilityRole &result)
+{
   react_native_expect(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -504,7 +491,8 @@ inline void fromRawValue(
   result = AccessibilityRole::None;
 }
 
-inline std::string toString(const Role& role) {
+inline std::string toString(const Role &role)
+{
   switch (role) {
     case Role::Alert:
       return "alert";
@@ -644,10 +632,8 @@ inline std::string toString(const Role& role) {
   return "none";
 }
 
-inline void fromRawValue(
-    const PropsParserContext& context,
-    const RawValue& value,
-    Role& result) {
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, Role &result)
+{
   react_native_expect(value.hasType<std::string>());
   if (value.hasType<std::string>()) {
     auto string = (std::string)value;
@@ -796,4 +782,61 @@ inline void fromRawValue(
   result = Role::None;
 }
 
+inline std::string toString(AccessibilityLiveRegion accessibilityLiveRegion)
+{
+  switch (accessibilityLiveRegion) {
+    case AccessibilityLiveRegion::None:
+      return "none";
+    case AccessibilityLiveRegion::Polite:
+      return "polite";
+    case AccessibilityLiveRegion::Assertive:
+      return "assertive";
+  }
+}
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+inline std::string toString(AccessibilityState::CheckedState state)
+{
+  switch (state) {
+    case AccessibilityState::Unchecked:
+      return "Unchecked";
+    case AccessibilityState::Checked:
+      return "Checked";
+    case AccessibilityState::Mixed:
+      return "Mixed";
+    case AccessibilityState::None:
+      return "None";
+  }
+}
+
+inline std::string toString(const AccessibilityAction &accessibilityAction)
+{
+  std::string result = accessibilityAction.name;
+  if (accessibilityAction.label.has_value()) {
+    result += ": '" + accessibilityAction.label.value() + "'";
+  }
+  return result;
+}
+
+inline std::string toString(std::vector<AccessibilityAction> accessibilityActions)
+{
+  std::string result = "[";
+  for (size_t i = 0; i < accessibilityActions.size(); i++) {
+    result += toString(accessibilityActions[i]);
+    if (i < accessibilityActions.size() - 1) {
+      result += ", ";
+    }
+  }
+  result += "]";
+  return result;
+}
+
+inline std::string toString(const AccessibilityState &accessibilityState)
+{
+  return "{disabled:" + toString(accessibilityState.disabled) + ",selected:" + toString(accessibilityState.selected) +
+      ",checked:" + toString(accessibilityState.checked) + ",busy:" + toString(accessibilityState.busy) +
+      ",expanded:" + toString(accessibilityState.expanded) + "}";
+}
+#endif
+
 } // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/EventDispatcher.cpp

@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+
+#if _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // deprecated APIs
+#endif
+#include "EventDispatcher.h"
+#include <cxxreact/JSExecutor.h>
+#include <react/renderer/core/StateUpdate.h>
+
+#include "EventQueue.h"
+#include "RawEvent.h"
+
+namespace facebook::react {
+
+EventDispatcher::EventDispatcher(
+    const EventQueueProcessor& eventProcessor,
+    std::unique_ptr<EventBeat> eventBeat,
+    StatePipe statePipe,
+    std::weak_ptr<EventLogger> eventLogger)
+    : eventQueue_(EventQueue(eventProcessor, std::move(eventBeat))),
+      statePipe_(std::move(statePipe)),
+      eventLogger_(std::move(eventLogger)) {}
+
+void EventDispatcher::dispatchEvent(RawEvent&& rawEvent) const {
+  // Allows the event listener to interrupt default event dispatch
+  if (eventListeners_.willDispatchEvent(rawEvent)) {
+    return;
+  }
+
+  auto eventLogger = eventLogger_.lock();
+  if (eventLogger != nullptr) {
+    rawEvent.loggingTag = eventLogger->onEventStart(
+        rawEvent.type, rawEvent.eventTarget, rawEvent.eventStartTimeStamp);
+  }
+  eventQueue_.enqueueEvent(std::move(rawEvent));
+}
+
+void EventDispatcher::experimental_flushSync() const {
+  eventQueue_.experimental_flushSync();
+}
+
+void EventDispatcher::dispatchStateUpdate(
+    StateUpdate&& stateUpdate,
+    EventQueue::UpdateMode updateMode) const {
+  eventQueue_.enqueueStateUpdate(std::move(stateUpdate), updateMode);
+}
+
+void EventDispatcher::dispatchUniqueEvent(RawEvent&& rawEvent) const {
+  // Allows the event listener to interrupt default event dispatch
+  if (eventListeners_.willDispatchEvent(rawEvent)) {
+    return;
+  }
+
+  eventQueue_.enqueueUniqueEvent(std::move(rawEvent));
+}
+
+void EventDispatcher::addListener(
+    std::shared_ptr<const EventListener> listener) const {
+  eventListeners_.addListener(std::move(listener));
+}
+
+/*
+ * Removes provided event listener to the event dispatcher.
+ */
+void EventDispatcher::removeListener(
+    const std::shared_ptr<const EventListener>& listener) const {
+  eventListeners_.removeListener(listener);
+}
+
+} // namespace facebook::react
+
+#if _MSC_VER
+#pragma warning(pop)
+#endif