mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-14 16:53:17 +01:00
fix cmd+enter submit shortcut on modals #1238
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { Dialog, DialogContent, DialogFooter } from './dialog/index';
|
||||
import { computed } from 'vue';
|
||||
import { computed, nextTick } from 'vue';
|
||||
|
||||
const props = defineProps({
|
||||
show: {
|
||||
@@ -17,7 +17,7 @@ const props = defineProps({
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['close']);
|
||||
const emit = defineEmits(['close', 'submit']);
|
||||
|
||||
const close = () => {
|
||||
if (props.closeable) {
|
||||
@@ -25,6 +25,25 @@ const close = () => {
|
||||
}
|
||||
};
|
||||
|
||||
// Ctrl+Enter (Cmd+Enter on macOS) submits the modal from any focused element inside it.
|
||||
// Handled in the capture phase so child elements (buttons, dropdown triggers, inputs with
|
||||
// their own Enter handlers) never see the keystroke and cannot open or double-submit.
|
||||
async function onKeydownCapture(event: KeyboardEvent) {
|
||||
if (event.key !== 'Enter' || !(event.ctrlKey || event.metaKey) || event.isComposing) {
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
// Inputs like the time and duration fields commit their value on blur, so blur first
|
||||
// and let the resulting model updates settle before submitting.
|
||||
const active = document.activeElement;
|
||||
if (active instanceof HTMLElement) {
|
||||
active.blur();
|
||||
}
|
||||
await nextTick();
|
||||
emit('submit');
|
||||
}
|
||||
|
||||
const maxWidthClass = computed(() => {
|
||||
return {
|
||||
sm: 'sm:max-w-sm',
|
||||
@@ -39,7 +58,7 @@ const maxWidthClass = computed(() => {
|
||||
<template>
|
||||
<Dialog :open="show" @update:open="close">
|
||||
<DialogContent :class="maxWidthClass">
|
||||
<div class="min-w-0">
|
||||
<div class="min-w-0" @keydown.capture="onKeydownCapture">
|
||||
<slot />
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user