piral-core 1.10.2-beta.bcfd89f → 1.10.2-beta.dc71cd5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/defaults/DefaultRouteSwitch_v6.js +18 -2
  2. package/lib/defaults/DefaultRouteSwitch_v6.js.map +1 -1
  3. package/lib/defaults/DefaultRouteSwitch_v7.js +18 -2
  4. package/lib/defaults/DefaultRouteSwitch_v7.js.map +1 -1
  5. package/lib/defaults/DefaultRouteSwitch_wouter.js.map +1 -1
  6. package/package.json +4 -4
  7. package/src/defaults/DefaultRouteSwitch_v6.tsx +31 -2
  8. package/src/defaults/DefaultRouteSwitch_v7.tsx +31 -2
  9. package/src/defaults/DefaultRouteSwitch_wouter.tsx +1 -0
package/lib/defaults/DefaultRouteSwitch_v6.js CHANGED
@@ -1,11 +1,27 @@
1
1
  import * as React from 'react';
2
2
  //@ts-ignore
3
- import { Routes, Route } from 'react-router-dom';
3
+ import { Routes, Route, useParams, useLocation, useNavigate } from 'react-router-dom';
4
+ function getHistory(navigate) {
5
+ return {
6
+ push(path, state) {
7
+ navigate(path, { replace: false, state });
8
+ },
9
+ replace(path, state) {
10
+ navigate(path, { replace: true, state });
11
+ },
12
+ };
13
+ }
14
+ const RouteContentWrapper = ({ Component }) => {
15
+ const navigate = useNavigate();
16
+ const params = useParams();
17
+ const loc = useLocation();
18
+ return (React.createElement(Component, { history: getHistory(navigate), location: loc, match: { params, isExact: true, path: loc.pathname, url: location.href } }));
19
+ };
4
20
  export const DefaultRouteSwitch = ({ paths, NotFound, ...props }) => {
5
21
  return (React.createElement(Routes, { ...props },
6
22
  paths.map(({ path, Component }) => (
7
23
  //@ts-ignore
8
- React.createElement(Route, { key: path, path: path, element: React.createElement(Component, null) }))),
24
+ React.createElement(Route, { key: path, path: path, element: React.createElement(RouteContentWrapper, { Component: Component }) }))),
9
25
  //@ts-ignore
10
26
  React.createElement(Route, { path: "*", element: React.createElement(NotFound, null) })));
11
27
  };
package/lib/defaults/DefaultRouteSwitch_v6.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultRouteSwitch_v6.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_v6.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGjD,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAClC,YAAY;QACZ,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAC,SAAS,OAAG,GAAI,CACzD,CAAC;QAEA,YAAY;QACZ,oBAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,oBAAC,QAAQ,OAAG,GAAI,CAEpC,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
1
+ {"version":3,"file":"DefaultRouteSwitch_v6.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_v6.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGtF,SAAS,UAAU,CAAC,QAAa;IAC/B,OAAO;QACL,IAAI,CAAC,IAAY,EAAE,KAAU;YAC3B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,CAAC,IAAY,EAAE,KAAU;YAC9B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,MAAM,mBAAmB,GAAuC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAChF,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;IAE1B,OAAO,CACL,oBAAC,SAAS,IACR,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,EAC7B,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GACxE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAClC,YAAY;QACZ,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAC,mBAAmB,IAAC,SAAS,EAAE,SAAS,GAAI,GAAI,CACzF,CAAC;QAEA,YAAY;QACZ,oBAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,oBAAC,QAAQ,OAAG,GAAI,CAEpC,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
package/lib/defaults/DefaultRouteSwitch_v7.js CHANGED
@@ -1,11 +1,27 @@
1
1
  import * as React from 'react';
2
2
  //@ts-ignore
3
- import { Routes, Route } from 'react-router';
3
+ import { Routes, Route, useParams, useLocation, useNavigate } from 'react-router';
4
+ function getHistory(navigate) {
5
+ return {
6
+ push(path, state) {
7
+ navigate(path, { replace: false, state });
8
+ },
9
+ replace(path, state) {
10
+ navigate(path, { replace: true, state });
11
+ },
12
+ };
13
+ }
14
+ const RouteContentWrapper = ({ Component }) => {
15
+ const navigate = useNavigate();
16
+ const params = useParams();
17
+ const loc = useLocation();
18
+ return (React.createElement(Component, { history: getHistory(navigate), location: loc, match: { params, isExact: true, path: loc.pathname, url: location.href } }));
19
+ };
4
20
  export const DefaultRouteSwitch = ({ paths, NotFound, ...props }) => {
5
21
  return (React.createElement(Routes, { ...props },
6
22
  paths.map(({ path, Component }) => (
7
23
  //@ts-ignore
8
- React.createElement(Route, { key: path, path: path, element: React.createElement(Component, null) }))),
24
+ React.createElement(Route, { key: path, path: path, element: React.createElement(RouteContentWrapper, { Component: Component }) }))),
9
25
  //@ts-ignore
10
26
  React.createElement(Route, { path: "*", element: React.createElement(NotFound, null) })));
11
27
  };
package/lib/defaults/DefaultRouteSwitch_v7.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultRouteSwitch_v7.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_v7.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG7C,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAClC,YAAY;QACZ,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAC,SAAS,OAAG,GAAI,CACzD,CAAC;QAEA,YAAY;QACZ,oBAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,oBAAC,QAAQ,OAAG,GAAI,CAEpC,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
1
+ {"version":3,"file":"DefaultRouteSwitch_v7.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_v7.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGlF,SAAS,UAAU,CAAC,QAAa;IAC/B,OAAO;QACL,IAAI,CAAC,IAAY,EAAE,KAAU;YAC3B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,CAAC,IAAY,EAAE,KAAU;YAC9B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,MAAM,mBAAmB,GAAuC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAChF,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;IAE1B,OAAO,CACL,oBAAC,SAAS,IACR,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,EAC7B,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GACxE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;QAClC,YAAY;QACZ,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAC,mBAAmB,IAAC,SAAS,EAAE,SAAS,GAAI,GAAI,CACzF,CAAC;QAEA,YAAY;QACZ,oBAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,oBAAC,QAAQ,OAAG,GAAI,CAEpC,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
package/lib/defaults/DefaultRouteSwitch_wouter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultRouteSwitch_wouter.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_wouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAG/D,SAAS,UAAU,CAAC,QAAa;IAC/B,OAAO;QACL,IAAI,CAAC,IAAY,EAAE,KAAU;YAC3B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,CAAC,IAAY,EAAE,KAAU;YAC9B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,MAAM,mBAAmB,GAAuC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAChF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,WAAW,EAAE,CAAC;IAC3C,OAAO,CACL,oBAAC,SAAS,IACR,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,EAC7B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EACtF,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GACpE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAClC,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAC1B,oBAAC,mBAAmB,IAAC,SAAS,EAAE,SAAS,GAAI,CACvC,CACT,CAAC;QACF,oBAAC,KAAK;YACJ,oBAAC,mBAAmB,IAAC,SAAS,EAAE,QAAQ,GAAI,CACtC,CACD,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
1
+ {"version":3,"file":"DefaultRouteSwitch_wouter.js","sourceRoot":"","sources":["../../src/defaults/DefaultRouteSwitch_wouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,YAAY;AACZ,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAG/D,SAAS,UAAU,CAAC,QAAa;IAC/B,OAAO;QACL,IAAI,CAAC,IAAY,EAAE,KAAU;YAC3B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,CAAC,IAAY,EAAE,KAAU;YAC9B,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,MAAM,mBAAmB,GAAuC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAChF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,WAAW,EAAE,CAAC;IAE3C,OAAO,CACL,oBAAC,SAAS,IACR,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,EAC7B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EACtF,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GACpE,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,OAAO,CACL,oBAAC,MAAM,OAAK,KAAK;QACd,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAClC,oBAAC,KAAK,IAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAC1B,oBAAC,mBAAmB,IAAC,SAAS,EAAE,SAAS,GAAI,CACvC,CACT,CAAC;QACF,oBAAC,KAAK;YACJ,oBAAC,mBAAmB,IAAC,SAAS,EAAE,QAAQ,GAAI,CACtC,CACD,CACV,CAAC;AACJ,CAAC,CAAC;AACF,kBAAkB,CAAC,WAAW,GAAG,oBAAoB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-core",
3
- "version": "1.10.2-beta.bcfd89f",
3
+ "version": "1.10.2-beta.dc71cd5",
4
4
  "description": "The core library for creating a Piral instance.",
5
5
  "keywords": [
6
6
  "portal",
@@ -63,8 +63,8 @@
63
63
  "test": "echo \"Error: run tests from root\" && exit 1"
64
64
  },
65
65
  "dependencies": {
66
- "piral-base": "1.10.2-beta.bcfd89f",
67
- "piral-debug-utils": "1.10.2-beta.bcfd89f",
66
+ "piral-base": "1.10.2-beta.dc71cd5",
67
+ "piral-debug-utils": "1.10.2-beta.dc71cd5",
68
68
  "zustand": "^3.0.0"
69
69
  },
70
70
  "devDependencies": {
@@ -84,5 +84,5 @@
84
84
  "react-router-dom",
85
85
  "tslib"
86
86
  ],
87
- "gitHead": "bcfd89f9f012d80d58769664e72415bdcee27a3d"
87
+ "gitHead": "dc71cd52424153bf2a1b56e05ccf03d6ad2a3fd8"
88
88
  }
package/src/defaults/DefaultRouteSwitch_v6.tsx CHANGED
@@ -1,14 +1,43 @@
1
1
  import * as React from 'react';
2
2
  //@ts-ignore
3
- import { Routes, Route } from 'react-router-dom';
3
+ import { Routes, Route, useParams, useLocation, useNavigate } from 'react-router-dom';
4
4
  import { RouteSwitchProps } from '../types';
5
5
 
6
+ function getHistory(navigate: any): any {
7
+ return {
8
+ push(path: string, state: any) {
9
+ navigate(path, { replace: false, state });
10
+ },
11
+ replace(path: string, state: any) {
12
+ navigate(path, { replace: true, state });
13
+ },
14
+ };
15
+ }
16
+
17
+ interface RouteContentWrapperProps {
18
+ Component: RouteSwitchProps['paths'][0]['Component'];
19
+ }
20
+
21
+ const RouteContentWrapper: React.FC<RouteContentWrapperProps> = ({ Component }) => {
22
+ const navigate = useNavigate();
23
+ const params = useParams();
24
+ const loc = useLocation();
25
+
26
+ return (
27
+ <Component
28
+ history={getHistory(navigate)}
29
+ location={loc}
30
+ match={{ params, isExact: true, path: loc.pathname, url: location.href }}
31
+ />
32
+ );
33
+ };
34
+
6
35
  export const DefaultRouteSwitch: React.FC<RouteSwitchProps> = ({ paths, NotFound, ...props }) => {
7
36
  return (
8
37
  <Routes {...props}>
9
38
  {paths.map(({ path, Component }) => (
10
39
  //@ts-ignore
11
- <Route key={path} path={path} element={<Component />} />
40
+ <Route key={path} path={path} element={<RouteContentWrapper Component={Component} />} />
12
41
  ))}
13
42
  {
14
43
  //@ts-ignore
package/src/defaults/DefaultRouteSwitch_v7.tsx CHANGED
@@ -1,14 +1,43 @@
1
1
  import * as React from 'react';
2
2
  //@ts-ignore
3
- import { Routes, Route } from 'react-router';
3
+ import { Routes, Route, useParams, useLocation, useNavigate } from 'react-router';
4
4
  import { RouteSwitchProps } from '../types';
5
5
 
6
+ function getHistory(navigate: any): any {
7
+ return {
8
+ push(path: string, state: any) {
9
+ navigate(path, { replace: false, state });
10
+ },
11
+ replace(path: string, state: any) {
12
+ navigate(path, { replace: true, state });
13
+ },
14
+ };
15
+ }
16
+
17
+ interface RouteContentWrapperProps {
18
+ Component: RouteSwitchProps['paths'][0]['Component'];
19
+ }
20
+
21
+ const RouteContentWrapper: React.FC<RouteContentWrapperProps> = ({ Component }) => {
22
+ const navigate = useNavigate();
23
+ const params = useParams();
24
+ const loc = useLocation();
25
+
26
+ return (
27
+ <Component
28
+ history={getHistory(navigate)}
29
+ location={loc}
30
+ match={{ params, isExact: true, path: loc.pathname, url: location.href }}
31
+ />
32
+ );
33
+ };
34
+
6
35
  export const DefaultRouteSwitch: React.FC<RouteSwitchProps> = ({ paths, NotFound, ...props }) => {
7
36
  return (
8
37
  <Routes {...props}>
9
38
  {paths.map(({ path, Component }) => (
10
39
  //@ts-ignore
11
- <Route key={path} path={path} element={<Component />} />
40
+ <Route key={path} path={path} element={<RouteContentWrapper Component={Component} />} />
12
41
  ))}
13
42
  {
14
43
  //@ts-ignore
package/src/defaults/DefaultRouteSwitch_wouter.tsx CHANGED
@@ -21,6 +21,7 @@ interface RouteContentWrapperProps {
21
21
  const RouteContentWrapper: React.FC<RouteContentWrapperProps> = ({ Component }) => {
22
22
  const params = useParams();
23
23
  const [pathname, navigate] = useLocation();
24
+
24
25
  return (
25
26
  <Component
26
27
  history={getHistory(navigate)}