@djangocfg/layouts 2.1.615 → 2.1.617

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/layouts",
-  "version": "2.1.615",
+  "version": "2.1.617",
   "description": "Simple, straightforward layout components for Next.js - import and use with props",
   "keywords": [
     "layouts",
@@ -91,11 +91,11 @@
     "test": "vitest run"
   },
   "peerDependencies": {
-    "@djangocfg/analytics": "^2.1.615",
-    "@djangocfg/api": "^2.1.615",
-    "@djangocfg/devtools": "^2.1.615",
-    "@djangocfg/i18n": "^2.1.615",
-    "@djangocfg/ui-core": "^2.1.615",
+    "@djangocfg/analytics": "^2.1.617",
+    "@djangocfg/api": "^2.1.617",
+    "@djangocfg/devtools": "^2.1.617",
+    "@djangocfg/i18n": "^2.1.617",
+    "@djangocfg/ui-core": "^2.1.617",
     "@hookform/resolvers": "^5.2.2 || ^7.0.2",
     "consola": "^3.4.2",
     "lucide-react": "^1.68.0",
@@ -120,16 +120,15 @@
   },
   "dependencies": {
     "libphonenumber-js": "^1.13.15",
-    "nextjs-toploader": "^3.9.17",
     "qrcode.react": "^4.2.0"
   },
   "devDependencies": {
-    "@djangocfg/analytics": "^2.1.615",
-    "@djangocfg/api": "^2.1.615",
-    "@djangocfg/devtools": "^2.1.615",
-    "@djangocfg/i18n": "^2.1.615",
-    "@djangocfg/typescript-config": "^2.1.615",
-    "@djangocfg/ui-core": "^2.1.615",
+    "@djangocfg/analytics": "^2.1.617",
+    "@djangocfg/api": "^2.1.617",
+    "@djangocfg/devtools": "^2.1.617",
+    "@djangocfg/i18n": "^2.1.617",
+    "@djangocfg/typescript-config": "^2.1.617",
+    "@djangocfg/ui-core": "^2.1.617",
     "@storybook/react-vite": "^10.6.5",
     "@types/node": "^25.9.5",
     "@types/react": "19.3.0",

package/src/index.ts

@@ -35,10 +35,6 @@ export * from './layouts';
 // Typed theme style bridge + presets (BaseApp `theme.style`)
 export * from './theme';
 
-// Re-export useRouter from nextjs-toploader for progress bar support
-// Use this instead of 'next/navigation' useRouter for router.push() to trigger progress
-export { useRouter } from 'nextjs-toploader/app';
-
 // Snippets - Reusable UI components (includes Analytics)
 export * from './snippets';
 

package/src/layouts/AppLayout/BaseApp.tsx

@@ -43,7 +43,6 @@
 'use client';
 
 import { nodeEnv } from "@djangocfg/ui-core/lib";
-import NextTopLoader from 'nextjs-toploader';
 import { SWRConfig } from 'swr';
 
 import { Devtools, devtools } from '@djangocfg/devtools';
@@ -52,6 +51,7 @@ import { AuthProvider } from '@djangocfg/api/auth';
 import { UiProviders } from '@djangocfg/ui-core/providers';
 import { useScrollToTop } from '@djangocfg/ui-core/hooks';
 import { NextRouterAdapter, NextLinkProvider } from '@djangocfg/ui-core/adapters/nextjs';
+import { RouteProgressProvider } from '@djangocfg/ui-core/route-progress';
 import { NextIntlLinkBridge } from './NextIntlLinkBridge';
 import { ThemeProvider } from '@djangocfg/ui-core/theme';
 import { AppErrorFallback } from '../../components/errors/AppErrorFallback';
@@ -107,6 +107,7 @@ export function BaseApp({
   devtools: devtoolsConfig,
   i18n,
   pwaMeta = true,
+  progressBar = true,
 }: BaseAppProps) {
   // auth=false disables AuthProvider entirely (public apps with no login)
   const authEnabled = auth !== false;
@@ -138,6 +139,10 @@ export function BaseApp({
        * correctly. Placed near the top so every provider below
        * (Auth, anything that may navigate) gets it.
        */}
+      <RouteProgressProvider
+        enabled={progressBar !== false}
+        {...(typeof progressBar === 'object' ? progressBar : {})}
+      >
       <NextRouterAdapter>
       <NextLinkProvider>
       {/* Single top-level boundary lives inside UiProviders. We feed it the
@@ -180,13 +185,6 @@ export function BaseApp({
                     )}
                   </ProjectNameProvider>
                 </LayoutI18nProvider>
-                <NextTopLoader
-                  color="var(--primary)"
-                  height={3}
-                  showSpinner={false}
-                  shadow="0 0 10px var(--primary), 0 0 5px var(--primary)"
-                />
-
                 {/* Auth Dialog - only when auth is enabled */}
                 {authEnabled && <AuthDialog authPath={authConfig?.routes?.auth} />}
               </ErrorTrackingProvider>
@@ -196,6 +194,7 @@ export function BaseApp({
       </UiProviders>
       </NextLinkProvider>
       </NextRouterAdapter>
+      </RouteProgressProvider>
     </ThemeProvider>
     </>
   );

package/src/layouts/types/layout.types.ts

@@ -34,6 +34,13 @@ import type { DevtoolsProps } from '@djangocfg/devtools';
  * Core configuration for BaseApp component.
  * All provider configs are imported from their respective modules.
  */
+/** Tuning for the top loading bar, see `BaseLayoutProps.progressBar`. */
+export interface RouteProgressOptions {
+  color?: string;
+  height?: number;
+  shouldShow?: (from: URL, to: URL) => boolean;
+}
+
 export interface BaseLayoutProps {
   children: ReactNode;
 
@@ -79,6 +86,15 @@ export interface BaseLayoutProps {
    * pass `false` to opt out.
    */
   pwaMeta?: boolean;
+
+  /**
+   * The top loading bar shown while moving between pages (`@djangocfg/ui-core/route-progress`). On by default;
+   * `false` removes it for the whole app. An object tunes it: `color`, `height` (px) and `shouldShow(from, to)`,
+   * the app's route rule (default: the pathname changes, so `?tab=2` and `#hash` never show it). A page or
+   * section can silence the bar, and the jump to the top, while it is mounted:
+   * `useNavigationBehavior({ progress: false, scroll: false })`.
+   */
+  progressBar?: boolean | RouteProgressOptions;
 }
 
 /** Devtools config for BaseApp — the `<Devtools>` props minus children. */