From 8c4d00ed12576bd798f0171c3c412a8c15a3ac7e Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Thu, 3 Nov 2022 10:32:59 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20https://github.com/siyuan-note/siyuan/i?=
 =?UTF-8?q?ssues/1359=20=E7=82=B9=E5=87=BB=E8=8F=9C=E5=8D=95=E5=BA=94?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/layout/dock/Files.ts        |  2 +-
 app/src/menus/Menu.ts               |  1 -
 app/src/menus/navigation.ts         | 25 +++++++++++++--
 app/src/mobile/util/MobileFiles.ts  |  2 +-
 app/src/protyle/wysiwyg/getBlock.ts |  3 +-
 app/src/util/globalShortcut.ts      | 50 ++++++++++++-----------------
 6 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts
index 0cf019d2a..b5af3a3a3 100644
--- a/app/src/layout/dock/Files.ts
+++ b/app/src/layout/dock/Files.ts
@@ -80,7 +80,7 @@ export class Files extends Model {
     <span class="fn__space"></span>
     <span data-type="min" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.min} ${updateHotkeyTip(window.siyuan.config.keymap.general.closeTab.custom)}"><svg><use xlink:href='#iconMin'></use></svg></span>
 </div>
-<div class="fn__flex-1" data-type="navigation"></div>
+<div class="fn__flex-1"></div>
 <ul class="b3-list fn__flex-column" style="min-height: auto;transition: var(--b3-transition)">
     <li class="b3-list-item" data-type="toggle">
         <span class="b3-list-item__toggle">
diff --git a/app/src/menus/Menu.ts b/app/src/menus/Menu.ts
index a83479f79..0da19fe52 100644
--- a/app/src/menus/Menu.ts
+++ b/app/src/menus/Menu.ts
@@ -74,7 +74,6 @@ export class Menu {
         }
 
         this.element.innerHTML = "";
-        this.element.removeAttribute("data-filetreeid"); // 用于标记文档数右键所选文档 https://ld246.com/article/1667311960383
         this.element.classList.add("fn__none");
         this.element.classList.remove("b3-menu--list");
         this.element.removeAttribute("style");  // zIndex
diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts
index 724a54ead..76ed26280 100644
--- a/app/src/menus/navigation.ts
+++ b/app/src/menus/navigation.ts
@@ -23,8 +23,20 @@ import {openFileById} from "../editor/util";
 import {confirmDialog} from "../dialog/confirmDialog";
 import {Constants} from "../constants";
 import {newFile} from "../util/newFile";
+import {hasClosestByClassName} from "../protyle/util/hasClosest";
 
 export const initNavigationMenu = (liElement: HTMLElement) => {
+    if (!liElement.classList.contains("b3-list-item--focus")) {
+        const fileElement = hasClosestByClassName(liElement, "sy__file")
+        if (fileElement) {
+            fileElement.querySelectorAll(".b3-list-item--focus").forEach(item => {
+                item.classList.remove("b3-list-item--focus");
+                item.removeAttribute("select-end")
+                item.removeAttribute("select-start")
+            })
+        }
+        liElement.classList.add("b3-list-item--focus");
+    }
     const notebookId = liElement.parentElement.getAttribute("data-url");
     const name = getNotebookName(notebookId);
     window.siyuan.menus.menu.remove();
@@ -132,11 +144,21 @@ export const initNavigationMenu = (liElement: HTMLElement) => {
             }
         }]
     }).element);
-    window.siyuan.menus.menu.element.setAttribute("data-filetreeid", notebookId);
     return window.siyuan.menus.menu;
 };
 
 export const initFileMenu = (notebookId: string, pathString: string, liElement: Element) => {
+    if (!liElement.classList.contains("b3-list-item--focus")) {
+        const fileElement = hasClosestByClassName(liElement, "sy__file")
+        if (fileElement) {
+            fileElement.querySelectorAll(".b3-list-item--focus").forEach(item => {
+                item.classList.remove("b3-list-item--focus");
+                item.removeAttribute("select-end")
+                item.removeAttribute("select-start")
+            })
+        }
+        liElement.classList.add("b3-list-item--focus");
+    }
     const id = liElement.getAttribute("data-node-id");
     let name = liElement.getAttribute("data-name");
     window.siyuan.menus.menu.remove();
@@ -284,7 +306,6 @@ export const initFileMenu = (notebookId: string, pathString: string, liElement:
     /// #endif
     genImportMenu(notebookId, pathString);
     window.siyuan.menus.menu.append(exportMd(id));
-    window.siyuan.menus.menu.element.setAttribute("data-filetreeid", id);
     return window.siyuan.menus.menu;
 };
 
diff --git a/app/src/mobile/util/MobileFiles.ts b/app/src/mobile/util/MobileFiles.ts
index 4c4be7217..942d738db 100644
--- a/app/src/mobile/util/MobileFiles.ts
+++ b/app/src/mobile/util/MobileFiles.ts
@@ -68,7 +68,7 @@ export class MobileFiles extends Model {
     <svg data-type="collapse" class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
     <svg data-type="sort" class="toolbar__icon${window.siyuan.config.readonly ? " fn__none" : ""}"><use xlink:href="#iconSort"></use></svg>
 </div>
-<div class="fn__flex-1" data-type="navigation"></div>
+<div class="fn__flex-1"></div>
 <ul class="b3-list b3-list--background fn__flex-column" style="min-height: auto;transition: var(--b3-transition)">
     <li class="b3-list-item" data-type="toggle">
         <span class="b3-list-item__toggle">
diff --git a/app/src/protyle/wysiwyg/getBlock.ts b/app/src/protyle/wysiwyg/getBlock.ts
index 517de8dad..4460b7910 100644
--- a/app/src/protyle/wysiwyg/getBlock.ts
+++ b/app/src/protyle/wysiwyg/getBlock.ts
@@ -223,7 +223,8 @@ export const getPreviousFileLi = (current: Element) => {
         } else if (previousElement.previousElementSibling.tagName === "LI") {
             return previousElement.previousElementSibling;
         } else if (previousElement.previousElementSibling.tagName === "UL") {
-            return previousElement.previousElementSibling.lastElementChild;
+            const liElements = previousElement.previousElementSibling.querySelectorAll(".b3-list-item")
+            return liElements[liElements.length - 1];
         }
     }
     return false;
diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts
index c1ac373e3..26ededeb5 100644
--- a/app/src/util/globalShortcut.ts
+++ b/app/src/util/globalShortcut.ts
@@ -867,20 +867,7 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
     if (!files.element.parentElement.classList.contains("layout__tab--active")) {
         return false;
     }
-    let liElements: Element[] = []
-    const menuId = window.siyuan.menus.menu.element.getAttribute("data-filetreeid")
-    if (menuId) {
-        let liElement = files.element.querySelector(`li[data-node-id="${menuId}"]`)
-        if (!liElement) {
-            liElement = files.element.querySelector(`ul[data-url="${menuId}"] > li`)
-        }
-        if (!liElement) {
-            return;
-        }
-        liElements.push(liElement)
-    } else {
-        liElements = Array.from(files.element.querySelectorAll(".b3-list-item--focus"));
-    }
+    const liElements = Array.from(files.element.querySelectorAll(".b3-list-item--focus"))
     if (liElements.length === 0) {
         if (event.key.startsWith("Arrow")) {
             const liElement = files.element.querySelector(".b3-list-item");
@@ -958,49 +945,54 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
     if (event.shiftKey) {
         if (event.key === "ArrowUp") {
             const startEndElement = getStartEndElement(liElements);
+            let previousElement: Element;
             if (startEndElement.startElement.getBoundingClientRect().top >= startEndElement.endElement.getBoundingClientRect().top) {
-                const previousElement = getPreviousFileLi(startEndElement.endElement)
+                previousElement = getPreviousFileLi(startEndElement.endElement) as Element;
                 if (previousElement) {
                     previousElement.classList.add("b3-list-item--focus");
                     previousElement.setAttribute("select-end", "true");
                     startEndElement.endElement.removeAttribute("select-end");
-
-                    const previousRect = previousElement.getBoundingClientRect();
-                    const fileRect = files.element.getBoundingClientRect();
-                    if (previousRect.top < fileRect.top || previousRect.bottom > fileRect.bottom) {
-                        previousElement.scrollIntoView(previousRect.top < fileRect.top);
-                    }
                 }
             } else {
                 startEndElement.endElement.classList.remove("b3-list-item--focus");
                 startEndElement.endElement.removeAttribute("select-end");
-                const previousElement = getPreviousFileLi(startEndElement.endElement);
+                previousElement = getPreviousFileLi(startEndElement.endElement) as Element;
                 if (previousElement) {
                     previousElement.setAttribute("select-end", "true");
                 }
             }
+            if (previousElement) {
+                const previousRect = previousElement.getBoundingClientRect();
+                const fileRect = files.element.getBoundingClientRect();
+                if (previousRect.top < fileRect.top || previousRect.bottom > fileRect.bottom) {
+                    previousElement.scrollIntoView(previousRect.top < fileRect.top);
+                }
+            }
         } else if (event.key === "ArrowDown") {
             const startEndElement = getStartEndElement(liElements);
+            let nextElement: Element;
             if (startEndElement.startElement.getBoundingClientRect().top <= startEndElement.endElement.getBoundingClientRect().top) {
-                const nextElement = getNextFileLi(startEndElement.endElement);
+                nextElement = getNextFileLi(startEndElement.endElement) as Element;
                 if (nextElement) {
                     nextElement.classList.add("b3-list-item--focus");
                     nextElement.setAttribute("select-end", "true");
                     startEndElement.endElement.removeAttribute("select-end");
-                    const nextRect = nextElement.getBoundingClientRect();
-                    const fileRect = files.element.getBoundingClientRect();
-                    if (nextRect.top < fileRect.top || nextRect.bottom > fileRect.bottom) {
-                        nextElement.scrollIntoView(nextRect.top < fileRect.top);
-                    }
                 }
             } else {
                 startEndElement.endElement.classList.remove("b3-list-item--focus");
                 startEndElement.endElement.removeAttribute("select-end");
-                const nextElement = getNextFileLi(startEndElement.endElement);
+                nextElement = getNextFileLi(startEndElement.endElement) as Element;
                 if (nextElement) {
                     nextElement.setAttribute("select-end", "true");
                 }
             }
+            if (nextElement) {
+                const nextRect = nextElement.getBoundingClientRect();
+                const fileRect = files.element.getBoundingClientRect();
+                if (nextRect.top < fileRect.top || nextRect.bottom > fileRect.bottom) {
+                    nextElement.scrollIntoView(nextRect.top < fileRect.top);
+                }
+            }
         }
         return;
     } else {