@lightningjs/blits 0.9.4 → 0.9.6

package/src/router/router.js

@@ -46,6 +46,9 @@ const normalizePath = (path) => {
       .toLowerCase()
   )
 }
+const isObject = (v) => typeof v === 'object' && v !== null
+
+const isString = (v) => typeof v === 'string'
 
 export const matchHash = (path, routes = []) => {
   // remove trailing slashes
@@ -57,6 +60,7 @@ export const matchHash = (path, routes = []) => {
     const route = routes[i]
     route.path = normalizePath(route.path)
     if (route.path === path) {
+      route.params = {}
       matchingRoute = route
     } else if (route.path.indexOf(':') > -1) {
       // match dynamic route parts
@@ -96,6 +100,9 @@ export const matchHash = (path, routes = []) => {
 
   if (matchingRoute) {
     matchingRoute.options = { ...matchingRoute.options, ...overrideOptions }
+    if (!matchingRoute.data) {
+      matchingRoute.data = {}
+    }
     currentRoute = matchingRoute
   }
 
@@ -107,9 +114,20 @@ export const navigate = async function () {
   if (this.parent[symbols.routes]) {
     const previousRoute = currentRoute
     const hash = getHash()
-    const route = matchHash(hash, this.parent[symbols.routes])
-
+    let route = matchHash(hash, this.parent[symbols.routes])
+    let beforeHookOutput
     if (route) {
+      if (route.hooks) {
+        if (route.hooks.before) {
+          beforeHookOutput = await route.hooks.before(route, previousRoute)
+          if (isString(beforeHookOutput)) {
+            currentRoute = previousRoute
+            to(beforeHookOutput)
+            return
+          }
+        }
+      }
+      route = isObject(beforeHookOutput) ? beforeHookOutput : route
       // add the previous route (technically still the current route at this point)
       // into the history stack, unless navigating back or inHistory flag of route is false
       if (navigatingBack === false && previousRoute && previousRoute.options.inHistory === true) {
@@ -134,8 +152,8 @@ export const navigate = async function () {
         holder.populate({})
         holder.set('w', '100%')
         holder.set('h', '100%')
-        // merge props with potential route params to be injected into the component instance
-        const props = { ...this[symbols.props], ...route.params, ...navigationData }
+        // merge props with potential route params, navigation data and route data to be injected into the component instance
+        const props = { ...this[symbols.props], ...route.params, ...navigationData, ...route.data }
 
         view = await route.component({ props }, holder, this)
         if (view[Symbol.toStringTag] === 'Module') {
@@ -149,7 +167,7 @@ export const navigate = async function () {
           view = view({ props }, holder, this)
         }
       } else {
-        holder = view[symbols.wrapper]
+        holder = view[symbols.holder]
       }
 
       this[symbols.children].push(view)
@@ -223,11 +241,11 @@ const removeView = async (route, view, transition) => {
     if (Array.isArray(transition)) {
       for (let i = 0; i < transition.length; i++) {
         i === transition.length - 1
-          ? await setOrAnimate(view[symbols.wrapper], transition[i])
-          : setOrAnimate(view[symbols.wrapper], transition[i])
+          ? await setOrAnimate(view[symbols.holder], transition[i])
+          : setOrAnimate(view[symbols.holder], transition[i])
       }
     } else {
-      await setOrAnimate(view[symbols.wrapper], transition)
+      await setOrAnimate(view[symbols.holder], transition)
     }
   }