mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-08-04 15:18:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(web): allow keyboard input even if the mouse is off the area of canvas (#685)

Browse source
This commit is contained in:
irvingouj@Devolutions 2025-03-04 20:03:42 -05:00 • committed by GitHub
parent 7f08a098e2
commit 5214929218
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
web-client/iron-remote-gui/src/iron-remote-gui.svelte
View file

@ -23,7 +23,14 @@
} = $props();
let isVisible = $state(false);
let capturingInputs = $state(false);
let capturingInputs = () => {
loggingService.info(`
capturingInputs: ${document.activeElement === canvas}
current active element: ${document.activeElement}
`);
return document.activeElement === canvas;
};
let inner: HTMLDivElement;
let wrapper: HTMLDivElement;
@ -367,7 +374,7 @@
userInteractionListeners();
function captureKeys(evt: KeyboardEvent) {
if (capturingInputs) {
if (capturingInputs()) {
if (ffPostponeKeyboardEvents) {
evt.preventDefault();
ffDelayedKeyboardEvents.push(evt);
@ -599,12 +606,11 @@
}
function setMouseIn(evt: MouseEvent) {
capturingInputs = true;
canvas.focus();
wasmService.mouseIn(evt);
}
function setMouseOut(evt: MouseEvent) {
capturingInputs = false;
wasmService.mouseOut(evt);
}
@ -699,6 +705,7 @@
oncontextmenu={(event) => event.preventDefault()}
onwheel={mouseWheel}
id="renderer"
tabindex="0"
></canvas>
</div>
</div>

10
web-client/iron-remote-gui/src/services/wasm-bridge.service.ts
View file

@ -40,7 +40,6 @@ export class WasmBridgeService {
private sessionEvent: Subject<SessionEvent> = new Subject();
private scale: BehaviorSubject<ScreenScale> = new BehaviorSubject(ScreenScale.Fit as ScreenScale);
private canvas?: HTMLCanvasElement;
private keyboardActive: boolean = false;
private keyboardUnicodeMode: boolean = false;
private backendSupportsUnicodeKeyboardShortcuts: boolean | undefined = undefined;
private onRemoteClipboardChanged?: OnRemoteClipboardChanged;
@ -98,18 +97,14 @@ export class WasmBridgeService {
mouseIn(event: MouseEvent) {
this.syncModifier(event);
this.keyboardActive = true;
}
mouseOut(_event: MouseEvent) {
this.keyboardActive = false;
this.releaseAllInputs();
}
sendKeyboardEvent(evt: KeyboardEvent) {
if (this.keyboardActive) {
this.sendKeyboard(evt);
}
this.sendKeyboard(evt);
}
shutdown() {
@ -125,9 +120,6 @@ export class WasmBridgeService {
}
updateMousePosition(position: MousePosition) {
if (!this.keyboardActive) {
this.keyboardActive = true;
}
this.doTransactionFromDeviceEvents([DeviceEvent.new_mouse_move(position.x, position.y)]);
this.mousePosition.next(position);
}