From 2a17958b34abf6595c72eb0f1dd881a563a5e109 Mon Sep 17 00:00:00 2001
From: Hans <hans.chen@bricks.tools>
Date: Thu, 16 May 2024 01:32:08 +0800
Subject: [PATCH] [js/rn] Fix some bugs (#20242)

### Description
<!-- Describe your changes. -->
- Fix `logSeverityLevel`
- Correct get RCTCxxBridge, old method for some cases will got wrong
bridge


### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->

---------

Co-authored-by: Yulong Wang <7679871+fs-eire@users.noreply.github.com>
---
 .../ai/onnxruntime/reactnative/OnnxruntimeModule.java    | 5 +++--
 js/react_native/ios/OnnxruntimeJSIHelper.mm              | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js/react_native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java b/js/react_native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java
index 707a356b94..3915292648 100644
--- a/js/react_native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java
+++ b/js/react_native/android/src/main/java/ai/onnxruntime/reactnative/OnnxruntimeModule.java
@@ -7,6 +7,7 @@ import ai.onnxruntime.OnnxTensor;
 import ai.onnxruntime.OnnxValue;
 import ai.onnxruntime.OrtEnvironment;
 import ai.onnxruntime.OrtException;
+import ai.onnxruntime.OrtLoggingLevel;
 import ai.onnxruntime.OrtSession;
 import ai.onnxruntime.OrtSession.Result;
 import ai.onnxruntime.OrtSession.RunOptions;
@@ -421,7 +422,7 @@ public class OnnxruntimeModule extends ReactContextBaseJavaModule implements Lif
 
     if (options.hasKey("logSeverityLevel")) {
       int logSeverityLevel = options.getInt("logSeverityLevel");
-      sessionOptions.setSessionLogVerbosityLevel(logSeverityLevel);
+      sessionOptions.setSessionLogLevel(OrtLoggingLevel.mapFromInt(logSeverityLevel));
     }
 
     return sessionOptions;
@@ -432,7 +433,7 @@ public class OnnxruntimeModule extends ReactContextBaseJavaModule implements Lif
 
     if (options.hasKey("logSeverityLevel")) {
       int logSeverityLevel = options.getInt("logSeverityLevel");
-      runOptions.setLogVerbosityLevel(logSeverityLevel);
+      runOptions.setLogLevel(OrtLoggingLevel.mapFromInt(logSeverityLevel));
     }
 
     if (options.hasKey("tag")) {
diff --git a/js/react_native/ios/OnnxruntimeJSIHelper.mm b/js/react_native/ios/OnnxruntimeJSIHelper.mm
index 6fac00cefa..f6ce63c172 100644
--- a/js/react_native/ios/OnnxruntimeJSIHelper.mm
+++ b/js/react_native/ios/OnnxruntimeJSIHelper.mm
@@ -5,11 +5,16 @@
 
 @implementation OnnxruntimeJSIHelper
 
+@synthesize bridge = _bridge;
+
 RCT_EXPORT_MODULE()
 
+- (void)setBridge:(RCTBridge *)bridge {
+  _bridge = bridge;
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
-  RCTBridge *bridge = [RCTBridge currentBridge];
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
+  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)_bridge;
   if (cxxBridge == nil) {
     return @false;
   }