fix(iOS): skip Swift type coercion on Cordova plugin calls (#4048)

ionic-team · Jan 12, 2021 · 7bb9e0f · 7bb9e0f
1 parent 98374fd
commit 7bb9e0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ios/Capacitor/Capacitor/CapacitorBridge.swift b/ios/Capacitor/Capacitor/CapacitorBridge.swift
@@ -385,7 +385,9 @@ internal class CapacitorBridge: NSObject, CAPBridgeProtocol {
         dispatchQueue.async { [weak self] in
             //let startTime = CFAbsoluteTimeGetCurrent()
 
-            let pluginCall = CAPPluginCall(callbackId: call.callbackId, options: call.options, success: {(result: CAPPluginCallResult?, pluginCall: CAPPluginCall?) -> Void in
+            let pluginCall = CAPPluginCall(callbackId: call.callbackId,
+                                           options: JSTypes.coerceDictionaryToJSObject(call.options) ?? [:],
+                                           success: {(result: CAPPluginCallResult?, pluginCall: CAPPluginCall?) -> Void in
                 if result != nil {
                     self?.toJs(result: JSResult(call: call, result: result!.data), save: pluginCall?.isSaved ?? false)
                 } else {

diff --git a/ios/Capacitor/Capacitor/JS.swift b/ios/Capacitor/Capacitor/JS.swift
@@ -11,13 +11,13 @@ public class JSDate {
  * A call originating from JavaScript land
  */
 public class JSCall {
-    public var options: JSObject = [:]
+    public var options: [String: Any] = [:]
     public var pluginId: String = ""
     public var method: String = ""
     public var callbackId: String = ""
 
     public init(options: [String: Any], pluginId: String, method: String, callbackId: String) {
-        self.options = JSTypes.coerceDictionaryToJSObject(options) ?? [:]
+        self.options = options
         self.pluginId = pluginId
         self.method = method
         self.callbackId = callbackId