reactive-route 0.0.1-alpha.30 → 0.0.1-alpha.31

package/core/index.d.ts

@@ -10,4 +10,5 @@ export { history } from './utils/history';
 export { loadComponentToConfig } from './utils/loadComponentToConfig';
 export { RedirectError } from './utils/RedirectError';
 export { replaceDynamicValues } from './utils/replaceDynamicValues';
+export { routerSetLoadedComponent } from './utils/routerSetLoadedComponent';
 //# sourceMappingURL=index.d.ts.map

package/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,YAAY,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,YAAY,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC"}

package/core/utils/routerSetLoadedComponent.d.ts

@@ -0,0 +1,7 @@
+import { TypePropsRouter } from '../types/TypePropsRouter';
+export declare function routerSetLoadedComponent(props: TypePropsRouter<any>, config: {
+    loadedComponentName?: any;
+    loadedComponentPage?: string;
+    currentProps: Record<string, any>;
+}): void;
+//# sourceMappingURL=routerSetLoadedComponent.d.ts.map

package/core/utils/routerSetLoadedComponent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routerSetLoadedComponent.d.ts","sourceRoot":"","sources":["../../../packages/core/utils/routerSetLoadedComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,eAAe,CAAC,GAAG,CAAC,EAC3B,MAAM,EAAE;IACN,mBAAmB,CAAC,EAAE,GAAG,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,QA8BF"}

package/index.cjs

@@ -25,7 +25,8 @@ __export(core_exports, {
   createRoutes: () => createRoutes,
   history: () => history,
   loadComponentToConfig: () => loadComponentToConfig,
-  replaceDynamicValues: () => replaceDynamicValues
+  replaceDynamicValues: () => replaceDynamicValues,
+  routerSetLoadedComponent: () => routerSetLoadedComponent
 });
 module.exports = __toCommonJS(core_exports);
 
@@ -377,3 +378,29 @@ function addNames(obj) {
 function createRoutes(config) {
   return addNames(config);
 }
+
+// packages/core/utils/routerSetLoadedComponent.ts
+function routerSetLoadedComponent(props, config) {
+  const currentRouteName = props.router.currentRoute.name;
+  const currentRoutePage = props.router.currentRoute.pageId;
+  const componentConfig = props.router.routes[currentRouteName];
+  let preventRedirect = false;
+  if (props.router.isRedirecting) preventRedirect = true;
+  else if (config.loadedComponentName === currentRouteName) preventRedirect = true;
+  else if (config.loadedComponentPage != null && currentRouteName != null) {
+    if (config.loadedComponentPage === currentRoutePage) {
+      props.router.adapters.batch(() => {
+        config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+      });
+      preventRedirect = true;
+    }
+  }
+  if (preventRedirect) return;
+  props.router.adapters.batch(() => {
+    if (config.loadedComponentName) props.beforeUpdatePageComponent?.();
+    props.beforeSetPageComponent?.(componentConfig);
+    config.currentProps = "props" in componentConfig ? componentConfig.props : {};
+    config.loadedComponentName = currentRouteName;
+    config.loadedComponentPage = componentConfig.pageId;
+  });
+}

package/index.mjs

@@ -346,11 +346,38 @@ function addNames(obj) {
 function createRoutes(config) {
   return addNames(config);
 }
+
+// packages/core/utils/routerSetLoadedComponent.ts
+function routerSetLoadedComponent(props, config) {
+  const currentRouteName = props.router.currentRoute.name;
+  const currentRoutePage = props.router.currentRoute.pageId;
+  const componentConfig = props.router.routes[currentRouteName];
+  let preventRedirect = false;
+  if (props.router.isRedirecting) preventRedirect = true;
+  else if (config.loadedComponentName === currentRouteName) preventRedirect = true;
+  else if (config.loadedComponentPage != null && currentRouteName != null) {
+    if (config.loadedComponentPage === currentRoutePage) {
+      props.router.adapters.batch(() => {
+        config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
+      });
+      preventRedirect = true;
+    }
+  }
+  if (preventRedirect) return;
+  props.router.adapters.batch(() => {
+    if (config.loadedComponentName) props.beforeUpdatePageComponent?.();
+    props.beforeSetPageComponent?.(componentConfig);
+    config.currentProps = "props" in componentConfig ? componentConfig.props : {};
+    config.loadedComponentName = currentRouteName;
+    config.loadedComponentPage = componentConfig.pageId;
+  });
+}
 export {
   RedirectError,
   createRouter,
   createRoutes,
   history,
   loadComponentToConfig,
-  replaceDynamicValues
+  replaceDynamicValues,
+  routerSetLoadedComponent
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "reactive-route",
   "author": "Dmitry Kazakov",
   "license": "MIT",
-  "version": "0.0.1-alpha.30",
+  "version": "0.0.1-alpha.31",
   "description": "Reactive Router for different frameworks",
   "repository": {
     "type": "git",
@@ -20,6 +20,11 @@
       "require": "./index.cjs",
       "import": "./index.mjs"
     },
+    "./solid": {
+      "types": "./solid/index.d.ts",
+      "require": "./solid/index.cjs",
+      "import": "./solid/index.mjs"
+    },
     "./react": {
       "types": "./react/index.d.ts",
       "require": "./react/index.cjs",
@@ -30,21 +35,11 @@
       "require": "./preact/index.cjs",
       "import": "./preact/index.mjs"
     },
-    "./solid": {
-      "types": "./solid/index.d.ts",
-      "require": "./solid/index.cjs",
-      "import": "./solid/index.mjs"
-    },
     "./vue": {
       "types": "./vue/index.d.ts",
       "require": "./vue/index.cjs",
       "import": "./vue/index.mjs"
     },
-    "./adapters/vue": {
-      "types": "./adapters/vue.d.ts",
-      "require": "./adapters/vue.cjs",
-      "import": "./adapters/vue.mjs"
-    },
     "./adapters/mobx-react": {
       "types": "./adapters/mobx-react.d.ts",
       "require": "./adapters/mobx-react.cjs",
@@ -70,15 +65,20 @@
       "require": "./adapters/kr-observable-react.cjs",
       "import": "./adapters/kr-observable-react.mjs"
     },
+    "./adapters/kr-observable-preact": {
+      "types": "./adapters/kr-observable-preact.d.ts",
+      "require": "./adapters/kr-observable-preact.cjs",
+      "import": "./adapters/kr-observable-preact.mjs"
+    },
     "./adapters/kr-observable-solid": {
       "types": "./adapters/kr-observable-solid.d.ts",
       "require": "./adapters/kr-observable-solid.cjs",
       "import": "./adapters/kr-observable-solid.mjs"
     },
-    "./adapters/kr-observable-preact": {
-      "types": "./adapters/kr-observable-preact.d.ts",
-      "require": "./adapters/kr-observable-preact.cjs",
-      "import": "./adapters/kr-observable-preact.mjs"
+    "./adapters/vue": {
+      "types": "./adapters/vue.d.ts",
+      "require": "./adapters/vue.cjs",
+      "import": "./adapters/vue.mjs"
     }
   },
   "main": "./index.cjs",

package/preact/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgGrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/preact/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmE/F,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC"}

package/preact/index.cjs

@@ -51,36 +51,14 @@ function RouterInner(props) {
       currentProps: {}
     })
   );
-  const setLoadedComponent = (0, import_hooks.useCallback)(() => {
-    const { loadedComponentName, loadedComponentPage } = config;
-    const { currentRoute, isRedirecting } = props.router;
-    const componentConfig = props.router.routes[currentRoute.name];
-    let preventRedirect = false;
-    if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageId) {
-        props.router.adapters.batch(() => {
-          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-        });
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (loadedComponentName) props.beforeUpdatePageComponent?.();
-      props.beforeSetPageComponent?.(componentConfig);
-      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageId;
-    });
-  }, []);
   (0, import_hooks.useState)(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
       redirectOnHistoryPop();
-      setLoadedComponent();
-      disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
+      (0, import_reactive_route.routerSetLoadedComponent)(props, config);
+      disposerRef.current = props.router.adapters.autorun(
+        () => (0, import_reactive_route.routerSetLoadedComponent)(props, config)
+      );
     });
   });
   (0, import_hooks.useEffect)(() => {

package/preact/index.mjs

@@ -1,6 +1,6 @@
 // packages/preact/Router.tsx
 import { useCallback, useEffect, useRef, useState } from "preact/hooks";
-import { history } from "reactive-route";
+import { history, routerSetLoadedComponent } from "reactive-route";
 import { jsx } from "preact/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
@@ -25,36 +25,14 @@ function RouterInner(props) {
       currentProps: {}
     })
   );
-  const setLoadedComponent = useCallback(() => {
-    const { loadedComponentName, loadedComponentPage } = config;
-    const { currentRoute, isRedirecting } = props.router;
-    const componentConfig = props.router.routes[currentRoute.name];
-    let preventRedirect = false;
-    if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageId) {
-        props.router.adapters.batch(() => {
-          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-        });
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (loadedComponentName) props.beforeUpdatePageComponent?.();
-      props.beforeSetPageComponent?.(componentConfig);
-      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageId;
-    });
-  }, []);
   useState(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
       redirectOnHistoryPop();
-      setLoadedComponent();
-      disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
+      routerSetLoadedComponent(props, config);
+      disposerRef.current = props.router.adapters.autorun(
+        () => routerSetLoadedComponent(props, config)
+      );
     });
   });
   useEffect(() => {

package/react/Router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgGrE,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmE/F,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}

package/react/index.cjs

@@ -51,36 +51,14 @@ function RouterInner(props) {
       currentProps: {}
     })
   );
-  const setLoadedComponent = (0, import_react.useCallback)(() => {
-    const { loadedComponentName, loadedComponentPage } = config;
-    const { currentRoute, isRedirecting } = props.router;
-    const componentConfig = props.router.routes[currentRoute.name];
-    let preventRedirect = false;
-    if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageId) {
-        props.router.adapters.batch(() => {
-          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-        });
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (loadedComponentName) props.beforeUpdatePageComponent?.();
-      props.beforeSetPageComponent?.(componentConfig);
-      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageId;
-    });
-  }, []);
   (0, import_react.useState)(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
       redirectOnHistoryPop();
-      setLoadedComponent();
-      disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
+      (0, import_reactive_route.routerSetLoadedComponent)(props, config);
+      disposerRef.current = props.router.adapters.autorun(
+        () => (0, import_reactive_route.routerSetLoadedComponent)(props, config)
+      );
     });
   });
   (0, import_react.useEffect)(() => {

package/react/index.mjs

@@ -1,6 +1,6 @@
 // packages/react/Router.tsx
 import { memo, useCallback, useEffect, useRef, useState } from "react";
-import { history } from "reactive-route";
+import { history, routerSetLoadedComponent } from "reactive-route";
 import { jsx } from "react/jsx-runtime";
 function RouterInner(props) {
   const disposerRef = useRef(null);
@@ -25,36 +25,14 @@ function RouterInner(props) {
       currentProps: {}
     })
   );
-  const setLoadedComponent = useCallback(() => {
-    const { loadedComponentName, loadedComponentPage } = config;
-    const { currentRoute, isRedirecting } = props.router;
-    const componentConfig = props.router.routes[currentRoute.name];
-    let preventRedirect = false;
-    if (isRedirecting) preventRedirect = true;
-    else if (loadedComponentName === currentRoute.name) preventRedirect = true;
-    else if (loadedComponentPage != null && currentRoute.name != null) {
-      if (loadedComponentPage === currentRoute.pageId) {
-        props.router.adapters.batch(() => {
-          config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-        });
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (loadedComponentName) props.beforeUpdatePageComponent?.();
-      props.beforeSetPageComponent?.(componentConfig);
-      config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
-      config.loadedComponentName = currentRoute.name;
-      config.loadedComponentPage = componentConfig.pageId;
-    });
-  }, []);
   useState(() => {
     props.router.adapters.batch(() => {
       props.beforeMount?.();
       redirectOnHistoryPop();
-      setLoadedComponent();
-      disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
+      routerSetLoadedComponent(props, config);
+      disposerRef.current = props.router.adapters.autorun(
+        () => routerSetLoadedComponent(props, config)
+      );
     });
   });
   useEffect(() => {

package/solid/Router.d.ts.map

@@ -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,kCAwGhG"}
+{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqC,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAI/F,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAwDhG"}

package/solid/index.cjs

@@ -36,7 +36,6 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
-  let currentProps = {};
   function redirectOnHistoryPop() {
     if (!import_reactive_route.history) return;
     import_reactive_route.history.listen((params) => {
@@ -51,43 +50,14 @@ function Router(props) {
       });
     });
   }
-  function setLoadedComponent() {
-    const currentRouteName = props.router.currentRoute.name;
-    const currentRoutePage = props.router.currentRoute.pageId;
-    const componentConfig = props.router.routes[currentRouteName];
-    let preventRedirect = false;
-    if (props.router.isRedirecting) preventRedirect = true;
-    else if (config.loadedComponentName === currentRouteName) {
-      preventRedirect = true;
-    } else if (config.loadedComponentPage != null && currentRouteName != null) {
-      if (config.loadedComponentPage === currentRoutePage) {
-        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
-        currentProps = "props" in componentConfig ? componentConfig.props : {};
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (config.loadedComponentName) {
-        props.beforeUpdatePageComponent?.();
-      }
-      props.beforeSetPageComponent?.(componentConfig);
-      props.router.adapters.batch(() => {
-        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
-        currentProps = "props" in componentConfig ? componentConfig.props : {};
-        config.loadedComponentName = currentRouteName;
-        config.loadedComponentPage = componentConfig.pageId;
-      });
-    });
-  }
   props.beforeMount?.();
   redirectOnHistoryPop();
   if (props.router.adapters.immediateSetComponent) {
     props.router.adapters.batch(() => {
-      setLoadedComponent();
+      (0, import_reactive_route.routerSetLoadedComponent)(props, config);
     });
   }
-  props.router.adapters.autorun(() => setLoadedComponent());
+  props.router.adapters.autorun(() => (0, import_reactive_route.routerSetLoadedComponent)(props, config));
   return (
     // @ts-ignore
     (0, import_web.createComponent)(import_solid_js.Show, {
@@ -99,10 +69,7 @@ function Router(props) {
           get component() {
             return props.router.routes[config.loadedComponentName]?.component || void 0;
           }
-        }, () => Object.keys(config.currentProps).reduce((acc, key) => {
-          acc[key] = currentProps[key];
-          return acc;
-        }, {}), {
+        }, () => config.currentProps, {
           get router() {
             return props.router;
           }

package/solid/index.mjs

@@ -1,7 +1,7 @@
 // packages/solid/Router.tsx
 import { createComponent as _$createComponent } from "solid-js/web";
 import { mergeProps as _$mergeProps } from "solid-js/web";
-import { history } from "reactive-route";
+import { history, routerSetLoadedComponent } from "reactive-route";
 import { Show } from "solid-js";
 import { Dynamic } from "solid-js/web";
 function Router(props) {
@@ -10,7 +10,6 @@ function Router(props) {
     loadedComponentPage: void 0,
     currentProps: {}
   });
-  let currentProps = {};
   function redirectOnHistoryPop() {
     if (!history) return;
     history.listen((params) => {
@@ -25,43 +24,14 @@ function Router(props) {
       });
     });
   }
-  function setLoadedComponent() {
-    const currentRouteName = props.router.currentRoute.name;
-    const currentRoutePage = props.router.currentRoute.pageId;
-    const componentConfig = props.router.routes[currentRouteName];
-    let preventRedirect = false;
-    if (props.router.isRedirecting) preventRedirect = true;
-    else if (config.loadedComponentName === currentRouteName) {
-      preventRedirect = true;
-    } else if (config.loadedComponentPage != null && currentRouteName != null) {
-      if (config.loadedComponentPage === currentRoutePage) {
-        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
-        currentProps = "props" in componentConfig ? componentConfig.props : {};
-        preventRedirect = true;
-      }
-    }
-    if (preventRedirect) return;
-    props.router.adapters.batch(() => {
-      if (config.loadedComponentName) {
-        props.beforeUpdatePageComponent?.();
-      }
-      props.beforeSetPageComponent?.(componentConfig);
-      props.router.adapters.batch(() => {
-        props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
-        currentProps = "props" in componentConfig ? componentConfig.props : {};
-        config.loadedComponentName = currentRouteName;
-        config.loadedComponentPage = componentConfig.pageId;
-      });
-    });
-  }
   props.beforeMount?.();
   redirectOnHistoryPop();
   if (props.router.adapters.immediateSetComponent) {
     props.router.adapters.batch(() => {
-      setLoadedComponent();
+      routerSetLoadedComponent(props, config);
     });
   }
-  props.router.adapters.autorun(() => setLoadedComponent());
+  props.router.adapters.autorun(() => routerSetLoadedComponent(props, config));
   return (
     // @ts-ignore
     _$createComponent(Show, {
@@ -73,10 +43,7 @@ function Router(props) {
           get component() {
             return props.router.routes[config.loadedComponentName]?.component || void 0;
           }
-        }, () => Object.keys(config.currentProps).reduce((acc, key) => {
-          acc[key] = currentProps[key];
-          return acc;
-        }, {}), {
+        }, () => config.currentProps, {
           get router() {
             return props.router;
           }