From bc016afea1687b9b3bfdfbf6f12ca2ca2f7dd316 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 7 Apr 2023 23:45:10 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7830

---
 app/src/assets/scss/base.scss            | 6 +++---
 app/src/assets/scss/component/_list.scss | 1 +
 app/src/assets/scss/mobile.scss          | 2 +-
 app/src/mobile/menu/search.ts            | 6 +++---
 app/src/mobile/util/keyboardToolbar.ts   | 8 ++++++++
 app/src/util/pathName.ts                 | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index e3a6fa1c3..2ffd2bd21 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -55,9 +55,6 @@ ctrl+p 搜索: 202
 // 需大于 .block__popover
 .b3-menu: 210
 
-// 需大于 mobile .status
-.keyboard: 222
-
 // 需小于 .b3-dialog 关于中的锁屏密码设置
 #menu & .side-panel: 220
 
@@ -65,6 +62,9 @@ ctrl+p 搜索: 202
 // 需大于 .protyle-util https://github.com/siyuan-note/siyuan/issues/5069
 .b3-dialog: 305
 
+// 需大于 mobile .status、.b3-dialog
+.keyboard: 306
+
 // 历史中切换笔记本需临时大于 .b3-dialog https://github.com/siyuan-note/siyuan/issues/5107
 // 移动端排序和菜单需临时大于 .side-panel https://github.com/siyuan-note/siyuan/issues/5254
 .b3-menu: 310
diff --git a/app/src/assets/scss/component/_list.scss b/app/src/assets/scss/component/_list.scss
index 957747c64..d3e61e271 100644
--- a/app/src/assets/scss/component/_list.scss
+++ b/app/src/assets/scss/component/_list.scss
@@ -42,6 +42,7 @@
 
   &-item {
     line-height: 28px;
+    min-height: 28px;
     padding: 1px 4px;
     display: flex;
     cursor: pointer;
diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss
index 15aed80d1..f6d0fb31c 100644
--- a/app/src/assets/scss/mobile.scss
+++ b/app/src/assets/scss/mobile.scss
@@ -253,7 +253,7 @@
   box-sizing: border-box;
   height: 42px;
   background: var(--b3-theme-background);
-  z-index: 222;
+  z-index: 306;
   display: flex;
   border-top: 1px solid var(--b3-theme-surface-lighter);
   overflow: hidden;
diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts
index 65bb58fbc..91880e973 100644
--- a/app/src/mobile/menu/search.ts
+++ b/app/src/mobile/menu/search.ts
@@ -179,7 +179,7 @@ ${unicode2Emoji(childItem.ial.icon, false, "b3-list-item__graphic", true)}
     ${unicode2Emoji(item.ial.icon, false, "b3-list-item__graphic", true)}
     <span class="b3-list-item__text">${item.content}</span>
 </div>
-<span class="b3-list-item__meta b3-list-item__meta--ellipsis"">${escapeGreat(title)}</span>
+<span class="b3-list-item__text b3-list-item__meta" style="margin-top: -4px">${escapeGreat(title)}</span>
 </div>`;
         }
     });
@@ -350,7 +350,7 @@ const initSearchEvent = (element: Element, config: ISearchOption) => {
                 event.stopPropagation();
                 event.preventDefault();
                 break;
-            } else if (type === "include") {
+            } else if (type === "include" && !target.hasAttribute("disabled")){
                 target.classList.toggle("toolbar__icon--active");
                 if (target.classList.contains("toolbar__icon--active")) {
                     config.idPath.forEach((item, index) => {
@@ -486,7 +486,7 @@ export const popSearch = (config = window.siyuan.storage[Constants.LOCAL_SEARCHD
         html: `<div class="fn__flex-column" style="height: 100%">
     <div class="toolbar toolbar--border${config.hasReplace ? "" : " fn__none"}">
         <svg class="toolbar__icon"><use xlink:href="#iconReplace"></use></svg>
-        <input id="toolbarReplace" class="b3-text-field fn__flex-1">
+        <input id="toolbarReplace" style="font-size: 17px" class="b3-text-field fn__flex-1">
         <svg class="fn__rotate fn__none toolbar__icon"><use xlink:href="#iconRefresh"></use></svg>
         <div class="fn__space"></div>
         <button data-type="replace-all" class="b3-button b3-button--outline fn__flex-center">${window.siyuan.languages.replaceAll}</button>
diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts
index ecdfb5925..58c21c554 100644
--- a/app/src/mobile/util/keyboardToolbar.ts
+++ b/app/src/mobile/util/keyboardToolbar.ts
@@ -258,6 +258,10 @@ export const showKeyboardToolbar = (height: number) => {
         return;
     }
     toolbarElement.classList.remove("fn__none");
+    const searchPathElement = document.getElementById("searchPath");
+    if (searchPathElement) {
+        (searchPathElement.nextElementSibling as HTMLElement).style.marginBottom = "42px"
+    }
     const range = getSelection().getRangeAt(0);
     if (!window.siyuan.mobile.editor ||
         !window.siyuan.mobile.editor.protyle.wysiwyg.element.contains(range.startContainer)) {
@@ -286,6 +290,10 @@ export const hideKeyboardToolbar = () => {
     toolbarElement.classList.add("fn__none");
     toolbarElement.style.height = "";
     window.siyuan.mobile.editor.protyle.element.style.marginBottom = "";
+    const searchPathElement = document.getElementById("searchPath");
+    if (searchPathElement) {
+        (searchPathElement.nextElementSibling as HTMLElement).style.marginBottom = ""
+    }
 };
 
 export const activeBlur = () => {
diff --git a/app/src/util/pathName.ts b/app/src/util/pathName.ts
index 4b71c734d..3a18286e5 100644
--- a/app/src/util/pathName.ts
+++ b/app/src/util/pathName.ts
@@ -115,7 +115,7 @@ export const movePathTo = (cb: (toPath: string[], toNotebook: string[]) => void,
     <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
     <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
 </div>`,
-        width: isMobile() ? "80vw" : "50vw",
+        width: isMobile() ? "90vw" : "50vw",
         destroyCallback() {
             if (range) {
                 focusByRange(range);