design-system-next 2.11.0 → 2.11.2

package/dist/package.json.d.ts

@@ -1,9 +1,9 @@
 declare const _default: {
   "name": "design-system-next",
   "private": false,
-  "version": "2.11.0",
-  "main": "./dist/design-system-next.js",
-  "module": "./dist/design-system-next.js",
+  "version": "2.11.2",
+  "main": "./dist/design-system-next.umd.js",
+  "module": "./dist/design-system-next.es.js",
   "repository": {
     "type": "git",
     "url": "https://dev.azure.com/sproutphil/Sprout%20Design%20System/_git/Sprout%20Design%20System%20Next"
@@ -18,8 +18,8 @@ declare const _default: {
   ],
   "exports": {
     ".": {
-      "import": "./dist/design-system-next.js",
-      "require": "./dist/design-system-next.js"
+      "import": "./dist/design-system-next.es.js",
+      "require": "./dist/design-system-next.umd.js"
     },
     "./style.css": "./dist/main.css"
   },

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "design-system-next",
   "private": false,
-  "version": "2.11.0",
-  "main": "./dist/design-system-next.js",
-  "module": "./dist/design-system-next.js",
+  "version": "2.11.2",
+  "main": "./dist/design-system-next.umd.js",
+  "module": "./dist/design-system-next.es.js",
   "repository": {
     "type": "git",
     "url": "https://dev.azure.com/sproutphil/Sprout%20Design%20System/_git/Sprout%20Design%20System%20Next"
@@ -18,8 +18,8 @@
   ],
   "exports": {
     ".": {
-      "import": "./dist/design-system-next.js",
-      "require": "./dist/design-system-next.js"
+      "import": "./dist/design-system-next.es.js",
+      "require": "./dist/design-system-next.umd.js"
     },
     "./style.css": "./dist/main.css"
   },

package/src/components/sidenav/use-sidenav.ts

@@ -1,7 +1,7 @@
 import { ref, onMounted } from 'vue';
 import type { SetupContext } from 'vue';
 
-import type { SidenavPropTypes, SidenavEmitTypes, ParentLinkItem, NavLinks, NavItem } from './sidenav';
+import type { SidenavPropTypes, SidenavEmitTypes, ParentLinkItem, NavLinks, NavItem, MenuLinkItem } from './sidenav';
 
 interface ObjectItem {
   redirect: {
@@ -68,6 +68,7 @@ export const useSidenav = (props: SidenavPropTypes, emit: SetupContext<SidenavEm
   const generateId = (...titles: string[]): string => {
     return titles.map(transformToCamelCaseId).join('_');
   }
+  
   const confirmIfOwnDomain = (url: string) => {
     const domain = window.location.href; 
     const urlHostname = new URL(url).hostname;
@@ -100,31 +101,47 @@ export const useSidenav = (props: SidenavPropTypes, emit: SetupContext<SidenavEm
     return Object.values(groups).map(group => ({ parentLinks: group.map(mapItemToNav) }));
   }
 
-  const mapItemToNav = (item: NavItem): ParentLinkItem => {
-    return {
-        title: item.label,
-        icon: item.icon || "",
-        redirect: item.url
-            ? {
-                openInNewTab: item.isNewTab || false,
-                isAbsoluteURL: !confirmIfOwnDomain(item.url),
-                link: navLinkCondition(item) || "",
-            }
-            : undefined,
-        menuLinks: item.children && item.children.length > 0
-            ? [{
-                menuHeading: '',
-                items: item.children.map(child => mapItemToNav(child))
-            }]
-            : [],
-        submenuLinks: item.children && item.children.length > 0 && !item.children.some(c => c.children)
-            ? [{
-                subMenuHeading: '',
-                items: item.children.map(child => mapItemToNav(child)),
-            }]
-            : [],
-    }
-  }
+
+    const mapItemToNav = (item: NavItem): ParentLinkItem | MenuLinkItem => {
+        const groupChildrenByProperty = (
+            children: NavItem[] | undefined,
+            property: keyof NavItem
+        ): { [key: string]: NavItem[] } => {
+            if (!children || children.length === 0) return {};
+            return children.reduce((acc: Record<string, NavItem[]>, child) => {
+                const key = String(child[property] || '');
+                acc[key] = acc[key] || [];
+                acc[key].push(child);
+                return acc;
+            }, {});
+        };
+
+        const mapGroupedChildren = (
+            groupedChildren: { [key: string]: NavItem[] },
+            headingKey: 'menuHeading' | 'subMenuHeading'
+        ) => {
+            return Object.entries(groupedChildren).map(([groupName, groupItems]) => ({
+                [headingKey]: groupName,
+                items: groupItems.map(mapItemToNav),
+            }));
+        };
+
+        const groupedChildren = groupChildrenByProperty(item.children ?? undefined, 'groupName');
+
+        return {
+            title: item.label,
+            icon: item.icon || undefined,
+            redirect: item.url
+                ? {
+                    openInNewTab: item.isNewTab || false,
+                    isAbsoluteURL: !confirmIfOwnDomain(item.url as string),
+                    link: navLinkCondition(item),
+                }
+                : undefined,
+            menuLinks: mapGroupedChildren(groupedChildren, 'menuHeading') as { menuHeading: string; items: ParentLinkItem[]; }[],
+            submenuLinks: mapGroupedChildren(groupedChildren, 'subMenuHeading') as { subMenuHeading: string; items: ParentLinkItem[]; }[],
+        };
+    };
 
   // Helper function to extract valid NavItems from an array of objects
   const extractValidNavItems = <T extends Record<string, unknown>>(items: T[]): NavItem[] => {

package/src/vite-env.d.ts

@@ -1,6 +0,0 @@
-interface ImportMeta { readonly glob: ImportMetaGlob }
-
-interface ImportMetaGlob {
-  (pattern: string, options?: { eager?: boolean }): Record<string, () => Promise<unknown>>
-  (pattern: string, options?: { eager: true }): Record<string, unknown>
-}