Merge branch 'fawney19:main' into main

frontend/src/components/ui/popover/PopoverTrigger.vue

@@ -2,10 +2,6 @@
 import { PopoverTrigger } from 'radix-vue'
 import { useAttrs } from 'vue'
 
-defineOptions({
-  inheritAttrs: false,
-})
-
 withDefaults(defineProps<{
   asChild?: boolean
   as?: string
@@ -14,6 +10,10 @@ withDefaults(defineProps<{
   as: 'button',
 })
 
+defineOptions({
+  inheritAttrs: false,
+})
+
 const attrs = useAttrs()
 </script>