Merge pull request #55 from connorabbas/develop

connorabbas · web-flow · commit 84964cb74add · 2025-09-28T12:07:37.000-05:00
Fix: Popup menu button component
diff --git a/src/components/PopupMenuButton.vue b/src/components/PopupMenuButton.vue
@@ -10,6 +10,7 @@ const props = withDefaults(defineProps<{
     buttonLabel?: string,
     buttonSeverity?: 'secondary' | 'success' | 'info' | 'warn' | 'help' | 'danger' | 'contrast' | undefined,
     buttonVariant?: 'default' | 'outlined' | 'text' | 'link' | undefined,
+    buttonSize?: 'small' | 'large' | undefined,
     fixedPosition?: 'left' | 'right',
 }>(), {
     buttonSeverity: 'secondary',
@@ -55,9 +56,19 @@ const menuPositionClasses = computed(() => {
             :pt:root:class="{ 'flex flex-row-reverse justify-between': props?.buttonLabel }"
             :severity="props.buttonSeverity"
             :variant="props.buttonVariant === 'default' ? undefined : props.buttonVariant"
+            :size="props?.buttonSize"
             @click="toggleDropdownMenu($event)"
         >
-            <template #icon>
+            <template
+                v-if="$slots.content && !props?.buttonLabel"
+                #default
+            >
+                <slot name="content" />
+            </template>
+            <template
+                v-else
+                #icon
+            >
                 <slot
                     v-if="$slots.toggleIcon"
                     name="toggleIcon"
diff --git a/src/layouts/app/HeaderLayout.vue b/src/layouts/app/HeaderLayout.vue
@@ -41,6 +41,7 @@ const {
                 <template #footer>
                     <PopupMenuButton
                         name="mobile-user-menu-dd"
+                        button-size="large"
                         :menu-items="userMenuItems"
                         :button-label="userName"
                     >
diff --git a/src/layouts/app/SidebarLayout.vue b/src/layouts/app/SidebarLayout.vue
@@ -39,6 +39,7 @@ const {
                 <template #footer>
                     <PopupMenuButton
                         name="mobile-user-menu-dd"
+                        button-size="large"
                         :menu-items="userMenuItems"
                         :button-label="userName"
                     >

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ const {`
`41`	`41`	`<template #footer>`
`42`	`42`	`<PopupMenuButton`
`43`	`43`	`name="mobile-user-menu-dd"`
	`44`	`+ button-size="large"`
`44`	`45`	`:menu-items="userMenuItems"`
`45`	`46`	`:button-label="userName"`
`46`	`47`	`>`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ const {`
`39`	`39`	`<template #footer>`
`40`	`40`	`<PopupMenuButton`
`41`	`41`	`name="mobile-user-menu-dd"`
	`42`	`+ button-size="large"`
`42`	`43`	`:menu-items="userMenuItems"`
`43`	`44`	`:button-label="userName"`
`44`	`45`	`>`