mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 23:33:29 +00:00
refactor(ui): one Segmented control instead of four
The timeline's Segmented, the document sources' SegmentedChoice, the medication detail's SegmentedToggle and the icon-only ViewToggle were four implementations of the same control in two looks, two at 36 px on a phone. ui/segmented.tsx replaces all four, plus the hand-rolled range rows above the lab and custom metric charts, the mood dimension window and the inventory quantity mode: a muted track with the chosen segment raised, radio semantics with roving focus by default, pressed-button semantics for view switches and form sheets, icon-only segments, and 44 px per segment on a coarse pointer. A test holds the definition to that one module.
This commit is contained in:
1 parent
c849619bee
commit
ab3f21c58c
26 files changed
+428
-139
No files matched your search
@@ -50,7 +50,6 @@ import { queryKeys } from "@/lib/query-keys";
|
||||
|
||||
import { ImportFromSourceButton } from "../import-from-source-button";
|
||||
import { mergeIds } from "../merge-ids";
|
||||
import { nextChoiceIndex } from "../segmented-choice";
|
||||
import { errorCodeOf, sourceErrorMessage } from "../source-errors";
|
||||
|
||||
const PAPERLESS = {
|
||||
@@ -255,19 +254,6 @@ describe("source error sentences", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("nextChoiceIndex", () => {
|
||||
it("moves with the arrows, wraps, and jumps with Home and End", () => {
|
||||
expect(nextChoiceIndex("ArrowRight", 0, 2)).toBe(1);
|
||||
expect(nextChoiceIndex("ArrowRight", 1, 2)).toBe(0);
|
||||
expect(nextChoiceIndex("ArrowLeft", 0, 2)).toBe(1);
|
||||
expect(nextChoiceIndex("ArrowDown", 0, 3)).toBe(1);
|
||||
expect(nextChoiceIndex("ArrowUp", 0, 3)).toBe(2);
|
||||
expect(nextChoiceIndex("Home", 2, 3)).toBe(0);
|
||||
expect(nextChoiceIndex("End", 0, 3)).toBe(2);
|
||||
expect(nextChoiceIndex("Enter", 0, 3)).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe("mergeIds", () => {
|
||||
it("adds imported ids to a form's selection once, in order", () => {
|
||||
expect(mergeIds(["a", "b"], ["b", "c", "c"])).toEqual(["a", "b", "c"]);
|
||||
|
||||
@@ -81,7 +81,7 @@ import {
|
||||
isStoppingError,
|
||||
sourceErrorMessage,
|
||||
} from "./source-errors";
|
||||
import { SegmentedChoice } from "./segmented-choice";
|
||||
import { Segmented } from "@/components/ui/segmented";
|
||||
import { systemName } from "./use-document-sources";
|
||||
import { InlineAction } from "@/components/ui/inline-action";
|
||||
|
||||
@@ -409,13 +409,16 @@ export function DocumentSourcePicker({
|
||||
>
|
||||
<div className="space-y-3" data-slot="document-source-picker">
|
||||
{systems.length > 1 && active ? (
|
||||
<SegmentedChoice
|
||||
options={systems}
|
||||
<Segmented
|
||||
options={systems.map((system) => ({
|
||||
value: system,
|
||||
label: systemName(system),
|
||||
}))}
|
||||
value={active}
|
||||
onChange={switchSystem}
|
||||
label={t("documents.sourcePicker.sourceLabel")}
|
||||
disabled={running}
|
||||
renderOption={systemName}
|
||||
className="self-start"
|
||||
/>
|
||||
) : null}
|
||||
|
||||
|
||||
Reference in new issue
Block a user