chore(release): v1.4.27

v1.4.27 — Mobile capability and maintainer-finding cleanup.

ResponsiveSheet primitive (bottom-sheet on narrow viewports, centred dialog on desktop)
applied to BD, Weight, Glucose, Mood, Activity forms. Maintainer-finding cleanups across
Coach, Insights, Reports, Privacy. GeoLite2 offline geocoding with resilience layer
(graceful fallback when EULA not yet propagated). E2E gap-fill coverage. 450-line
release notes attached to the GitHub Release.
This commit is contained in:
Marc-André Bombeck authored and GitHub committed 2026-05-15 22:59:10 +02:00
1 parent d98e85cd03
commit 4f09c3f862
314 files changed
+26801 -4419

No files matched your search

+138 -50
View File
@@ -70,7 +70,6 @@ const HOURS_PER_DAY = 24;
* for a research-view chart that emphasises the sawtooth shape. */
const WINDOW_HOURS_BEFORE = 21 * HOURS_PER_DAY;
const WINDOW_HOURS_AFTER = 0;
const SAMPLE_STEP_HOURS = 6;
interface IntakeEvent {
id: string;
@@ -112,9 +111,34 @@ export interface DrugLevelChartProps {
* cost low.
*/
asOf?: Date;
/**
* v1.4.27 B1 — compact rendering for tile-internal mounts (the GLP-1
* dashboard tile carves out a mini pane for this chart). When set:
* - the outer `<section class="bg-card …">` wrapper drops so the
* parent tile owns the card surface (no card-inside-a-card).
* - the chart body shrinks (160 px instead of 240 px) to match
* mini-mode density of the other tile-internal charts.
* - the header + disclaimer collapse to a single inline caption.
*/
compact?: boolean;
/**
* v1.4.27 B1 — window length override (in hours of history before
* `asOf`). Defaults to 21 × 24 = 504 h (three weekly cycles), the
* shape the standalone surface ships. The dashboard mini-chart
* exposes 7d / 30d / 90d / All via a range strip and threads the
* mapped window length through this prop. The sample step scales
* with the window so an "All"-mode chart doesn't paint thousands of
* points: 6 h / 12 h / 24 h / 48 h for ≤ 21 d / ≤ 60 d / ≤ 180 d / >.
*/
windowHoursBefore?: number;
}
export function DrugLevelChart({ medication, asOf }: DrugLevelChartProps) {
export function DrugLevelChart({
medication,
asOf,
compact = false,
windowHoursBefore,
}: DrugLevelChartProps) {
const { t } = useTranslations();
// Resolve the catalog key via the shared helper. v1.4.25 W21 Fix-N
@@ -194,27 +218,51 @@ export function DrugLevelChart({ medication, asOf }: DrugLevelChartProps) {
const isLoading = rmLoading || (gateOpen && (detailsLoading || intakeLoading));
const hasDoses = doses.length > 0;
const animationsEnabled = !prefersReducedMotion();
// Resolve the window length once, then derive a sample step that
// keeps the AreaChart inside a sensible point count even on the
// "All" branch of the dashboard's range strip.
const resolvedWindowHours = windowHoursBefore ?? WINDOW_HOURS_BEFORE;
const resolvedStepHours = pickSampleStepHours(resolvedWindowHours);
const chartBodyHeightPx = compact ? 160 : 240;
return (
<section
aria-labelledby="drug-level-chart-title"
className="bg-card border-border rounded-xl border p-4 md:p-6"
data-slot="drug-level-chart"
>
<header className="mb-3 flex flex-wrap items-center gap-2">
<Activity className="text-dracula-purple h-4 w-4 shrink-0" />
<h3
id="drug-level-chart-title"
className="text-sm font-semibold"
>
// Compact mode mounts the chart inside a host card (the GLP-1 tile)
// and skips the outer `<section>` wrapper so the user doesn't see a
// card painted inside a card. The disclaimer also collapses to a
// single muted line to keep the tile's vertical footprint tight.
// v1.4.27 MB7 / CF-66 — drop the `md:p-6` lift so the wrapper
// stays at the `p-4` density across viewports. The 6 unit padding
// on `md+` made the GLP-1 tile feel oversized relative to the
// neighbouring trend cards, which all use `p-4`. Compact mode
// retains the `space-y-2` layout without an outer card wrapper.
const wrapperClass = compact
? "space-y-2"
: "bg-card border-border rounded-xl border p-4";
const wrapperProps = {
"aria-labelledby": "drug-level-chart-title",
className: wrapperClass,
"data-slot": "drug-level-chart",
"data-compact": compact ? "true" : undefined,
} as const;
const body = (
<>
{!compact && (
<header className="mb-3 flex flex-wrap items-center gap-2">
<Activity className="text-dracula-purple h-4 w-4 shrink-0" />
<h3 id="drug-level-chart-title" className="text-sm font-semibold">
{t("medications.researchMode.chart.title")}
</h3>
{drugId && (
<span className="text-muted-foreground text-xs">
· {t(`medications.glp1.drug.${drugId}.name`)}
</span>
)}
</header>
)}
{compact && (
<h3 id="drug-level-chart-title" className="sr-only">
{t("medications.researchMode.chart.title")}
</h3>
{drugId && (
<span className="text-muted-foreground text-xs">
· {t(`medications.glp1.drug.${drugId}.name`)}
</span>
)}
</header>
)}
{/* Decision tree:
1. drug not in catalog → gated-unknown-drug placeholder
@@ -232,7 +280,11 @@ export function DrugLevelChart({ medication, asOf }: DrugLevelChartProps) {
/>
) : isLoading ? (
<div
className="flex h-[220px] items-center justify-center"
className={
compact
? "flex h-[160px] items-center justify-center"
: "flex h-[220px] items-center justify-center"
}
data-slot="drug-level-chart-loading"
>
<Loader2 className="text-primary h-6 w-6 animate-spin" />
@@ -246,19 +298,43 @@ export function DrugLevelChart({ medication, asOf }: DrugLevelChartProps) {
asOf={now}
animationsEnabled={animationsEnabled}
axisLabel={t("medications.researchMode.chart.axisLabel")}
windowHoursBefore={resolvedWindowHours}
stepHours={resolvedStepHours}
heightPx={chartBodyHeightPx}
/>
)}
{gateOpen && hasDoses && (
<p
className="text-muted-foreground mt-2 text-xs italic"
className={
compact
? "text-muted-foreground text-[10px] leading-snug italic"
: "text-muted-foreground mt-2 text-xs italic"
}
data-slot="drug-level-chart-disclaimer"
>
{t("medications.researchMode.chart.estimateNote")}
</p>
)}
</section>
</>
);
return compact ? <div {...wrapperProps}>{body}</div> : <section {...wrapperProps}>{body}</section>;
}
/**
* v1.4.27 B1 — pick a sample step in hours appropriate for the chosen
* window length. The default 6 h is fine at ≤ 21 days (≤ 84 samples);
* "All"-mode windows need a coarser grid so the AreaChart stays under
* a few hundred points. The chart is qualitative (research §2.3) so a
* coarse step does not change the rising/peak/fading shape.
*/
function pickSampleStepHours(windowHoursBefore: number): number {
const days = windowHoursBefore / 24;
if (days <= 21) return 6;
if (days <= 60) return 12;
if (days <= 180) return 24;
return 48;
}
/* ────────────────────────────────────────────────────────────────
@@ -354,6 +430,9 @@ function ChartBody({
asOf,
animationsEnabled,
axisLabel,
windowHoursBefore,
stepHours,
heightPx,
}: {
drug: Glp1DrugId;
doses: readonly DoseEvent[];
@@ -366,20 +445,27 @@ function ChartBody({
* users and SSR snapshots both surface the framing.
*/
axisLabel: string;
/** Window length in hours; the chart's x-axis domain is `[-days, 0]`. */
windowHoursBefore: number;
/** Sample step in hours; scales with the window length. */
stepHours: number;
/** Chart-area height in CSS pixels; compact mode passes 160. */
heightPx: number;
}) {
const windowDays = windowHoursBefore / HOURS_PER_DAY;
const samples = useMemo(
() =>
computeOneCompartment(drug, doses, asOf, {
windowHoursBefore: WINDOW_HOURS_BEFORE,
windowHoursBefore,
windowHoursAfter: WINDOW_HOURS_AFTER,
stepHours: SAMPLE_STEP_HOURS,
stepHours,
}),
[drug, doses, asOf],
[drug, doses, asOf, windowHoursBefore, stepHours],
);
// Map samples to chart points. x-axis is "days since now" — negative
// values for the past 21 days, with 0 = now. Recharts uses the raw
// domain so categorical day labels don't crowd a 21-day window.
// values for the past window, with 0 = now. Recharts uses the raw
// domain so categorical day labels don't crowd the visible range.
const chartData = useMemo(
() =>
samples.map((s) => ({
@@ -389,6 +475,16 @@ function ChartBody({
[samples],
);
// Pick four x-axis ticks evenly across the window so the strip
// reads as quarter / midpoint / three-quarter / now regardless of
// whether the user picked 7d, 30d, 90d, or All.
const ticks = useMemo(() => {
const quarter = -Math.round(windowDays * 0.75);
const midpoint = -Math.round(windowDays * 0.5);
const lastQuarter = -Math.round(windowDays * 0.25);
return [-Math.round(windowDays), quarter, midpoint, lastQuarter, 0];
}, [windowDays]);
return (
<>
<p
@@ -398,7 +494,8 @@ function ChartBody({
{axisLabel}
</p>
<div
className="h-[240px] touch-pan-y"
className="touch-pan-y"
style={{ height: `${heightPx}px` }}
data-slot="drug-level-chart-area"
>
<ResponsiveContainer width="100%" height="100%">
@@ -431,43 +528,34 @@ function ChartBody({
stroke="var(--border)"
opacity={0.5}
/>
{/* v1.4.27 MB6 CF-16 — dropped a stray empty `<text>` child
that previously declared no content and rendered an
invisible SVG node beneath the x-axis. */}
<XAxis
dataKey="dayOffset"
type="number"
domain={[-21, 0]}
ticks={[-21, -14, -7, 0]}
domain={[-windowDays, 0]}
ticks={ticks}
tickFormatter={(v) => (v === 0 ? "0" : `${v}d`)}
tick={{ fontSize: 11, fill: "var(--muted-foreground)" }}
tickLine={false}
axisLine={false}
>
<text
x="50%"
y="100%"
dy={14}
textAnchor="middle"
fontSize={10}
fill="var(--muted-foreground)"
/>
</XAxis>
/>
{/* Research §2.3 — y-axis is unit-less. We hide tick labels
and the axis line entirely; the human-readable label sits
outside the chart frame, above. The `tick={false}` flag
suppresses the textual ticks per Recharts. */}
suppresses the textual ticks per Recharts. v1.4.27 MB6
CF-16 — the duplicate Recharts `label={…}` prop dropped
here painted the same caption inside the SVG behind the
`width={1}` axis, where it could never be read. The
external `<p>` above the chart is the single source of
truth for the caption. */}
<YAxis
domain={[0, "auto"]}
tick={false}
tickLine={false}
axisLine={false}
width={1}
label={{
value: axisLabel,
angle: -90,
position: "insideLeft",
fontSize: 10,
fill: "var(--muted-foreground)",
offset: 0,
}}
/>
<Tooltip
content={() => null}
@@ -42,14 +42,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
import { toast } from "sonner";
import { AlertTriangle, BookOpenCheck, Loader2 } from "lucide-react";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
import { Button } from "@/components/ui/button";
import { useTranslations } from "@/lib/i18n/context";
@@ -131,27 +124,44 @@ export function ResearchModeAcknowledgmentDialog({
}
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent
data-slot="research-mode-acknowledgment-dialog"
className="flex max-h-[90vh] flex-col sm:max-w-xl"
>
<DialogHeader>
<DialogTitle className="flex items-center gap-2">
<BookOpenCheck className="text-dracula-purple h-5 w-5 shrink-0" />
{t("medications.researchMode.dialog.title")}
</DialogTitle>
<DialogDescription>
{t("medications.researchMode.dialog.intro")}
</DialogDescription>
</DialogHeader>
{/* Only the body scrolls; header + footer stay pinned so the
Acknowledge / Cancel CTAs are always reachable without
scrolling on small viewports (the previous markup scrolled
the entire DialogContent, pushing the footer below the
fold on iPhone-class heights). */}
<div className="-mr-2 flex-1 space-y-4 overflow-y-auto pr-2 text-sm">
<ResponsiveSheet
open={open}
onOpenChange={onOpenChange}
title={
<span className="flex items-center gap-2">
<BookOpenCheck className="text-dracula-purple h-5 w-5 shrink-0" />
{t("medications.researchMode.dialog.title")}
</span>
}
description={t("medications.researchMode.dialog.intro")}
className="sm:max-w-xl"
footer={
<div className="flex w-full gap-2 sm:justify-end sm:gap-2">
<Button
variant="outline"
onClick={handleCancel}
disabled={mutation.isPending}
data-slot="research-mode-cancel"
>
{t("medications.researchMode.dialog.cancelCta")}
</Button>
<Button
onClick={handleAcknowledge}
disabled={mutation.isPending || !currentDisclaimerVersion}
data-slot="research-mode-acknowledge"
>
{mutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : null}
{t("medications.researchMode.dialog.acknowledgeCta")}
</Button>
</div>
}
>
<div
data-slot="research-mode-acknowledgment-dialog"
className="space-y-4 text-sm"
>
<section
aria-labelledby="research-mode-what-it-is"
data-slot="research-mode-what-it-is"
@@ -253,28 +263,6 @@ export function ResearchModeAcknowledgmentDialog({
</p>
)}
</div>
<DialogFooter className="gap-2 sm:gap-2">
<Button
variant="outline"
onClick={handleCancel}
disabled={mutation.isPending}
data-slot="research-mode-cancel"
>
{t("medications.researchMode.dialog.cancelCta")}
</Button>
<Button
onClick={handleAcknowledge}
disabled={mutation.isPending || !currentDisclaimerVersion}
data-slot="research-mode-acknowledge"
>
{mutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
) : null}
{t("medications.researchMode.dialog.acknowledgeCta")}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</ResponsiveSheet>
);
}
@@ -151,7 +151,7 @@ export function SchedulingSection({
>
{isLoading && (
<div className="text-muted-foreground flex items-center gap-2">
<Loader2 className="h-3.5 w-3.5 animate-spin" />
<Loader2 className="h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
<span>{t("medications.scheduling.loading")}</span>
</div>
)}
@@ -192,7 +192,14 @@ export function SchedulingSection({
) : (
<>
<div
className="flex flex-wrap gap-1"
// v1.4.27 MB7 / CF-49 — tighten the gap from
// `gap-1` (4 px) to `gap-0.5` (2 px) on `<sm` so
// the 30-day cadence grid fits in fewer rows on
// Pixel 5 (375 px) without sacrificing the 44 px
// tap target per cell. At `sm:` and above the
// original 4 px gap returns; the wider container
// there already absorbs the timeline in 1-2 rows.
className="flex flex-wrap gap-0.5 sm:gap-1"
role="img"
aria-label={t(
"medications.scheduling.cadenceViz.ariaTimeline",
@@ -1,17 +1,12 @@
"use client";
import { useMemo, useState } from "react";
import { useId, useMemo, useState } from "react";
import { createPortal } from "react-dom";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { Loader2, Plus, Trash2 } from "lucide-react";
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
import { Label } from "@/components/ui/label";
import { Badge } from "@/components/ui/badge";
import {
@@ -109,6 +104,11 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
const [severity, setSeverity] = useState<1 | 2 | 3 | 4 | 5 | null>(null);
const [notes, setNotes] = useState<string>("");
const [formError, setFormError] = useState<string | null>(null);
// v1.4.27 R4 RC2 — sticky-pin the Save / Cancel row by portalling it
// into the `<ResponsiveSheet>` footer slot. The submit button keeps
// its `<form>` association via the HTML `form` attribute.
const [footerEl, setFooterEl] = useState<HTMLDivElement | null>(null);
const formId = useId();
const listKey = [
"medications",
@@ -256,7 +256,7 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
>
{isLoading && (
<div className="flex items-center gap-2 text-muted-foreground">
<Loader2 className="h-3.5 w-3.5 animate-spin" />
<Loader2 className="h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
<span>{t("medications.sideEffects.loading")}</span>
</div>
)}
@@ -308,7 +308,7 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
<Button
variant="ghost"
size="icon"
className="text-muted-foreground hover:text-destructive h-7 w-7 shrink-0"
className="text-muted-foreground hover:text-destructive size-11 shrink-0"
aria-label={t("medications.sideEffects.deleteCta")}
onClick={() => {
if (
@@ -330,13 +330,14 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
</div>
)}
<Dialog open={open} onOpenChange={setOpen}>
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>{t("medications.sideEffects.sheetTitle")}</DialogTitle>
</DialogHeader>
<ResponsiveSheet
open={open}
onOpenChange={setOpen}
title={t("medications.sideEffects.sheetTitle")}
footer={<div ref={setFooterEl} className="flex w-full" />}
>
<form
id={formId}
onSubmit={handleSubmit}
className="space-y-4"
aria-label={t("medications.sideEffects.sheetTitle")}
@@ -450,6 +451,9 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
placeholder={t("medications.sideEffects.notesPlaceholder")}
rows={3}
maxLength={NOTES_MAX}
enterKeyHint="done"
autoCapitalize="sentences"
autoComplete="off"
className="border-input bg-background text-foreground w-full rounded-md border px-2 py-1.5 text-sm"
/>
<p className="text-muted-foreground text-right text-[10px]">
@@ -463,24 +467,32 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
</p>
)}
<DialogFooter className="gap-2">
<Button
type="button"
variant="ghost"
onClick={() => setOpen(false)}
>
{t("medications.sideEffects.cancelCta")}
</Button>
<Button type="submit" disabled={createMutation.isPending}>
{createMutation.isPending && (
<Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />
)}
{t("medications.sideEffects.submitCta")}
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
{footerEl
? createPortal(
<div className="flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<Button
type="button"
variant="ghost"
onClick={() => setOpen(false)}
>
{t("medications.sideEffects.cancelCta")}
</Button>
<Button
type="submit"
form={formId}
disabled={createMutation.isPending}
>
{createMutation.isPending && (
<Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
)}
{t("medications.sideEffects.submitCta")}
</Button>
</div>,
footerEl,
)
: null}
</ResponsiveSheet>
</MedicationDetailSection>
);
}
@@ -119,7 +119,7 @@ export function TitrationSection({ medicationId }: TitrationSectionProps) {
>
{isLoading && (
<div className="text-muted-foreground flex items-center gap-2">
<Loader2 className="h-3.5 w-3.5 animate-spin" />
<Loader2 className="h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
<span>{t("medications.titration.loading")}</span>
</div>
)}
@@ -138,7 +138,15 @@ export function TitrationSection({ medicationId }: TitrationSectionProps) {
{hasLadder ? (
<ol
className="flex flex-col gap-2 sm:flex-row sm:flex-wrap sm:items-stretch"
// v1.4.27 MB7 / CF-48 — keep the vertical (`flex-col`)
// layout until `md:` instead of breaking to horizontal
// at `sm:`. On Pixel 5 (375 px) the horizontal ladder
// had 4-5 visible steps but each step's "Standard 0.5
// mg" + "typical 4 weeks" label combo wrapped to 3
// lines per step, which read as a denser block than
// the vertical layout below. From `md:` upwards the
// wider container can absorb the horizontal stride.
className="flex flex-col gap-2 md:flex-row md:flex-wrap md:items-stretch"
aria-label={t("medications.titration.drugLadderHeader")}
>
{data.ladder.map((step) => {
@@ -149,7 +157,7 @@ export function TitrationSection({ medicationId }: TitrationSectionProps) {
<li
key={step.stepIndex}
className={[
"border-border/70 flex flex-1 flex-col rounded-md border px-2.5 py-2 sm:min-w-[7rem]",
"border-border/70 flex flex-1 flex-col rounded-md border px-2.5 py-2 md:min-w-[7rem]",
isCurrent
? "border-primary ring-primary/40 ring-2"
: "",
@@ -60,37 +60,38 @@ vi.mock("sonner", () => ({
},
}));
// Radix Dialog uses Portals which `renderToStaticMarkup` does not
// realise. We collapse the primitives to plain wrappers so the body of
// the dialog is reachable in the static markup.
vi.mock("@/components/ui/dialog", () => ({
Dialog: ({
// v1.4.27 R4 RC2 — the dialog now mounts <ResponsiveSheet>. Its
// internals (Sheet on `<md`, Dialog on `md+`) both portal at runtime;
// we collapse the primitive to a plain wrapper so the body of the
// dialog stays reachable in the static markup.
vi.mock("@/components/ui/responsive-sheet", () => ({
ResponsiveSheet: ({
open,
title,
description,
footer,
children,
}: {
open: boolean;
title: React.ReactNode;
description?: React.ReactNode;
footer?: React.ReactNode;
children: React.ReactNode;
}) => (open ? <div data-slot="mock-dialog">{children}</div> : null),
DialogContent: ({
children,
...rest
}: React.ComponentProps<"div"> & { children: React.ReactNode }) => (
<div data-slot="mock-dialog-content" {...rest}>
{children}
</div>
),
DialogHeader: ({ children }: { children: React.ReactNode }) => (
<div data-slot="mock-dialog-header">{children}</div>
),
DialogTitle: ({ children }: { children: React.ReactNode }) => (
<h2 data-slot="mock-dialog-title">{children}</h2>
),
DialogDescription: ({ children }: { children: React.ReactNode }) => (
<p data-slot="mock-dialog-description">{children}</p>
),
DialogFooter: ({ children }: { children: React.ReactNode }) => (
<div data-slot="mock-dialog-footer">{children}</div>
),
}) =>
open ? (
<div data-slot="mock-responsive-sheet">
<div data-slot="mock-responsive-sheet-header">
<h2 data-slot="mock-responsive-sheet-title">{title}</h2>
{description ? (
<p data-slot="mock-responsive-sheet-description">{description}</p>
) : null}
</div>
<div data-slot="mock-responsive-sheet-body">{children}</div>
{footer ? (
<div data-slot="mock-responsive-sheet-footer">{footer}</div>
) : null}
</div>
) : null,
}));
import { ResearchModeAcknowledgmentDialog } from "../ResearchModeAcknowledgmentDialog";
+156 -101
View File
@@ -16,12 +16,7 @@ import {
AlertDialogTitle,
AlertDialogTrigger,
} from "@/components/ui/alert-dialog";
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
import {
DropdownMenu,
DropdownMenuContent,
@@ -53,7 +48,8 @@ import {
SkipForward,
AlertTriangle,
} from "lucide-react";
import { useState, useCallback } from "react";
import { useId, useState, useCallback } from "react";
import { createPortal } from "react-dom";
import { formatDateTime } from "@/lib/format";
import { useTranslations } from "@/lib/i18n/context";
@@ -115,6 +111,21 @@ export function IntakeHistoryList({
const [editSkipped, setEditSkipped] = useState(false);
const [editError, setEditError] = useState<string | null>(null);
const [editDeleteDialogOpen, setEditDeleteDialogOpen] = useState(false);
// v1.4.27 MB3 — error banners reference the form inputs via
// aria-describedby so screen readers announce validation failures.
const editErrorId = useId();
const editErrorDescriptor = editError ? editErrorId : undefined;
// v1.4.27 R4 RC2 — portal targets + stable form ids so the edit and
// create sheets sticky-pin Save / Cancel via the
// `<ResponsiveSheet>` footer slot. Submit buttons keep their `<form>`
// association via the HTML `form` attribute.
const editFormId = useId();
const createFormId = useId();
const [editFooterEl, setEditFooterEl] = useState<HTMLDivElement | null>(null);
const [createFooterEl, setCreateFooterEl] = useState<HTMLDivElement | null>(
null,
);
// Create state — controlled via props or internal
const [internalCreating, setInternalCreating] = useState(false);
@@ -123,6 +134,8 @@ export function IntakeHistoryList({
const [createTakenAt, setCreateTakenAt] = useState("");
const [createSkipped, setCreateSkipped] = useState(false);
const [createError, setCreateError] = useState<string | null>(null);
const createErrorId = useId();
const createErrorDescriptor = createError ? createErrorId : undefined;
const setCreatingRaw = onCreateOpenChange ?? setInternalCreating;
const setCreating = useCallback(
(open: boolean) => {
@@ -370,7 +383,7 @@ export function IntakeHistoryList({
{isLoading ? (
<div className="flex h-32 items-center justify-center">
<Loader2 className="text-primary h-6 w-6 animate-spin" />
<Loader2 className="text-primary h-6 w-6 animate-spin motion-reduce:animate-none" />
</div>
) : !data?.events?.length ? (
<div className="text-muted-foreground flex h-32 items-center justify-center rounded-lg border border-dashed">
@@ -433,11 +446,11 @@ export function IntakeHistoryList({
<Button
variant="ghost"
size="icon"
className="h-8 w-8"
className="size-11"
onClick={() => startEdit(event)}
aria-label={t("common.edit")}
>
<Pencil className="h-3.5 w-3.5" />
<Pencil className="h-4 w-4" />
</Button>
<DeleteButton
label={t("medications.intakeDeleteConfirm")}
@@ -483,11 +496,11 @@ export function IntakeHistoryList({
<Button
variant="ghost"
size="icon"
className="h-8 w-8"
className="size-11"
onClick={() => startEdit(event)}
aria-label={t("common.edit")}
>
<Pencil className="h-3.5 w-3.5" />
<Pencil className="h-4 w-4" />
</Button>
<DeleteButton
label={t("medications.intakeDeleteConfirm")}
@@ -511,17 +524,21 @@ export function IntakeHistoryList({
<div className="flex gap-1">
<Button
variant="ghost"
size="sm"
size="icon"
className="size-11"
disabled={page <= 1}
onClick={() => setPage((p) => p - 1)}
aria-label={t("medications.previousPage")}
>
<ChevronLeft className="h-4 w-4" />
</Button>
<Button
variant="ghost"
size="sm"
size="icon"
className="size-11"
disabled={page >= totalPages}
onClick={() => setPage((p) => p + 1)}
aria-label={t("medications.nextPage")}
>
<ChevronRight className="h-4 w-4" />
</Button>
@@ -530,14 +547,19 @@ export function IntakeHistoryList({
)}
</div>
{/* Edit Dialog */}
<Dialog open={!!editing} onOpenChange={(open) => !open && closeEdit()}>
<DialogContent>
<DialogHeader>
<DialogTitle>{t("medications.editIntake")}</DialogTitle>
</DialogHeader>
{/* Edit Sheet */}
<ResponsiveSheet
open={!!editing}
onOpenChange={(open) => !open && closeEdit()}
title={t("medications.editIntake")}
footer={<div ref={setEditFooterEl} className="flex w-full" />}
>
{editing && (
<form onSubmit={submitEdit} className="space-y-4">
<form
id={editFormId}
onSubmit={submitEdit}
className="space-y-4"
>
<div className="space-y-2">
<Label htmlFor="edit-scheduledFor">
{t("medications.intakeScheduledFor")}
@@ -547,6 +569,9 @@ export function IntakeHistoryList({
value={editScheduledFor}
onChange={(e) => setEditScheduledFor(e.target.value)}
required
aria-required="true"
aria-invalid={!!editError || undefined}
aria-describedby={editErrorDescriptor}
/>
</div>
@@ -559,6 +584,8 @@ export function IntakeHistoryList({
value={editTakenAt}
onChange={(e) => setEditTakenAt(e.target.value)}
disabled={editSkipped}
aria-invalid={!!editError || undefined}
aria-describedby={editErrorDescriptor}
/>
</div>
@@ -578,6 +605,7 @@ export function IntakeHistoryList({
{editError && (
<div
id={editErrorId}
role="alert"
aria-live="assertive"
className="bg-destructive/10 text-destructive rounded-lg p-3 text-sm"
@@ -586,57 +614,66 @@ export function IntakeHistoryList({
</div>
)}
<div className="flex items-center justify-between gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
type="button"
variant="outline"
size="icon"
className="h-9 w-9"
disabled={
updateMutation.isPending || deleteMutation.isPending
}
aria-label={t("common.moreOptions")}
>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
<DropdownMenuItem
variant="destructive"
onClick={() => setEditDeleteDialogOpen(true)}
>
<Trash2 className="mr-2 h-4 w-4" />
{t("common.delete")}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
{editFooterEl
? createPortal(
<div className="flex w-full items-center justify-between gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
type="button"
variant="outline"
size="icon"
className="size-11"
disabled={
updateMutation.isPending ||
deleteMutation.isPending
}
aria-label={t("common.moreOptions")}
>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
<DropdownMenuItem
variant="destructive"
onClick={() => setEditDeleteDialogOpen(true)}
>
<Trash2 className="mr-2 h-4 w-4" />
{t("common.delete")}
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<div className="flex items-center gap-2">
<Button
type="button"
variant="outline"
onClick={closeEdit}
disabled={
updateMutation.isPending || deleteMutation.isPending
}
>
{t("common.cancel")}
</Button>
<Button
type="submit"
disabled={
updateMutation.isPending || deleteMutation.isPending
}
>
{updateMutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
) : null}
{t("common.save")}
</Button>
</div>
</div>
<div className="flex items-center gap-2">
<Button
type="button"
variant="outline"
onClick={closeEdit}
disabled={
updateMutation.isPending ||
deleteMutation.isPending
}
>
{t("common.cancel")}
</Button>
<Button
type="submit"
form={editFormId}
disabled={
updateMutation.isPending ||
deleteMutation.isPending
}
>
{updateMutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : null}
{t("common.save")}
</Button>
</div>
</div>,
editFooterEl,
)
: null}
<AlertDialog
open={editDeleteDialogOpen}
@@ -661,7 +698,7 @@ export function IntakeHistoryList({
disabled={deleteMutation.isPending}
>
{deleteMutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : null}
{t("common.delete")}
</AlertDialogAction>
@@ -670,16 +707,20 @@ export function IntakeHistoryList({
</AlertDialog>
</form>
)}
</DialogContent>
</Dialog>
</ResponsiveSheet>
{/* Create Dialog */}
<Dialog open={creating} onOpenChange={(open) => !open && closeCreate()}>
<DialogContent>
<DialogHeader>
<DialogTitle>{t("medications.newIntake")}</DialogTitle>
</DialogHeader>
<form onSubmit={submitCreate} className="space-y-4">
{/* Create Sheet */}
<ResponsiveSheet
open={creating}
onOpenChange={(open) => !open && closeCreate()}
title={t("medications.newIntake")}
footer={<div ref={setCreateFooterEl} className="flex w-full" />}
>
<form
id={createFormId}
onSubmit={submitCreate}
className="space-y-4"
>
<div className="space-y-2">
<Label htmlFor="create-scheduledFor">
{t("medications.intakeScheduledFor")}
@@ -689,6 +730,9 @@ export function IntakeHistoryList({
value={createScheduledFor}
onChange={(e) => setCreateScheduledFor(e.target.value)}
required
aria-required="true"
aria-invalid={!!createError || undefined}
aria-describedby={createErrorDescriptor}
/>
</div>
@@ -701,6 +745,8 @@ export function IntakeHistoryList({
value={createTakenAt}
onChange={(e) => setCreateTakenAt(e.target.value)}
disabled={createSkipped}
aria-invalid={!!createError || undefined}
aria-describedby={createErrorDescriptor}
/>
</div>
@@ -720,6 +766,7 @@ export function IntakeHistoryList({
{createError && (
<div
id={createErrorId}
role="alert"
aria-live="assertive"
className="bg-destructive/10 text-destructive rounded-lg p-3 text-sm"
@@ -728,25 +775,33 @@ export function IntakeHistoryList({
</div>
)}
<div className="flex items-center justify-end gap-2">
<Button
type="button"
variant="outline"
onClick={closeCreate}
disabled={createMutation.isPending}
>
{t("common.cancel")}
</Button>
<Button type="submit" disabled={createMutation.isPending}>
{createMutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
) : null}
{t("common.save")}
</Button>
</div>
</form>
</DialogContent>
</Dialog>
{createFooterEl
? createPortal(
<div className="flex w-full items-center justify-end gap-2">
<Button
type="button"
variant="outline"
onClick={closeCreate}
disabled={createMutation.isPending}
>
{t("common.cancel")}
</Button>
<Button
type="submit"
form={createFormId}
disabled={createMutation.isPending}
>
{createMutation.isPending ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : null}
{t("common.save")}
</Button>
</div>,
createFooterEl,
)
: null}
</ResponsiveSheet>
</>
);
}
@@ -805,10 +860,10 @@ function DeleteButton({
<Button
variant="ghost"
size="icon"
className="text-destructive h-8 w-8"
className="text-destructive size-11"
aria-label={label}
>
<Trash2 className="h-3.5 w-3.5" />
<Trash2 className="h-4 w-4" />
</Button>
</AlertDialogTrigger>
<AlertDialogContent>
@@ -1,17 +1,12 @@
"use client";
import { useMemo, useState } from "react";
import { useId, useMemo, useState } from "react";
import { createPortal } from "react-dom";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { ChevronDown, Loader2, Plus, Trash2 } from "lucide-react";
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Badge } from "@/components/ui/badge";
@@ -75,6 +70,18 @@ export function InventorySection({
const [open, setOpen] = useState(false);
const [addOpen, setAddOpen] = useState(false);
// v1.4.27 B7 / L3 — explicit aria-controls between summary and disclosed
// panel for parity with the W8e Provenance accordion.
const panelId = useId();
const pastPanelId = useId();
// v1.4.27 MB3 — link the add-pen error message back to the doses-total
// input via aria-describedby so screen readers announce the failure
// when the form rejects an out-of-range value.
const formErrorId = useId();
// v1.4.27 R4 RC2 — portal target + stable form id wire the sticky
// Save / Cancel row into the `<ResponsiveSheet>` footer slot.
const formId = useId();
const [footerEl, setFooterEl] = useState<HTMLDivElement | null>(null);
const [dosesTotal, setDosesTotal] = useState<string>(
defaultDosesPerUnit ? String(defaultDosesPerUnit) : "",
);
@@ -247,7 +254,11 @@ export function InventorySection({
open={open}
onToggle={(e) => setOpen((e.target as HTMLDetailsElement).open)}
>
<summary className="text-foreground/85 flex cursor-pointer list-none items-center justify-between px-3 py-2 font-medium">
<summary
className="text-foreground/85 flex cursor-pointer list-none items-center justify-between px-3 py-2 font-medium"
aria-controls={panelId}
aria-expanded={open}
>
<span>
{t("medications.inventory.title")}
{liveItems.length > 0 && (
@@ -262,10 +273,13 @@ export function InventorySection({
}`}
/>
</summary>
<div className="border-border/60 space-y-3 border-t px-3 py-2.5">
<div
id={panelId}
className="border-border/60 space-y-3 border-t px-3 py-2.5"
>
{isLoading && (
<div className="flex items-center gap-2 text-muted-foreground">
<Loader2 className="h-3.5 w-3.5 animate-spin" />
<Loader2 className="h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
<span>{t("medications.inventory.loading")}</span>
</div>
)}
@@ -319,9 +333,8 @@ export function InventorySection({
<div className="flex shrink-0 flex-col gap-1">
{item.state === "ACTIVE" && (
<Button
size="sm"
variant="outline"
className="h-7 px-2 text-[10px]"
className="min-h-11 px-3 text-xs"
onClick={() =>
patchMutation.mutate({
itemId: item.id,
@@ -335,9 +348,8 @@ export function InventorySection({
)}
{(item.state === "ACTIVE" || item.state === "IN_USE") && (
<Button
size="sm"
variant="ghost"
className="h-7 px-2 text-[10px]"
className="min-h-11 px-3 text-xs"
onClick={() =>
patchMutation.mutate({
itemId: item.id,
@@ -357,12 +369,18 @@ export function InventorySection({
{pastItems.length > 0 && (
<details className="border-border/40 rounded-md border">
<summary className="text-muted-foreground cursor-pointer list-none px-2.5 py-1.5 font-medium">
<summary
className="text-muted-foreground cursor-pointer list-none px-2.5 py-1.5 font-medium"
aria-controls={pastPanelId}
>
{t("medications.inventory.pastTitle", {
count: pastItems.length,
})}
</summary>
<ul className="border-border/40 space-y-1 border-t px-2.5 py-2">
<ul
id={pastPanelId}
className="border-border/40 space-y-1 border-t px-2.5 py-2"
>
{pastItems.map((item) => (
<li
key={item.id}
@@ -386,14 +404,14 @@ export function InventorySection({
)}
</div>
<Button
size="sm"
variant="ghost"
className="h-6 w-6 p-0"
size="icon"
className="size-11 shrink-0"
onClick={() => deleteMutation.mutate(item.id)}
disabled={deleteMutation.isPending}
aria-label={t("medications.inventory.delete")}
>
<Trash2 className="h-3.5 w-3.5" />
<Trash2 className="h-4 w-4" />
</Button>
</li>
))}
@@ -413,14 +431,13 @@ export function InventorySection({
</div>
</details>
<Dialog open={addOpen} onOpenChange={setAddOpen}>
<DialogContent>
<DialogHeader>
<DialogTitle>
{t("medications.inventory.addPenTitle")}
</DialogTitle>
</DialogHeader>
<form onSubmit={handleSubmit} className="space-y-4">
<ResponsiveSheet
open={addOpen}
onOpenChange={setAddOpen}
title={t("medications.inventory.addPenTitle")}
footer={<div ref={setFooterEl} className="flex w-full" />}
>
<form id={formId} onSubmit={handleSubmit} className="space-y-4">
<div className="space-y-1.5">
<Label htmlFor="inv-doses-total">
{t("medications.inventory.fieldDosesTotal")}
@@ -429,12 +446,16 @@ export function InventorySection({
id="inv-doses-total"
type="number"
inputMode="numeric"
enterKeyHint="next"
min={1}
max={100}
step={1}
value={dosesTotal}
onChange={(e) => setDosesTotal(e.target.value)}
required
aria-required="true"
aria-invalid={!!formError || undefined}
aria-describedby={formError ? formErrorId : undefined}
/>
<p className="text-muted-foreground text-xs">
{t("medications.inventory.fieldDosesTotalHelp")}
@@ -448,6 +469,7 @@ export function InventorySection({
<Input
id="inv-printed-expiry"
type="date"
enterKeyHint="next"
value={printedExpiry}
onChange={(e) => setPrintedExpiry(e.target.value)}
/>
@@ -460,6 +482,7 @@ export function InventorySection({
<Input
id="inv-purchased-at"
type="date"
enterKeyHint="next"
value={purchasedAt}
onChange={(e) => setPurchasedAt(e.target.value)}
/>
@@ -475,35 +498,52 @@ export function InventorySection({
onChange={(e) => setNotes(e.target.value)}
maxLength={200}
rows={2}
enterKeyHint="done"
autoCapitalize="sentences"
className="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex w-full rounded-md border px-3 py-2 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50"
/>
</div>
{formError && (
<p className="text-destructive text-sm">{formError}</p>
<p
id={formErrorId}
role="alert"
aria-live="polite"
className="text-destructive text-sm"
>
{formError}
</p>
)}
<DialogFooter>
<Button
type="button"
variant="outline"
onClick={() => {
resetAddForm();
setAddOpen(false);
}}
>
{t("medications.inventory.cancel")}
</Button>
<Button type="submit" disabled={createMutation.isPending}>
{createMutation.isPending && (
<Loader2 className="mr-1 h-3.5 w-3.5 animate-spin" />
)}
{t("medications.inventory.save")}
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
{footerEl
? createPortal(
<div className="flex w-full flex-col-reverse gap-2 sm:flex-row sm:justify-end">
<Button
type="button"
variant="outline"
onClick={() => {
resetAddForm();
setAddOpen(false);
}}
>
{t("medications.inventory.cancel")}
</Button>
<Button
type="submit"
form={formId}
disabled={createMutation.isPending}
>
{createMutation.isPending && (
<Loader2 className="mr-1 h-3.5 w-3.5 animate-spin motion-reduce:animate-none" />
)}
{t("medications.inventory.save")}
</Button>
</div>,
footerEl,
)
: null}
</ResponsiveSheet>
</>
);
}
@@ -567,7 +567,7 @@ export function MedicationCard({ medication, onEdit }: MedicationCardProps) {
disabled={!!intakeLoading}
>
{intakeLoading === "take" ? (
<Loader2 className="mr-1 h-4 w-4 animate-spin" />
<Loader2 className="mr-1 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : (
<Check className="mr-1 h-4 w-4" />
)}
@@ -580,7 +580,7 @@ export function MedicationCard({ medication, onEdit }: MedicationCardProps) {
disabled={!!intakeLoading}
>
{intakeLoading === "skip" ? (
<Loader2 className="mr-1 h-4 w-4 animate-spin" />
<Loader2 className="mr-1 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : (
<SkipForward className="mr-1 h-4 w-4" />
)}
+206 -121
View File
@@ -1,6 +1,7 @@
"use client";
import { useState } from "react";
import { useId, useState } from "react";
import { createPortal } from "react-dom";
import { useQueryClient } from "@tanstack/react-query";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
@@ -160,6 +161,14 @@ interface Schedule {
interface MedicationFormProps {
onSuccess?: () => void;
onCancel?: () => void;
/**
* v1.4.27 R4 RC2 — when the form is mounted inside a
* `<ResponsiveSheet>` the caller passes the sheet's footer slot
* element here. The kebab + Cancel + Save row portals into that slot
* so the bottom-sheet branch can sticky-pin it; the Save button keeps
* its `<form>` association via the HTML `form` attribute.
*/
footerSlot?: HTMLElement | null;
editActions?: {
onImportIntakes: () => void;
onApiAccess: () => void;
@@ -236,6 +245,7 @@ function sortSchedules(list: Schedule[]): Schedule[] {
export function MedicationForm({
onSuccess,
onCancel,
footerSlot,
editActions,
initial,
}: MedicationFormProps) {
@@ -243,6 +253,11 @@ export function MedicationForm({
const { t, locale } = useTranslations();
const fmt = useFormatters();
// v1.4.27 R4 RC2 — stable form id so the portalled Save button keeps
// its `<form>` association via the HTML `form` attribute even when
// DOM-mounted in the `<ResponsiveSheet>` footer slot.
const formId = useId();
const doseUnits = [
"mg",
"g",
@@ -304,6 +319,12 @@ export function MedicationForm({
const [purgeDialogOpen, setPurgeDialogOpen] = useState(false);
const [phaseConfigOpen, setPhaseConfigOpen] = useState(false);
// v1.4.27 MB3 — link the form-level error banner to every required
// input via `aria-describedby` so screen readers announce the
// validation failure on save.
const errorId = useId();
const errorDescriptor = error ? errorId : undefined;
const isEdit = !!initial;
const dose = doseAmount
? `${doseAmount}${doseUnit ? ` ${doseUnit}` : ""}`
@@ -517,7 +538,7 @@ export function MedicationForm({
}
return (
<form onSubmit={handleSubmit} className="space-y-4">
<form id={formId} onSubmit={handleSubmit} className="space-y-4">
<div className="space-y-1.5">
<Label htmlFor="med-name">{t("medications.name")}</Label>
<Input
@@ -527,6 +548,12 @@ export function MedicationForm({
placeholder={t("medications.namePlaceholder")}
required
maxLength={100}
enterKeyHint="next"
autoCapitalize="words"
autoComplete="off"
aria-required="true"
aria-invalid={!!error || undefined}
aria-describedby={errorDescriptor}
/>
</div>
@@ -613,6 +640,11 @@ export function MedicationForm({
placeholder={t("medications.dosePlaceholder")}
required
maxLength={20}
enterKeyHint="next"
autoComplete="off"
aria-required="true"
aria-invalid={!!error || undefined}
aria-describedby={errorDescriptor}
/>
</div>
<div className="space-y-1.5">
@@ -625,6 +657,8 @@ export function MedicationForm({
placeholder="mg"
maxLength={30}
className="w-full"
enterKeyHint="next"
autoComplete="off"
/>
</div>
</div>
@@ -690,11 +724,14 @@ export function MedicationForm({
id="med-doses-per-unit"
type="number"
inputMode="numeric"
enterKeyHint="next"
min={1}
max={100}
value={dosesPerUnit}
onChange={(e) => setDosesPerUnit(e.target.value)}
placeholder={t("medications.glp1DosesPerUnitPlaceholder")}
aria-invalid={!!error || undefined}
aria-describedby={errorDescriptor}
/>
<p className="text-muted-foreground text-xs leading-4">
{t("medications.glp1DosesPerUnitHelp")}
@@ -768,64 +805,78 @@ export function MedicationForm({
</div>
<div className="mt-1 grid items-end gap-2 sm:grid-cols-2 xl:grid-cols-4">
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-xs font-normal">
{t("medications.scheduleFrom")}
</Label>
<Input
type="text"
inputMode="numeric"
pattern="[0-2][0-9]:[0-5][0-9]"
type="time"
enterKeyHint="next"
placeholder="08:00"
value={s.windowStart}
className="h-11 text-xs md:text-xs"
// v1.4.27 MB3 — `text-base` on mobile keeps the
// schedule time inputs at 16 px, the iOS Safari floor
// below which the focus-zoom auto-fires. Desktop
// stays compact at `text-xs` because the surrounding
// grid carries the small dense rhythm.
className="h-11 text-base md:text-xs"
onChange={(e) =>
updateSchedule(i, "windowStart", e.target.value)
}
required
aria-required="true"
aria-invalid={!!error || undefined}
aria-describedby={errorDescriptor}
maxLength={5}
/>
</div>
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-xs font-normal">
{t("medications.scheduleTo")}
</Label>
<Input
type="text"
inputMode="numeric"
pattern="[0-2][0-9]:[0-5][0-9]"
type="time"
enterKeyHint="next"
placeholder="09:00"
value={s.windowEnd}
className="h-11 text-xs md:text-xs"
className="h-11 text-base md:text-xs"
onChange={(e) =>
updateSchedule(i, "windowEnd", e.target.value)
}
required
aria-required="true"
aria-invalid={!!error || undefined}
aria-describedby={errorDescriptor}
maxLength={5}
/>
</div>
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-xs font-normal">
{t("medications.scheduleLabel")}
</Label>
<Input
value={s.label}
className="h-11 text-xs md:text-xs"
className="h-11 text-base md:text-xs"
onChange={(e) => updateSchedule(i, "label", e.target.value)}
placeholder={t("medications.labelPlaceholder")}
maxLength={50}
enterKeyHint="next"
autoCapitalize="sentences"
autoComplete="off"
/>
</div>
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-xs font-normal">
{t("medications.dose")}
</Label>
<Input
value={s.dose}
className="h-11 text-xs md:text-xs"
className="h-11 text-base md:text-xs"
onChange={(e) => updateSchedule(i, "dose", e.target.value)}
placeholder={dose || t("medications.defaultDose")}
maxLength={50}
enterKeyHint="done"
autoComplete="off"
/>
</div>
</div>
@@ -838,7 +889,7 @@ export function MedicationForm({
{/* Day-of-week selection */}
{s.showAdvanced && (
<div className="border-border/60 mt-2.5 space-y-2.5 border-t pt-2.5">
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-sm">
{t("medications.scheduleInterval")}
</Label>
@@ -862,22 +913,34 @@ export function MedicationForm({
</div>
</div>
<div className="space-y-1.5">
<div className="space-y-2">
<Label className="text-sm">
{t("medications.scheduleDays")}
</Label>
<div className="flex w-full gap-1">
<button
type="button"
onClick={() => updateSchedule(i, "daysOfWeek", [])}
className={`h-8 min-w-24 rounded-md border px-3 text-xs font-medium transition-colors ${
s.daysOfWeek.length === 0
? "border-primary bg-primary text-primary-foreground"
: "border-border/70 bg-muted text-foreground/70 hover:bg-accent hover:text-foreground"
}`}
>
{t("medications.scheduleDaily")}
</button>
{/* v1.4.27 MB6 CF-4 — the previous single-row
`flex w-full gap-1` layout placed the wide
"Daily" pill (min-w-24 ≈ 96 px) next to seven
weekday pills inside the same row. At 320 px
viewport widths the eighth child pushed the row
past the form edge and the last weekday clipped
off-screen. The new layout stacks the Daily
pill above a seven-column grid so each weekday
keeps the 44 px tap-target floor without
relying on the available width. The grid wraps
naturally at any container width because every
cell is one explicit grid track. */}
<button
type="button"
onClick={() => updateSchedule(i, "daysOfWeek", [])}
className={`block w-full min-h-11 rounded-md border px-3 text-xs font-medium transition-colors ${
s.daysOfWeek.length === 0
? "border-primary bg-primary text-primary-foreground"
: "border-border/70 bg-muted text-foreground/70 hover:bg-accent hover:text-foreground"
}`}
>
{t("medications.scheduleDaily")}
</button>
<div className="grid w-full grid-cols-7 gap-1">
{getDayLabelsShort(t).map((label, dayIndex) => {
const isSelected = s.daysOfWeek.includes(dayIndex);
return (
@@ -885,7 +948,7 @@ export function MedicationForm({
key={dayIndex}
type="button"
onClick={() => toggleDay(i, dayIndex)}
className={`h-8 flex-1 rounded-md border text-xs font-medium transition-colors ${
className={`min-h-11 rounded-md border text-xs font-medium transition-colors ${
isSelected
? "border-primary bg-primary text-primary-foreground"
: "border-border/70 bg-muted text-foreground/75 hover:bg-accent hover:text-foreground"
@@ -910,6 +973,7 @@ export function MedicationForm({
{error && (
<div
id={errorId}
role="alert"
aria-live="assertive"
className="bg-destructive/10 text-destructive rounded-lg p-3 text-sm"
@@ -918,102 +982,123 @@ export function MedicationForm({
</div>
)}
<div className="flex items-center justify-between gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
type="button"
variant="outline"
size="icon"
className="h-9 w-9"
disabled={loading || deleting}
aria-label={t("common.moreOptions")}
>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
{isEdit ? (
<>
{editActions && (
{(() => {
const footerNode = (
<div className="flex w-full items-center justify-between gap-2">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
type="button"
variant="outline"
size="icon"
className="h-11 w-11"
disabled={loading || deleting}
aria-label={t("common.moreOptions")}
>
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start">
{isEdit ? (
<>
<DropdownMenuItem onClick={editActions.onImportIntakes}>
<Upload className="mr-2 h-4 w-4" />
{t("medications.importIntakesAction")}
{editActions && (
<>
<DropdownMenuItem onClick={editActions.onImportIntakes}>
<Upload className="mr-2 h-4 w-4" />
{t("medications.importIntakesAction")}
</DropdownMenuItem>
<DropdownMenuItem onClick={editActions.onApiAccess}>
<Terminal className="mr-2 h-4 w-4" />
{t("medications.apiEndpointAction")}
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => setPhaseConfigOpen(true)}
>
<Clock className="mr-2 h-4 w-4" />
{t("medications.phaseConfig")}
</DropdownMenuItem>
<DropdownMenuSeparator />
</>
)}
<DropdownMenuItem
onClick={() => setActive((prev) => !prev)}
>
{active ? (
<Pause className="mr-2 h-4 w-4" />
) : (
<Play className="mr-2 h-4 w-4" />
)}
{active
? t("medications.pause")
: t("medications.activate")}
</DropdownMenuItem>
<DropdownMenuItem onClick={editActions.onApiAccess}>
<Terminal className="mr-2 h-4 w-4" />
{t("medications.apiEndpointAction")}
</DropdownMenuItem>
<DropdownMenuItem onClick={() => setPhaseConfigOpen(true)}>
<Clock className="mr-2 h-4 w-4" />
{t("medications.phaseConfig")}
<DropdownMenuItem
onClick={() =>
setNotificationsEnabled((prev) => !prev)
}
>
{notificationsEnabled ? (
<BellOff className="mr-2 h-4 w-4" />
) : (
<Bell className="mr-2 h-4 w-4" />
)}
{notificationsEnabled
? t("medications.disableNotifications")
: t("medications.enableNotifications")}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
onClick={() => setPurgeDialogOpen(true)}
>
<Eraser className="mr-2 h-4 w-4" />
{t("medications.purgeRecords")}
</DropdownMenuItem>
<DropdownMenuItem
variant="destructive"
onClick={() => setDeleteDialogOpen(true)}
>
<Trash2 className="mr-2 h-4 w-4" />
{t("common.delete")}
</DropdownMenuItem>
</>
) : (
<DropdownMenuItem onClick={resetCreateForm}>
<RotateCcw className="mr-2 h-4 w-4" />
{t("medications.formReset")}
</DropdownMenuItem>
)}
<DropdownMenuItem onClick={() => setActive((prev) => !prev)}>
{active ? (
<Pause className="mr-2 h-4 w-4" />
) : (
<Play className="mr-2 h-4 w-4" />
)}
{active ? t("medications.pause") : t("medications.activate")}
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => setNotificationsEnabled((prev) => !prev)}
>
{notificationsEnabled ? (
<BellOff className="mr-2 h-4 w-4" />
) : (
<Bell className="mr-2 h-4 w-4" />
)}
{notificationsEnabled
? t("medications.disableNotifications")
: t("medications.enableNotifications")}
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
variant="destructive"
onClick={() => setPurgeDialogOpen(true)}
>
<Eraser className="mr-2 h-4 w-4" />
{t("medications.purgeRecords")}
</DropdownMenuItem>
<DropdownMenuItem
variant="destructive"
onClick={() => setDeleteDialogOpen(true)}
>
<Trash2 className="mr-2 h-4 w-4" />
{t("common.delete")}
</DropdownMenuItem>
</>
) : (
<DropdownMenuItem onClick={resetCreateForm}>
<RotateCcw className="mr-2 h-4 w-4" />
{t("medications.formReset")}
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
</DropdownMenuContent>
</DropdownMenu>
<div className="flex items-center gap-2">
{onCancel && (
<Button
type="button"
variant="outline"
onClick={onCancel}
disabled={loading || deleting}
>
{t("common.cancel")}
</Button>
)}
<Button type="submit" disabled={loading || deleting}>
{loading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
{isEdit ? t("common.save") : t("medications.createMedication")}
</Button>
</div>
</div>
<div className="flex items-center gap-2">
{onCancel && (
<Button
type="button"
variant="outline"
onClick={onCancel}
disabled={loading || deleting}
>
{t("common.cancel")}
</Button>
)}
<Button
type="submit"
form={formId}
disabled={loading || deleting}
>
{loading && (
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
)}
{isEdit
? t("common.save")
: t("medications.createMedication")}
</Button>
</div>
</div>
);
return footerSlot ? createPortal(footerNode, footerSlot) : footerNode;
})()}
<AlertDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
<AlertDialogContent>
@@ -1057,7 +1142,7 @@ export function MedicationForm({
disabled={purging}
>
{purging ? (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
) : null}
{t("medications.purgeRecords")}
</AlertDialogAction>
@@ -2,14 +2,7 @@
import { useState } from "react";
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogDescription,
DialogFooter,
} from "@/components/ui/dialog";
import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Loader2, RotateCcw } from "lucide-react";
@@ -160,18 +153,49 @@ export function PhaseConfigDialog({
};
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>{t("medications.phaseConfig")}</DialogTitle>
<DialogDescription>
{t("medications.phaseConfigDescription")}
</DialogDescription>
</DialogHeader>
<ResponsiveSheet
open={open}
onOpenChange={onOpenChange}
title={t("medications.phaseConfig")}
description={t("medications.phaseConfigDescription")}
className="sm:max-w-md"
footer={
<div className="flex w-full flex-row justify-between gap-2 sm:justify-between">
<Button
type="button"
variant="ghost"
size="sm"
onClick={() => resetMutation.mutate()}
disabled={resetMutation.isPending}
>
<RotateCcw className="mr-2 h-4 w-4" />
{t("medications.phaseResetDefaults")}
</Button>
<div className="flex gap-2">
<Button
type="button"
variant="outline"
onClick={() => onOpenChange(false)}
>
{t("common.cancel")}
</Button>
<Button
type="button"
onClick={() => saveMutation.mutate(form)}
disabled={saveMutation.isPending}
>
{saveMutation.isPending && (
<Loader2 className="mr-2 h-4 w-4 animate-spin motion-reduce:animate-none" />
)}
{t("common.save")}
</Button>
</div>
</div>
}
>
{isLoading ? (
<div className="flex items-center justify-center py-8">
<Loader2 className="h-6 w-6 animate-spin" />
<Loader2 className="h-6 w-6 animate-spin motion-reduce:animate-none" />
</div>
) : (
<div className="space-y-3">
@@ -182,7 +206,18 @@ export function PhaseConfigDialog({
const mode = form[modeKey] as "MINUTES" | "PERCENT";
return (
<div key={key} className="flex items-center gap-2">
// v1.4.27 MB7 / CF-50 — stack the row on `<sm` so
// the input + mode toggle + suffix caption don't
// overflow the 280-300 px dialog inner width on
// Galaxy Fold. The dot + phase label stay on the
// first line; the input / toggle / suffix wrap
// beneath. At `sm:` the original single-line layout
// returns because the wider dialog can absorb the
// five horizontal slots.
<div
key={key}
className="flex flex-wrap items-center gap-2 sm:flex-nowrap"
>
<div
className={`h-3 w-3 rounded-full ${dotClass} shrink-0`}
aria-hidden="true"
@@ -211,7 +246,7 @@ export function PhaseConfigDialog({
? t("medications.phaseMinutes")
: t("medications.phasePercent")}
</Button>
<span className="text-muted-foreground shrink-0 text-xs">
<span className="text-muted-foreground basis-full text-xs sm:basis-auto sm:shrink-0">
{direction === "before"
? t("medications.phaseBeforeEnd")
: t("medications.phaseAfterEnd")}
@@ -227,39 +262,6 @@ export function PhaseConfigDialog({
{statusMessage}
</div>
)}
<DialogFooter className="flex-row justify-between gap-2 sm:justify-between">
<Button
type="button"
variant="ghost"
size="sm"
onClick={() => resetMutation.mutate()}
disabled={resetMutation.isPending}
>
<RotateCcw className="mr-2 h-4 w-4" />
{t("medications.phaseResetDefaults")}
</Button>
<div className="flex gap-2">
<Button
type="button"
variant="outline"
onClick={() => onOpenChange(false)}
>
{t("common.cancel")}
</Button>
<Button
type="button"
onClick={() => saveMutation.mutate(form)}
disabled={saveMutation.isPending}
>
{saveMutation.isPending && (
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
)}
{t("common.save")}
</Button>
</div>
</DialogFooter>
</DialogContent>
</Dialog>
</ResponsiveSheet>
);
}