From bf7418f90d2b549c2502e07c1ca076c5a5f8c98a Mon Sep 17 00:00:00 2001
From: Andrew Coates <30809111+acoates-ms@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:19:57 -0800
Subject: [PATCH] Fixes to bridging/base.h for MSVC compatibility

---
 .../ReactCommon/react/bridging/Base.h         | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/react-native/ReactCommon/react/bridging/Base.h b/packages/react-native/ReactCommon/react/bridging/Base.h
index 2858ea7833bf65..2c67d46f2ff830 100644
--- a/packages/react-native/ReactCommon/react/bridging/Base.h
+++ b/packages/react-native/ReactCommon/react/bridging/Base.h
@@ -63,8 +63,8 @@ using bridging_t = typename detail::bridging_wrapper<T>::type;
 
 template <typename R, typename T, std::enable_if_t<is_jsi_v<T>, int> = 0>
 auto fromJs(jsi::Runtime& rt, T&& value, const std::shared_ptr<CallInvoker>&)
-    -> decltype(static_cast<R>(convert(rt, std::forward<T>(value)))) {
-  return convert(rt, std::forward<T>(value));
+    -> decltype(static_cast<R>(std::move(convert(rt, std::forward<T>(value))))) {
+  return static_cast<R>(std::move(convert(rt, std::forward<T>(value))));
 }
 
 template <typename R, typename T>
@@ -121,7 +121,7 @@ auto toJs(
 template <typename, typename = jsi::Value, typename = void>
 inline constexpr bool supportsFromJs = false;
 
-template <typename T, typename Arg = jsi::Value>
+template <typename T, typename Arg>
 inline constexpr bool supportsFromJs<
     T,
     Arg,
@@ -130,10 +130,19 @@ inline constexpr bool supportsFromJs<
         std::declval<Arg>(),
         nullptr))>> = true;
 
+template <typename T>
+inline constexpr bool supportsFromJs<
+    T,
+    jsi::Value,
+    std::void_t<decltype(fromJs<T>(
+       std::declval<jsi::Runtime &>(),
+       std::declval<jsi::Value>(),
+       nullptr))>> = true;
+
 template <typename, typename = jsi::Value, typename = void>
 inline constexpr bool supportsToJs = false;
 
-template <typename T, typename Ret = jsi::Value>
+template <typename T, typename Ret>
 inline constexpr bool supportsToJs<
     T,
     Ret,
@@ -148,5 +157,20 @@ inline constexpr bool supportsToJs<
             nullptr)),
         Ret>;
 
+template <typename T>
+inline constexpr bool supportsToJs<
+    T,
+    jsi::Value,
+    std::void_t<decltype(toJs(
+        std::declval<jsi::Runtime&>(),
+        std::declval<T>(),
+        nullptr))>> =
+    std::is_convertible_v<
+        decltype(toJs(
+            std::declval<jsi::Runtime&>(),
+            std::declval<T>(),
+            nullptr)),
+        jsi::Value>;
+
 } // namespace bridging
 } // namespace facebook::react