Fix Component#registerScopeEvent removed from the API

Signed-off-by: William So <polyipseity@gmail.com>
polyipseity · May 5, 2023 · e203c80 · e203c80
1 parent d5c8168
commit e203c80
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/sources/terminal/view.ts b/sources/terminal/view.ts
@@ -31,6 +31,7 @@ import {
 	printError,
 	printMalformedData,
 	readStateCollabratively,
+	registerKey,
 	saveFileAs,
 	updateDisplayText,
 	useSettings,
@@ -484,15 +485,17 @@ export class TerminalView extends ItemView {
 			keymap.pushScope(focusedScope)
 		}
 
-		this.registerScopeEvent(scope.register(
+		this.register(registerKey(
+			scope,
 			cloneAsWritable(TerminalView.modifiers),
 			"`",
 			event => {
 				this.#emulator?.terminal.focus()
 				consumeEvent(event)
 			},
 		))
-		this.registerScopeEvent(focusedScope.register(
+		this.register(registerKey(
+			focusedScope,
 			cloneAsWritable(TerminalView.modifiers),
 			"`",
 			event => {
@@ -504,15 +507,17 @@ export class TerminalView extends ItemView {
 				consumeEvent(event)
 			},
 		))
-		this.registerScopeEvent(focusedScope.register(
+		this.register(registerKey(
+			focusedScope,
 			cloneAsWritable(TerminalView.modifiers),
 			"f",
 			event => {
 				this.startFind()
 				consumeEvent(event)
 			},
 		))
-		this.registerScopeEvent(focusedScope.register(
+		this.register(registerKey(
+			focusedScope,
 			cloneAsWritable(TerminalView.modifiers),
 			"k",
 			event => {

diff --git a/sources/utils/obsidian.ts b/sources/utils/obsidian.ts
@@ -9,6 +9,7 @@ import {
 	Notice,
 	Plugin,
 	type PluginManifest,
+	type Scope,
 	Setting,
 	View,
 	addIcon as addIcon0,
@@ -377,6 +378,14 @@ export function printError(
 	)
 }
 
+export function registerKey(
+	self: Scope,
+	...args: Parameters<Scope["register"]>
+): () => void {
+	const handle = self.register(...args)
+	return () => { self.unregister(handle) }
+}
+
 export function readStateCollabratively(
 	implType: string,
 	state: unknown,