@djangocfg/layouts 2.1.145 → 2.1.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/layouts",
-  "version": "2.1.145",
+  "version": "2.1.147",
   "description": "Simple, straightforward layout components for Next.js - import and use with props",
   "keywords": [
     "layouts",
@@ -74,12 +74,12 @@
     "check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@djangocfg/api": "^2.1.145",
-    "@djangocfg/centrifugo": "^2.1.145",
-    "@djangocfg/i18n": "^2.1.145",
-    "@djangocfg/ui-core": "^2.1.145",
-    "@djangocfg/ui-nextjs": "^2.1.145",
-    "@djangocfg/ui-tools": "^2.1.145",
+    "@djangocfg/api": "^2.1.147",
+    "@djangocfg/centrifugo": "^2.1.147",
+    "@djangocfg/i18n": "^2.1.147",
+    "@djangocfg/ui-core": "^2.1.147",
+    "@djangocfg/ui-nextjs": "^2.1.147",
+    "@djangocfg/ui-tools": "^2.1.147",
     "@hookform/resolvers": "^5.2.2",
     "consola": "^3.4.2",
     "lucide-react": "^0.545.0",
@@ -102,13 +102,13 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@djangocfg/api": "^2.1.145",
-    "@djangocfg/i18n": "^2.1.145",
-    "@djangocfg/centrifugo": "^2.1.145",
-    "@djangocfg/typescript-config": "^2.1.145",
-    "@djangocfg/ui-core": "^2.1.145",
-    "@djangocfg/ui-nextjs": "^2.1.145",
-    "@djangocfg/ui-tools": "^2.1.145",
+    "@djangocfg/api": "^2.1.147",
+    "@djangocfg/i18n": "^2.1.147",
+    "@djangocfg/centrifugo": "^2.1.147",
+    "@djangocfg/typescript-config": "^2.1.147",
+    "@djangocfg/ui-core": "^2.1.147",
+    "@djangocfg/ui-nextjs": "^2.1.147",
+    "@djangocfg/ui-tools": "^2.1.147",
     "@types/node": "^24.7.2",
     "@types/react": "^19.1.0",
     "@types/react-dom": "^19.1.0",

package/src/hooks/index.ts

@@ -0,0 +1 @@
+export { usePathnameWithoutLocale, stripLocalePrefix } from './usePathnameWithoutLocale';

package/src/hooks/usePathnameWithoutLocale.ts

@@ -0,0 +1,39 @@
+'use client';
+
+import { usePathname } from 'next/navigation';
+import { useMemo } from 'react';
+
+/**
+ * Strip locale prefix from pathname
+ * Handles: /xx/path, /xx-XX/path (e.g., /en, /ko, /pt-BR)
+ */
+function stripLocalePrefix(pathname: string): string {
+  // Match /xx or /xx-XX at the start
+  const match = pathname.match(/^\/[a-z]{2}(-[A-Z]{2})?(\/|$)/);
+
+  if (match) {
+    const rest = pathname.slice(match[0].length - 1) || '/';
+    return rest.startsWith('/') ? rest : '/' + rest;
+  }
+
+  return pathname;
+}
+
+/**
+ * usePathnameWithoutLocale
+ *
+ * Returns pathname without locale prefix.
+ * Useful for route matching when using next-intl or similar i18n routing.
+ *
+ * @example
+ * // URL: /ko/private/dashboard
+ * const pathname = usePathnameWithoutLocale();
+ * // pathname = '/private/dashboard'
+ */
+export function usePathnameWithoutLocale(): string {
+  const pathname = usePathname();
+
+  return useMemo(() => stripLocalePrefix(pathname), [pathname]);
+}
+
+export { stripLocalePrefix };

package/src/index.ts

@@ -43,5 +43,8 @@ export * from './components';
 // Utils
 export * from './utils';
 
+// Hooks
+export * from './hooks';
+
 // Pages
 export * from './pages';

package/src/layouts/AppLayout/AppLayout.tsx

@@ -32,10 +32,10 @@
 
 'use client';
 
-import { usePathname } from 'next/navigation';
 import React, { ReactNode, useMemo } from 'react';
 
 import { ClientOnly, Suspense } from '../../components/core';
+import { usePathnameWithoutLocale } from '../../hooks';
 import { BaseApp } from './BaseApp';
 
 import type {
@@ -57,11 +57,11 @@ export type LayoutMode = 'public' | 'private' | 'admin';
  */
 function matchesPath(pathname: string, enabledPath?: string | string[]): boolean {
   if (!enabledPath) return false;
-  
+
   if (typeof enabledPath === 'string') {
     return pathname === enabledPath || pathname.startsWith(enabledPath + '/');
   }
-  
+
   // Array of paths
   return enabledPath.some(path => pathname === path || pathname.startsWith(path + '/'));
 }
@@ -164,7 +164,8 @@ function AppLayoutContent({
   noLayoutPaths,
   i18n,
 }: AppLayoutProps) {
-  const pathname = usePathname();
+  // Use pathname without locale prefix for route matching
+  const pathname = usePathnameWithoutLocale();
 
   // Check if current path should skip layout
   const shouldSkipLayout = useMemo(