fix: 修复 tag 建议的一些错误

lazyloong · Feb 6, 2024 · 2605cf6 · 2605cf6
1 parent 456c27f
commit 2605cf6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 31 deletions.
diff --git a/manifest.json b/manifest.json
@@ -5,5 +5,5 @@
     "author": "lazyloong",
 
     "minAppVersion": "1.0.0",
-    "version": "2.17.0"
+    "version": "2.17.1"
 }
diff --git a/src/fileEditorSuggest.ts b/src/fileEditorSuggest.ts
@@ -7,7 +7,7 @@ import {
     EditorSuggestTriggerInfo,
     TFile,
 } from "obsidian";
-import { MatchData as fMatchData, Item as fItem } from "./fuzzyFileModal";
+import { MatchData as fMatchData, Item as fItem, LinkItem } from "./fuzzyFileModal";
 import { PinyinIndex, Pinyin } from "./utils";
 import FuzzyChinesePinyinPlugin from "./main";
 
@@ -170,13 +170,14 @@ export default class FileEditorSuggest extends EditorSuggest<MatchData> {
     selectSuggestion(matchData: MatchData, evt: MouseEvent | KeyboardEvent): void {
         let item = matchData.item;
         let result: OriginEditorSuggestResult;
+        let file = app.workspace.getActiveFile();
         switch (item.type) {
             case "heading":
             case "link":
                 result = {
-                    heading: item.name,
+                    heading: isLinkItem(item) ? item.link : item.name,
                     type: "heading",
-                    path: item.file.basename,
+                    path: item.file == file ? "" : item.file.basename,
                     file: item.file,
                     subpath: "#",
                     level: 1,
@@ -216,3 +217,7 @@ export default class FileEditorSuggest extends EditorSuggest<MatchData> {
         this.originEditorSuggest.selectSuggestion(result, evt);
     }
 }
+
+function isLinkItem(item: Item): item is LinkItem {
+    return item.type === "link";
+}
diff --git a/src/fuzzyFileModal.ts b/src/fuzzyFileModal.ts
@@ -25,7 +25,7 @@ interface Item_<T extends ItemType> extends uItem {
 interface FileItem extends Item_<"file"> {}
 interface AliasItem extends Item_<"alias"> {}
 interface UnresolvedLinkItem extends Item_<"unresolvedLink"> {}
-interface LinkItem extends Item_<"link"> {
+export interface LinkItem extends Item_<"link"> {
     link: string;
 }
 export type Item = FileItem | AliasItem | UnresolvedLinkItem | LinkItem;

diff --git a/src/fuzzyModal.ts b/src/fuzzyModal.ts
@@ -10,7 +10,7 @@ export default abstract class FuzzyModal<T extends Item> extends SuggestModal<Ma
         suggestions: HTMLElement;
         values: MatchData<T>[];
         selectedItem: number;
-        setSelectedItem(index: number): void;
+        setSelectedItem(index: number, e: KeyboardEvent): void;
     };
     index: PinyinIndex<T>;
     plugin: FuzzyChinesePinyinPlugin;
@@ -30,34 +30,14 @@ export default abstract class FuzzyModal<T extends Item> extends SuggestModal<Ma
             }
         });
         this.scope.register(["Mod"], "N", async (e) => {
-            if (this.chooser.selectedItem != this.chooser.values.length - 1) {
-                this.chooser.setSelectedItem(this.chooser.selectedItem + 1);
-                this.chooser.suggestions[this.chooser.selectedItem].scrollIntoView({
-                    block: "center",
-                    behavior: "smooth",
-                });
-            } else {
-                this.chooser.setSelectedItem(0);
-                this.chooser.suggestions[this.chooser.selectedItem].scrollIntoView({
-                    block: "center",
-                    behavior: "smooth",
-                });
-            }
+            if (this.chooser.selectedItem != this.chooser.values.length - 1)
+                this.chooser.setSelectedItem(this.chooser.selectedItem + 1, e);
+            else this.chooser.setSelectedItem(0, e);
         });
         this.scope.register(["Mod"], "P", async (e) => {
             if (this.chooser.selectedItem != 0) {
-                this.chooser.setSelectedItem(this.chooser.selectedItem - 1);
-                this.chooser.suggestions[this.chooser.selectedItem].scrollIntoView({
-                    block: "center",
-                    behavior: "smooth",
-                });
-            } else {
-                this.chooser.setSelectedItem(this.chooser.values.length - 1);
-                this.chooser.suggestions[this.chooser.selectedItem].scrollIntoView({
-                    block: "center",
-                    behavior: "smooth",
-                });
-            }
+                this.chooser.setSelectedItem(this.chooser.selectedItem - 1, e);
+            } else this.chooser.setSelectedItem(this.chooser.values.length - 1, e);
         });
     }
     onOpen() {

diff --git a/src/viewEventHijacking.ts b/src/viewEventHijacking.ts
@@ -130,6 +130,14 @@ export function hijackingTagForMarkdownView(plugin: FuzzyChinesePinyinPlugin) {
                 newInputEl.addEventListener("input", async (e) => {
                     tagSuggest.onInputChanged();
                 });
+                newInputEl.addEventListener("keydown", async (e) => {
+                    if (!e.isComposing)
+                        if ("Enter" === e.key && newInputEl.innerText.length > 0) {
+                            e.preventDefault();
+                            rendered["_children"][0].multiselect.addElement(newInputEl.innerText);
+                            newInputEl.innerText = "";
+                        }
+                });
             });
         })
     );