Skip to content

Commit 20e96ed

Browse files
committed
🐛 Restore mobile menu transitions #19025
1 parent f63e35a commit 20e96ed

5 files changed

Lines changed: 4 additions & 6 deletions

File tree

app/src/assets/scss/main/_mobile.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,8 +1137,7 @@ body.mobile-topbar--merged {
11371137
#menu {
11381138
z-index: 7;
11391139
top: 0;
1140-
transform: none;
1141-
transition: none;
1140+
transform: translateX(100vw);
11421141

11431142
.mobile-main-menu {
11441143
&__search {

app/src/assets/template/mobile/index.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<div class="fn__flex-column fn__none" data-type="sidebar-agent"></div>
5454
</div>
5555
</div>
56-
<div id="menu" class="b3-menu b3-menu--fullscreen fn__none"></div>
56+
<div id="menu" class="b3-menu b3-menu--fullscreen"></div>
5757
<div id="model" class="side-panel side-panel--all fn__flex-column">
5858
<div class="toolbar toolbar--border">
5959
<svg class="toolbar__icon"><use xlink:href="#iconMenu"></use></svg>

app/src/mobile/menu/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export const popMenu = () => {
339339
closePanel();
340340
const menuElement = document.getElementById("menu");
341341
menuElement.style.zIndex = (++window.siyuan.zIndex).toString();
342-
menuElement.classList.remove("fn__none");
342+
menuElement.style.transform = "translateX(0px)";
343343
};
344344

345345
export const initRightMenu = (app: App) => {

app/src/mobile/util/MobileBackFoward.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const goBack = () => {
4747
searchAssetsPanelElement.classList.add("fn__none");
4848
}
4949
return;
50-
} else if ((menuElement && !menuElement.classList.contains("fn__none")) ||
50+
} else if (menuElement?.style.transform === "translateX(0px)" ||
5151
document.getElementById("sidebar")?.style.transform === "translateX(0px)" ||
5252
document.getElementById("sidebarRight")?.style.transform === "translateX(0px)") {
5353
closePanel();

app/src/mobile/util/closePanel.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export const closePanel = () => {
1919
const menuElement = document.getElementById("menu");
2020
if (menuElement) {
2121
menuElement.dispatchEvent(new CustomEvent(MOBILE_MENU_CLOSE_EVENT));
22-
menuElement.classList.add("fn__none");
2322
menuElement.style.removeProperty("transform");
2423
menuElement.style.removeProperty("z-index");
2524
}

0 commit comments

Comments
 (0)