try again

keajs · Nov 23, 2022 · 421ac58 · 421ac58
1 parent 62f27a4
commit 421ac58
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/src/router.ts b/src/router.ts
@@ -182,19 +182,9 @@ export const router = kea<routerType>([
 
 export function getRouterContext(): RouterPluginContext {
   let context: RouterPluginContext | undefined = getPluginContext('router')
-  if (!context || !context.history || !context.location) {
-    const defaultContext = getDefaultContext()
-    if (!context) {
-      context = defaultContext
-      setRouterContext(context)
-    } else {
-      if (!context.history) {
-        context.history = defaultContext.history
-      }
-      if (!context.location) {
-        context.location = defaultContext.location
-      }
-    }
+  if (!context.history || !context.location || Object.keys(context).length === 0) {
+    context = { ...getDefaultContext(), ...context }
+    setRouterContext(context)
   }
   return context
 }