@geomak/ui 6.22.0 → 6.23.0

package/dist/index.d.cts

@@ -2867,8 +2867,20 @@ interface SecureLayoutProps {
     /** Required permission(s). One needed (or all, with `requireAllPermissions`). */
     requiredPermissions?: string[];
     requireAllPermissions?: boolean;
-    /** Final say. Runs after the built-in checks; may be async. Return false to deny. */
-    canAccess?: () => boolean | Promise<boolean>;
+    /**
+     * The current route path (e.g. `location.pathname`). Pass it from your
+     * router to do **per-route** access from a single root wrapper: the check
+     * re-runs whenever `route` changes (i.e. on navigation), and the value is
+     * forwarded to `canAccess`. Omit it for a static, app-wide gate.
+     */
+    route?: string;
+    /**
+     * Final say. Runs after the built-in checks; may be async; return false to
+     * deny. Receives the current `route`, so a single wrapper can decide access
+     * per path (e.g. consult a route → permissions map). Keep it synchronous
+     * for instant, flash-free per-route guarding.
+     */
+    canAccess?: (route?: string) => boolean | Promise<boolean>;
     /** Shown while the (possibly async) check resolves. Pass `null` to render nothing. */
     loadingFallback?: React__default.ReactNode;
     /** Shown when access is denied. Defaults to a simple "Access denied" panel;
@@ -2911,8 +2923,19 @@ interface SecureLayoutProps {
  * >
  *   <AppRoutes />
  * </SecureLayout>
+ *
+ * @example Per-route access from a single root wrapper
+ * // Pass the path so the check re-runs on navigation; decide per route.
+ * const allowed = { '/admin': ['admin'], '/reports': ['analyst', 'admin'] }
+ * <SecureLayout
+ *   route={location.pathname}
+ *   canAccess={(path) => (allowed[path] ?? []).some((r) => user.roles.includes(r))}
+ *   onDeny={() => navigate('/403')}
+ * >
+ *   <AppRoutes />
+ * </SecureLayout>
  */
-declare function SecureLayout({ children, isAuthenticated, token, roles, requiredRoles, requireAllRoles, permissions, requiredPermissions, requireAllPermissions, canAccess, loadingFallback, fallback, onGranted, onDeny, className, }: SecureLayoutProps): react_jsx_runtime.JSX.Element;
+declare function SecureLayout({ children, isAuthenticated, token, roles, requiredRoles, requireAllRoles, permissions, requiredPermissions, requireAllPermissions, route, canAccess, loadingFallback, fallback, onGranted, onDeny, className, }: SecureLayoutProps): react_jsx_runtime.JSX.Element;
 
 interface ThemeColors {
     background?: string;

package/dist/index.d.ts

@@ -2867,8 +2867,20 @@ interface SecureLayoutProps {
     /** Required permission(s). One needed (or all, with `requireAllPermissions`). */
     requiredPermissions?: string[];
     requireAllPermissions?: boolean;
-    /** Final say. Runs after the built-in checks; may be async. Return false to deny. */
-    canAccess?: () => boolean | Promise<boolean>;
+    /**
+     * The current route path (e.g. `location.pathname`). Pass it from your
+     * router to do **per-route** access from a single root wrapper: the check
+     * re-runs whenever `route` changes (i.e. on navigation), and the value is
+     * forwarded to `canAccess`. Omit it for a static, app-wide gate.
+     */
+    route?: string;
+    /**
+     * Final say. Runs after the built-in checks; may be async; return false to
+     * deny. Receives the current `route`, so a single wrapper can decide access
+     * per path (e.g. consult a route → permissions map). Keep it synchronous
+     * for instant, flash-free per-route guarding.
+     */
+    canAccess?: (route?: string) => boolean | Promise<boolean>;
     /** Shown while the (possibly async) check resolves. Pass `null` to render nothing. */
     loadingFallback?: React__default.ReactNode;
     /** Shown when access is denied. Defaults to a simple "Access denied" panel;
@@ -2911,8 +2923,19 @@ interface SecureLayoutProps {
  * >
  *   <AppRoutes />
  * </SecureLayout>
+ *
+ * @example Per-route access from a single root wrapper
+ * // Pass the path so the check re-runs on navigation; decide per route.
+ * const allowed = { '/admin': ['admin'], '/reports': ['analyst', 'admin'] }
+ * <SecureLayout
+ *   route={location.pathname}
+ *   canAccess={(path) => (allowed[path] ?? []).some((r) => user.roles.includes(r))}
+ *   onDeny={() => navigate('/403')}
+ * >
+ *   <AppRoutes />
+ * </SecureLayout>
  */
-declare function SecureLayout({ children, isAuthenticated, token, roles, requiredRoles, requireAllRoles, permissions, requiredPermissions, requireAllPermissions, canAccess, loadingFallback, fallback, onGranted, onDeny, className, }: SecureLayoutProps): react_jsx_runtime.JSX.Element;
+declare function SecureLayout({ children, isAuthenticated, token, roles, requiredRoles, requireAllRoles, permissions, requiredPermissions, requireAllPermissions, route, canAccess, loadingFallback, fallback, onGranted, onDeny, className, }: SecureLayoutProps): react_jsx_runtime.JSX.Element;
 
 interface ThemeColors {
     background?: string;

package/dist/index.js

@@ -5847,6 +5847,7 @@ function SecureLayout({
   permissions,
   requiredPermissions,
   requireAllPermissions,
+  route,
   canAccess,
   loadingFallback,
   fallback,
@@ -5884,8 +5885,13 @@ function SecureLayout({
     } else if (!canAccess) {
       finish(true);
     } else {
-      setState("checking");
-      Promise.resolve(canAccess()).then((ok) => finish(Boolean(ok)));
+      const result = canAccess(route);
+      if (result && typeof result.then === "function") {
+        setState("checking");
+        result.then((ok) => finish(Boolean(ok)));
+      } else {
+        finish(Boolean(result));
+      }
     }
     return () => {
       cancelled = true;
@@ -5893,6 +5899,7 @@ function SecureLayout({
   }, [
     isAuthenticated,
     token,
+    route,
     requireAllRoles,
     requireAllPermissions,
     canAccess,