fix(iOS): properly handle date types during JSValue coercion (#4043)

ionic-team · Jan 13, 2021 · 1affae7 · 1affae7
1 parent 7bb9e0f
commit 1affae7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ios/Capacitor/Capacitor/JSTypes.swift b/ios/Capacitor/Capacitor/JSTypes.swift
@@ -9,6 +9,7 @@ extension Float: JSValue {}
 extension Double: JSValue {}
 extension NSNumber: JSValue {}
 extension Array: JSValue {}
+extension Date: JSValue {}
 extension Dictionary: JSValue where Key == String, Value == JSValue {}
 
 // convenience aliases
@@ -151,7 +152,7 @@ extension JSValueContainer {
         if let isoString = jsObjectRepresentation[key] as? String {
             return Self.jsDateFormatter.date(from: isoString)
         }
-        return nil
+        return jsObjectRepresentation[key] as? Date
     }
 
     public func getArray(_ key: String) -> JSArray? {
@@ -201,6 +202,8 @@ private func coerceToJSValue(_ value: Any?) -> JSValue? {
         return floatValue
     case let doubleValue as Double:
         return doubleValue
+    case let dateValue as Date:
+        return dateValue
     case let arrayValue as NSArray:
         return arrayValue.compactMap { coerceToJSValue($0) }
     case let dictionaryValue as NSDictionary: