浏览代码

Merge remote-tracking branch 'origin/dev' into dev

Vanessa 7 月之前
父节点
当前提交
fd5c60c054
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 1 1
      app/src/block/popover.ts
  2. 4 0
      app/src/protyle/render/av/render.ts

+ 1 - 1
app/src/block/popover.ts

@@ -54,7 +54,7 @@ export const initBlockPopover = (app: App) => {
                         aElement.style.overflow = "";
                     }
                 }
-            } else if (aElement.parentElement.parentElement.classList.contains("av__views")) {
+            } else if (aElement.parentElement.parentElement.classList.contains("av__views") && aElement.parentElement.classList.contains("layout-tab-bar")) {
                 const textElement = aElement.querySelector(".item__text");
                 const desc = aElement.getAttribute("data-desc");
                 if (textElement.scrollWidth > textElement.clientWidth + 2 || desc) {

+ 4 - 0
app/src/protyle/render/av/render.ts

@@ -349,7 +349,11 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)}
                 if (isSearching) {
                     searchInputElement.focus();
                 }
+                searchInputElement.addEventListener("compositionstart", (event: KeyboardEvent) => {
+                    event.stopPropagation();
+                })
                 searchInputElement.addEventListener("input", (event: KeyboardEvent) => {
+                    event.stopPropagation();
                     if (event.isComposing) {
                         return;
                     }