Skip to content

Commit 18ac016

Browse files
authored
Merge branch 'laravel:main' into main
2 parents 62699e7 + 5ae6361 commit 18ac016

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

resources/js/components/NavMain.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ const page = usePage<SharedData>();
1515
<SidebarGroupLabel>Platform</SidebarGroupLabel>
1616
<SidebarMenu>
1717
<SidebarMenuItem v-for="item in items" :key="item.title">
18-
<SidebarMenuButton as-child :is-active="item.href === page.url">
18+
<SidebarMenuButton
19+
as-child :is-active="item.href === page.url"
20+
:tooltip="item.title"
21+
>
1922
<Link :href="item.href">
2023
<component :is="item.icon" />
2124
<span>{{ item.title }}</span>

resources/js/types/ziggy.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Config, RouteParams } from 'ziggy-js';
1+
import { RouteParams, Router } from 'ziggy-js';
22

33
declare global {
4-
function route(): Config;
4+
function route(): Router;
55
function route(name: string, params?: RouteParams<typeof name> | undefined, absolute?: boolean): string;
66
}
77

0 commit comments

Comments
 (0)