mobx-route 0.0.26 → 0.0.28

package/core/route-group/route-group.d.ts

@@ -4,6 +4,7 @@ export declare class RouteGroup<TRoutesCollection extends RoutesCollection> {
     routes: TRoutesCollection;
     constructor(routes: TRoutesCollection);
     get isOpened(): boolean;
+    get indexRoute(): import("./route-group.types.js").AnyRouteEntity | undefined;
     open(params?: any, navigateParams?: RouteNavigateParams): void;
 }
 //# sourceMappingURL=route-group.d.ts.map

package/core/route-group/route-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAM5C,IAAI,QAAQ,IAAI,OAAO,CAGtB;IAED,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,mBAAmB;CAqBxD"}
+{"version":3,"file":"route-group.d.ts","sourceRoot":"","sources":["../../../src/core/route-group/route-group.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,qBAAa,UAAU,CAAC,iBAAiB,SAAS,gBAAgB;IAC7C,MAAM,EAAE,iBAAiB;gBAAzB,MAAM,EAAE,iBAAiB;IAO5C,IAAI,QAAQ,IAAI,OAAO,CAGtB;IAED,IAAI,UAAU,gEAIb;IAED,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,cAAc,CAAC,EAAE,mBAAmB;CAuBxD"}

package/core/route-group/route-group.js

@@ -4,6 +4,7 @@ export class RouteGroup {
     constructor(routes) {
         this.routes = routes;
         computed.struct(this, 'isMatches');
+        computed.struct(this, 'indexRoute');
         observable.shallow(this, 'routes');
         makeObservable(this);
     }
@@ -11,17 +12,20 @@ export class RouteGroup {
         const routes = Object.values(this.routes);
         return routes.some((route) => route.isOpened);
     }
+    get indexRoute() {
+        return Object.values(this.routes).find((route) => 'isIndex' in route && route.isIndex);
+    }
     open(params, navigateParams) {
         let lastGroupRoute;
+        if (this.indexRoute) {
+            this.indexRoute.open(params, navigateParams);
+            return;
+        }
         for (const routeName in this.routes) {
             const route = this.routes[routeName];
             if (route instanceof RouteGroup) {
                 lastGroupRoute = route;
             }
-            else if ('isIndex' in route && route.isIndex) {
-                route.open(params, navigateParams);
-                return;
-            }
         }
         if (lastGroupRoute) {
             lastGroupRoute.open(params, navigateParams);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-route",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "keywords": [
     "mobx",
     "react",
@@ -136,6 +136,11 @@
       "default": "./react/components/link.js",
       "types": "./react/components/link.d.ts"
     },
+    "./react/components/route-group-view": {
+      "import": "./react/components/route-group-view.js",
+      "default": "./react/components/route-group-view.js",
+      "types": "./react/components/route-group-view.d.ts"
+    },
     "./react/components/route-view": {
       "import": "./react/components/route-view.js",
       "default": "./react/components/route-view.js",

package/react/components/index.d.ts

@@ -1,3 +1,4 @@
 export * from './link.js';
 export * from './route-view.js';
+export * from './route-group-view.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC"}

package/react/components/index.js

@@ -1,2 +1,3 @@
 export * from './link.js';
 export * from './route-view.js';
+export * from './route-group-view.js';

package/react/components/route-group-view.d.ts

@@ -0,0 +1,11 @@
+import { AnyRouteGroup } from '../../core/index.js';
+import { RouteViewProps } from './route-view.js';
+export type RouteViewCollectionProps<TRouteGroup extends AnyRouteGroup> = {
+    [K in keyof TRouteGroup['routes']]: Omit<RouteViewProps<TRouteGroup['routes'][K]>, 'route'> | Exclude<RouteViewProps<TRouteGroup['routes'][K]>['view'], undefined>;
+};
+export interface RouteGroupViewProps<TRouteGroup extends AnyRouteGroup> {
+    group: TRouteGroup;
+    views: Partial<RouteViewCollectionProps<TRouteGroup>>;
+}
+export declare const RouteGroupView: import("react").MemoExoticComponent<(<TRouteGroup extends AnyRouteGroup>({ group, views, }: RouteGroupViewProps<TRouteGroup>) => import("react/jsx-runtime").JSX.Element)>;
+//# sourceMappingURL=route-group-view.d.ts.map

package/react/components/route-group-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-group-view.d.ts","sourceRoot":"","sources":["../../../src/react/components/route-group-view.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAa,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,MAAM,wBAAwB,CAAC,WAAW,SAAS,aAAa,IAAI;KACvE,CAAC,IAAI,MAAM,WAAW,CAAC,QAAQ,CAAC,GAC7B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GACvD,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;CACzE,CAAC;AAEF,MAAM,WAAW,mBAAmB,CAAC,WAAW,SAAS,aAAa;IACpE,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC,CAAC;CACvD;AAED,eAAO,MAAM,cAAc,wCACxB,WAAW,SAAS,aAAa,qBAG/B,mBAAmB,CAAC,WAAW,CAAC,8CAmBpC,CAAC"}

package/react/components/route-group-view.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { memo } from 'react';
+import { RouteView } from './route-view.js';
+export const RouteGroupView = memo(({ group, views, }) => {
+    const viewEntries = Object.entries(views);
+    return (_jsx(_Fragment, { children: viewEntries.map(([routeName, props]) => {
+            const route = group.routes[routeName];
+            const viewProps = typeof props === 'function'
+                ? {
+                    view: props,
+                }
+                : props;
+            return _jsx(RouteView, { route: route, ...viewProps }, routeName);
+        }) }));
+}, () => true);

package/react/components/route-view.d.ts

@@ -1,8 +1,7 @@
 import { ComponentType, ReactNode } from 'react';
-import type { AnyRoute, AnyRouteGroup, VirtualRoute } from '../../core/index.js';
-type RouteKind = AnyRouteGroup | AnyRoute | VirtualRoute;
-export interface RouteViewProps<TRouteKind extends RouteKind> {
-    route: TRouteKind;
+import type { AnyRouteEntity } from '../../core/index.js';
+export interface RouteViewProps<TRouteEntity extends AnyRouteEntity> {
+    route: TRouteEntity;
     view?: ComponentType<{
         children?: ReactNode;
     }>;
@@ -13,7 +12,7 @@ export interface RouteViewProps<TRouteKind extends RouteKind> {
     notOpenedContent?: ReactNode;
     children?: ReactNode;
 }
-declare function RouteViewBase<TRouteKind extends RouteKind>(props: RouteViewProps<TRouteKind>): string | number | boolean | Iterable<ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
+declare function RouteViewBase<TRouteEntity extends AnyRouteEntity>(props: RouteViewProps<TRouteEntity>): string | number | boolean | Iterable<ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
 export declare const RouteView: typeof RouteViewBase & {
     displayName: string;
 };

package/react/components/route-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-view.d.ts","sourceRoot":"","sources":["../../../src/react/components/route-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAU,MAAM,OAAO,CAAC;AAGzD,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,YAAY,EACb,MAAM,qBAAqB,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG,QAAQ,GAAG,YAAY,CAAC;AAEzD,MAAM,WAAW,cAAc,CAAC,UAAU,SAAS,SAAS;IAC1D,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,iBAAS,aAAa,CAAC,UAAU,SAAS,SAAS,EACjD,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC,gHAoBlC;AAED,eAAO,MAAM,SAAS;;CAA0B,CAAC"}
+{"version":3,"file":"route-view.d.ts","sourceRoot":"","sources":["../../../src/react/components/route-view.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAU,MAAM,OAAO,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,WAAW,cAAc,CAAC,YAAY,SAAS,cAAc;IACjE,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC;IAC/C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;QAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,iBAAS,aAAa,CAAC,YAAY,SAAS,cAAc,EACxD,KAAK,EAAE,cAAc,CAAC,YAAY,CAAC,gHAoBpC;AAED,eAAO,MAAM,SAAS;;CAA0B,CAAC"}