diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index 92d06b8305..b2630ec7df 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -669,7 +669,7 @@ async function reconnectRestoredTabs() { function handleContextMenu(e: MouseEvent) { const target = e.target as HTMLElement; if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) return; - if (target.closest("[data-radix-vue-collection-item], [data-context-menu]")) return; + if (target.closest("[data-reka-collection-item], [data-radix-vue-collection-item], [data-context-menu]")) return; e.preventDefault(); } diff --git a/apps/desktop/src/components/ui/context-menu/ContextMenu.vue b/apps/desktop/src/components/ui/context-menu/ContextMenu.vue index 31ce27cfb5..e35c9efddd 100644 --- a/apps/desktop/src/components/ui/context-menu/ContextMenu.vue +++ b/apps/desktop/src/components/ui/context-menu/ContextMenu.vue @@ -2,7 +2,9 @@ import type { ContextMenuRootEmits, ContextMenuRootProps } from "reka-ui"; import { ContextMenuRoot, useForwardPropsEmits } from "reka-ui"; -const props = defineProps(); +const props = withDefaults(defineProps(), { + modal: false, +}); const emits = defineEmits(); const forwarded = useForwardPropsEmits(props, emits); diff --git a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenu.vue b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenu.vue index 3d5e3346a6..93313f6dac 100644 --- a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenu.vue +++ b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenu.vue @@ -2,7 +2,9 @@ import type { DropdownMenuRootEmits, DropdownMenuRootProps } from "reka-ui"; import { DropdownMenuRoot, useForwardPropsEmits } from "reka-ui"; -const props = defineProps(); +const props = withDefaults(defineProps(), { + modal: false, +}); const emits = defineEmits(); const forwarded = useForwardPropsEmits(props, emits); diff --git a/apps/desktop/src/components/ui/select/SelectContent.vue b/apps/desktop/src/components/ui/select/SelectContent.vue index 0e62f807b6..dc443afd73 100644 --- a/apps/desktop/src/components/ui/select/SelectContent.vue +++ b/apps/desktop/src/components/ui/select/SelectContent.vue @@ -11,10 +11,17 @@ defineOptions({ }); const props = withDefaults( - defineProps(), + defineProps< + SelectContentProps & { + class?: HTMLAttributes["class"]; + disablePortal?: boolean; + disableOutsidePointerEvents?: boolean; + } + >(), { position: "popper", disablePortal: false, + disableOutsidePointerEvents: false, }, ); const emits = defineEmits(); diff --git a/packages/app-tests/selectContentPointerEvents.test.ts b/packages/app-tests/selectContentPointerEvents.test.ts new file mode 100644 index 0000000000..7a86423175 --- /dev/null +++ b/packages/app-tests/selectContentPointerEvents.test.ts @@ -0,0 +1,10 @@ +import { readFileSync } from "node:fs"; +import assert from "node:assert/strict"; +import test from "node:test"; + +test("select content disables outside pointer-event lock by default", () => { + const source = readFileSync("apps/desktop/src/components/ui/select/SelectContent.vue", "utf8"); + + assert.match(source, /disableOutsidePointerEvents\?: boolean/); + assert.match(source, /disableOutsidePointerEvents:\s*false/); +});