0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/7597

Browse source
This commit is contained in:
Vanessa 2023-04-07 09:06:30 +08:00
parent faafc9f837
commit 95ac0e828b
7 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/assets/scss/mobile.scss
View file

@ -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);
}
}

2
app/src/mobile/menu/index.ts
View file

@ -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 = () => {

2
app/src/mobile/menu/model.ts
View file

@ -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;

18
app/src/mobile/menu/search.ts
View file

@ -64,9 +64,23 @@ const initToolbarSearch = () => {
export const popSearch = () => {
openModel({
title: '<input id="toolbarSearch" style="background-color: var(--b3-theme-surface);border: 0;" class="b3-text-field fn__block">',
title: `<input id="toolbarSearch" placeholder="${window.siyuan.languages.showRecentUpdatedBlocks}" style="background-color: var(--b3-theme-surface);border: 0;" class="b3-text-field fn__block">`,
icon:"iconSearch",
html: '<div id="searchPanel"></div>',
html: `<div class="fn__flex-column" style="height: 100%">
<div id="searchPanel" style="overflow:auto;" class="fn__flex-1"></div>
<div class="toolbar">
<span class="fn__flex-1"></span>
<svg class="toolbar__icon"><use xlink:href="#iconReplace"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconRegex"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconFilter"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconCopy"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconFolder"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconExpand"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconContract"></use></svg>
<svg class="toolbar__icon"><use xlink:href="#iconMore"></use></svg>
<span class="fn__flex-1"></span>
</div>
</div>`,
bindEvent() {
initToolbarSearch();
const searchElement = document.getElementById("searchPanel");

12
app/src/mobile/util/MobileBackFoward.ts
View file

@ -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;
}

2
app/src/mobile/util/initFramework.ts
View file

@ -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();

6
app/src/mobile/util/touch.ts
View file

@ -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;