@herdingbits/trailhead-cloudscape 0.0.15 → 0.0.17

package/dist/shell-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-app.d.ts","sourceRoot":"","sources":["../src/shell-app.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,UAAU,aAAa;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB;AAiBD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,2CAmNhD"}
+{"version":3,"file":"shell-app.d.ts","sourceRoot":"","sources":["../src/shell-app.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,6BAA6B,CAAC;AAEtE,UAAU,aAAa;IACrB,KAAK,EAAE,SAAS,CAAC;CAClB;AAiBD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,2CAkNhD"}

package/dist/shell-app.js

@@ -70,11 +70,10 @@ export function ShellApp({ shell }) {
         }
     }, [navigation, currentPath]);
     const handleRoute = (path) => {
-        // Normalize path by removing trailing slash for matching
         const normalizedPath = path.endsWith('/') && path !== '/' ? path.slice(0, -1) : path;
-        const route = navigation.find(item => normalizedPath.startsWith(item.path));
-        if (route && contentRef.current) {
-            loadApp(route.app, route.path);
+        const app = shell.getApps().find(entry => normalizedPath.startsWith(entry.basePath));
+        if (app && contentRef.current) {
+            loadApp(app.src, app.basePath);
         }
     };
     const loadApp = async (appName, appPath) => {

package/dist/shell-layout.d.ts

@@ -1,12 +1,7 @@
 import React from 'react';
-interface NavigationItem {
-    id: string;
-    label: string;
-    path: string;
-    icon?: string;
-}
+import type { NavItem } from '@herdingbits/trailhead-core';
 interface ShellLayoutProps {
-    navigation: NavigationItem[];
+    navigation: NavItem[];
     currentPath: string;
     basePath: string;
     onNavigate: (path: string) => void;

package/dist/shell-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-layout.d.ts","sourceRoot":"","sources":["../src/shell-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAMnD,UAAU,cAAc;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,UAAU,gBAAgB;IACxB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,WAAW,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,gBAAgB,2CA2BxG"}
+{"version":3,"file":"shell-layout.d.ts","sourceRoot":"","sources":["../src/shell-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,KAAK,EAAE,OAAO,EAAW,MAAM,6BAA6B,CAAC;AAEpE,UAAU,gBAAgB;IACxB,UAAU,EAAE,OAAO,EAAE,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,WAAW,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,gBAAgB,2CA+CxG"}

package/dist/shell-layout.js

@@ -4,11 +4,29 @@ import AppLayout from '@cloudscape-design/components/app-layout';
 import SideNavigation from '@cloudscape-design/components/side-navigation';
 export function ShellLayout({ navigation, currentPath, basePath, onNavigate, children }) {
     const [navigationOpen, setNavigationOpen] = useState(true);
-    const navItems = navigation.map(item => ({
+    const isExternal = (href) => /^https?:\/\/|^\/\//.test(href);
+    const resolveHref = (href) => isExternal(href) ? href : basePath + href + '/';
+    const mapLink = (item) => ({
         type: 'link',
         text: item.label,
-        href: basePath + item.path + '/', // Add trailing slash for directory routing
-    }));
+        href: resolveHref(item.href),
+    });
+    const navItems = [...navigation]
+        .sort((a, b) => a.order - b.order)
+        .map((item) => {
+        switch (item.type) {
+            case 'link':
+                return mapLink(item);
+            case 'section':
+                return {
+                    type: 'section',
+                    text: item.label,
+                    items: [...item.children].sort((a, b) => a.order - b.order).map(mapLink),
+                };
+            case 'divider':
+                return { type: 'divider' };
+        }
+    });
     return (_jsx(AppLayout, { navigationOpen: navigationOpen, onNavigationChange: ({ detail }) => setNavigationOpen(detail.open), navigation: _jsx(SideNavigation, { activeHref: basePath + currentPath + (currentPath.endsWith('/') ? '' : '/'), items: navItems, onFollow: (event) => {
                 event.preventDefault();
                 onNavigate(event.detail.href);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdingbits/trailhead-cloudscape",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "AWS CloudScape adapter for Trailhead. React-based shell with CloudScape components. Supports React 19.",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,14 +23,14 @@
   "peerDependencies": {
     "@cloudscape-design/components": "^3.0.0",
     "@cloudscape-design/global-styles": "^1.0.0",
-    "@herdingbits/trailhead-core": "^0.0.16",
+    "@herdingbits/trailhead-core": "^0.0.17",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@cloudscape-design/components": "^3.0.1297",
     "@cloudscape-design/global-styles": "^1.0.59",
-    "@herdingbits/trailhead-types": "^0.0.13",
+    "@herdingbits/trailhead-types": "^0.0.14",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "react": "^19.2.6",