From fa0f062421ecb274ee88ecbf39b46c8d3184e8ff Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sun, 7 Apr 2024 23:33:02 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/10920

---
 app/src/protyle/render/av/cell.ts    |  4 +++-
 app/src/protyle/render/av/keydown.ts | 28 +++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/src/protyle/render/av/cell.ts b/app/src/protyle/render/av/cell.ts
index cc42454bb..685def84d 100644
--- a/app/src/protyle/render/av/cell.ts
+++ b/app/src/protyle/render/av/cell.ts
@@ -861,5 +861,7 @@ export const addDragFill = (cellElement: Element) => {
         return;
     }
     cellElement.classList.add("av__cell--active");
-    cellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
+    if (!cellElement.querySelector(".av__drag-fill")) {
+        cellElement.insertAdjacentHTML("beforeend", `<div aria-label="${window.siyuan.languages.dragFill}" class="av__drag-fill ariaLabel"></div>`);
+    }
 };
diff --git a/app/src/protyle/render/av/keydown.ts b/app/src/protyle/render/av/keydown.ts
index 779f2166c..b6149df6a 100644
--- a/app/src/protyle/render/av/keydown.ts
+++ b/app/src/protyle/render/av/keydown.ts
@@ -28,15 +28,17 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
             event.preventDefault();
             return true;
         }
-        // 复制、粘贴
-        if (!event.ctrlKey && !event.metaKey) {
-            nodeElement.querySelectorAll(".av__cell--active").forEach(item => {
-                item.classList.remove("av__cell--active");
-                item.querySelector(".av__drag-fill")?.remove();
-            });
+        const avPanelElement = document.querySelector(".av__panel")
+        if (avPanelElement &&
+            (event.key === "Escape" || event.key.startsWith("ArrowLeft") || event.key === "Enter" || matchHotKey("⇥", event) || matchHotKey("⇧⇥", event))) {
+            avPanelElement.remove();
+            event.preventDefault();
+            event.stopPropagation();
+            return true;
         }
         if (event.key === "Escape") {
-            selectCellElement.classList.remove("av__cell--select");
+            selectCellElement.classList.remove("av__cell--select", "av__cell--active");
+            selectCellElement.querySelector(".av__drag-fill")?.remove();
             selectRow(rowElement.querySelector(".av__firstcol"), "select");
             event.preventDefault();
             return true;
@@ -60,7 +62,8 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
                 newCellElement = previousCellElements[previousCellElements.length - 1];
             }
             if (newCellElement) {
-                selectCellElement.classList.remove("av__cell--select");
+                selectCellElement.classList.remove("av__cell--select", "av__cell--active");
+                selectCellElement.querySelector(".av__drag-fill")?.remove();
                 newCellElement.classList.add("av__cell--select");
                 addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement, false);
@@ -78,7 +81,8 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
                 newCellElement = nextRowElement.querySelector(".av__cell");
             }
             if (newCellElement) {
-                selectCellElement.classList.remove("av__cell--select");
+                selectCellElement.classList.remove("av__cell--select", "av__cell--active");
+                selectCellElement.querySelector(".av__drag-fill")?.remove();
                 newCellElement.classList.add("av__cell--select");
                 addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement, false);
@@ -92,7 +96,8 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
                 newCellElement = previousRowElement.querySelector(`.av__cell[data-col-id="${selectCellElement.dataset.colId}"]`);
             }
             if (newCellElement) {
-                selectCellElement.classList.remove("av__cell--select");
+                selectCellElement.classList.remove("av__cell--select", "av__cell--active");
+                selectCellElement.querySelector(".av__drag-fill")?.remove();
                 newCellElement.classList.add("av__cell--select");
                 addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement);
@@ -106,7 +111,8 @@ export const avKeydown = (event: KeyboardEvent, nodeElement: HTMLElement, protyl
                 newCellElement = nextRowElement.querySelector(`.av__cell[data-col-id="${selectCellElement.dataset.colId}"]`);
             }
             if (newCellElement) {
-                selectCellElement.classList.remove("av__cell--select");
+                selectCellElement.classList.remove("av__cell--select", "av__cell--active");
+                selectCellElement.querySelector(".av__drag-fill")?.remove();
                 newCellElement.classList.add("av__cell--select");
                 addDragFill(newCellElement);
                 cellScrollIntoView(nodeElement, newCellElement);