fix: handle QS for default route

mikaelkaron · Jul 8, 2019 · eef3d23 · eef3d23
1 parent 79628f4
commit eef3d23
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/packages/stencil-xstate-router/src/components/xstate-router-navigo/xstate-router-navigo.tsx b/packages/stencil-xstate-router/src/components/xstate-router-navigo/xstate-router-navigo.tsx
@@ -146,7 +146,18 @@ export class XstateRouterNavigo implements ComponentInterface {
               (acc, { path, handler }) => ({
                 ...acc,
                 [path]: (params: Record<string, any>, query: string) =>
-                  handler({ ...params, ...(this.useQs && parse(query)) })
+                  handler(
+                    // parsing QS for params?
+                    this.useQs
+                      ? // is this the default handler
+                        path === '/'
+                        ? // query is passed as params
+                          parse((params as unknown) as string)
+                        : // combine params and query
+                          { ...params, ...parse(query) }
+                      : // since we're not parsing QS just pass params
+                        params
+                  )
               }),
               {}
             )