reactive-route 0.0.1-alpha.24 → 0.0.1-alpha.25

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.
@@ -54,7 +54,7 @@ function RouterInner(props) {
54
54
  const setLoadedComponent = (0, import_hooks.useCallback)(() => {
55
55
  const { loadedComponentName, loadedComponentPage } = config;
56
56
  const { currentRoute, isRedirecting } = props.router;
57
- const componentConfig = props.routes[currentRoute.name];
57
+ const componentConfig = props.router.routes[currentRoute.name];
58
58
  let preventRedirect = false;
59
59
  if (isRedirecting) preventRedirect = true;
60
60
  else if (loadedComponentName === currentRoute.name) preventRedirect = true;
@@ -89,7 +89,7 @@ function RouterInner(props) {
89
89
  };
90
90
  }, []);
91
91
  if (!config.loadedComponentName) return null;
92
- const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
92
+ const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
93
93
  if (LoadedComponent)
94
94
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
95
95
  return null;
@@ -54,7 +54,7 @@ function RouterInner(props) {
54
54
  const setLoadedComponent = (0, import_react.useCallback)(() => {
55
55
  const { loadedComponentName, loadedComponentPage } = config;
56
56
  const { currentRoute, isRedirecting } = props.router;
57
- const componentConfig = props.routes[currentRoute.name];
57
+ const componentConfig = props.router.routes[currentRoute.name];
58
58
  let preventRedirect = false;
59
59
  if (isRedirecting) preventRedirect = true;
60
60
  else if (loadedComponentName === currentRoute.name) preventRedirect = true;
@@ -89,7 +89,7 @@ function RouterInner(props) {
89
89
  };
90
90
  }, []);
91
91
  if (!config.loadedComponentName) return null;
92
- const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
92
+ const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
93
93
  if (LoadedComponent)
94
94
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
95
95
  return null;
@@ -54,7 +54,7 @@ function Router(props) {
54
54
  function setLoadedComponent() {
55
55
  const currentRouteName = props.router.currentRoute.name;
56
56
  const currentRoutePage = props.router.currentRoute.pageId;
57
- const componentConfig = props.routes[currentRouteName];
57
+ const componentConfig = props.router.routes[currentRouteName];
58
58
  let preventRedirect = false;
59
59
  if (props.router.isRedirecting) preventRedirect = true;
60
60
  else if (config.loadedComponentName === currentRouteName) {
@@ -97,7 +97,7 @@ function Router(props) {
97
97
  get children() {
98
98
  return (0, import_web.createComponent)(import_web3.Dynamic, (0, import_web2.mergeProps)({
99
99
  get component() {
100
- return props.routes[config.loadedComponentName]?.component || void 0;
100
+ return props.router.routes[config.loadedComponentName]?.component || void 0;
101
101
  }
102
102
  }, () => Object.keys(config.currentProps).reduce((acc, key) => {
103
103
  acc[key] = currentProps[key];
@@ -1,7 +1,6 @@
1
1
  import { TypeRoute } from './TypeRoute';
2
2
  import { TypeRouter } from './TypeRouter';
3
3
  export type TypePropsRouter<TRoutes extends Record<string, TypeRoute>> = {
4
- routes: TRoutes;
5
4
  router: TypeRouter<TRoutes>;
6
5
  beforeMount?: () => void;
7
6
  beforeSetPageComponent?: (componentConfig: TRoutes[keyof TRoutes]) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"TypePropsRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypePropsRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACvE,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,sBAAsB,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3E,yBAAyB,CAAC,EAAE,MAAM,IAAI,CAAC;CACxC,CAAC"}
1
+ {"version":3,"file":"TypePropsRouter.d.ts","sourceRoot":"","sources":["../../../packages/core/types/TypePropsRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,eAAe,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI;IACvE,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,sBAAsB,CAAC,EAAE,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,OAAO,CAAC,KAAK,IAAI,CAAC;IAC3E,yBAAyB,CAAC,EAAE,MAAM,IAAI,CAAC;CACxC,CAAC"}
@@ -28,7 +28,7 @@ function RouterInner(props) {
28
28
  const setLoadedComponent = useCallback(() => {
29
29
  const { loadedComponentName, loadedComponentPage } = config;
30
30
  const { currentRoute, isRedirecting } = props.router;
31
- const componentConfig = props.routes[currentRoute.name];
31
+ const componentConfig = props.router.routes[currentRoute.name];
32
32
  let preventRedirect = false;
33
33
  if (isRedirecting) preventRedirect = true;
34
34
  else if (loadedComponentName === currentRoute.name) preventRedirect = true;
@@ -63,7 +63,7 @@ function RouterInner(props) {
63
63
  };
64
64
  }, []);
65
65
  if (!config.loadedComponentName) return null;
66
- const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
66
+ const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
67
67
  if (LoadedComponent)
68
68
  return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
69
69
  return null;
@@ -28,7 +28,7 @@ function RouterInner(props) {
28
28
  const setLoadedComponent = useCallback(() => {
29
29
  const { loadedComponentName, loadedComponentPage } = config;
30
30
  const { currentRoute, isRedirecting } = props.router;
31
- const componentConfig = props.routes[currentRoute.name];
31
+ const componentConfig = props.router.routes[currentRoute.name];
32
32
  let preventRedirect = false;
33
33
  if (isRedirecting) preventRedirect = true;
34
34
  else if (loadedComponentName === currentRoute.name) preventRedirect = true;
@@ -63,7 +63,7 @@ function RouterInner(props) {
63
63
  };
64
64
  }, []);
65
65
  if (!config.loadedComponentName) return null;
66
- const LoadedComponent = props.routes[config.loadedComponentName]?.component || null;
66
+ const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
67
67
  if (LoadedComponent)
68
68
  return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
69
69
  return null;
@@ -28,7 +28,7 @@ function Router(props) {
28
28
  function setLoadedComponent() {
29
29
  const currentRouteName = props.router.currentRoute.name;
30
30
  const currentRoutePage = props.router.currentRoute.pageId;
31
- const componentConfig = props.routes[currentRouteName];
31
+ const componentConfig = props.router.routes[currentRouteName];
32
32
  let preventRedirect = false;
33
33
  if (props.router.isRedirecting) preventRedirect = true;
34
34
  else if (config.loadedComponentName === currentRouteName) {
@@ -71,7 +71,7 @@ function Router(props) {
71
71
  get children() {
72
72
  return _$createComponent(Dynamic, _$mergeProps({
73
73
  get component() {
74
- return props.routes[config.loadedComponentName]?.component || void 0;
74
+ return props.router.routes[config.loadedComponentName]?.component || void 0;
75
75
  }
76
76
  }, () => Object.keys(config.currentProps).reduce((acc, key) => {
77
77
  acc[key] = currentProps[key];
@@ -1 +1 @@
1
- {"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAsGhG"}
1
+ {"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAwGhG"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "reactive-route",
3
3
  "author": "Dmitry Kazakov",
4
4
  "license": "MIT",
5
- "version": "0.0.1-alpha.24",
5
+ "version": "0.0.1-alpha.25",
6
6
  "description": "Reactive Router for different frameworks",
7
7
  "repository": {
8
8
  "type": "git",
@@ -19,6 +19,7 @@
19
19
  "check-types": "tsc --project tsconfig.json&&tsc --project tsconfig.solid.json",
20
20
  "check-types-example": "tsc --project examples/react/tsconfig.json",
21
21
  "prepare": "husky",
22
+ "upgrade-examples": "pnpm upgrade -r reactive-route@latest",
22
23
  "docs:dev": "vitepress dev docs",
23
24
  "docs:build": "vitepress build docs",
24
25
  "docs:preview": "vitepress preview docs"