Skip to content

Build your personal knowledge base with Trilium Notes

fix(mobile): fit the note panel's sections to the sheet's bottom edge

Elian Doran1e082f00cc4f
diff --git a/apps/client/src/stylesheets/theme-next/ios.css b/apps/client/src/stylesheets/theme-next/ios.css
index f21597251f..08fb9e0ebd 100644
--- a/apps/client/src/stylesheets/theme-next/ios.css
+++ b/apps/client/src/stylesheets/theme-next/ios.css
@@ -239,6 +239,12 @@ body.mobile.ios {
padding-bottom: var(--menu-padding-size) !important;
}
+ .modal.mobile-note-panel #right-pane .right-pane-flat-tab-body #sidebar-chat :is(.llm-chat-input-form, .llm-chat-no-provider) {
+ margin: 0 var(--mobile-sheet-margin) var(--mobile-sheet-margin);
+ border-end-start-radius: var(--mobile-sheet-corner-radius);
+ border-end-end-radius: var(--mobile-sheet-corner-radius);
+ }
+
#mobile-bottom-bar {
position: relative;
z-index: 999;
diff --git a/apps/client/src/widgets/mobile_widgets/MobileNotePanel.css b/apps/client/src/widgets/mobile_widgets/MobileNotePanel.css
index cd758f88aa..9bbb7f74b9 100644
--- a/apps/client/src/widgets/mobile_widgets/MobileNotePanel.css
+++ b/apps/client/src/widgets/mobile_widgets/MobileNotePanel.css
@@ -10,7 +10,6 @@ body.mobile .modal.mobile-note-panel {
.modal-content {
flex: 1;
min-height: 0;
- padding-bottom: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
}
.modal-body {
@@ -32,17 +31,22 @@ body.mobile .modal.mobile-note-panel {
display: flex;
flex-direction: column;
overflow-y: auto;
+ padding-bottom: var(--safe-area-inset-bottom, env(safe-area-inset-bottom));
+
+ &:has(#sidebar-chat) {
+ padding-bottom: 0;
+ }
> .card:only-child > .card-header:has(> .card-header-buttons:empty) {
display: none;
}
- > .card {
- border-bottom: 1px solid var(--main-border-color);
+ .card-header {
+ --icon-button-size: 32px;
}
- > :is(#pdf-pages, #noteMap) {
- order: 1;
+ #sidebar-chat:not(.ios *) :is(.llm-chat-input-form, .llm-chat-no-provider) {
+ padding-bottom: calc(0.5rem + var(--safe-area-inset-bottom, env(safe-area-inset-bottom)));
}
> :is(#pdf-pages, #noteMap):not(.grow) .card-body {
diff --git a/apps/client/src/widgets/mobile_widgets/MobileNotePanel.tsx b/apps/client/src/widgets/mobile_widgets/MobileNotePanel.tsx
index 4b890f4f1c..faa1b11df8 100644
--- a/apps/client/src/widgets/mobile_widgets/MobileNotePanel.tsx
+++ b/apps/client/src/widgets/mobile_widgets/MobileNotePanel.tsx
@@ -9,7 +9,9 @@ import ActionButton from "../react/ActionButton";
import { useNoteContext } from "../react/hooks";
import Modal from "../react/Modal";
import TabStrip from "../react/TabStrip";
-import { RightPaneTabBodies, useRightPaneTabs } from "../sidebar/RightPanelContainer";
+import NoteMap from "../sidebar/NoteMap";
+import PdfPages from "../sidebar/pdf/PdfPages";
+import { RightPaneTabBodies, type RightPaneTabContents, useRightPaneTabs } from "../sidebar/RightPanelContainer";
import { NavigatedInNote } from "../sidebar/RightPanelWidget";
import { RightPaneTabId } from "../sidebar/RightPaneTabs";
@@ -34,7 +36,9 @@ export default function MobileNotePanel({ widgetsByParent }: { widgetsByParent:
}
function MobileNotePanelModal({ shown, onHidden, widgetsByParent }: { shown: boolean; onHidden: () => void; widgetsByParent: WidgetsByParent }) {
- const tabs = useRightPaneTabs(shown, widgetsByParent).filter((tab) => tab.id !== "attributes");
+ const tabs = useRightPaneTabs(shown, widgetsByParent)
+ .filter((tab) => tab.id !== "attributes")
+ .map(withFixedHeightWidgetsLast);
const [ selectedTabId, setSelectedTabId ] = useState<RightPaneTabId>();
const activeTab = tabs.find((tab) => tab.id === selectedTabId) ?? tabs[0];
@@ -57,3 +61,15 @@ function MobileNotePanelModal({ shown, onHidden, widgetsByParent }: { shown: boo
</Modal>
);
}
+
+/**
+ * Moves `NoteMap` and `PdfPages` to the end of the tab: both are drawn to a fixed height, which in a
+ * tab that scrolls as a whole would sit between the sections around them.
+ */
+function withFixedHeightWidgetsLast(tab: RightPaneTabContents): RightPaneTabContents {
+ const isFixedHeight = (item: RightPaneTabContents["items"][number]) => item.type === NoteMap || item.type === PdfPages;
+ return {
+ ...tab,
+ items: [ ...tab.items.filter((item) => !isFixedHeight(item)), ...tab.items.filter(isFixedHeight) ]
+ };
+}