mobx-route 0.0.94 → 0.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-route",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "keywords": [
     "mobx",
     "react",

package/react/components/switch.d.ts

@@ -1,8 +1,22 @@
 import { ReactNode } from 'react';
-export interface SwitchProps {
+import { AllPropertiesOptional, Maybe } from 'yummies/utils/types';
+import { AnyRouteEntity, RouteNavigateParams, RouteParams } from '../../core/index.js';
+type SwitchBaseProps = {
     children: ReactNode;
-}
-export declare const Switch: (({ children }: SwitchProps) => ReactNode) & {
+};
+type SwitchPropsWithDefaultRoute<TRoute extends AnyRouteEntity> = {
+    default?: TRoute;
+} & (AllPropertiesOptional<RouteParams<TRoute>> extends true ? {
+    params?: Maybe<RouteParams<TRoute>>;
+} : {
+    params: RouteParams<TRoute>;
+}) & SwitchBaseProps & RouteNavigateParams;
+type SwitchPropsWithDefaultUrl = {
+    default?: string;
+} & SwitchBaseProps & RouteNavigateParams;
+export type SwitchProps<TRoute extends AnyRouteEntity> = SwitchPropsWithDefaultRoute<TRoute> | SwitchPropsWithDefaultUrl;
+export declare const Switch: (<TRoute extends AnyRouteEntity>({ children, default: defaultNavigation, params, ...navigateParams }: SwitchProps<TRoute>) => ReactNode) & {
     displayName: string;
 };
+export {};
 //# sourceMappingURL=switch.d.ts.map

package/react/components/switch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../../src/react/components/switch.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA0C,SAAS,EAAE,MAAM,OAAO,CAAC;AAM1E,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,SAAS,CAAC;CACrB;AAsBD,eAAO,MAAM,MAAM,kBAA2B,WAAW;;CAYvD,CAAC"}
+{"version":3,"file":"switch.d.ts","sourceRoot":"","sources":["../../../src/react/components/switch.tsx"],"names":[],"mappings":"AAGA,OAAO,EAIL,SAAS,EAEV,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EACL,cAAc,EAEd,mBAAmB,EACnB,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAG7B,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,KAAK,2BAA2B,CAAC,MAAM,SAAS,cAAc,IAAI;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,CAAC,qBAAqB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,IAAI,GACxD;IACE,MAAM,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;CACrC,GACD;IACE,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,GACJ,eAAe,GACf,mBAAmB,CAAC;AAEtB,KAAK,yBAAyB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,eAAe,GACjB,mBAAmB,CAAC;AAEtB,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,cAAc,IACjD,2BAA2B,CAAC,MAAM,CAAC,GACnC,yBAAyB,CAAC;AAsB9B,eAAO,MAAM,MAAM,IAAsB,MAAM,SAAS,cAAc,uEAMnE,WAAW,CAAC,MAAM,CAAC;;CAiCpB,CAAC"}

package/react/components/switch.js

@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
+import { buildSearchString } from 'mobx-location-history';
 import { observer } from 'mobx-react-lite';
-import { Fragment, isValidElement } from 'react';
+import { Fragment, isValidElement, useEffect, } from 'react';
 import { flatMapDeep } from 'yummies/data';
+import { routeConfig, } from '../../core/index.js';
 import { isRouteEntity } from '../../core/utils/is-route-entity.js';
 const flattenChildren = (children) => flatMapDeep(children, (c) => 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -12,15 +14,37 @@ const isValidRouteElement = (element) => {
         // @ts-ignore
         isRouteEntity(element.props?.route));
 };
-export const Switch = observer(({ children }) => {
+export const Switch = observer(function ({ children, default: defaultNavigation, 
+// @ts-ignore
+params, ...navigateParams }) {
+    let resultElement = null;
     let defaultElement = null;
     for (const element of flattenChildren(children)) {
         if (isValidRouteElement(element) && element.props.route.isOpened) {
-            return element;
+            resultElement = element;
+            break;
         }
         else {
             defaultElement = element;
         }
     }
-    return defaultElement;
+    const isResultElementFound = !!resultElement;
+    useEffect(() => {
+        if (!isResultElementFound && defaultNavigation) {
+            if (typeof defaultNavigation === 'string') {
+                const history = routeConfig.get().history;
+                const url = `${defaultNavigation}${buildSearchString(navigateParams.query || {})}`;
+                if (navigateParams.replace) {
+                    history.replace(url, navigateParams.state);
+                }
+                else {
+                    history.push(url, navigateParams.state);
+                }
+            }
+            else if (!defaultNavigation.isOpened) {
+                defaultNavigation.open(params, navigateParams);
+            }
+        }
+    }, [isResultElementFound, defaultNavigation]);
+    return resultElement ?? defaultElement;
 });