diff --git a/web/src/engine/keyboard/src/defaultRules.ts b/web/src/engine/keyboard/src/defaultRules.ts index 74a4542dbc..a057eda386 100644 --- a/web/src/engine/keyboard/src/defaultRules.ts +++ b/web/src/engine/keyboard/src/defaultRules.ts @@ -6,7 +6,7 @@ import { ModifierKeyConstants } from '@keymanapp/common-types'; import Codes from './codes.js'; -import type KeyEvent from './keyEvent.js'; +import { type KeyEvent } from './keyEvent.js'; import { type OutputTarget } from './outputTarget.js'; export enum EmulationKeystrokes { diff --git a/web/src/engine/keyboard/src/index.ts b/web/src/engine/keyboard/src/index.ts index b60a9a5ecc..1ff8203dfe 100644 --- a/web/src/engine/keyboard/src/index.ts +++ b/web/src/engine/keyboard/src/index.ts @@ -25,8 +25,7 @@ export { default as Codes } from "./codes.js"; export * from "./codes.js"; export { default as DefaultRules } from "./defaultRules.js"; export * from "./defaultRules.js"; -export { default as KeyEvent } from "./keyEvent.js"; -export * from "./keyEvent.js"; +export { type KeyDistribution, KeyEventSpec, KeyEvent } from "./keyEvent.js"; export { default as KeyMapping } from "./keyMapping.js"; export { OutputTarget } from "./outputTarget.js"; export * from "./systemStores.js"; diff --git a/web/src/engine/keyboard/src/keyEvent.ts b/web/src/engine/keyboard/src/keyEvent.ts index 15785817f0..787e20ea78 100644 --- a/web/src/engine/keyboard/src/keyEvent.ts +++ b/web/src/engine/keyboard/src/keyEvent.ts @@ -64,7 +64,7 @@ export interface KeyEventSpec { * This class is defined within its own file so that it can be loaded by code outside of KMW without * having to actually load the entirety of KMW. */ -export default class KeyEvent implements KeyEventSpec { +export class KeyEvent implements KeyEventSpec { Lcode: number; Lstates: number; LmodifierChange?: boolean; diff --git a/web/src/engine/keyboard/src/keyMapping.ts b/web/src/engine/keyboard/src/keyMapping.ts index 663eb5457f..52b053de6a 100644 --- a/web/src/engine/keyboard/src/keyMapping.ts +++ b/web/src/engine/keyboard/src/keyMapping.ts @@ -3,7 +3,7 @@ Copyright 2019 SIL International ***/ -import type KeyEvent from "./keyEvent.js"; +import { KeyEvent } from "./keyEvent.js"; import { KeyEventSpec } from "./keyEvent.js"; class KeyMap { diff --git a/web/src/engine/keyboard/src/keyboards/activeLayout.ts b/web/src/engine/keyboard/src/keyboards/activeLayout.ts index f874d36157..e709dda7df 100644 --- a/web/src/engine/keyboard/src/keyboards/activeLayout.ts +++ b/web/src/engine/keyboard/src/keyboards/activeLayout.ts @@ -1,5 +1,5 @@ import Codes from "../codes.js"; -import KeyEvent, { KeyEventSpec } from "../keyEvent.js"; +import { KeyEvent, KeyEventSpec } from "../keyEvent.js"; import KeyMapping from "../keyMapping.js"; import { ButtonClasses, Layouts } from "./defaultLayouts.js"; import type { LayoutKey, LayoutSubKey, LayoutRow, LayoutLayer, LayoutFormFactor, ButtonClass } from "./defaultLayouts.js"; diff --git a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts index d94b50c9b8..cef519406e 100644 --- a/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts +++ b/web/src/engine/keyboard/src/keyboards/jsKeyboard.ts @@ -1,7 +1,7 @@ import Codes from "../codes.js"; import { Layouts } from "./defaultLayouts.js"; import { ActiveKey, ActiveLayout, ActiveSubKey } from "./activeLayout.js"; -import KeyEvent from "../keyEvent.js"; +import { KeyEvent } from "../keyEvent.js"; import { type OutputTarget } from "../outputTarget.js"; import { KeymanWebKeyboard, ModifierKeyConstants, TouchLayout } from "@keymanapp/common-types";