@symbo.ls/create 2.10.286 → 2.10.287

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@symbo.ls/create",
-  "version": "2.10.286",
+  "version": "2.10.287",
   "license": "MIT",
-  "gitHead": "bcff4f38fa5f1356e93c5b7c33ad53ce5a3c4cb6",
+  "gitHead": "08b67d43ab7faa70d7c5b5675cce10512d9b42ad",
   "source": "index.js",
   "main": "index.js",
   "dependencies": {

package/router.js

@@ -3,7 +3,7 @@
 import { router as defaultRouter } from '@domql/router'
 import { window } from '@domql/globals'
 import { Link, RouterLink } from '@symbo.ls/uikit'
-import { deepMerge, merge } from '@domql/utils'
+import { deepMerge, merge, isUndefined } from '@domql/utils'
 
 const DEFAULT_ROUTING_OPTIONS = {
   initRouter: true,
@@ -11,7 +11,7 @@ const DEFAULT_ROUTING_OPTIONS = {
   popState: true
 }
 
-export const initRouter = (rootElement, options) => {
+export const initRouter = (element, options) => {
   let routerOptions = merge(options.routerOptions || {}, DEFAULT_ROUTING_OPTIONS)
 
   if (routerOptions === false) return
@@ -19,18 +19,19 @@ export const initRouter = (rootElement, options) => {
 
   const router = (options.snippets && options.snippets.router) ? options.snippets.router : defaultRouter
 
-  const onRender = (el, s) => {
+  const onRouterRenderDefault = (el, s) => {
     const { pathname, hash } = window.location
     const url = pathname + hash
-    if (el.routes) router(url, el, {})
+    if (el.routes) router(url, el, {}, { initialRender: true })
   }
 
-  if (routerOptions.initRouter) {
-    if (rootElement.on) {
-      rootElement.on.renderRouter = onRender
+  const hasRenderRouter = element.on && !isUndefined(element.on.renderRouter)
+  if (routerOptions.initRouter && !hasRenderRouter) {
+    if (element.on) {
+      element.on.renderRouter = onRouterRenderDefault
     } else {
-      rootElement.on = {
-        renderRouter: onRender
+      element.on = {
+        renderRouter: onRouterRenderDefault
       }
     }
   }
@@ -41,14 +42,14 @@ export const initRouter = (rootElement, options) => {
 }
 
 let popStateFired
-export const popStateRouter = (rootElement, options) => {
+export const popStateRouter = (element, options) => {
   if (popStateFired) return
   const routerOptions = options.routerOptions || DEFAULT_ROUTING_OPTIONS
   if (!routerOptions.popState) return
   const router = (options.snippets && options.snippets.router) ? options.snippets.router : defaultRouter
   const { pathname, hash } = window.location
   const url = pathname + hash
-  window.onpopstate = e => router(url, rootElement, { pushState: false, level: 0 })
+  window.onpopstate = e => router(url, element, { pushState: false, level: 0 })
   popStateFired = true
 }