A free, open source, and extensible speech-to-text application that works completely offline.
fix: ignore IME confirmation Enter in text inputs (#2248)
daydreamer.jin090b370be3aa
diff --git a/src/components/settings/CustomWords.tsx b/src/components/settings/CustomWords.tsxindex a4f310b3..9b3123b0 100644--- a/src/components/settings/CustomWords.tsx+++ b/src/components/settings/CustomWords.tsx@@ -2,6 +2,7 @@ import React, { useState } from "react";import { useTranslation } from "react-i18next";import { notify } from "@/stores/noticeStore";import { useSettings } from "../../hooks/useSettings";+import { isComposingKeyEvent } from "../../lib/utils/keyboard";import { Input } from "../ui/Input";import { Button } from "../ui/Button";import { SettingContainer } from "../ui/SettingContainer";@@ -48,6 +49,7 @@ export const CustomWords: React.FC<CustomWordsProps> = React.memo(};const handleKeyPress = (e: React.KeyboardEvent) => {+ if (isComposingKeyEvent(e.nativeEvent)) return;if (e.key === "Enter") {e.preventDefault();handleAddWord();diff --git a/src/components/settings/LanguageSelector.tsx b/src/components/settings/LanguageSelector.tsxindex c2ee36c2..7b48bfd9 100644--- a/src/components/settings/LanguageSelector.tsx+++ b/src/components/settings/LanguageSelector.tsx@@ -7,6 +7,7 @@ import { InfoTooltip } from "../ui/InfoTooltip";import { Tooltip } from "../ui/Tooltip";import { LanguageDetectorDownload } from "./LanguageDetectorDownload";import { useSettings } from "../../hooks/useSettings";+import { isComposingKeyEvent } from "../../lib/utils/keyboard";import { useLanguageDetector } from "../../hooks/useLanguageDetector";import { languageIdentity } from "@handy-computer/models";import {@@ -187,6 +188,7 @@ export const LanguageSelector: React.FC<LanguageSelectorProps> = ({};const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {+ if (isComposingKeyEvent(event.nativeEvent)) return;const first = filteredLanguages.find((language) => !language.disabled);if (event.key === "Enter" && first) {// Select first selectable filtered language on Enterdiff --git a/src/components/settings/PreferredLanguages.tsx b/src/components/settings/PreferredLanguages.tsxindex 30ef937e..e354c5ee 100644--- a/src/components/settings/PreferredLanguages.tsx+++ b/src/components/settings/PreferredLanguages.tsx@@ -9,6 +9,7 @@ import {import { suggestedLanguages } from "@/lib/utils/languageSuggestions";import { isWeakLanguage } from "@/lib/models/catalog";import { useSettings } from "../../hooks/useSettings";+import { isComposingKeyEvent } from "@/lib/utils/keyboard";import { languageList } from "../../lib/constants/languages";interface PreferredLanguagesProps {@@ -59,6 +60,7 @@ export const PreferredLanguages: React.FC<PreferredLanguagesProps> = ({}, [available.length, open]);const onKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {+ if (isComposingKeyEvent(e.nativeEvent)) return;if (!picker.onKeyDown(e) && e.key === "Escape") inputRef.current?.blur();};diff --git a/src/components/shared/LanguagePicker.tsx b/src/components/shared/LanguagePicker.tsxindex 5e0c1527..f399d4f9 100644--- a/src/components/shared/LanguagePicker.tsx+++ b/src/components/shared/LanguagePicker.tsx@@ -1,5 +1,6 @@import React, { useMemo, useRef, useState } from "react";import { useTranslation } from "react-i18next";+import { isComposingKeyEvent } from "@/lib/utils/keyboard";import {getLanguage,languageList,@@ -129,7 +130,7 @@ export const languageSearchKeys = (clear: () => void;},): boolean => {- if (e.nativeEvent.isComposing) return false;+ if (isComposingKeyEvent(e.nativeEvent)) return false;if (e.key === "Enter" && query) {e.preventDefault();if (first) toggle(first);diff --git a/src/components/shared/modelTable/ModelTable.tsx b/src/components/shared/modelTable/ModelTable.tsxindex 32749749..c2c9dd49 100644--- a/src/components/shared/modelTable/ModelTable.tsx+++ b/src/components/shared/modelTable/ModelTable.tsx@@ -14,6 +14,7 @@ import { CAPABILITIES, CAPABILITY_KEYS, type Capability } from "./capabilities";import { CODE_CLASS, Codes, rowGrid } from "./columns";import { ModelTableContext, type TableModel } from "./context";import type { Grading } from "@/lib/models/grading";+import { isComposingKeyEvent } from "@/lib/utils/keyboard";import { ScrollThumb } from "./ScrollThumb";/** The search, and per capability whether only models with it are kept. */@@ -126,6 +127,7 @@ export const ModelTable: React.FC<ModelTableProps> = ({query.current = filters.query;useEffect(() => {const onKey = (e: KeyboardEvent) => {+ if (isComposingKeyEvent(e)) return;if (e.key === "Escape") {if (query.current) {e.preventDefault();@@ -286,6 +288,7 @@ export const ModelTable: React.FC<ModelTableProps> = ({if (listRef.current) listRef.current.scrollTop = 0;}}onKeyDown={(e) => {+ if (isComposingKeyEvent(e.nativeEvent)) return;const d =e.key === "ArrowDown" ? 1 : e.key === "ArrowUp" ? -1 : 0;if (d) {diff --git a/src/lib/utils/keyboard.ts b/src/lib/utils/keyboard.tsindex 75120818..565ac0d3 100644--- a/src/lib/utils/keyboard.ts+++ b/src/lib/utils/keyboard.ts@@ -6,6 +6,11 @@ import type { KeyboardEvent as ReactKeyboardEvent } from "react";export type OSType = "macos" | "windows" | "linux" | "unknown";+/** IME boundary keydowns can have isComposing=false while keyCode is still 229. */+export const isComposingKeyEvent = (+ event: Pick<KeyboardEvent, "isComposing" | "keyCode">,+): boolean => event.isComposing || event.keyCode === 229;+const keepSpace = (e: ReactKeyboardEvent<HTMLElement>) => {if (e.key === " ") e.preventDefault();};