Skip to content

Improvements: Fallthrough attributes, TabMenu fixes, PanelMenu expanded keys #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connorabbas merged 1 commit into from
Dec 18, 2025
Merged

Improvements: Fallthrough attributes, TabMenu fixes, PanelMenu expanded keys #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/js/components/router-link-menus/Breadcrumb.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defineExpose({ $el: childRef })
<template>
<Breadcrumb
ref="child-ref"
v-bind="{ ...componentProps, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
>
<template #item="{ item, props }">
<InertiaLink
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/router-link-menus/ContextMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defineExpose({
<template>
<ContextMenu
ref="child-ref"
v-bind="{ ...componentProps, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, ptOptions: { mergeProps: ptViewMerge } }"
>
<template #item="{ item, props, hasSubmenu }">
<InertiaLink
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/router-link-menus/Menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defineExpose({
<template>
<Menu
ref="child-ref"
v-bind="{ ...componentProps, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, ptOptions: { mergeProps: ptViewMerge } }"
>
<template
v-for="(_, slotName) in $slots"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/router-link-menus/Menubar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ defineExpose({ $el: childRef })
<template>
<Menubar
ref="child-ref"
v-bind="{ ...componentProps, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, ptOptions: { mergeProps: ptViewMerge } }"
>
<template
v-for="(_, slotName) in $slots"
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/router-link-menus/PanelMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ defineExpose({ $el: childRef })
<template>
<PanelMenu
ref="child-ref"
v-bind="{ ...componentProps, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, pt: defaultPt, ptOptions: { mergeProps: ptViewMerge } }"
>
<template #item="{ item, root, active, props, hasSubmenu }">
<Divider
Expand Down Expand Up @@ -91,4 +91,4 @@ defineExpose({ $el: childRef })
</a>
</template>
</PanelMenu>
</template>
</template>
17 changes: 8 additions & 9 deletions resources/js/components/router-link-menus/TabMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { useTemplateRef, computed } from 'vue'
import { usePage, Link as InertiaLink } from '@inertiajs/vue3'
import { route } from 'ziggy-js'
import Tabs from 'primevue/tabs'
import TabList, { type TabListProps } from 'primevue/tablist'
import Tab from 'primevue/tab'
import Tab, { type TabsProps } from 'primevue/tabs'
import TabList from 'primevue/tablist'
import type { MenuItem } from '@/types'
import { ptViewMerge } from '@/utils'

interface ExtendedTabListProps extends Omit<TabListProps, 'items'> {
items?: MenuItem[] | undefined;
interface ExtendedTabsProps extends Omit<TabsProps, 'value' | 'items'> {
items: MenuItem[];
}
const componentProps = defineProps<ExtendedTabListProps>()
const componentProps = defineProps<ExtendedTabsProps>()

const page = usePage()
const currentRoute = computed(() => {
Expand All @@ -30,7 +30,7 @@ defineExpose({ $el: childRef })
<template>
<Tabs
ref="child-ref"
v-bind="{ ...componentProps, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, ptOptions: { mergeProps: ptViewMerge } }"
:value="currentRoute ?? '/'"
scrollable
>
Expand All @@ -39,15 +39,14 @@ defineExpose({ $el: childRef })
v-for="item in componentProps.items"
:key="item.route"
:href="item.route ?? ''"
:class="['no-underline', { 'p-tab-active': item.active }]"
:class="['p-tab no-underline', { 'p-tab-active': item.active }]"
custom
>
<Tab
v-if="item.route"
:value="item.route"
:class="[
'flex items-center gap-2 hover:text-color',
item.active ? 'p-tab-active' : 'text-muted-color',
'flex flex-row items-center gap-2 hover:text-color',
item.class
]"
:style="item.style"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/router-link-menus/TieredMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defineExpose({ $el: childRef })
<template>
<TieredMenu
ref="child-ref"
v-bind="{ ...componentProps, ptOptions: { mergeProps: ptViewMerge } }"
v-bind="{ ...componentProps, ...$attrs, ptOptions: { mergeProps: ptViewMerge } }"
>
<template
v-for="(_, slotName) in $slots"
Expand Down
39 changes: 34 additions & 5 deletions resources/js/composables/useAppLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ref, computed, onMounted, onUnmounted, watchEffect } from 'vue'
import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
import { usePage, useForm } from '@inertiajs/vue3'
import { LayoutGrid, House, Info, Settings, LogOut, ExternalLink, FileSearch, FolderGit2 } from 'lucide-vue-next'
import { MenuItem } from '@/types'
Expand All @@ -16,40 +16,47 @@ export function useAppLayout() {
// Menu items
const menuItems = computed<MenuItem[]>(() => [
{
key: 'home',
label: 'Home',
lucideIcon: House,
route: route('welcome'),
active: currentRoute.value == 'welcome',
},
{
key: 'dashboard',
label: 'Dashboard',
lucideIcon: LayoutGrid,
route: route('dashboard'),
active: currentRoute.value == 'dashboard',
},
{
key: 'resources',
label: 'Resources',
lucideIcon: Info,
items: [
{
key: 'resources-laravel',
label: 'Laravel Docs',
url: 'https://laravel.com/docs/master',
target: '_blank',
lucideIcon: ExternalLink,
},
{
key: 'resources-primevue',
label: 'PrimeVue Docs',
url: 'https://primevue.org/',
target: '_blank',
lucideIcon: ExternalLink,
},
{
key: 'resources-starter-docs',
label: 'Starter Kit Docs',
url: 'https://connorabbas.github.io/laravel-primevue-starter-kit-docs/',
target: '_blank',
lucideIcon: FileSearch,
},
{
key: 'resources-starter-repo',
label: 'Starter Kit Repo',
url: 'https://github.com/connorabbas/laravel-primevue-starter-kit',
target: '_blank',
Expand All @@ -59,7 +66,28 @@ export function useAppLayout() {
},
])

// User menu and logout functionality.
// Check/set expanded PanelMenu items based on active status, for non-persistent layouts
const expandedKeys = ref<Record<string, boolean>>({})
const updateExpandedKeys = () => {
const keys: Record<string, boolean> = {}
const hasActiveChild = (item: MenuItem): boolean => {
if (item.items) {
for (const child of item.items) {
if (hasActiveChild(child)) {
if (item.key) keys[item.key] = true
return true
}
}
}
return !!item.active
}
menuItems.value.forEach(hasActiveChild)
expandedKeys.value = keys
}
watch(currentRoute, () => {
updateExpandedKeys()
}, { immediate: true })

const logoutForm = useForm({})
const logout = () => {
logoutForm.post(route('logout'))
Expand All @@ -80,7 +108,7 @@ export function useAppLayout() {
},
]

// Mobile menu
// Mobile drawer menu
const mobileMenuOpen = ref(false)
if (typeof window !== 'undefined') {
const windowWidth = ref(window.innerWidth)
Expand All @@ -93,8 +121,8 @@ export function useAppLayout() {
onUnmounted(() => {
window.removeEventListener('resize', updateWidth)
})
watchEffect(() => {
if (windowWidth.value > 1024) {
watch(windowWidth, (newWidth) => {
if (newWidth > 1024) {
mobileMenuOpen.value = false
}
})
Expand All @@ -103,6 +131,7 @@ export function useAppLayout() {
return {
currentRoute,
menuItems,
expandedKeys,
userMenuItems,
mobileMenuOpen,
logout,
Expand Down
2 changes: 2 additions & 0 deletions resources/js/layouts/app/HeaderLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const {
currentRoute,
mobileMenuOpen,
menuItems,
expandedKeys,
userMenuItems,
} = useAppLayout()
</script>
Expand All @@ -38,6 +39,7 @@ const {
>
<div>
<PanelMenu
v-model:expandedKeys="expandedKeys"
:model="menuItems"
class="mt-1 w-full"
/>
Expand Down
3 changes: 3 additions & 0 deletions resources/js/layouts/app/SidebarLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const page = usePage()
const {
mobileMenuOpen,
menuItems,
expandedKeys,
userMenuItems,
} = useAppLayout()
</script>
Expand All @@ -36,6 +37,7 @@ const {
>
<div>
<PanelMenu
v-model:expandedKeys="expandedKeys"
:model="menuItems"
class="mt-1 w-full"
/>
Expand Down Expand Up @@ -96,6 +98,7 @@ const {
</div>
<div>
<PanelMenu
v-model:expandedKeys="expandedKeys"
:model="menuItems"
class="mt-1 w-full"
/>
Expand Down