refs#10866 IME入力セッション中はEscapeキーが来ても投稿ダイアログを閉じない

yuba · Oct 18, 2024 · e489fe4 · e489fe4
1 parent b1aac6a
commit e489fe4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
@@ -201,6 +201,7 @@ const recentHashtags = ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]'
 const imeText = ref('');
 const showingOptions = ref(false);
 const textAreaReadOnly = ref(false);
+comst composing = ref(false);
 
 const draftKey = computed((): string => {
 	let key = props.channel ? `channel:${props.channel.id}` : '';
@@ -573,15 +574,17 @@ function clear() {
 function onKeydown(ev: KeyboardEvent) {
 	if (ev.key === 'Enter' && (ev.ctrlKey || ev.metaKey) && canPost.value) post();
 
-	if (ev.key === 'Escape') emit('esc');
+	if (ev.key === 'Escape' && !composing.value) emit('esc');
 }
 
 function onCompositionUpdate(ev: CompositionEvent) {
 	imeText.value = ev.data;
+	composing.value = true;
 }
 
 function onCompositionEnd(ev: CompositionEvent) {
 	imeText.value = '';
+	composing.value = false;
 }
 
 async function onPaste(ev: ClipboardEvent) {