Add check for nullable value

mobxjs · Oct 22, 2018 · ee9454a · ee9454a
1 parent 9c89b50
commit ee9454a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/api/tojs.ts b/src/api/tojs.ts
@@ -27,16 +27,17 @@ function toJSHelper(source, options: ToJSOptions, __alreadySeen: Map<any, any>)
     if (!options.recurseEverything && !isObservable(source)) return source
 
     if (typeof source !== "object") return source
+
+    // Directly return null if source is null
+    if (source === null) return null
 
     // Directly return the Date object itself if contained in the observable
     if (source instanceof Date) return source
 
     if (isObservableValue(source)) return toJSHelper(source.get(), options!, __alreadySeen)
 
     // make sure we track the keys of the object
-    if (isObservable(source)) {
-        keys(source)
-    }
+    if (isObservable(source)) keys(source)
 
     const detectCycles = options.detectCycles === true