@14ch/svelte-ui 0.0.27 → 0.0.29

package/dist/components/Nav.svelte

@@ -4,7 +4,7 @@
 	import NavItem from './NavItem.svelte';
 	import type { NavItemSelectedStyle } from './NavItem.svelte';
 	import type { MenuItem } from '../types/menuItem';
-	import type { NavVariant } from '../types/propOptions';
+	import type { NavVariant, SubMenuMode } from '../types/propOptions';
 	import { subscribeUrlChange } from '../utils/urlChange';
 	import { getCurrentPath, matchPath } from '../utils/navPath';
 	import type { IconVariant, IconWeight, IconGrade, IconOpticalSize } from '../types/icon';
@@ -14,10 +14,15 @@
 	// =========================================================================
 	export type NavProps = {
 		// 基本プロパティ
+		/** `{ label, href, icon?, children?, disabled? }[]` */
 		navItems?: MenuItem[];
+		/** Layout variant. @default 'horizontal' */
 		variant?: NavVariant;
+		/** Prepended to each item's href for active-state matching. */
 		pathPrefix?: string;
+		/** Custom function to determine if an item is active. */
 		customPathMatcher?: (currentPath: string, itemHref: string, item: MenuItem) => boolean;
+		/** Overrides the auto-detected current path. */
 		currentPath?: string;
 
 		// HTML属性
@@ -31,8 +36,13 @@
 		iconVariant?: IconVariant;
 
 		// スタイル/レイアウト
+		/** Visual style for the selected item. */
 		selectedStyle?: NavItemSelectedStyle;
 		gap?: number | string;
+		/** Sub-menu display mode for items that have children. @default 'popup' */
+		subMenuMode?: SubMenuMode;
+		/** Show chevron icon on parent items. @default true */
+		chevron?: boolean;
 
 		// ARIA/アクセシビリティ
 		ariaLabel?: string;
@@ -42,7 +52,7 @@
 	let {
 		// 基本プロパティ
 		navItems = [],
-		variant = 'tab',
+		variant = 'horizontal',
 		pathPrefix = '',
 		customPathMatcher,
 		currentPath,
@@ -60,6 +70,8 @@
 		// スタイル/レイアウト
 		selectedStyle,
 		gap,
+		subMenuMode = 'popup',
+		chevron,
 
 		// ARIA/アクセシビリティ
 		ariaLabel,
@@ -67,6 +79,11 @@
 	}: NavProps = $props();
 
 	let resolvedCurrentPath = $state('');
+	let navEl: HTMLElement | undefined = $state();
+	let subBarEl: HTMLElement | undefined = $state();
+
+	// bar/accordion モード: 展開中の親アイテム（$state.raw で Proxy ラップを避け === 比較を正常にする）
+	let expandedParent: MenuItem | null = $state.raw(null);
 
 	// =========================================================================
 	// Effects
@@ -78,25 +95,58 @@
 	$effect(() => {
 		return subscribeUrlChange(() => {
 			resolvedCurrentPath = getCurrentPath(currentPath);
+			if (subMenuMode !== 'accordion') expandedParent = null;
 		});
 	});
 
+	// accordion モード: アクティブな子を持つ親を自動展開
+	$effect(() => {
+		if (subMenuMode !== 'accordion' || !resolvedCurrentPath) return;
+		const activeParent = navItems.find((item) =>
+			item.children?.some(
+				(child) =>
+					child.href &&
+					matchPath(resolvedCurrentPath, child.href, child, pathPrefix, customPathMatcher)
+			)
+		);
+		if (activeParent) expandedParent = activeParent;
+	});
+
 	// =========================================================================
 	// Methods
 	// =========================================================================
-	const handleKeyDown = (event: KeyboardEvent) => {
-		if (navItems.length === 0 || enabledIndices.length === 0) return;
+	const focusExpandedParent = () => {
+		if (!expandedParent || !navEl) return;
+		const idx = navItems.indexOf(expandedParent);
+		const parentEls = Array.from(navEl.querySelectorAll<HTMLElement>('[data-nav-item]'));
+		parentEls[idx]?.focus();
+	};
 
+	const handleKeyDown = (event: KeyboardEvent) => {
+		// accordion/expanded は子アイテムも DOM 順で含める
+		const includeChildren = subMenuMode === 'accordion' || subMenuMode === 'expanded';
+		const selector = includeChildren ? '[data-nav-item], [data-nav-item-child]' : '[data-nav-item]';
 		const navItemEls = Array.from(
-			(event.currentTarget as HTMLElement).querySelectorAll('[data-nav-item]')
-		) as HTMLElement[];
-		const currentItem = event.target as HTMLElement;
-		const currentIndex = navItemEls.indexOf(currentItem);
+			(event.currentTarget as HTMLElement).querySelectorAll<HTMLElement>(selector)
+		).filter(el => el.tabIndex !== -1);
+
+		if (navItemEls.length === 0) return;
 
+		const currentIndex = navItemEls.indexOf(event.target as HTMLElement);
 		if (currentIndex === -1) return;
 
-		const currentEnabledPosition = enabledIndices.indexOf(currentIndex);
-		let nextEnabledPosition = currentEnabledPosition;
+		// bar モード: 展開中の親で ArrowDown → サブバーの最初の子へ
+		if (subMenuMode === 'bar' && event.key === 'ArrowDown' && showSubBar) {
+			const allNavItemEls = Array.from(
+				(event.currentTarget as HTMLElement).querySelectorAll<HTMLElement>('[data-nav-item]')
+			);
+			const expandedEl = allNavItemEls[navItems.indexOf(expandedParent!)];
+			if (expandedEl && expandedEl.contains(event.target as Node)) {
+				event.preventDefault();
+				subBarEl?.querySelector<HTMLElement>('[data-nav-item-child]:not([tabindex="-1"])')?.focus();
+				return;
+			}
+		}
 
 		const isVertical = variant === 'vertical';
 		const prevKey = isVertical ? 'ArrowUp' : 'ArrowLeft';
@@ -105,28 +155,70 @@
 		switch (event.key) {
 			case prevKey:
 				event.preventDefault();
-				nextEnabledPosition =
-					currentEnabledPosition > 0 ? currentEnabledPosition - 1 : enabledIndices.length - 1;
+				navItemEls[currentIndex > 0 ? currentIndex - 1 : navItemEls.length - 1]?.focus();
 				break;
 			case nextKey:
 				event.preventDefault();
-				nextEnabledPosition =
-					currentEnabledPosition < enabledIndices.length - 1 ? currentEnabledPosition + 1 : 0;
+				navItemEls[currentIndex < navItemEls.length - 1 ? currentIndex + 1 : 0]?.focus();
 				break;
 			case 'Home':
 				event.preventDefault();
-				nextEnabledPosition = 0;
+				navItemEls[0]?.focus();
 				break;
 			case 'End':
 				event.preventDefault();
-				nextEnabledPosition = enabledIndices.length - 1;
+				navItemEls[navItemEls.length - 1]?.focus();
 				break;
 			default:
 				return;
 		}
+	};
+
+	const handleSubBarKeyDown = (event: KeyboardEvent) => {
+		const container = event.currentTarget as HTMLElement;
+		const items = Array.from(
+			container.querySelectorAll<HTMLElement>('[data-nav-item-child]:not([tabindex="-1"])')
+		);
+		const currentIndex = items.indexOf(event.target as HTMLElement);
+		if (currentIndex === -1) return;
 
-		const nextIndex = enabledIndices[nextEnabledPosition];
-		navItemEls[nextIndex]?.focus();
+		switch (event.key) {
+			case 'ArrowLeft':
+				event.preventDefault();
+				items[currentIndex > 0 ? currentIndex - 1 : items.length - 1]?.focus();
+				break;
+			case 'ArrowRight':
+				event.preventDefault();
+				items[currentIndex < items.length - 1 ? currentIndex + 1 : 0]?.focus();
+				break;
+			case 'ArrowUp':
+				event.preventDefault();
+				focusExpandedParent();
+				break;
+			case 'Home':
+				event.preventDefault();
+				items[0]?.focus();
+				break;
+			case 'End':
+				event.preventDefault();
+				items[items.length - 1]?.focus();
+				break;
+			case 'Escape':
+				event.preventDefault();
+				focusExpandedParent();
+				expandedParent = null;
+				break;
+		}
+	};
+
+	const handleSubMenuToggle = (item: MenuItem) => {
+		if (subMenuMode === 'accordion') {
+			// accordion: 開くのみ（再クリックで閉じない、他は自動的に閉じる）
+			expandedParent = item;
+		} else {
+			// bar: トグル
+			expandedParent = expandedParent === item ? null : item;
+		}
 	};
 
 	// =========================================================================
@@ -135,33 +227,37 @@
 	const selectedIndex = $derived.by(() => {
 		for (let i = 0; i < navItems.length; i++) {
 			const item = navItems[i];
-			if (!item.href) continue;
-			if (matchPath(resolvedCurrentPath, item.href, item, pathPrefix, customPathMatcher)) {
+			if (item.href && matchPath(resolvedCurrentPath, item.href, item, pathPrefix, customPathMatcher)) {
+				return i;
+			}
+			// bar モード: 子が選択されていれば親も選択とみなす
+			if (subMenuMode === 'bar' && item.children?.some(
+				(child) => child.href && matchPath(resolvedCurrentPath, child.href, child, pathPrefix, customPathMatcher)
+			)) {
 				return i;
 			}
 		}
 		return -1;
 	});
 
-	const enabledIndices = $derived(
-		navItems.map((item, i) => (item.disabled ? -1 : i)).filter((i) => i >= 0)
+	const showSubBar = $derived(
+		variant === 'horizontal' && subMenuMode === 'bar' && expandedParent != null
 	);
 
-	const isTabVariant = $derived(variant === 'tab');
+	const isChildSelected = (child: MenuItem) =>
+		!!child.href && matchPath(resolvedCurrentPath, child.href, child, pathPrefix, customPathMatcher);
 </script>
 
 <nav
 	class="nav nav--{variant}"
-	role={isTabVariant ? 'tablist' : undefined}
 	aria-label={ariaLabelledby ? undefined : ariaLabel}
 	aria-labelledby={ariaLabelledby}
-	aria-orientation={variant === 'vertical' ? 'vertical' : 'horizontal'}
 	style:--internal-nav-gap={gap != null ? (typeof gap === 'number' ? `${gap}px` : gap) : undefined}
-	tabindex="-1"
 	{id}
-	onkeydown={handleKeyDown}
 	data-testid="nav"
+	bind:this={navEl}
 >
+	<div style="display: contents" role="presentation" onkeydown={handleKeyDown}>
 	{#each navItems as item, index}
 		<NavItem
 			{item}
@@ -175,32 +271,47 @@
 			{iconOpticalSize}
 			{iconVariant}
 			{selectedStyle}
+			{subMenuMode}
+			{chevron}
+			{resolvedCurrentPath}
+			{customPathMatcher}
+			isSubMenuExpanded={(subMenuMode === 'bar' || subMenuMode === 'accordion') && expandedParent === item}
+			onSubMenuToggle={handleSubMenuToggle}
+			onClose={() => { expandedParent = null; }}
 		/>
 	{/each}
+	</div>
 </nav>
 
+<!-- bar モード: 選択中の親の子アイテムを横バーとして表示 -->
+{#if showSubBar && expandedParent?.children}
+	<div class="nav__sub-bar" role="menu" tabindex="-1" onkeydown={handleSubBarKeyDown} bind:this={subBarEl}>
+		{#each expandedParent.children as child}
+			<NavItem
+				item={child}
+				variant="horizontal"
+				{pathPrefix}
+				{iconFilled}
+				{iconWeight}
+				{iconGrade}
+				{iconOpticalSize}
+				{iconVariant}
+				{selectedStyle}
+				isChild={true}
+				{resolvedCurrentPath}
+				{customPathMatcher}
+				isSelected={isChildSelected(child)}
+				isDisabled={child.disabled ?? false}
+			/>
+		{/each}
+	</div>
+{/if}
+
 <style>.nav {
   display: flex;
   box-sizing: border-box;
 }
 
-.nav--tab {
-  flex-direction: row;
-  justify-content: start;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  min-height: var(--svelte-ui-tab-min-height);
-  overflow-x: auto;
-  overflow-y: visible;
-  -ms-overflow-style: none;
-  overscroll-behavior: contain;
-}
-
-.nav--tab::-webkit-scrollbar {
-  display: none;
-}
-
 .nav--mobile {
   flex-direction: row;
   width: 100%;
@@ -215,7 +326,24 @@
 }
 
 .nav--horizontal {
+  flex-direction: row;
+  justify-content: start;
+  align-items: center;
+  gap: var(--internal-nav-gap, var(--svelte-ui-nav-horizontal-item-gap));
+  overflow-x: auto;
+  overflow-y: visible;
+  -ms-overflow-style: none;
+  overscroll-behavior: none;
+}
+
+.nav--horizontal::-webkit-scrollbar {
+  display: none;
+}
+
+.nav__sub-bar {
+  display: flex;
   flex-direction: row;
   gap: var(--internal-nav-gap, var(--svelte-ui-nav-horizontal-item-gap));
   align-items: center;
+  min-height: var(--svelte-ui-nav-sub-bar-min-height);
 }</style>

package/dist/components/Nav.svelte.d.ts

@@ -1,12 +1,17 @@
 import type { NavItemSelectedStyle } from './NavItem.svelte';
 import type { MenuItem } from '../types/menuItem';
-import type { NavVariant } from '../types/propOptions';
+import type { NavVariant, SubMenuMode } from '../types/propOptions';
 import type { IconVariant, IconWeight, IconGrade, IconOpticalSize } from '../types/icon';
 export type NavProps = {
+    /** `{ label, href, icon?, children?, disabled? }[]` */
     navItems?: MenuItem[];
+    /** Layout variant. @default 'horizontal' */
     variant?: NavVariant;
+    /** Prepended to each item's href for active-state matching. */
     pathPrefix?: string;
+    /** Custom function to determine if an item is active. */
     customPathMatcher?: (currentPath: string, itemHref: string, item: MenuItem) => boolean;
+    /** Overrides the auto-detected current path. */
     currentPath?: string;
     id?: string;
     iconFilled?: boolean;
@@ -14,8 +19,13 @@ export type NavProps = {
     iconGrade?: IconGrade;
     iconOpticalSize?: IconOpticalSize;
     iconVariant?: IconVariant;
+    /** Visual style for the selected item. */
     selectedStyle?: NavItemSelectedStyle;
     gap?: number | string;
+    /** Sub-menu display mode for items that have children. @default 'popup' */
+    subMenuMode?: SubMenuMode;
+    /** Show chevron icon on parent items. @default true */
+    chevron?: boolean;
     ariaLabel?: string;
     ariaLabelledby?: string;
 };