From 19ee5cde68bd12122863c43facf1f250d9cf67f6 Mon Sep 17 00:00:00 2001
From: Lost Paul <70213368+LostPaul@users.noreply.github.com>
Date: Sat, 7 Sep 2024 15:22:39 +0200
Subject: [PATCH] Fix suggesters

---
 src/suggesters/FileSuggester.ts     | 2 +-
 src/suggesters/FolderSuggester.ts   | 2 +-
 src/suggesters/Suggest.ts           | 7 +++++--
 src/suggesters/TemplateSuggester.ts | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/suggesters/FileSuggester.ts b/src/suggesters/FileSuggester.ts
index 6b0c685..cf3a9ff 100644
--- a/src/suggesters/FileSuggester.ts
+++ b/src/suggesters/FileSuggester.ts
@@ -11,7 +11,7 @@ export enum FileSuggestMode {
 export class FileSuggest extends TextInputSuggest<TFile> {
 	constructor(
         public inputEl: HTMLInputElement,
-        private plugin: FolderNotesPlugin
+        plugin: FolderNotesPlugin
 	) {
 		super(inputEl);
 	}
diff --git a/src/suggesters/FolderSuggester.ts b/src/suggesters/FolderSuggester.ts
index 6129fd2..f79f645 100644
--- a/src/suggesters/FolderSuggester.ts
+++ b/src/suggesters/FolderSuggester.ts
@@ -11,7 +11,7 @@ export enum FileSuggestMode {
 export class FolderSuggest extends TextInputSuggest<TFolder> {
 	constructor(
         public inputEl: HTMLInputElement,
-        private plugin: FolderNotesPlugin,
+        plugin: FolderNotesPlugin,
 		public folder?: TFolder,
 	) {
 		super(inputEl);
diff --git a/src/suggesters/Suggest.ts b/src/suggesters/Suggest.ts
index d116118..6796393 100644
--- a/src/suggesters/Suggest.ts
+++ b/src/suggesters/Suggest.ts
@@ -3,6 +3,7 @@
 
 import { ISuggestOwner, Scope } from 'obsidian';
 import { createPopper, Instance as PopperInstance } from '@popperjs/core';
+import FolderNotesPlugin from 'src/main';
 
 const wrapAround = (value: number, size: number): number => {
 	return ((value % size) + size) % size;
@@ -14,6 +15,7 @@ class Suggest<T> {
 	private suggestions: HTMLDivElement[];
 	private selectedItem: number;
 	private containerEl: HTMLElement;
+	plugin: FolderNotesPlugin;
 
 	constructor(
 		owner: ISuggestOwner<T>,
@@ -117,6 +119,7 @@ export abstract class TextInputSuggest<T> implements ISuggestOwner<T> {
 	private scope: Scope;
 	private suggestEl: HTMLElement;
 	private suggest: Suggest<T>;
+	plugin: FolderNotesPlugin;
 
 	constructor(inputEl: HTMLInputElement | HTMLTextAreaElement) {
 		this.inputEl = inputEl;
@@ -160,7 +163,7 @@ export abstract class TextInputSuggest<T> implements ISuggestOwner<T> {
 
 	open(container: HTMLElement, inputEl: HTMLElement): void {
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		app.keymap.pushScope(this.scope);
+		this.plugin.app.keymap.pushScope(this.scope);
 
 		container.appendChild(this.suggestEl);
 		this.popper = createPopper(inputEl, this.suggestEl, {
@@ -189,7 +192,7 @@ export abstract class TextInputSuggest<T> implements ISuggestOwner<T> {
 	}
 
 	close(): void {
-		app.keymap.popScope(this.scope);
+		this.plugin.app.keymap.popScope(this.scope);
 
 		this.suggest.setSuggestions([]);
 		if (this.popper) this.popper.destroy();
diff --git a/src/suggesters/TemplateSuggester.ts b/src/suggesters/TemplateSuggester.ts
index a32abc3..573e21c 100644
--- a/src/suggesters/TemplateSuggester.ts
+++ b/src/suggesters/TemplateSuggester.ts
@@ -12,7 +12,7 @@ export enum FileSuggestMode {
 export class TemplateSuggest extends TextInputSuggest<TFile> {
 	constructor(
         public inputEl: HTMLInputElement,
-        private plugin: FolderNotesPlugin
+        plugin: FolderNotesPlugin
 	) {
 		super(inputEl);
 	}