Fix bug in keyboard event handling

nothingislost · Sep 9, 2021 · e01dc4f · e01dc4f
1 parent e9aa4db
commit e01dc4f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "workspace-picker",
   "name": "Workspace Picker",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "minAppVersion": "0.9.12",
   "description": "Quickly switch and manage workspaces",
   "author": "NothingIsLost",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-workspace-picker",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Quickly switch and manage workspaces",
   "main": "main.js",
   "scripts": {

diff --git a/versions.json b/versions.json
@@ -1,4 +1,5 @@
 {
+  "0.0.5": "0.9.12",
   "0.0.4": "0.9.12",
   "0.0.3": "0.9.12",
   "0.0.2": "0.9.12",

diff --git a/workspace-picker-modal.ts b/workspace-picker-modal.ts
@@ -48,7 +48,7 @@ declare module "obsidian" {
     saveWorkspace(workspaceName: string): void;
     loadWorkspace(workspaceName: string): void;
     activeWorkspace: string;
-    workspaces: { [x: string]: { [x: string]: any; active: any; }; };
+    workspaces: { [x: string]: { [x: string]: any; active: any; }; }; // TODO: fix this inferred typing
   }
 }
 
@@ -164,15 +164,15 @@ export default class WorkspacePickerPluginModal extends FuzzySuggestModal<string
   }
 
   useSelectedItem = function (evt: MouseEvent | KeyboardEvent) {
-    let workspaceName = this.inputEl.value ? this.inputEl.value : null;
+    let workspaceName = this.inputEl.value ? this.inputEl.value : this.chooser.values[this.chooser.selectedItem].item;
     if (!this.values && workspaceName && evt.shiftKey) {
       this.saveAndStay();
       this.setWorkspace(workspaceName);
       this.close();
       return !1;
-    } else if (!this.values) return !1;
-    var item = this.values ? this.values[this.selectedItem] : workspaceName;
-    return void 0 !== item && (this.chooser.selectSuggestion(item, evt), !0);
+    } else if (!this.chooser.values) return !1;
+    var item = this.chooser.values ? this.chooser.values[this.chooser.selectedItem] : workspaceName;
+    return void 0 !== item && (this.selectSuggestion(item, evt), !0);
   };
 
   saveAndStay() {
@@ -230,7 +230,6 @@ export default class WorkspacePickerPluginModal extends FuzzySuggestModal<string
     if (evt.shiftKey && !evt.altKey) modifiers = "Shift";
     else if (evt.altKey && !evt.shiftKey) modifiers = "Alt";
     else modifiers = "";
-
     if (modifiers === "Shift") this.saveAndStay(), this.setWorkspace(item), this.close();
     if (modifiers === "Alt") this.saveAndSwitch(), this.setWorkspace(item);
     else this.setWorkspace(item);