diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp index 53cfd47e70d..5e64d48879e 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp +++ b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp @@ -125,7 +125,7 @@ namespace facebook::react { template <> struct Bridging { - static jsi::Value toJs( + static jsi::Object toJs( jsi::Runtime& runtime, const JsErrorHandler::ProcessedError::StackFrame& frame) { auto stackFrame = jsi::Object(runtime); @@ -143,7 +143,7 @@ struct Bridging { template <> struct Bridging { - static jsi::Value toJs( + static jsi::Object toJs( jsi::Runtime& runtime, const JsErrorHandler::ProcessedError& error) { auto data = jsi::Object(runtime); @@ -341,7 +341,7 @@ void JsErrorHandler::handleErrorWithCppPipeline( .extraData = std::move(extraData), }; - auto data = bridging::toJs(runtime, processedError).asObject(runtime); + auto data = bridging::toJs(runtime, processedError); auto isComponentError = isTruthy(runtime, errorObj.getProperty(runtime, "isComponentError")); diff --git a/packages/react-native/ReactCommon/react/bridging/Bool.h b/packages/react-native/ReactCommon/react/bridging/Bool.h index 86143113288..fe2a756bcd4 100644 --- a/packages/react-native/ReactCommon/react/bridging/Bool.h +++ b/packages/react-native/ReactCommon/react/bridging/Bool.h @@ -17,7 +17,7 @@ struct Bridging { return value.asBool(); } - static jsi::Value toJs(jsi::Runtime&, bool value) { + static bool toJs(jsi::Runtime& /*unused*/, bool value) { return value; } }; diff --git a/packages/react-native/ReactCommon/react/bridging/Number.h b/packages/react-native/ReactCommon/react/bridging/Number.h index 6d480ae3364..68b4c259440 100644 --- a/packages/react-native/ReactCommon/react/bridging/Number.h +++ b/packages/react-native/ReactCommon/react/bridging/Number.h @@ -13,45 +13,45 @@ namespace facebook::react { template <> struct Bridging { - static double fromJs(jsi::Runtime&, const jsi::Value& value) { + static double fromJs(jsi::Runtime& /*unused*/, const jsi::Value& value) { return value.asNumber(); } - static jsi::Value toJs(jsi::Runtime&, double value) { + static double toJs(jsi::Runtime& /*unused*/, double value) { return value; } }; template <> struct Bridging { - static float fromJs(jsi::Runtime&, const jsi::Value& value) { + static float fromJs(jsi::Runtime& /*unused*/, const jsi::Value& value) { return (float)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime&, float value) { - return (double)value; + static float toJs(jsi::Runtime& /*unused*/, float value) { + return value; } }; template <> struct Bridging { - static int32_t fromJs(jsi::Runtime&, const jsi::Value& value) { + static int32_t fromJs(jsi::Runtime& /*unused*/, const jsi::Value& value) { return (int32_t)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime&, int32_t value) { + static int32_t toJs(jsi::Runtime& /*unused*/, int32_t value) { return value; } }; template <> struct Bridging { - static uint32_t fromJs(jsi::Runtime&, const jsi::Value& value) { + static uint32_t fromJs(jsi::Runtime& /*unused*/, const jsi::Value& value) { return (uint32_t)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime&, uint32_t value) { - return (double)value; + static jsi::Value toJs(jsi::Runtime& /*unused*/, uint32_t value) { + return double(value); } }; diff --git a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp index 01263a3d6b9..3021a663b96 100644 --- a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp +++ b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp @@ -46,8 +46,8 @@ TEST_F(BridgingTest, boolTest) { EXPECT_FALSE(bridging::fromJs(rt, jsi::Value(false), invoker)); EXPECT_JSI_THROW(bridging::fromJs(rt, jsi::Value(1), invoker)); - EXPECT_TRUE(bridging::toJs(rt, true).asBool()); - EXPECT_FALSE(bridging::toJs(rt, false).asBool()); + EXPECT_TRUE(bridging::toJs(rt, true)); + EXPECT_FALSE(bridging::toJs(rt, false)); } TEST_F(BridgingTest, numberTest) { @@ -56,10 +56,9 @@ TEST_F(BridgingTest, numberTest) { EXPECT_DOUBLE_EQ(1.2, bridging::fromJs(rt, jsi::Value(1.2), invoker)); EXPECT_JSI_THROW(bridging::fromJs(rt, jsi::Value(true), invoker)); - EXPECT_EQ(1, static_cast(bridging::toJs(rt, 1).asNumber())); - EXPECT_FLOAT_EQ( - 1.2f, static_cast(bridging::toJs(rt, 1.2f).asNumber())); - EXPECT_DOUBLE_EQ(1.2, bridging::toJs(rt, 1.2).asNumber()); + EXPECT_EQ(1, static_cast(bridging::toJs(rt, 1))); + EXPECT_FLOAT_EQ(1.2f, static_cast(bridging::toJs(rt, 1.2f))); + EXPECT_DOUBLE_EQ(1.2, bridging::toJs(rt, 1.2)); EXPECT_EQ( 42, diff --git a/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.h b/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.h index 7723a1a2c81..1a23499f988 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.h +++ b/packages/react-native/ReactCommon/react/nativemodule/webperformance/NativePerformance.h @@ -42,10 +42,8 @@ struct Bridging { return static_cast(value.asNumber()); } - static jsi::Value toJs( - jsi::Runtime& /*rt*/, - const PerformanceEntryType& value) { - return {static_cast(value)}; + static int toJs(jsi::Runtime& /*rt*/, const PerformanceEntryType& value) { + return static_cast(value); } }; diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h index 5dc3483413c..116c7fa2181 100644 --- a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h +++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h @@ -62,7 +62,7 @@ struct Bridging { } } - static jsi::Value toJs(jsi::Runtime& rt, CustomEnumInt value) { + static int32_t toJs(jsi::Runtime& rt, CustomEnumInt value) { return bridging::toJs(rt, static_cast(value)); } };