Merge branch 'main' into tyriar/210757_interrupt__cmdline

Author: Tyriar

build/win32/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Microsoft <[email protected]>"]
 build = "build.rs"
 
@@ -9,7 +9,7 @@ byteorder = "1.4.3"
 crc = "3.0.1"
 slog = "2.7.0"
 slog-async = "2.7.0"
-slog-term = "2.9.0"
+slog-term = "2.9.1"
 
 [target.'cfg(windows)'.dependencies.windows-sys]
 version = "0.42"

build/win32/Cargo.toml

@@ -67,21 +67,8 @@ export class HoverAction extends Disposable {
 		const label = dom.append(this.action, $('span'));
 		label.textContent = keybindingLabel ? `${actionOptions.label} (${keybindingLabel})` : actionOptions.label;
 
-		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.CLICK, e => {
-			e.stopPropagation();
-			e.preventDefault();
-			actionOptions.run(this.actionContainer);
-		}));
-
-		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.KEY_DOWN, e => {
-			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
-				e.stopPropagation();
-				e.preventDefault();
-				actionOptions.run(this.actionContainer);
-			}
-		}));
-
+		this._store.add(new ClickAction(this.actionContainer, actionOptions.run));
+		this._store.add(new KeyDownAction(this.actionContainer, actionOptions.run, [KeyCode.Enter, KeyCode.Space]));
 		this.setEnabled(true);
 	}
 
@@ -99,3 +86,28 @@ export class HoverAction extends Disposable {
 export function getHoverAccessibleViewHint(shouldHaveHint?: boolean, keybinding?: string | null): string | undefined {
 	return shouldHaveHint && keybinding ? localize('acessibleViewHint', "Inspect this in the accessible view with {0}.", keybinding) : shouldHaveHint ? localize('acessibleViewHintNoKbOpen', "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.") : '';
 }
+
+export class ClickAction extends Disposable {
+	constructor(container: HTMLElement, run: (container: HTMLElement) => void) {
+		super();
+		this._register(dom.addDisposableListener(container, dom.EventType.CLICK, e => {
+			e.stopPropagation();
+			e.preventDefault();
+			run(container);
+		}));
+	}
+}
+
+export class KeyDownAction extends Disposable {
+	constructor(container: HTMLElement, run: (container: HTMLElement) => void, keyCodes: KeyCode[]) {
+		super();
+		this._register(dom.addDisposableListener(container, dom.EventType.KEY_DOWN, e => {
+			const event = new StandardKeyboardEvent(e);
+			if (keyCodes.some(keyCode => event.equals(keyCode))) {
+				e.stopPropagation();
+				e.preventDefault();
+				run(container);
+			}
+		}));
+	}
+}