From 95ac0e828b4449803e19f5fcaaed90e682983956 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 7 Apr 2023 09:06:30 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/7597 --- app/src/assets/scss/mobile.scss | 5 ++--- app/src/mobile/menu/index.ts | 2 +- app/src/mobile/menu/model.ts | 2 +- app/src/mobile/menu/search.ts | 18 ++++++++++++++++-- app/src/mobile/util/MobileBackFoward.ts | 12 ++++++------ app/src/mobile/util/initFramework.ts | 2 +- app/src/mobile/util/touch.ts | 6 +++--- 7 files changed, 30 insertions(+), 17 deletions(-) diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss index 2b4c9cca0..15aed80d1 100644 --- a/app/src/assets/scss/mobile.scss +++ b/app/src/assets/scss/mobile.scss @@ -113,15 +113,14 @@ flex-shrink: 0; margin: 6px 4px; color: var(--b3-theme-on-surface); + border-radius: 4px; &[disabled] { opacity: 0.38; } &--active { - background-color: var(--b3-theme-primary); - border-radius: 4px; - color: var(--b3-theme-on-primary); + background-color: var(--b3-list-hover); } } diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts index ff68b0221..344e2c88c 100644 --- a/app/src/mobile/menu/index.ts +++ b/app/src/mobile/menu/index.ts @@ -18,7 +18,7 @@ import {getRecentDocs} from "./getRecentDocs"; export const popMenu = () => { activeBlur(); hideKeyboardToolbar(); - document.getElementById("menu").style.transform = "translateX(0)"; + document.getElementById("menu").style.transform = "translateX(0px)"; }; export const initRightMenu = () => { diff --git a/app/src/mobile/menu/model.ts b/app/src/mobile/menu/model.ts index f6e38009b..3870ed0c1 100644 --- a/app/src/mobile/menu/model.ts +++ b/app/src/mobile/menu/model.ts @@ -5,7 +5,7 @@ export const openModel = (obj: { bindEvent: (element: HTMLElement) => void }) => { const modelElement = document.getElementById("model"); - modelElement.style.transform = "translateY(0)"; + modelElement.style.transform = "translateY(0px)"; modelElement.querySelector(".toolbar__icon use").setAttribute("xlink:href", "#" + obj.icon); modelElement.querySelector(".toolbar__text").innerHTML = obj.title; const modelMainElement = modelElement.querySelector("#modelMain") as HTMLElement; diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts index c7fca3acf..396b6f785 100644 --- a/app/src/mobile/menu/search.ts +++ b/app/src/mobile/menu/search.ts @@ -64,9 +64,23 @@ const initToolbarSearch = () => { export const popSearch = () => { openModel({ - title: '', + title: ``, icon:"iconSearch", - html: '
', + html: `
+
+
+ + + + + + + + + + +
+
`, bindEvent() { initToolbarSearch(); const searchElement = document.getElementById("searchPanel"); diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts index 36dad2d4b..d134b7c31 100644 --- a/app/src/mobile/util/MobileBackFoward.ts +++ b/app/src/mobile/util/MobileBackFoward.ts @@ -103,9 +103,9 @@ export const goForward = () => { !window.siyuan.menus.menu.element.classList.contains("fn__none")) { window.siyuan.menus.menu.element.dispatchEvent(new CustomEvent("click", {detail: "back"})); return; - } else if (document.getElementById("model").style.transform === "translateY(0)" || - document.getElementById("menu").style.transform === "translateX(0)" || - document.getElementById("sidebar").style.transform === "translateX(0)") { + } else if (document.getElementById("model").style.transform === "translateY(0px)" || + document.getElementById("menu").style.transform === "translateX(0px)" || + document.getElementById("sidebar").style.transform === "translateX(0px)") { closePanel(); return; } @@ -125,11 +125,11 @@ export const goBack = () => { !window.siyuan.menus.menu.element.classList.contains("fn__none")) { window.siyuan.menus.menu.element.dispatchEvent(new CustomEvent("click", {detail: "back"})); return; - } else if (document.getElementById("model").style.transform === "translateY(0)") { + } else if (document.getElementById("model").style.transform === "translateY(0px)") { document.getElementById("model").style.transform = ""; return; - } else if (document.getElementById("menu").style.transform === "translateX(0)" || - document.getElementById("sidebar").style.transform === "translateX(0)") { + } else if (document.getElementById("menu").style.transform === "translateX(0px)" || + document.getElementById("sidebar").style.transform === "translateX(0px)") { closePanel(); return; } diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts index fb922427d..200581c3d 100644 --- a/app/src/mobile/util/initFramework.ts +++ b/app/src/mobile/util/initFramework.ts @@ -85,7 +85,7 @@ export const initFramework = () => { document.getElementById("toolbarFile").addEventListener("click", () => { hideKeyboardToolbar(); activeBlur(); - sidebarElement.style.transform = "translateX(0)"; + sidebarElement.style.transform = "translateX(0px)"; const type = sidebarElement.querySelector(".toolbar--border .toolbar__icon--active").getAttribute("data-type"); if (type === "sidebar-outline-tab") { outline.update(); diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.ts index f9b54e046..06a681a80 100644 --- a/app/src/mobile/util/touch.ts +++ b/app/src/mobile/util/touch.ts @@ -17,7 +17,7 @@ const popSide = (render = true) => { } else { hideKeyboardToolbar(); activeBlur(); - document.getElementById("sidebar").style.transform = "translateX(0)"; + document.getElementById("sidebar").style.transform = "translateX(0px)"; } }; @@ -213,7 +213,7 @@ export const handleTouchMove = (event: TouchEvent) => { menuElement.style.transform = `translateX(${-xDiff}px)`; transformMask(-xDiff / windowWidth); } else { - menuElement.style.transform = "translateX(0)"; + menuElement.style.transform = "translateX(0px)"; transformMask(0); } return; @@ -224,7 +224,7 @@ export const handleTouchMove = (event: TouchEvent) => { sideElement.style.transform = `translateX(${-xDiff}px)`; transformMask(xDiff / windowWidth); } else { - sideElement.style.transform = "translateX(0)"; + sideElement.style.transform = "translateX(0px)"; transformMask(0); } return;