Pin bottom nav to viewport and reserve scroll clearance.

Track visual viewport for keyboard offset, add bottom spacer, use solid
nav background with safe-area padding, and avoid zero nav offset fallback.
This commit is contained in:
2026-05-24 04:34:34 -06:00
parent 68b3da1d13
commit 831170573b
8 changed files with 97 additions and 17 deletions

View File

@@ -1,6 +1,7 @@
import { Suspense } from "react"; import { Suspense } from "react";
import { AppAuthGate } from "@/components/layout/app-auth-gate"; import { AppAuthGate } from "@/components/layout/app-auth-gate";
import { AppBottomSpacer } from "@/components/layout/app-bottom-spacer";
import { DailyReminderProvider } from "@/components/reminders/daily-reminder-provider"; import { DailyReminderProvider } from "@/components/reminders/daily-reminder-provider";
import { InAppReminderBanner } from "@/components/reminders/in-app-reminder-banner"; import { InAppReminderBanner } from "@/components/reminders/in-app-reminder-banner";
@@ -14,7 +15,10 @@ export default function AppLayout({
<AppAuthGate> <AppAuthGate>
<DailyReminderProvider /> <DailyReminderProvider />
<InAppReminderBanner /> <InAppReminderBanner />
<div className="pb-nav">{children}</div> <div>
{children}
<AppBottomSpacer />
</div>
</AppAuthGate> </AppAuthGate>
</Suspense> </Suspense>
); );

View File

@@ -5,7 +5,8 @@
@layer base { @layer base {
:root { :root {
--app-topbar-height: 3.5rem; --app-topbar-height: 3.5rem;
--app-nav-offset: var(--bottom-nav-height); --app-viewport-bottom-offset: 0px;
--app-nav-offset: 6rem;
--bottom-nav-height: 6rem; --bottom-nav-height: 6rem;
--background: 252 38% 10%; --background: 252 38% 10%;
--foreground: 52 100% 88%; --foreground: 52 100% 88%;
@@ -68,6 +69,7 @@
html { html {
overflow-x: clip; overflow-x: clip;
scroll-padding-bottom: var(--app-nav-offset, var(--bottom-nav-height));
} }
body { body {
@@ -170,7 +172,14 @@
@layer utilities { @layer utilities {
.pb-nav { .pb-nav {
padding-bottom: var(--app-nav-offset); padding-bottom: var(--app-nav-offset, var(--bottom-nav-height));
}
.pb-nav-safe {
padding-bottom: calc(
var(--app-nav-offset, var(--bottom-nav-height)) +
var(--app-viewport-bottom-offset, 0px)
);
} }
.pt-topbar { .pt-topbar {

View File

@@ -1,4 +1,4 @@
import type { Metadata } from "next"; import type { Metadata, Viewport } from "next";
import { Press_Start_2P } from "next/font/google"; import { Press_Start_2P } from "next/font/google";
import { ThemeProvider } from "next-themes"; import { ThemeProvider } from "next-themes";
@@ -16,6 +16,13 @@ export const metadata: Metadata = {
description: "Build habits, care for your pixel pet, and track wellness every day.", description: "Build habits, care for your pixel pet, and track wellness every day.",
}; };
export const viewport: Viewport = {
width: "device-width",
initialScale: 1,
viewportFit: "cover",
interactiveWidget: "resizes-content",
};
const pixelFont = Press_Start_2P({ const pixelFont = Press_Start_2P({
weight: "400", weight: "400",
subsets: ["latin"], subsets: ["latin"],

View File

@@ -0,0 +1,12 @@
export function AppBottomSpacer() {
return (
<div
aria-hidden
className="app-bottom-spacer w-full shrink-0"
style={{
minHeight:
"calc(var(--app-nav-offset, var(--bottom-nav-height)) + var(--app-viewport-bottom-offset, 0px))",
}}
/>
);
}

View File

@@ -50,7 +50,11 @@ export const AppNav = forwardRef<HTMLElement, AppNavProps>(function AppNav(
return ( return (
<nav <nav
ref={ref} ref={ref}
className="bottom-nav fixed inset-x-0 bottom-0 z-50 border-t-2 border-border bg-background/95 shadow-[0_-4px_0_0_hsl(280_45%_28%/0.35)] backdrop-blur supports-[backdrop-filter]:bg-background/90" className="bottom-nav fixed inset-x-0 z-50 border-t-2 border-border bg-background shadow-[0_-4px_0_0_hsl(280_45%_28%/0.35)]"
style={{
bottom: "var(--app-viewport-bottom-offset, 0px)",
paddingBottom: "env(safe-area-inset-bottom, 0px)",
}}
> >
<div <div
aria-hidden aria-hidden
@@ -58,7 +62,7 @@ export const AppNav = forwardRef<HTMLElement, AppNavProps>(function AppNav(
/> />
<div <div
className={cn( className={cn(
"mx-auto grid max-w-6xl gap-1 px-2 pb-[max(0.5rem,env(safe-area-inset-bottom))] pt-2", "mx-auto grid max-w-6xl gap-1 px-2 pb-2 pt-2",
gridColsClass[columnCount], gridColsClass[columnCount],
)} )}
> >

View File

@@ -10,6 +10,8 @@ import {
type Ref, type Ref,
} from "react"; } from "react";
const NAV_OFFSET_FALLBACK = "6rem";
type NavOffsetContextValue = { type NavOffsetContextValue = {
setNavElement: (element: HTMLElement | null) => void; setNavElement: (element: HTMLElement | null) => void;
}; };
@@ -38,6 +40,17 @@ type NavOffsetProviderProps = {
enabled?: boolean; enabled?: boolean;
}; };
function setNavOffset(value: string) {
document.documentElement.style.setProperty("--app-nav-offset", value);
}
function setViewportBottomOffset(value: string) {
document.documentElement.style.setProperty(
"--app-viewport-bottom-offset",
value,
);
}
export function NavOffsetProvider({ export function NavOffsetProvider({
children, children,
enabled = true, enabled = true,
@@ -46,19 +59,30 @@ export function NavOffsetProvider({
const observerRef = useRef<ResizeObserver | null>(null); const observerRef = useRef<ResizeObserver | null>(null);
const syncOffset = useCallback(() => { const syncOffset = useCallback(() => {
const root = document.documentElement;
if (!enabled || !navElementRef.current) { if (!enabled || !navElementRef.current) {
root.style.setProperty("--app-nav-offset", "0px"); setNavOffset(enabled ? NAV_OFFSET_FALLBACK : "0px");
return; return;
} }
root.style.setProperty( setNavOffset(`${navElementRef.current.offsetHeight}px`);
"--app-nav-offset",
`${navElementRef.current.offsetHeight}px`,
);
}, [enabled]); }, [enabled]);
const syncViewportBottom = useCallback(() => {
const viewport = window.visualViewport;
if (!viewport) {
setViewportBottomOffset("0px");
return;
}
const keyboardGap = Math.max(
0,
window.innerHeight - viewport.height - viewport.offsetTop,
);
setViewportBottomOffset(`${keyboardGap}px`);
}, []);
const setNavElement = useCallback( const setNavElement = useCallback(
(element: HTMLElement | null) => { (element: HTMLElement | null) => {
if (observerRef.current) { if (observerRef.current) {
@@ -86,20 +110,34 @@ export function NavOffsetProvider({
useEffect(() => { useEffect(() => {
syncOffset(); syncOffset();
syncViewportBottom();
window.addEventListener("resize", syncOffset); window.addEventListener("resize", syncOffset);
window.addEventListener("resize", syncViewportBottom);
const viewport = window.visualViewport;
viewport?.addEventListener("resize", syncViewportBottom);
viewport?.addEventListener("scroll", syncViewportBottom);
return () => { return () => {
window.removeEventListener("resize", syncOffset); window.removeEventListener("resize", syncOffset);
window.removeEventListener("resize", syncViewportBottom);
viewport?.removeEventListener("resize", syncViewportBottom);
viewport?.removeEventListener("scroll", syncViewportBottom);
if (observerRef.current) { if (observerRef.current) {
observerRef.current.disconnect(); observerRef.current.disconnect();
} }
document.documentElement.style.setProperty("--app-nav-offset", "0px");
setNavOffset(NAV_OFFSET_FALLBACK);
setViewportBottomOffset("0px");
}; };
}, [syncOffset]); }, [syncOffset, syncViewportBottom]);
useEffect(() => { useEffect(() => {
if (!enabled) { if (!enabled) {
setNavElement(null); setNavElement(null);
setNavOffset("0px");
} }
}, [enabled, setNavElement]); }, [enabled, setNavElement]);

View File

@@ -36,7 +36,10 @@ export function InAppReminderBanner() {
role="status" role="status"
aria-live="polite" aria-live="polite"
className="fixed inset-x-0 z-[60] px-4 pb-[env(safe-area-inset-bottom,0px)]" className="fixed inset-x-0 z-[60] px-4 pb-[env(safe-area-inset-bottom,0px)]"
style={{ bottom: "calc(var(--app-nav-offset, var(--bottom-nav-height)) + 0.5rem)" }} style={{
bottom:
"calc(var(--app-viewport-bottom-offset, 0px) + var(--app-nav-offset, var(--bottom-nav-height)) + 0.5rem)",
}}
> >
<div className="mx-auto flex max-w-lg items-start gap-3 rounded-xl border border-primary/30 bg-card p-4 shadow-lg"> <div className="mx-auto flex max-w-lg items-start gap-3 rounded-xl border border-primary/30 bg-card p-4 shadow-lg">
<div className="rounded-full bg-primary/10 p-2"> <div className="rounded-full bg-primary/10 p-2">

View File

@@ -46,7 +46,10 @@ export function ToastProvider({ children }: { children: ReactNode }) {
<div <div
aria-live="polite" aria-live="polite"
className="pointer-events-none fixed right-4 z-[60] flex w-[min(100vw-2rem,20rem)] flex-col gap-2" className="pointer-events-none fixed right-4 z-[60] flex w-[min(100vw-2rem,20rem)] flex-col gap-2"
style={{ bottom: "calc(var(--app-nav-offset, var(--bottom-nav-height)) + 0.75rem)" }} style={{
bottom:
"calc(var(--app-viewport-bottom-offset, 0px) + var(--app-nav-offset, var(--bottom-nav-height)) + 0.75rem)",
}}
> >
{messages.map((message) => ( {messages.map((message) => (
<div <div