Skip to content

Build your personal knowledge base with Trilium Notes

feat(mobile): set fullscreen and Zen mode side by side

Elian Doran72a308538f70
diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json
index ef3c075f95..bb69429fa9 100644
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -1169,6 +1169,7 @@
"switch_to_desktop_version": "Switch to desktop version",
"zoom": "Zoom",
"toggle_fullscreen": "Toggle fullscreen",
+ "fullscreen": "Fullscreen",
"zoom_out": "Zoom out",
"reset_zoom_level": "Reset zoom level",
"zoom_in": "Zoom in",
diff --git a/apps/client/src/widgets/buttons/global_menu.spec.tsx b/apps/client/src/widgets/buttons/global_menu.spec.tsx
index 8b7e0aecaf..87b04bca9d 100644
--- a/apps/client/src/widgets/buttons/global_menu.spec.tsx
+++ b/apps/client/src/widgets/buttons/global_menu.spec.tsx
@@ -312,4 +312,21 @@ describe("GlobalMenu", () => {
expect([ ...topLevel, ...advanced ].some((row) => row?.startsWith("global_menu.open_new_window"))).toBe(false);
expect([ ...topLevel, ...advanced ].some((row) => row?.startsWith("global_menu.show-cheatsheet"))).toBe(false);
});
+
+ it("sets fullscreen and Zen mode side by side on a phone, and as rows elsewhere", async () => {
+ const pairOf = (scope: Element | null | undefined) => [ ...scope?.querySelectorAll(":scope > .form-list-row > .form-list-col") ?? [] ]
+ .map((col) => col.textContent?.trim());
+
+ const desktop = await openSubmenu("global_menu.advanced");
+ expect(pairOf(desktop.topLevelScroll)).toEqual([]);
+ expect(desktop.topLevel).toContain("global_menu.toggle_fullscreen");
+ expect(desktop.topLevel.some((row) => row?.startsWith("global_menu.toggle-zen-mode"))).toBe(true);
+ render(null, container ?? document.body);
+
+ ctrl.mobile = true;
+ const phone = await openSubmenu("global_menu.advanced");
+ expect(pairOf(phone.topLevelScroll)).toEqual([ "global_menu.fullscreen", "global_menu.toggle-zen-mode" ]);
+ expect(phone.topLevel.some((row) => row?.startsWith("global_menu.toggle_fullscreen"))).toBe(false);
+ expect(phone.topLevel.some((row) => row?.startsWith("global_menu.toggle-zen-mode"))).toBe(false);
+ });
});
diff --git a/apps/client/src/widgets/buttons/global_menu.tsx b/apps/client/src/widgets/buttons/global_menu.tsx
index ca71e7df89..cebb5590bc 100644
--- a/apps/client/src/widgets/buttons/global_menu.tsx
+++ b/apps/client/src/widgets/buttons/global_menu.tsx
@@ -59,9 +59,11 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
<MenuItem command="showDeletedNotes" icon="bx bx-trash-alt" text={t("global_menu.show_deleted_notes")} />
<FormDropdownDivider />
- <ZoomControls parentComponent={parentComponent} />
- <ToggleWindowOnTop />
- <KeyboardActionMenuItem command="toggleZenMode" icon="bx bxs-yin-yang" text={t("global_menu.toggle-zen-mode")} />
+ {isMobile() ? <ViewModeRow /> : <>
+ <ZoomControls parentComponent={parentComponent} />
+ <ToggleWindowOnTop />
+ <KeyboardActionMenuItem command="toggleZenMode" icon="bx bxs-yin-yang" text={t("global_menu.toggle-zen-mode")} />
+ </>}
<FormDropdownDivider />
{!isMobile() && <SwitchToOptions />}
@@ -266,6 +268,20 @@ function ZoomControls({ parentComponent }: { parentComponent?: Component | null
);
}
+/** Fullscreen and Zen mode in two columns, as the mobile note menu sets backlinks and note paths. */
+function ViewModeRow() {
+ return (
+ <div className="form-list-row">
+ <div className="form-list-col">
+ <MenuItem command="toggleFullscreen" icon="bx bx-expand-alt" text={t("global_menu.fullscreen")} />
+ </div>
+ <div className="form-list-col">
+ <MenuItem command="toggleZenMode" icon="bx bxs-yin-yang" text={t("global_menu.toggle-zen-mode")} />
+ </div>
+ </div>
+ );
+}
+
function ToggleWindowOnTop() {
const api = window.electronApi?.window;
const [ isOnTop, setIsOnTop ] = useState(() => api?.isAlwaysOnTop() ?? false);