Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/src/app/(shell)/course-planner/page.tsx
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
"use client";
import { TopBar } from "@/components/TopBar";
import { Icon } from "@/components/Icon";
import { FullHeightScreen } from "@/components/FullHeightScreen";

export default function CoursePlannerPage() {
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<TopBar title="Course Planner" />
<main
style={{
Expand DownExpand Up@@ -44,6 +45,6 @@ export default function CoursePlannerPage() {
building it — check back soon.
</div>
</main>
</div>
</FullHeightScreen>
);
}
6 changes: 3 additions & 3 deletions frontend/src/app/(shell)/notetaker/page.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,7 @@ export default function NotetakerPage() {
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
color: "var(--text-muted)",
fontSize: 13,
}}
Expand All@@ -499,7 +499,7 @@ export default function NotetakerPage() {
flexDirection: "column",
alignItems: "center",
justifyContent: "center",
height: "100vh",
height: "100%",
padding: 32,
textAlign: "center",
gap: 12,
Expand DownExpand Up@@ -556,7 +556,7 @@ export default function NotetakerPage() {
}

return (
<div style={{ display: "flex", flexDirection: "column", height: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
<div
style={{
flex: 1,
Expand Down
46 changes: 46 additions & 0 deletions frontend/src/components/FullHeightScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
"use client";

import React from "react";

/**
* Full-height root for screens rendered inside `ShellFrame`'s `<main>`.
*
* ShellFrame's horizontal-nav layout stacks the 56px `TopNav` above `<main>`
* in a `100dvh` flex column, so `<main>` is only `100dvh - 56px` tall. Screens
* that hardcoded `height: 100vh` were therefore taller than their container,
* which overflowed `<main>` and made the whole page scroll — dragging chat
* headers/inputs out of view instead of scrolling just the body (issue #331).
*
* Filling the parent with `height: 100%` pins the screen to `<main>` exactly,
* so inner regions scroll internally. `<main>` has a definite height in both
* the sidebar and top-nav layouts, so the percentage resolves correctly in
* each — keeping the sidebar layout unaffected.
*
* Use this instead of `height: 100vh` for any full-height shell screen.
*/
export function FullHeightScreen({
children,
direction = "column",
className,
style,
}: {
children: React.ReactNode;
/** Flex direction of the root. Defaults to "column". */
direction?: "row" | "column";
className?: string;
style?: React.CSSProperties;
}) {
return (
<div
className={className}
style={{
display: "flex",
flexDirection: direction,
height: "100%",
...style,
}}
>
{children}
</div>
);
}
14 changes: 12 additions & 2 deletions frontend/src/components/ShellFrame.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,16 @@ import { AchievementUnlockWatcher } from "./AchievementUnlockWatcher";
import { useLayoutPref } from "@/lib/useLayoutPref";
import { useIsMobile } from "@/lib/useIsMobile";

/**
* `100dvh`, not `100vh`: on iOS Safari `100vh` is the *large* viewport (the
* height with the toolbar collapsed), so with the toolbar expanded a `100vh`
* shell runs past the visual viewport and hides its own bottom edge — the
* `/learn` composer, most visibly. Screens now fill `<main>` exactly (#331),
* so there is no leftover scroll slack to drag that edge back into view.
* `100dvh` tracks the visual viewport instead, and since the shell itself
* never scrolls (`overflow: hidden`, inner panes scroll), the toolbar never
* collapses and the value stays put — no resize thrash.
*/
export function ShellFrame({ children }: { children: React.ReactNode }) {
const [pref] = useLayoutPref();
const isMobile = useIsMobile();
Expand All@@ -22,7 +32,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "row",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand DownExpand Up@@ -58,7 +68,7 @@ export function ShellFrame({ children }: { children: React.ReactNode }) {
style={{
display: "flex",
flexDirection: "column",
height: "100vh",
height: "100dvh",
overflow: "hidden",
position: "relative",
}}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/screens/Learn.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import { TopBar } from "../TopBar";
import { Icon } from "../Icon";
import { CustomSelect } from "../CustomSelect";
import { ChatPanel, type ChatMsg } from "../ChatPanel";
import { FullHeightScreen } from "../FullHeightScreen";
import { SessionSummary } from "../SessionSummary";
import { SharedContextToggle, useSharedContext } from "../SharedContextToggle";
import { ModelToggle, useModelPref } from "../ModelToggle";
Expand DownExpand Up@@ -430,7 +431,7 @@ function LearnInner() {
// ────────── Entry screen (no active session) ──────────
if (!sessionId && !starting) {
return (
<div className="fade-in" style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen className="fade-in">
<DisclaimerModal />
<TopBar
title="Start a session"
Expand DownExpand Up@@ -506,13 +507,13 @@ function LearnInner() {
))}
</div>
</div>
</div>
</FullHeightScreen>
);
}

// ────────── Active session ──────────
return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />

{isMobile && (
Expand DownExpand Up@@ -650,7 +651,7 @@ function LearnInner() {
onStartNext={startNextFromSummary}
/>
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Library.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import dynamic from "next/dynamic";
import { createPortal } from "react-dom";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Pill } from "../Pill";
import { DocumentUploadModal } from "../DocumentUploadModal";
Expand DownExpand Up@@ -137,7 +138,7 @@ export function Library() {
}, [documents]);

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
<TopBar
title="Library"
Expand DownExpand Up@@ -423,7 +424,7 @@ export function Library() {
}
}}
/>
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Quiz.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
import React, { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { AIDisclaimerChip } from "../AIDisclaimerChip";
import { DisclaimerModal } from "../DisclaimerModal";
import { QuizPanel } from "../QuizPanel";
Expand DownExpand Up@@ -72,7 +73,7 @@ function QuizInner() {
}, [conceptParam, topicParam, concepts]);

return (
<div style={{ display: "flex", height: "100vh", flexDirection: "column" }}>
<FullHeightScreen>
<DisclaimerModal />
<TopBar
title="Quiz"
Expand DownExpand Up@@ -100,6 +101,6 @@ function QuizInner() {
/>
) : null}
</div>
</div>
</FullHeightScreen>
);
}
10 changes: 7 additions & 3 deletions frontend/src/components/screens/Settings.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@
import React from "react";
import Link from "next/link";
import { TopBar } from "../TopBar";
import { FullHeightScreen } from "../FullHeightScreen";
import { Icon } from "../Icon";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
Expand DownExpand Up@@ -216,7 +217,7 @@ export function Settings() {
const tabs: Tab[] = ["profile", "preferences", "notifications", "data"];

return (
<div>
<FullHeightScreen>
<TopBar
title="Settings"
subtitle="Profile, preferences, and account"
Expand All@@ -229,7 +230,10 @@ export function Settings() {
</>
}
/>
<div style={{ display: "flex", height: "calc(100vh - 112px)" }}>
{/* Fills whatever `<main>` leaves below TopBar. `minHeight: 0` lets this
shrink past its content so the panes below scroll internally rather
than pushing the screen taller than `<main>`. */}
<div style={{ display: "flex", flex: 1, minHeight: 0 }}>
<div style={{ flex: 1, minWidth: 0, padding: "24px 32px", overflowY: "auto" }}>
{!settings && tab !== "cosmetics" && <SettingsFormSkeleton />}
{tab === "profile" && settings && (
Expand DownExpand Up@@ -635,7 +639,7 @@ export function Settings() {
{previewOpen && preview && (
<PreviewModal profile={preview} onClose={() => setPreviewOpen(false)} />
)}
</div>
</FullHeightScreen>
);
}

Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/screens/Social.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ import React from "react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
import { Icon } from "../Icon";
import { FullHeightScreen } from "../FullHeightScreen";
import { Avatar } from "../Avatar";
import { CustomSelect } from "../CustomSelect";
import { SocialRoomsSkeleton } from "../Skeleton";
Expand DownExpand Up@@ -1043,7 +1044,7 @@ export function Social() {
const members = (overview?.members || []).map(m => ({ user_id: m.user_id, name: m.name }));

return (
<div style={{ display: "flex", height: "100vh" }}>
<FullHeightScreen direction="row">
<div style={{ flex: 1, display: "flex", flexDirection: "column", minWidth: 0 }}>
{tab === "directory" ? <SchoolDirectory /> : active ? (
<>
Expand DownExpand Up@@ -1124,7 +1125,7 @@ export function Social() {
))}
</div>
</aside>
</div>
</FullHeightScreen>
);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/screens/Study.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ export function Study() {
);

return (
<div style={{ display: "flex", flexDirection: "column", minHeight: "100vh" }}>
<div style={{ display: "flex", flexDirection: "column", minHeight: "100%" }}>
<TopBar
title="Study"
subtitle={mode === "guide" ? undefined : "Spaced review with ratings and a 3D flip"}
Expand Down
Loading