@resistdesign/voltra 3.0.0-alpha.41 → 3.0.0-alpha.42

package/app/index.js

@@ -1,6 +1,6 @@
-export { createEasyLayout, getEasyLayoutTemplateDetails, getPascalCaseAreaName } from '../chunk-2MOLWZMQ.js';
+export { createEasyLayout, getEasyLayoutTemplateDetails, getPascalCaseAreaName } from '../chunk-B4DHXYKJ.js';
 export { computeTrackPixels } from '../chunk-TJFTWPXQ.js';
-export { AutoForm, AutoFormView, Route, RouteContext, RouteContextConsumer, RouteContextProvider, RouteProvider, buildHistoryPath, buildQueryString, buildRoutePath, canUseBrowserHistory, computeAreaBounds, createAutoField, createBrowserRouteAdapter, createFormRenderer, createHistoryBackHandler, createManualRouteAdapter, createMemoryHistory, createNativeRouteAdapter, createRouteAdapterFromHistory, createUniversalAdapter, defaultTranslateValidationErrorCode, getFieldKind, parseHistoryPath, parseTemplate, resolveSuite, useFormEngine, useRouteContext, validateAreas, wrapRouteAdapterWithPathResolver } from '../chunk-DT6WWJUI.js';
+export { AutoForm, AutoFormView, Route, RouteContext, RouteContextConsumer, RouteContextProvider, RouteProvider, buildHistoryPath, buildQueryString, buildRoutePath, canUseBrowserHistory, computeAreaBounds, createAutoField, createBrowserRouteAdapter, createFormRenderer, createHistoryBackHandler, createManualRouteAdapter, createMemoryHistory, createNativeRouteAdapter, createRouteAdapterFromHistory, createUniversalAdapter, defaultTranslateValidationErrorCode, getFieldKind, parseHistoryPath, parseTemplate, resolveSuite, useFormEngine, useRouteContext, validateAreas, wrapRouteAdapterWithPathResolver } from '../chunk-FXMKH3RB.js';
 import '../chunk-7AMEFPPP.js';
 import '../chunk-YCTVEW2I.js';
 import { mergeStringPaths, PATH_DELIMITER } from '../chunk-WNFRDIBW.js';

package/app/utils/Route.d.ts

@@ -140,9 +140,9 @@ export declare const RouteProvider: ({ adapter, initialPath, children, }: RouteP
  */
 export type RouteProps<ParamsType extends Record<string, any>> = {
     /**
-     * Route path pattern, using `:` for params.
+     * Route path pattern(s), using `:` for params.
      */
-    path?: string;
+    path?: string | string[];
     /**
      * Callback when params update for this route.
      *

package/{chunk-2MOLWZMQ.js → chunk-B4DHXYKJ.js}

@@ -1,4 +1,4 @@
-import { parseTemplate, validateAreas } from './chunk-DT6WWJUI.js';
+import { parseTemplate, validateAreas } from './chunk-FXMKH3RB.js';
 
 // src/app/utils/EasyLayout.tsx
 var getPascalCaseAreaName = (area) => {

package/{chunk-DT6WWJUI.js → chunk-FXMKH3RB.js}

@@ -673,37 +673,49 @@ var RouteMatcher = ({
     () => currentWindowPath,
     [currentWindowPath]
   );
-  const fullPath = useMemo(
-    () => mergeStringPaths(parentPath, path),
-    [parentPath, path]
+  const normalizedPaths = useMemo(
+    () => Array.isArray(path) ? path : [path],
+    [path]
   );
-  const newParams = useMemo(
-    () => getParamsAndTestPath(targetCurrentPath, fullPath, exact),
-    [targetCurrentPath, fullPath, exact]
+  const matchedRoute = useMemo(
+    () => {
+      for (const routePath of normalizedPaths) {
+        const fullPath = mergeStringPaths(parentPath, routePath);
+        const newParams = getParamsAndTestPath(targetCurrentPath, fullPath, exact);
+        if (newParams) {
+          return {
+            fullPath,
+            newParams
+          };
+        }
+      }
+      return null;
+    },
+    [targetCurrentPath, parentPath, normalizedPaths, exact]
   );
   const params = useMemo(
     () => ({
       ...parentParams,
-      ...newParams ? newParams : {}
+      ...matchedRoute?.newParams ? matchedRoute.newParams : {}
     }),
-    [parentParams, newParams]
+    [parentParams, matchedRoute]
   );
   const newRouteContext = useMemo(
     () => ({
       currentWindowPath: targetCurrentPath,
-      parentPath: fullPath,
+      parentPath: matchedRoute?.fullPath ?? parentPath,
       params,
       isTopLevel: false,
       adapter
     }),
-    [targetCurrentPath, fullPath, params, adapter]
+    [targetCurrentPath, matchedRoute, parentPath, params, adapter]
   );
   useEffect(() => {
     if (onParamsChange) {
       onParamsChange(params);
     }
   }, [params, onParamsChange]);
-  return newParams ? /* @__PURE__ */ jsx(RouteContextProvider, { value: newRouteContext, children }) : null;
+  return matchedRoute?.newParams ? /* @__PURE__ */ jsx(RouteContextProvider, { value: newRouteContext, children }) : null;
 };
 var RouteRootProvider = ({
   children,

package/native/index.js

@@ -1,5 +1,5 @@
 import { computeTrackPixels } from '../chunk-TJFTWPXQ.js';
-import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, Route, buildRoutePath } from '../chunk-DT6WWJUI.js';
+import { createFormRenderer, createHistoryBackHandler, buildHistoryPath, AutoFormView, AutoForm, parseTemplate, validateAreas, computeAreaBounds, parseHistoryPath, createMemoryHistory, Route, buildRoutePath } from '../chunk-FXMKH3RB.js';
 import { ERROR_MESSAGE_CONSTANTS } from '../chunk-YCTVEW2I.js';
 import { resolveRouteAdapterPath, getPathArray } from '../chunk-WNFRDIBW.js';
 import '../chunk-I2KLQ2HA.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resistdesign/voltra",
-  "version": "3.0.0-alpha.41",
+  "version": "3.0.0-alpha.42",
   "description": "With our powers combined!",
   "homepage": "https://voltra.app",
   "repository": "git@github.com:resistdesign/voltra.git",

package/web/index.js

@@ -1,5 +1,5 @@
-import { createEasyLayout } from '../chunk-2MOLWZMQ.js';
-import { createFormRenderer, AutoFormView, AutoForm, createBrowserRouteAdapter, Route } from '../chunk-DT6WWJUI.js';
+import { createEasyLayout } from '../chunk-B4DHXYKJ.js';
+import { createFormRenderer, AutoFormView, AutoForm, createBrowserRouteAdapter, Route } from '../chunk-FXMKH3RB.js';
 import { ERROR_MESSAGE_CONSTANTS } from '../chunk-YCTVEW2I.js';
 import '../chunk-WNFRDIBW.js';
 import { __export, __reExport } from '../chunk-I2KLQ2HA.js';