{/* Power Controls */}
@@ -84,6 +100,21 @@ export function DCPowerControl() {
onClick={() => handlePowerToggle(false)}
/>
+ {powerState.restoreState > -1 ? (
+
+ handleRestoreChange(parseInt(e.target.value))}
+ options={[
+ { value: '0', label: "Power OFF" },
+ { value: '1', label: "Power ON" },
+ { value: '2', label: "Last State" },
+ ]}
+ />
+
+ ) : null}
{/* Status Display */}
diff --git a/ui/src/components/popovers/PasteModal.tsx b/ui/src/components/popovers/PasteModal.tsx
index 8103edd..23a504a 100644
--- a/ui/src/components/popovers/PasteModal.tsx
+++ b/ui/src/components/popovers/PasteModal.tsx
@@ -10,11 +10,11 @@ import { SettingsPageHeader } from "@components/SettingsPageheader";
import { useJsonRpc } from "@/hooks/useJsonRpc";
import { useHidStore, useRTCStore, useUiStore, useSettingsStore } from "@/hooks/stores";
import { keys, modifiers } from "@/keyboardMappings";
-import { layouts, chars } from "@/keyboardLayouts";
+import { KeyStroke, KeyboardLayout, selectedKeyboard } from "@/keyboardLayouts";
import notifications from "@/notifications";
-const hidKeyboardPayload = (keys: number[], modifier: number) => {
- return { keys, modifier };
+const hidKeyboardPayload = (modifier: number, keys: number[]) => {
+ return { modifier, keys };
};
const modifierCode = (shift?: boolean, altRight?: boolean) => {
@@ -62,49 +62,56 @@ export default function PasteModal() {
const onConfirmPaste = useCallback(async () => {
setPasteMode(false);
setDisableVideoFocusTrap(false);
+
if (rpcDataChannel?.readyState !== "open" || !TextAreaRef.current) return;
- if (!safeKeyboardLayout) return;
- if (!chars[safeKeyboardLayout]) return;
+ const keyboard: KeyboardLayout = selectedKeyboard(safeKeyboardLayout);
+ if (!keyboard) return;
+
const text = TextAreaRef.current.value;
try {
for (const char of text) {
- const { key, shift, altRight, deadKey, accentKey } = chars[safeKeyboardLayout][char]
+ const keyprops = keyboard.chars[char];
+ if (!keyprops) continue;
+
+ const { key, shift, altRight, deadKey, accentKey } = keyprops;
if (!key) continue;
- const keyz = [ keys[key] ];
- const modz = [ modifierCode(shift, altRight) ];
-
- if (deadKey) {
- keyz.push(keys["Space"]);
- modz.push(noModifier);
- }
+ // if this is an accented character, we need to send that accent FIRST
if (accentKey) {
- keyz.unshift(keys[accentKey.key])
- modz.unshift(modifierCode(accentKey.shift, accentKey.altRight))
+ await sendKeystroke({modifier: modifierCode(accentKey.shift, accentKey.altRight), keys: [ keys[accentKey.key] ] })
}
- for (const [index, kei] of keyz.entries()) {
- await new Promise
((resolve, reject) => {
- send(
- "keyboardReport",
- hidKeyboardPayload([kei], modz[index]),
- params => {
- if ("error" in params) return reject(params.error);
- send("keyboardReport", hidKeyboardPayload([], 0), params => {
- if ("error" in params) return reject(params.error);
- resolve();
- });
- },
- );
- });
+ // now send the actual key
+ await sendKeystroke({ modifier: modifierCode(shift, altRight), keys: [ keys[key] ]});
+
+ // if what was requested was a dead key, we need to send an unmodified space to emit
+ // just the accent character
+ if (deadKey) {
+ await sendKeystroke({ modifier: noModifier, keys: [ keys["Space"] ] });
}
+
+ // now send a message with no keys down to "release" the keys
+ await sendKeystroke({ modifier: 0, keys: [] });
}
} catch (error) {
- console.error(error);
+ console.error("Failed to paste text:", error);
notifications.error("Failed to paste text");
}
- }, [rpcDataChannel?.readyState, send, setDisableVideoFocusTrap, setPasteMode, safeKeyboardLayout]);
+
+ async function sendKeystroke(stroke: KeyStroke) {
+ await new Promise((resolve, reject) => {
+ send(
+ "keyboardReport",
+ hidKeyboardPayload(stroke.modifier, stroke.keys),
+ params => {
+ if ("error" in params) return reject(params.error);
+ resolve();
+ }
+ );
+ });
+ }
+ }, [rpcDataChannel?.readyState, safeKeyboardLayout, send, setDisableVideoFocusTrap, setPasteMode]);
useEffect(() => {
if (TextAreaRef.current) {
@@ -154,7 +161,7 @@ export default function PasteModal() {
// @ts-expect-error TS doesn't recognize Intl.Segmenter in some environments
[...new Intl.Segmenter().segment(value)]
.map(x => x.segment)
- .filter(char => !chars[safeKeyboardLayout][char]),
+ .filter(char => !selectedKeyboard(safeKeyboardLayout).chars[char]),
),
];
@@ -175,7 +182,7 @@ export default function PasteModal() {