@codeleap/web 4.0.2 → 4.2.1

package/src/lib/tools/navigation/{index.ts → index.tsx}

@@ -5,7 +5,7 @@ const IS_SSR = typeof window === 'undefined' || typeof history === 'undefined'
 
 const defaultConfig: Partial<Config> = {
   historyEnabled: false,
-  getMetadata: () => {}
+  getMetadata: () => {},
 }
 
 export type {
@@ -13,7 +13,7 @@ export type {
   Routes,
 }
 
-export class Navigation<O extends object, R extends object = {}> {
+export class Navigation<O extends object, R extends object = {}, C extends Record<string, any> = {}> {
   private _history: History = {}
 
   private config: Config = defaultConfig
@@ -22,6 +22,8 @@ export class Navigation<O extends object, R extends object = {}> {
     return this._history
   }
 
+  public context: C = {} as C
+
   private putHistory(path: RoutePath, info: any = {}) {
     const idx = Object.keys(this._history).length + 1
 
@@ -34,7 +36,7 @@ export class Navigation<O extends object, R extends object = {}> {
         path,
         metadata: this.config?.getMetadata?.(),
         info,
-      }
+      },
     }
 
     this._history = this.merge(this._history, value)
@@ -53,7 +55,7 @@ export class Navigation<O extends object, R extends object = {}> {
 
   constructor(
     routes: R,
-    navigator: Navigator<O>,
+    navigator: Navigator<O, C>,
     config: Config = {},
   ) {
     this.navigator = navigator
@@ -69,15 +71,15 @@ export class Navigation<O extends object, R extends object = {}> {
    * @returns Is on the route - boolean
    */
   public isCurrentRoute<T extends keyof Routes<R>>(
-    route: T, 
+    route: T,
     // @ts-expect-error
     routeParams: Record<Routes<R>[T], string|number> = {} as any,
-    exact: boolean = false,
+    exact = false,
   ) {
     if (IS_SSR) return false
-  
+
     let path = window?.location?.pathname
-    
+
     // @ts-ignore
     const routePath = this.getPathWithParams(route, routeParams)
 
@@ -99,7 +101,7 @@ export class Navigation<O extends object, R extends object = {}> {
     if (path?.includes(routePath)) {
       return true
     }
-  
+
     return false
   }
 
@@ -134,9 +136,9 @@ export class Navigation<O extends object, R extends object = {}> {
    * @returns Path - string
    */
   public getPathWithParams<T extends keyof Routes<R>>(
-    route: T, 
+    route: T,
     // @ts-expect-error
-    routeParams: Record<Routes<R>[T], string|number> = {} as any
+    routeParams: Record<Routes<R>[T], string|number> = {} as any,
   ) {
     let path = this.getPath(route)
 
@@ -162,7 +164,7 @@ export class Navigation<O extends object, R extends object = {}> {
   }
 
   /**
-   * Function to navigate to the previous page, if history is enabled, the penultimate record will be used, 
+   * Function to navigate to the previous page, if history is enabled, the penultimate record will be used,
    * otherwise the browser's own api with "history.back()"
    */
   public goBack() {
@@ -182,7 +184,7 @@ export class Navigation<O extends object, R extends object = {}> {
     }
 
     const info = this.merge(historyData?.info, {
-      'action': 'goBack'
+      'action': 'goBack',
     })
 
     this.to(historyData?.path, historyData?.info?.options ?? {}, info)
@@ -194,9 +196,9 @@ export class Navigation<O extends object, R extends object = {}> {
    * @param options Route parameters (marked by {{}}), which will be automatically shown if they exist, and navigator options and route queryParams can also be passed through the "params" property
    */
   public navigate<T extends keyof Routes<R>>(
-    route: T, 
+    route: T,
     // @ts-expect-error
-    options: Record<Routes<R>[T], string|number> & O & { params?: RouteParams } = {} as any
+    options: Record<Routes<R>[T], string|number> & O & { params?: RouteParams } = {} as any,
   ) {
     // @ts-ignore
     let path = this.getPath(route)
@@ -229,15 +231,15 @@ export class Navigation<O extends object, R extends object = {}> {
 
     if (typeof params === 'object') {
       let searchParams = null
-  
+
       for (const paramKey in (params ?? {})) {
         const value = params?.[paramKey]
         const param = `${paramKey}=${encodeURIComponent(value)}`
         const separator = searchParams == null ? '' : '&'
-  
+
         searchParams = `${searchParams ?? ''}${separator}${param}`
       }
-  
+
       if (typeof searchParams === 'string') {
         if (path?.endsWith('/')) {
           path = path.slice(0, -1)
@@ -268,7 +270,7 @@ export class Navigation<O extends object, R extends object = {}> {
       this.putHistory(path, this.merge(options, info))
     }
 
-    this.navigator(path, options)
+    this.navigator(path, options, this.context)
   }
 
   /**

package/src/lib/tools/navigation/types.ts

@@ -1,7 +1,6 @@
-
 export type ExtractParams<T extends string> =
-  T extends `${infer _Start}{{${infer Param}}}${infer Rest}` 
-    ? Param | ExtractParams<Rest> 
+  T extends `${infer _Start}{{${infer Param}}}${infer Rest}`
+    ? Param | ExtractParams<Rest>
     : never
 
 type Params<T> = {
@@ -10,8 +9,8 @@ type Params<T> = {
 
 // @ts-ignore
 type ExtractRoutes<T, PM, Prefix extends string = ''> = {
-  [K in keyof T & string]: 
-    T[K] extends string 
+  [K in keyof T & string]:
+    T[K] extends string
       ? {
         // @ts-ignore
         [P in `${Prefix}${Prefix extends '' ? '' : '.'}${K}`]: PM[K]
@@ -19,7 +18,7 @@ type ExtractRoutes<T, PM, Prefix extends string = ''> = {
       : ExtractRoutes<T[K], PM[K], `${Prefix}${Prefix extends '' ? '' : '.'}${K}`>
 }[keyof T]
 
-type UnionToIntersection<U> = 
+type UnionToIntersection<U> =
   (U extends any ? (x: U)=> void : never) extends ((x: infer I)=>void) ? I : never
 
 export type Routes<T> = UnionToIntersection<ExtractRoutes<T, Params<T>>>
@@ -32,7 +31,7 @@ export type RouteParams = {
   [x: string]: string
 }
 
-export type Navigator<O extends object = {}> = (path: RoutePath, options: O) => void
+export type Navigator<O extends object = {}, C extends Record<string, any> = {}> = (path: RoutePath, options: O, context?: C) => void
 
 export type AnyValue = {
   [key: string]: any
@@ -40,8 +39,8 @@ export type AnyValue = {
 
 export type HistoryData = {
   origin: string
-  date: Date,
-  path: RoutePath,
+  date: Date
+  path: RoutePath
   metadata: any
   info: any
 }

package/src/types/utility.ts

@@ -22,6 +22,11 @@ export type ElementMap = {
   'section': WithChildren<JSX.IntrinsicElements['section']>
   'header': WithChildren<JSX.IntrinsicElements['header']>
   'footer': WithChildren<JSX.IntrinsicElements['footer']>
+  'nav': WithChildren<JSX.IntrinsicElements['nav']>
+  'article': WithChildren<JSX.IntrinsicElements['article']>
+  'ul': WithChildren<JSX.IntrinsicElements['ul']>
+  'ol': WithChildren<JSX.IntrinsicElements['ol']>
+  'aside': WithChildren<JSX.IntrinsicElements['aside']>
 }
 
 export type NativeHTMLElement = keyof ElementMap