Skip to content

Open source personal finance application

fix(ui): keep popovers and confirm modal above bottom-sheet layers

Ilya Komichevb967494c5d37
diff --git a/app/app/app.config.ts b/app/app/app.config.ts
index af1b7255..5f3744ef 100644
--- a/app/app/app.config.ts
+++ b/app/app/app.config.ts
@@ -29,11 +29,21 @@ export default defineAppConfig({
viewport: 'scrollerBlock',
},
},
+ contextMenu: {
+ props: {
+ pressOpenDelay: 500,
+ },
+ },
modal: {
slots: {
overlay: '!bg-overlay',
},
},
+ popover: {
+ slots: {
+ content: 'w-[22rem] max-w-sm',
+ },
+ },
selectMenu: {
defaultVariants: {
size: 'lg',
diff --git a/app/app/assets/css/main.css b/app/app/assets/css/main.css
index c8242588..fe4b1083 100644
--- a/app/app/assets/css/main.css
+++ b/app/app/assets/css/main.css
@@ -23,4 +23,11 @@
@apply antialiased text-default bg-muted/30 select-none;
overscroll-behavior-y: none;
}
+
+ /* Reka UI popper portals (UPopover, UDropdownMenu, UContextMenu, UTooltip)
+ render at body level with inline z-index: auto. Bump above BottomSheet (z-50)
+ and trnForm Sidebar (z-50) so nested menus stay clickable inside modals. */
+ [data-reka-popper-content-wrapper] {
+ z-index: 60 !important;
+ }
}
diff --git a/app/app/components/layout/ConfirmModal.vue b/app/app/components/layout/ConfirmModal.vue
index ed2910e5..310fa55f 100644
--- a/app/app/components/layout/ConfirmModal.vue
+++ b/app/app/components/layout/ConfirmModal.vue
@@ -38,9 +38,13 @@ useEventListener('keydown', (e: KeyboardEvent) => {
<UModal
v-model:open="isOpen"
:title="props.title || t('base.sure')"
- :ui="{ content: 'max-w-sm', footer: 'justify-between' }"
+ :ui="{ overlay: 'z-[70]', content: 'z-[70] max-w-sm divide-y-0', footer: 'justify-between' }"
@after:leave="onClosed"
>
+ <template #close>
+ <BottomSheetClose />
+ </template>
+
<template v-if="description || highlight" #body>
<div class="text-muted">
{{ description }}
diff --git a/app/app/components/stat/filter/Selected.vue b/app/app/components/stat/filter/Selected.vue
index 3d8a79d2..bc2fd48c 100644
--- a/app/app/components/stat/filter/Selected.vue
+++ b/app/app/components/stat/filter/Selected.vue
@@ -11,11 +11,11 @@ const props = defineProps<{
const filter = inject(filterKey)!
const walletsStore = useWalletsStore()
const categoriesStore = useCategoriesStore()
-const itemClasses = 'bg-elevated/30 rounded-sm'
+const itemClasses = 'bg-elevated/30 rounded-sm shrink-0'
</script>
<template>
- <div class="flex gap-2">
+ <div class="flex shrink-0 gap-2">
<template v-if="props.isShowWallets">
<WalletsItem
v-for="walletId in filter?.walletsIds?.value"
diff --git a/app/app/components/ui/PopoverWrap.vue b/app/app/components/ui/PopoverWrap.vue
index 8da7831d..ebfcaf3c 100644
--- a/app/app/components/ui/PopoverWrap.vue
+++ b/app/app/components/ui/PopoverWrap.vue
@@ -27,7 +27,7 @@ const emit = defineEmits<{
<div
v-if="$slots.default"
- class="scroller overflow-y-auto py-px"
+ class="scroller overflow-y-auto px-2 py-px"
>
<slot />
</div>