github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 05:08:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

add cancelNext function

Browse Source
This commit is contained in:
Nitwel
2020-09-28 20:14:01 +02:00
parent 57863547e9
commit 0000abab3b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/components/v-dialog/v-dialog.vue
View File

@@ -33,10 +33,10 @@ export default defineComponent({
},
setup(props, { emit }) {
const dialog = ref<HTMLElement | null>(null);
useShortcut('escape', () => {
useShortcut('escape', (event) => {
if (_active.value) {
emitToggle();
return true;
event.cancelNext();
}
});

16
app/src/composables/use-shortcut/use-shortcut.ts
View File

@@ -1,7 +1,11 @@
import { onMounted, onUnmounted, Ref, ref } from '@vue/composition-api';
import Vue from 'vue';
type ShortcutHandler = (event: KeyboardEvent) => void | any | boolean;
type ShortcutHandler = (event: CancelableKeyboardEvent) => void | any | boolean;
interface CancelableKeyboardEvent extends KeyboardEvent {
cancelNext: () => void;
}
const keysdown: Set<string> = new Set([]);
const handlers: Record<string, ShortcutHandler[]> = {};
@@ -42,10 +46,14 @@ function callHandlers(event: KeyboardEvent) {
const rest = key.split('+').filter((keySegment) => keysdown.has(keySegment) === false);
if (rest.length > 0) return;
for (let i = 0; i < value.length; i++) {
const cancel = value[i](event);
let cancel = false;
(event as CancelableKeyboardEvent).cancelNext = () => {
cancel = true;
};
value[i](event as CancelableKeyboardEvent);
// if the return value is true discontinue going through the queue.
if (typeof cancel === 'boolean' && cancel === true) break;
// if cancelNext is called, discontinue going through the queue.
if (typeof cancel === 'boolean' && cancel) break;
}
});
}