erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-12 00:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(web): use KeyboardDetails type 🧼

Browse source 
PR #15856 introduced the `KeyboardDetails` type but overlooked the use in
one file.

Follow-up-of: #15856
Follows: #15887
Build-bot: skip build:web
Test-bot: skip
This commit is contained in:
Eberhard Beilharz 2026-04-27 16:21:56 +02:00
parent 3b84867961
commit 269ba67e89
No known key found for this signature in database
GPG key ID: E9140597606020D3
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
web/src/app/browser/src/test-index.ts
View file

@ -1,6 +1,7 @@
export { BrowserConfiguration, BrowserInitOptionSpec } from './configuration.js';
export { ContextManager, KeyboardCookie } from "./contextManager.js";
export { preprocessKeyboardEvent, HardwareEventKeyboard } from './hardwareEventKeyboard.js';
export { KeyboardDetails } from './keyboardDetails.js';
export { KeymanEngine } from './keymanEngine.js';
export { KeyboardInterface } from './keyboardInterface.js';

18
web/src/app/ui/kmwuitoolbar.ts
View file

@ -2,7 +2,7 @@
* Keyman is copyright (C) SIL Global. MIT License.
*/
import type { KeymanEngine, KeyboardCookie, UIModule } from 'keyman/app/browser';
import type { KeymanEngine, KeyboardCookie, KeyboardDetails, UIModule } from 'keyman/app/browser';
declare global {
interface Window {
@ -30,8 +30,6 @@ type ToolbarCookie = {
maxrecent: number;
} & Record<`recent${number}`, string>;
type KeyboardDetail = ReturnType<KeymanEngine['_GetKeyboardDetail']>;
type LanguageEntry = {
/** Language id */
id: string;
@ -42,13 +40,13 @@ type LanguageEntry = {
/**
* A rich list of keyboard metadata for keyboards matching this language's language code (`id`).
*/
keyboards: KeyboardDetail[];
keyboards: KeyboardDetails[];
}
interface ListedKeyboard {
priority: number;
lang: LanguageEntry,
keyboard: KeyboardDetail;
keyboard: KeyboardDetails;
buttonNode: HTMLDivElement;
aNode: HTMLAnchorElement;
}
@ -127,7 +125,7 @@ if(!keymanweb) {
*/
maxListedKeyboards = 1;
lastActiveControl: HTMLElement = null;
selectedKeyboard: KeyboardDetail = null;
selectedKeyboard: KeyboardDetails = null;
selectedLanguage = '';
helpOffsetX = 0;
helpOffsetY = 0;
@ -562,7 +560,7 @@ if(!keymanweb) {
* @param {Object} b
* @return {number}
**/
readonly sortKeyboards = function(a: KeyboardDetail, b: KeyboardDetail) {
readonly sortKeyboards = function(a: KeyboardDetails, b: KeyboardDetails) {
if(a.RegionCode < b.RegionCode) {
return -2;
}
@ -610,7 +608,7 @@ if(!keymanweb) {
* @param {Object} lang
* @param {Object} kbd
**/
addKeyboardToList(lang: LanguageEntry, kbd: KeyboardDetail) {
addKeyboardToList(lang: LanguageEntry, kbd: KeyboardDetails) {
const found = this.findListedKeyboard(lang);
if(found == null) {
// Add the button
@ -794,7 +792,7 @@ if(!keymanweb) {
**/
selectLanguage(event: Event, lang: LanguageEntry) {
const found = this.findListedKeyboard(lang);
let kbd: KeyboardDetail = null;
let kbd: KeyboardDetails = null;
if(found == null) {
kbd = lang.keyboards[0];
@ -819,7 +817,7 @@ if(!keymanweb) {
* @param {boolean} updateKeyman
* @return {boolean}
**/
private async selectKeyboard(event: Event, lang: LanguageEntry, kbd: KeyboardDetail, updateKeyman: boolean): Promise<boolean> {
private async selectKeyboard(event: Event, lang: LanguageEntry, kbd: KeyboardDetails, updateKeyman: boolean): Promise<boolean> {
keymanweb.activatingUI(true);
if(this.selectedLanguage) {