From 08d7ed1c7f6991b344aea85a1fafa19cb98eade2 Mon Sep 17 00:00:00 2001
From: Anton Korzunov <thekashey@gmail.com>
Date: Wed, 11 Sep 2019 09:47:15 +1000
Subject: [PATCH] fix: return null for null types, fixes #1324

---
 src/reconciler/resolver.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/reconciler/resolver.js b/src/reconciler/resolver.js
index e1ce2c58f..d5e9802c7 100644
--- a/src/reconciler/resolver.js
+++ b/src/reconciler/resolver.js
@@ -66,7 +66,13 @@ export function resolveNotComponent(type) {
   return undefined;
 }
 
-export const resolveSimpleType = type => resolveProxy(type) || resolveUtility(type) || type;
+export const resolveSimpleType = type => {
+  if (!type) {
+    return type;
+  }
+
+  return resolveProxy(type) || resolveUtility(type) || type;
+};
 
 export const resolveType = (type, options = {}) => {
   if (!type) {