@ossy/router-react 1.10.0 → 1.11.0

package/build/index.js

@@ -1 +1 @@
-import e,{createContext as n,useCallback as a,useContext as r}from"react";import{Router as o,isCatchAllRoutePath as t}from"@ossy/router";var i=function(){return i=Object.assign||function(e){for(var n,a=1,r=arguments.length;a<r;a++)for(var o in n=arguments[a])Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=n[o]);return e},i.apply(this,arguments)};"function"==typeof SuppressedError&&SuppressedError;var u=n({pages:[],defaultLanguage:void 0,supportedLanguages:[]}),l=function(){return r(u)},d=function(n){var r,l,d,s,c,f=n.url,p=n.pages,g=void 0===p?[]:p,v=n.defaultLanguage,w=void 0===v?void 0:v,h=n.supportedLanguages,m=void 0===h?[]:h;if(f){var y=f.match(/([^?#]*)(\?[^#]*)?(#.*)?/);l=f,d=(null==y?void 0:y[1])||"",s=(null==y?void 0:y[3])||"",c=(null==y?void 0:y[2])||""}else{if("undefined"==typeof window)return e.createElement(e.Fragment,null);l=window.location.href,d=window.location.pathname,c=(null==(s=window.location.hash)?void 0:s.includes("?"))?s.split("?")[1]:window.location.search}var L=m.length>1&&!!w,P=d.split("/")[1]||"",S=m.includes(P)?P:w,b=o.of({pages:g,defaultLanguage:w,supportedLanguages:m}),E=b.getParamsFromUrl(l),R=new URLSearchParams(c),k=b.getPageByUrl(l);if(k||(L&&"/"===d&&"undefined"!=typeof window&&(window.location.href="/"+w),k=L?g.find(function(e){var n,a=e.path,r=null!==(n=null==a?void 0:a[S])&&void 0!==n?n:null==a?void 0:a[w];return t(r)}):g.find(function(e){return t(e.path)})),!k)return console.warn("[RouterReact] No active page found for",d),e.createElement(e.Fragment,null);a(function(e,n){if("undefined"!=typeof window){window.history.pushState({},"","".concat(d,"?").concat(R.toString()));var a=new URLSearchParams(R);a.set(e,n),history.pushState({},"","?".concat(a.toString()))}},[R]);var U=a(function(e){var n,a,r,o,t,i={};if("string"==typeof e?(n=e,i=E,a=S):(t=e).id||void 0===t.language?(n=(null==e?void 0:e.id)||k.id,i=(null==e?void 0:e.params)||E,a=(null==e?void 0:e.language)||S):(n=k.id,i=E,a=e.language),n.includes("#")){var u=n.split("#");if(n=u[0],(r=u[1]).includes("?")){var l=n.split("?");r=l[0],o=l[1]}}else if(n.includes("?")){var d=n.split("?");n=d[0],o=d[1]}var s=b.getPathname({id:n.replace("@",""),params:i,language:a});return r&&(s=s+"#"+r),o&&(s=s+"?"+o),s},[b,S]),F=a(function(e){if("undefined"!=typeof window&&e)if("@back"!==e){var n=U(e);n&&(window.location.href=n)}else window.history.back()},[U]),O=a(function(){"undefined"!=typeof window&&window.history.back()},[]),j={href:l,pages:g,language:S,defaultLanguage:w,supportedLanguages:m,params:E,searchParams:i({},Array.from(R.entries()).reduce(function(e,n){var a,r=n[0],o=n[1];return i(i({},e),((a={})[r]=o,a))},{})),navigate:F,getHref:U,back:O};(null==k?void 0:k.redirect)&&F({id:k.redirect});var x=(null==k?void 0:k.element)||(null===(r=null==k?void 0:k.render)||void 0===r?void 0:r.call(k));return e.createElement(u.Provider,{value:j},x)};export{d as Router,u as RouterContext,l as useRouter};
+import e,{createContext as n,useCallback as a,useContext as r}from"react";import{Router as i,isCatchAllRoutePath as o}from"@ossy/router";var t=function(){return t=Object.assign||function(e){for(var n,a=1,r=arguments.length;a<r;a++)for(var i in n=arguments[a])Object.prototype.hasOwnProperty.call(n,i)&&(e[i]=n[i]);return e},t.apply(this,arguments)};"function"==typeof SuppressedError&&SuppressedError;var u=n({pages:[],defaultLanguage:void 0,supportedLanguages:[]}),l=function(){return r(u)},d=function(n){var r,l,d,s,c,f=n.url,p=n.pages,g=void 0===p?[]:p,v=n.defaultLanguage,w=void 0===v?void 0:v,h=n.supportedLanguages,m=void 0===h?[]:h,y=n.children;if(f){var L=f.match(/([^?#]*)(\?[^#]*)?(#.*)?/);l=f,d=(null==L?void 0:L[1])||"",s=(null==L?void 0:L[3])||"",c=(null==L?void 0:L[2])||""}else{if("undefined"==typeof window)return e.createElement(e.Fragment,null);l=window.location.href,d=window.location.pathname,c=(null==(s=window.location.hash)?void 0:s.includes("?"))?s.split("?")[1]:window.location.search}var P=m.length>1&&!!w,S=d.split("/")[1]||"",b=m.includes(S)?S:w,E=i.of({pages:g,defaultLanguage:w,supportedLanguages:m}),R=E.getParamsFromUrl(l),k=new URLSearchParams(c),U=E.getPageByUrl(l);if(U||(P&&"/"===d&&"undefined"!=typeof window&&(window.location.href="/"+w),U=P?g.find(function(e){var n,a=e.path,r=null!==(n=null==a?void 0:a[b])&&void 0!==n?n:null==a?void 0:a[w];return o(r)}):g.find(function(e){return o(e.path)})),!U)return console.warn("[RouterReact] No active page found for",d),e.createElement(e.Fragment,null);a(function(e,n){if("undefined"!=typeof window){window.history.pushState({},"","".concat(d,"?").concat(k.toString()));var a=new URLSearchParams(k);a.set(e,n),history.pushState({},"","?".concat(a.toString()))}},[k]);var F=a(function(e){var n,a,r,i,o,t={};if("string"==typeof e?(n=e,t=R,a=b):(o=e).id||void 0===o.language?(n=(null==e?void 0:e.id)||U.id,t=(null==e?void 0:e.params)||R,a=(null==e?void 0:e.language)||b):(n=U.id,t=R,a=e.language),n.includes("#")){var u=n.split("#");if(n=u[0],(r=u[1]).includes("?")){var l=n.split("?");r=l[0],i=l[1]}}else if(n.includes("?")){var d=n.split("?");n=d[0],i=d[1]}var s=E.getPathname({id:n.replace("@",""),params:t,language:a});return r&&(s=s+"#"+r),i&&(s=s+"?"+i),s},[E,b]),O=a(function(e){if("undefined"!=typeof window&&e)if("@back"!==e){var n=F(e);n&&(window.location.href=n)}else window.history.back()},[F]),j=a(function(){"undefined"!=typeof window&&window.history.back()},[]),x={href:l,pages:g,language:b,defaultLanguage:w,supportedLanguages:m,params:R,searchParams:t({},Array.from(k.entries()).reduce(function(e,n){var a,r=n[0],i=n[1];return t(t({},e),((a={})[r]=i,a))},{})),navigate:O,getHref:F,back:j};(null==U?void 0:U.redirect)&&O({id:U.redirect});var A=(null==U?void 0:U.element)||(null===(r=null==U?void 0:U.render)||void 0===r?void 0:r.call(U));return e.createElement(u.Provider,{value:x},y||A)};export{d as Router,u as RouterContext,l as useRouter};

package/build/types/router-react.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PropsWithChildren } from 'react';
 import { MultiLanguagePage, RouterOptions, SingleLanguagePage } from '@ossy/router';
 export declare const RouterContext: React.Context<{
     pages: RouterPage[];
@@ -10,7 +10,7 @@ export declare const useRouter: () => {
     defaultLanguage: string | undefined;
     supportedLanguages: string[];
 };
-export declare const Router: <T extends RouterPage>({ url, pages, defaultLanguage, supportedLanguages }: RouterProps<T>) => React.JSX.Element;
+export declare const Router: <T extends RouterPage>({ url, pages, defaultLanguage, supportedLanguages, children }: PropsWithChildren<RouterProps<T>>) => React.JSX.Element;
 export interface RouterProps<T extends RouterPage> extends RouterOptions<T> {
     /**
      * Render page associated with the given url.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/router-react",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -61,5 +61,5 @@
     "/build",
     "README.md"
   ],
-  "gitHead": "bd9dfaf87661392562fbe2cdfd3ca6d645147f24"
+  "gitHead": "a151faf7a9af599b885ea98137575978fa1dffae"
 }