react-native-windows 0.82.3 → 0.83.0-preview.1

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/CallbackWrapper.h

@@ -20,46 +20,47 @@ class CallInvoker;
 // Helper for passing jsi::Function arg to other methods.
 class CallbackWrapper : public LongLivedObject {
  private:
-  CallbackWrapper(
-      jsi::Function&& callback,
-      jsi::Runtime& runtime,
-      std::shared_ptr<CallInvoker> jsInvoker)
-      : LongLivedObject(runtime),
-        callback_(std::move(callback)),
-        jsInvoker_(std::move(jsInvoker)) {}
+  CallbackWrapper(jsi::Function &&callback, jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker)
+      : LongLivedObject(runtime), callback_(std::move(callback)), jsInvoker_(std::move(jsInvoker))
+  {
+  }
 
   jsi::Function callback_;
   std::shared_ptr<CallInvoker> jsInvoker_;
 
  public:
-  static std::weak_ptr<CallbackWrapper> createWeak(
-      jsi::Function&& callback,
-      jsi::Runtime& runtime,
-      std::shared_ptr<CallInvoker> jsInvoker) {
-    auto wrapper = std::shared_ptr<CallbackWrapper>(new CallbackWrapper(
-        std::move(callback), runtime, std::move(jsInvoker)));
+  static std::weak_ptr<CallbackWrapper>
+  createWeak(jsi::Function &&callback, jsi::Runtime &runtime, std::shared_ptr<CallInvoker> jsInvoker)
+  {
+    auto wrapper =
+        std::shared_ptr<CallbackWrapper>(new CallbackWrapper(std::move(callback), runtime, std::move(jsInvoker)));
     LongLivedObjectCollection::get(runtime).add(wrapper);
     return wrapper;
   }
 
   // Delete the enclosed jsi::Function
-  void destroy() {
+  void destroy()
+  {
     allowRelease();
   }
 
-  jsi::Function& callback() noexcept {
+  jsi::Function &callback() noexcept
+  {
     return callback_;
   }
 
-  jsi::Runtime& runtime() noexcept {
+  jsi::Runtime &runtime() noexcept
+  {
     return runtime_;
   }
 
-  CallInvoker& jsInvoker() noexcept {
+  CallInvoker &jsInvoker() noexcept
+  {
     return *(jsInvoker_);
   }
 
-  std::shared_ptr<CallInvoker> jsInvokerPtr() noexcept {
+  std::shared_ptr<CallInvoker> jsInvokerPtr() noexcept
+  {
     return jsInvoker_;
   }
 };

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/Class.h

@@ -11,64 +11,41 @@
 
 namespace facebook::react::bridging {
 
-template <
-    typename JSReturnT,
-    typename ClassT,
-    typename ReturnT,
-    typename... ArgsT,
-    typename... JSArgsT>
+template <typename JSReturnT, typename ClassT, typename ReturnT, typename... ArgsT, typename... JSArgsT>
 JSReturnT callFromJs(
-    jsi::Runtime& rt,
-    ReturnT (ClassT::*method)(jsi::Runtime&, ArgsT...),
-    const std::shared_ptr<CallInvoker>& jsInvoker,
-    ClassT* instance,
-    JSArgsT&&... args) {
-  static_assert(
-      sizeof...(ArgsT) == sizeof...(JSArgsT), "Incorrect arguments length");
-  static_assert(
-      (supportsFromJs<ArgsT, JSArgsT> && ...), "Incompatible arguments");
+    jsi::Runtime &rt,
+    ReturnT (ClassT::*method)(jsi::Runtime &, ArgsT...),
+    const std::shared_ptr<CallInvoker> &jsInvoker,
+    ClassT *instance,
+    JSArgsT &&...args)
+{
+  static_assert(sizeof...(ArgsT) == sizeof...(JSArgsT), "Incorrect arguments length");
+  static_assert((supportsFromJs<ArgsT, JSArgsT> && ...), "Incompatible arguments");
   if constexpr (std::is_void_v<JSReturnT>) {
-    static_assert(
-        std::is_void_v<ReturnT>,
-        "Method must return void when JSReturnT is void");
+    static_assert(std::is_void_v<ReturnT>, "Method must return void when JSReturnT is void");
   }
 
   if constexpr (std::is_void_v<JSReturnT>) {
-    (instance->*method)(
-        rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
+    (instance->*method)(rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
 
   } else if constexpr (std::is_void_v<ReturnT>) {
-    static_assert(
-        std::is_same_v<JSReturnT, jsi::Value>,
-        "Void functions may only return undefined");
+    static_assert(std::is_same_v<JSReturnT, jsi::Value>, "Void functions may only return undefined");
 
-    (instance->*method)(
-        rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
+    (instance->*method)(rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
     return jsi::Value();
 
-  } else if constexpr (
-      is_jsi_v<JSReturnT> || supportsToJs<ReturnT, JSReturnT>) {
+  } else if constexpr (is_jsi_v<JSReturnT> || supportsToJs<ReturnT, JSReturnT>) {
     static_assert(supportsToJs<ReturnT, JSReturnT>, "Incompatible return type");
 
-    return toJs(
-        rt,
-        (instance->*method)(
-            rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...),
-        jsInvoker);
+    return toJs(rt, (instance->*method)(rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...), jsInvoker);
   } else if constexpr (is_optional_jsi_v<JSReturnT>) {
     static_assert(
-        is_optional_v<ReturnT>
-            ? supportsToJs<
-                  typename ReturnT::value_type,
-                  typename JSReturnT::value_type>
-            : supportsToJs<ReturnT, typename JSReturnT::value_type>,
+        is_optional_v<ReturnT> ? supportsToJs<typename ReturnT::value_type, typename JSReturnT::value_type>
+                               : supportsToJs<ReturnT, typename JSReturnT::value_type>,
         "Incompatible return type");
 
-    auto result = toJs(
-        rt,
-        (instance->*method)(
-            rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...),
-        jsInvoker);
+    auto result =
+        toJs(rt, (instance->*method)(rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...), jsInvoker);
 
     if constexpr (std::is_same_v<decltype(result), jsi::Value>) {
       if (result.isNull() || result.isUndefined()) {
@@ -78,20 +55,20 @@ JSReturnT callFromJs(
 
     return convert(rt, std::move(result));
   } else {
-    static_assert(
-        std::is_convertible_v<ReturnT, JSReturnT>, "Incompatible return type");
-    return (instance->*method)(
-        rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
+    static_assert(std::is_convertible_v<ReturnT, JSReturnT>, "Incompatible return type");
+    return (instance->*method)(rt, fromJs<ArgsT>(rt, std::forward<JSArgsT>(args), jsInvoker)...);
   }
 }
 
 template <typename ReturnT, typename... ArgsT>
-constexpr size_t getParameterCount(ReturnT (*)(ArgsT...)) {
+constexpr size_t getParameterCount(ReturnT (* /*unused*/)(ArgsT...))
+{
   return sizeof...(ArgsT);
 }
 
 template <typename Class, typename ReturnT, typename... ArgsT>
-constexpr size_t getParameterCount(ReturnT (Class::*)(ArgsT...)) {
+constexpr size_t getParameterCount(ReturnT (Class::* /*unused*/)(ArgsT...))
+{
   return sizeof...(ArgsT);
 }
 

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/Convert.h

@@ -19,10 +19,8 @@ template <typename T>
 using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
 
 template <typename T>
-inline constexpr bool is_jsi_v =
-    std::is_same_v<jsi::Value, remove_cvref_t<T>> ||
-    std::is_same_v<jsi::String, remove_cvref_t<T>> ||
-    std::is_base_of_v<jsi::Object, remove_cvref_t<T>>;
+inline constexpr bool is_jsi_v = std::is_same_v<jsi::Value, remove_cvref_t<T>> ||
+    std::is_same_v<jsi::String, remove_cvref_t<T>> || std::is_base_of_v<jsi::Object, remove_cvref_t<T>>;
 
 template <typename>
 struct is_optional : std::false_type {};
@@ -37,9 +35,8 @@ template <typename T, typename = void>
 inline constexpr bool is_optional_jsi_v = false;
 
 template <typename T>
-inline constexpr bool
-    is_optional_jsi_v<T, typename std::enable_if_t<is_optional_v<T>>> =
-        is_jsi_v<typename T::value_type>;
+inline constexpr bool is_optional_jsi_v<T, typename std::enable_if_t<is_optional_v<T>>> =
+    is_jsi_v<typename T::value_type>;
 
 template <typename T>
 struct Converter;
@@ -48,10 +45,10 @@ template <typename T>
 struct ConverterBase {
   using BaseT = remove_cvref_t<T>;
 
-  ConverterBase(jsi::Runtime& rt, T&& value)
-      : rt_(rt), value_(std::forward<T>(value)) {}
+  ConverterBase(jsi::Runtime &rt, T &&value) : rt_(rt), value_(std::forward<T>(value)) {}
 
-  operator BaseT() && {
+  operator BaseT() &&
+  {
     if constexpr (std::is_lvalue_reference_v<T>) {
       // Copy the reference into a Value that then can be moved from.
       auto value = jsi::Value(rt_, value_);
@@ -79,17 +76,16 @@ struct ConverterBase {
               // Ensure non-reference type can be converted to the desired type.
               std::is_convertible_v<Converter<BaseT>, U>,
           int> = 0>
-  operator U() && {
+  operator U() &&
+  {
     return Converter<BaseT>(rt_, std::move(*this).operator BaseT());
   }
 
-  template <
-      typename U,
-      std::enable_if_t<is_jsi_v<T> && std::is_same_v<U, jsi::Value>, int> = 0>
+  template <typename U, std::enable_if_t<is_jsi_v<T> && std::is_same_v<U, jsi::Value>, int> = 0>
   operator U() && = delete; // Prevent unwanted upcasting of JSI values.
 
  protected:
-  jsi::Runtime& rt_;
+  jsi::Runtime &rt_;
   T value_;
 };
 
@@ -102,19 +98,23 @@ template <>
 struct Converter<jsi::Value> : public ConverterBase<jsi::Value> {
   using ConverterBase<jsi::Value>::ConverterBase;
 
-  operator jsi::String() && {
+  operator jsi::String() &&
+  {
     return std::move(value_).asString(rt_);
   }
 
-  operator jsi::Object() && {
+  operator jsi::Object() &&
+  {
     return std::move(value_).asObject(rt_);
   }
 
-  operator jsi::Array() && {
+  operator jsi::Array() &&
+  {
     return std::move(value_).asObject(rt_).asArray(rt_);
   }
 
-  operator jsi::Function() && {
+  operator jsi::Function() &&
+  {
     return std::move(value_).asObject(rt_).asFunction(rt_);
   }
 };
@@ -123,21 +123,26 @@ template <>
 struct Converter<jsi::Object> : public ConverterBase<jsi::Object> {
   using ConverterBase<jsi::Object>::ConverterBase;
 
-  operator jsi::Array() && {
+  operator jsi::Array() &&
+  {
     return std::move(value_).asArray(rt_);
   }
 
-  operator jsi::Function() && {
+  operator jsi::Function() &&
+  {
     return std::move(value_).asFunction(rt_);
   }
 };
 
 template <typename T>
 struct Converter<std::optional<T>> : public ConverterBase<jsi::Value> {
-  Converter(jsi::Runtime& rt, std::optional<T> value)
-      : ConverterBase(rt, value ? std::move(*value) : jsi::Value::null()) {}
+  Converter(jsi::Runtime &rt, std::optional<T> value)
+      : ConverterBase(rt, value ? std::move(*value) : jsi::Value::null())
+  {
+  }
 
-  operator std::optional<T>() && {
+  operator std::optional<T>() &&
+  {
     if (value_.isNull() || value_.isUndefined()) {
       return {};
     }
@@ -146,24 +151,26 @@ struct Converter<std::optional<T>> : public ConverterBase<jsi::Value> {
 };
 
 template <typename T, std::enable_if_t<is_jsi_v<T>, int> = 0>
-auto convert(jsi::Runtime& rt, T&& value) {
+auto convert(jsi::Runtime &rt, T &&value)
+{
   return Converter<T>(rt, std::forward<T>(value));
 }
 
-template <
-    typename T,
-    std::enable_if_t<is_jsi_v<T> || std::is_scalar_v<T>, int> = 0>
-auto convert(jsi::Runtime& rt, std::optional<T> value) {
+template <typename T, std::enable_if_t<is_jsi_v<T> || std::is_scalar_v<T>, int> = 0>
+auto convert(jsi::Runtime &rt, std::optional<T> value)
+{
   return Converter<std::optional<T>>(rt, std::move(value));
 }
 
 template <typename T, std::enable_if_t<std::is_scalar_v<T>, int> = 0>
-auto convert(jsi::Runtime& /*rt*/, T&& value) {
+auto convert(jsi::Runtime & /*rt*/, T &&value)
+{
   return value;
 }
 
 template <typename T>
-auto convert(jsi::Runtime& /*rt*/, Converter<T>&& converter) {
+auto convert(jsi::Runtime & /*rt*/, Converter<T> &&converter)
+{
   return std::move(converter);
 }
 

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/Error.h

@@ -16,9 +16,10 @@ class Error {
   // TODO (T114055466): Retain stack trace (at least caller location)
   Error(std::string message) : message_(std::move(message)) {}
 
-  Error(const char* message) : Error(std::string(message)) {}
+  Error(const char *message) : Error(std::string(message)) {}
 
-  const std::string& message() const {
+  const std::string &message() const
+  {
     return message_;
   }
 
@@ -28,22 +29,26 @@ class Error {
 
 template <>
 struct Bridging<jsi::JSError> {
-  static jsi::JSError fromJs(jsi::Runtime& rt, const jsi::Value& value) {
+  static jsi::JSError fromJs(jsi::Runtime &rt, const jsi::Value &value)
+  {
     return jsi::JSError(rt, jsi::Value(rt, value));
   }
 
-  static jsi::JSError fromJs(jsi::Runtime& rt, jsi::Value&& value) {
+  static jsi::JSError fromJs(jsi::Runtime &rt, jsi::Value &&value)
+  {
     return jsi::JSError(rt, std::move(value));
   }
 
-  static jsi::Value toJs(jsi::Runtime& rt, std::string message) {
+  static jsi::Value toJs(jsi::Runtime &rt, std::string message)
+  {
     return jsi::Value(rt, jsi::JSError(rt, std::move(message)).value());
   }
 };
 
 template <>
 struct Bridging<Error> {
-  static jsi::Value toJs(jsi::Runtime& rt, const Error& error) {
+  static jsi::Value toJs(jsi::Runtime &rt, const Error &error)
+  {
     return jsi::Value(rt, jsi::JSError(rt, error.message()).value());
   }
 };

package/Microsoft.ReactNative.Cxx/ReactCommon/react/bridging/EventEmitter.h

@@ -13,36 +13,43 @@
 #include <mutex>
 #include <unordered_map>
 
-#define FRIEND_TEST(test_case_name, test_name) \
-  friend class test_case_name##_##test_name##_Test
+#define FRIEND_TEST(test_case_name, test_name) friend class test_case_name##_##test_name##_Test
 
 namespace facebook::react {
 
 class EventSubscription {
  public:
-  explicit EventSubscription(std::function<void()> remove)
-      : remove_(std::move(remove)) {}
+  explicit EventSubscription(std::function<void()> remove) : remove_(std::move(remove)) {}
   ~EventSubscription() = default;
-  EventSubscription(EventSubscription&&) noexcept = default;
-  EventSubscription& operator=(EventSubscription&&) noexcept = default;
-  EventSubscription(const EventSubscription&) = delete;
-  EventSubscription& operator=(const EventSubscription&) = delete;
+  EventSubscription(EventSubscription &&) noexcept = default;
+  EventSubscription &operator=(EventSubscription &&) noexcept = default;
+  EventSubscription(const EventSubscription &) = delete;
+  EventSubscription &operator=(const EventSubscription &) = delete;
+
+  void remove()
+  {
+    remove_();
+  }
 
  private:
   friend Bridging<EventSubscription>;
-
   std::function<void()> remove_;
 };
 
 template <>
 struct Bridging<EventSubscription> {
-  static jsi::Object toJs(
-      jsi::Runtime& rt,
-      const EventSubscription& eventSubscription,
-      const std::shared_ptr<CallInvoker>& jsInvoker) {
+  static EventSubscription
+  fromJs(jsi::Runtime &rt, const jsi::Object &value, const std::shared_ptr<CallInvoker> &jsInvoker)
+  {
+    auto listener = bridging::fromJs<AsyncCallback<>>(rt, value.getProperty(rt, "remove"), jsInvoker);
+    return EventSubscription([listener = std::move(listener)]() mutable { listener(); });
+  }
+
+  static jsi::Object
+  toJs(jsi::Runtime &rt, const EventSubscription &eventSubscription, const std::shared_ptr<CallInvoker> &jsInvoker)
+  {
     auto result = jsi::Object(rt);
-    result.setProperty(
-        rt, "remove", bridging::toJs(rt, eventSubscription.remove_, jsInvoker));
+    result.setProperty(rt, "remove", bridging::toJs(rt, eventSubscription.remove_, jsInvoker));
     return result;
   }
 };
@@ -51,24 +58,21 @@ class IAsyncEventEmitter {
  public:
   IAsyncEventEmitter() noexcept = default;
   virtual ~IAsyncEventEmitter() noexcept = default;
-  IAsyncEventEmitter(IAsyncEventEmitter&&) noexcept = default;
-  IAsyncEventEmitter& operator=(IAsyncEventEmitter&&) noexcept = default;
-  IAsyncEventEmitter(const IAsyncEventEmitter&) = delete;
-  IAsyncEventEmitter& operator=(const IAsyncEventEmitter&) = delete;
-
-  virtual jsi::Object get(
-      jsi::Runtime& rt,
-      const std::shared_ptr<CallInvoker>& jsInvoker) const = 0;
+  IAsyncEventEmitter(IAsyncEventEmitter &&) noexcept = default;
+  IAsyncEventEmitter &operator=(IAsyncEventEmitter &&) noexcept = default;
+  IAsyncEventEmitter(const IAsyncEventEmitter &) = delete;
+  IAsyncEventEmitter &operator=(const IAsyncEventEmitter &) = delete;
+
+  virtual jsi::Object get(jsi::Runtime &rt, const std::shared_ptr<CallInvoker> &jsInvoker) const = 0;
 };
 
 template <typename... Args>
 class AsyncEventEmitter : public IAsyncEventEmitter {
-  static_assert(
-      sizeof...(Args) <= 1,
-      "AsyncEventEmitter must have at most one argument");
+  static_assert(sizeof...(Args) <= 1, "AsyncEventEmitter must have at most one argument");
 
  public:
-  AsyncEventEmitter() : state_(std::make_shared<SharedState>()) {
+  AsyncEventEmitter() : state_(std::make_shared<SharedState>())
+  {
     listen_ = [state = state_](AsyncCallback<Args...> listener) {
       std::lock_guard<std::mutex> lock(state->mutex);
       auto listenerId = state->listenerId++;
@@ -80,30 +84,29 @@ class AsyncEventEmitter : public IAsyncEventEmitter {
     };
   }
   ~AsyncEventEmitter() override = default;
-  AsyncEventEmitter(AsyncEventEmitter&&) noexcept = default;
-  AsyncEventEmitter& operator=(AsyncEventEmitter&&) noexcept = default;
-  AsyncEventEmitter(const AsyncEventEmitter&) = delete;
-  AsyncEventEmitter& operator=(const AsyncEventEmitter&) = delete;
+  AsyncEventEmitter(AsyncEventEmitter &&) noexcept = default;
+  AsyncEventEmitter &operator=(AsyncEventEmitter &&) noexcept = default;
+  AsyncEventEmitter(const AsyncEventEmitter &) = delete;
+  AsyncEventEmitter &operator=(const AsyncEventEmitter &) = delete;
 
-  void emit(std::function<jsi::Value(jsi::Runtime&)>&& converter) {
+  void emit(std::function<jsi::Value(jsi::Runtime &)> &&converter)
+  {
     std::lock_guard<std::mutex> lock(state_->mutex);
-    for (auto& [_, listener] : state_->listeners) {
-      listener.call([converter](jsi::Runtime& rt, jsi::Function& jsFunction) {
-        jsFunction.call(rt, converter(rt));
-      });
+    for (auto &[_, listener] : state_->listeners) {
+      listener.call([converter](jsi::Runtime &rt, jsi::Function &jsFunction) { jsFunction.call(rt, converter(rt)); });
     }
   }
 
-  void emit(Args... value) {
+  void emit(Args... value)
+  {
     std::lock_guard<std::mutex> lock(state_->mutex);
-    for (const auto& [_, listener] : state_->listeners) {
+    for (const auto &[_, listener] : state_->listeners) {
       listener.call(static_cast<Args>(value)...);
     }
   }
 
-  jsi::Object get(
-      jsi::Runtime& rt,
-      const std::shared_ptr<CallInvoker>& jsInvoker) const override {
+  jsi::Object get(jsi::Runtime &rt, const std::shared_ptr<CallInvoker> &jsInvoker) const override
+  {
     return bridging::toJs(rt, listen_, jsInvoker);
   }
 
@@ -123,10 +126,9 @@ class AsyncEventEmitter : public IAsyncEventEmitter {
 
 template <typename... Args>
 struct Bridging<AsyncEventEmitter<Args...>> {
-  static jsi::Object toJs(
-      jsi::Runtime& rt,
-      const AsyncEventEmitter<Args...>& eventEmitter,
-      const std::shared_ptr<CallInvoker>& jsInvoker) {
+  static jsi::Object
+  toJs(jsi::Runtime &rt, const AsyncEventEmitter<Args...> &eventEmitter, const std::shared_ptr<CallInvoker> &jsInvoker)
+  {
     return eventEmitter.get(rt, jsInvoker);
   }
 };