{t('footerCopyright')}
diff --git a/frontend/src/components/treatment/toothSelectionGroups.ts b/frontend/src/components/treatment/toothSelectionGroups.ts
index a86bf1d..42483c1 100644
--- a/frontend/src/components/treatment/toothSelectionGroups.ts
+++ b/frontend/src/components/treatment/toothSelectionGroups.ts
@@ -23,6 +23,28 @@ export function deriveTeethFromGroups(groups: ToothSelectionGroup[]): FdiToothId
return [...set].sort() as FdiToothId[];
}
+/** Never allow a 1-tooth connected group (no lone connected dots). */
+function normalizeGroupKind(kind: ToothSelectionKind, teeth: FdiToothId[]): ToothSelectionKind {
+ if (kind === 'connected' && teeth.length < 2) return 'single';
+ return kind;
+}
+
+function makeGroup(kind: ToothSelectionKind, teeth: FdiToothId[]): ToothSelectionGroup | null {
+ if (teeth.length === 0) return null;
+ return {
+ groupId: newGroupId(),
+ kind: normalizeGroupKind(kind, teeth),
+ teeth,
+ };
+}
+
+function sortInArchOrder(teeth: FdiToothId[]): FdiToothId[] {
+ if (teeth.length === 0) return [];
+ const arch = archOrder(teeth[0]);
+ if (!arch) return [...teeth];
+ return [...teeth].sort((a, b) => arch.indexOf(a) - arch.indexOf(b));
+}
+
/** Legacy / empty groups: each selected tooth becomes its own single group. */
export function groupsFromFlatTeeth(
teeth: readonly FdiToothId[],
@@ -36,11 +58,10 @@ export function groupsFromFlatTeeth(
teeth: g.teeth.filter((t) => flat.has(t)) as FdiToothId[],
}))
.filter((g) => g.teeth.length > 0)
- .map((g) =>
- g.kind === 'connected' && g.teeth.length < 2
- ? { ...g, kind: 'single' as const }
- : g,
- );
+ .map((g) => ({
+ ...g,
+ kind: normalizeGroupKind(g.kind, g.teeth),
+ }));
const covered = new Set(next.flatMap((g) => g.teeth));
for (const tooth of teeth) {
if (!covered.has(tooth)) {
@@ -94,8 +115,11 @@ export function teethBetweenInclusive(a: FdiToothId, b: FdiToothId): FdiToothId[
/**
* Plain click:
* - unselected → add as single
- * - selected single → remove
- * - selected in connected → drop the whole connected span and keep only this tooth as a single
+ * - selected single → remove (deselect)
+ * - in connected bridge → cut from bridge, keep selected as single:
+ * - end tooth → remainder stays one bridge (or demotes if 1 left)
+ * - middle tooth → left and right become separate bridges/singles
+ * Never leaves a 1-tooth connected group (no lone dots).
*/
export function toggleToothInGroups(
groups: ToothSelectionGroup[],
@@ -110,15 +134,26 @@ export function toggleToothInGroups(
return groups.filter((g) => g.groupId !== owning.groupId);
}
- // Collapse connected span: only the clicked tooth remains, as a separate single.
+ const ordered = sortInArchOrder(owning.teeth);
+ const idx = ordered.indexOf(tooth);
+ if (idx < 0) return groups;
+
+ const left = ordered.slice(0, idx);
+ const right = ordered.slice(idx + 1);
const next = groups.filter((g) => g.groupId !== owning.groupId);
+
+ const leftGroup = makeGroup(left.length >= 2 ? 'connected' : 'single', left);
+ const rightGroup = makeGroup(right.length >= 2 ? 'connected' : 'single', right);
+ if (leftGroup) next.push(leftGroup);
+ if (rightGroup) next.push(rightGroup);
next.push({ groupId: newGroupId(), kind: 'single', teeth: [tooth] });
return next;
}
/**
* Shift-click creates a connected span between anchor and target on the same arch.
- * Any existing groups that intersect the span are replaced by the new connected group.
+ * Overlapping existing bridges are merged (union) into one connected bridge.
+ * Non-overlapping bridges are left alone. Singles inside the union are absorbed.
*/
export function applyShiftRange(
groups: ToothSelectionGroup[],
@@ -129,58 +164,47 @@ export function applyShiftRange(
const span = teethBetweenInclusive(anchor, target);
if (!span || span.length < 2) return null;
- const spanSet = new Set(span);
- const next = groups
- .map((g) => ({
- ...g,
- teeth: g.teeth.filter((t) => !spanSet.has(t)) as FdiToothId[],
- }))
- .filter((g) => g.teeth.length > 0)
- .map((g) =>
- g.kind === 'connected' && g.teeth.length < 2
- ? { ...g, kind: 'single' as const }
- : g,
- );
-
- next.push({ groupId: newGroupId(), kind: 'connected', teeth: span });
- return next;
-}
-
-/**
- * Ctrl-click selects every tooth in the same-arch range as its own single group
- * (not connected). Lab dispatch gets one prosthesis row per tooth.
- */
-export function applyCtrlRange(
- groups: ToothSelectionGroup[],
- anchor: FdiToothId,
- target: FdiToothId,
-): ToothSelectionGroup[] | null {
- if (anchor === target) return null;
- const span = teethBetweenInclusive(anchor, target);
- if (!span || span.length < 2) return null;
-
- const spanSet = new Set(span);
- const next = groups
- .map((g) => ({
- ...g,
- teeth: g.teeth.filter((t) => !spanSet.has(t)) as FdiToothId[],
- }))
- .filter((g) => g.teeth.length > 0)
- .map((g) =>
- g.kind === 'connected' && g.teeth.length < 2
- ? { ...g, kind: 'single' as const }
- : g,
- );
-
- for (const tooth of span) {
- next.push({ groupId: newGroupId(), kind: 'single', teeth: [tooth] });
+ const union = new Set
(span);
+ let changed = true;
+ while (changed) {
+ changed = false;
+ for (const group of groups) {
+ if (group.kind !== 'connected') continue;
+ if (!group.teeth.some((t) => union.has(t))) continue;
+ for (const t of group.teeth) {
+ if (!union.has(t)) {
+ union.add(t);
+ changed = true;
+ }
+ }
+ }
}
+
+ const unionTeeth = sortInArchOrder([...union] as FdiToothId[]);
+ if (unionTeeth.length < 2) return null;
+
+ const next = groups
+ .map((g) => ({
+ ...g,
+ teeth: g.teeth.filter((t) => !union.has(t)) as FdiToothId[],
+ }))
+ .filter((g) => g.teeth.length > 0)
+ .map((g) => ({
+ ...g,
+ kind: normalizeGroupKind(g.kind, g.teeth),
+ }));
+
+ next.push({
+ groupId: newGroupId(),
+ kind: 'connected',
+ teeth: unionTeeth,
+ });
return next;
}
/**
* Drop prosthesis rows for teeth no longer selected on a detail, and refresh
- * selectionGroupId so connected→single collapses do not leave stale group ids.
+ * selectionGroupId so group changes do not leave stale group ids.
*/
export function pruneToothProsthesisForGroups<
T extends { detailClientId: string; tooth: string; selectionGroupId?: string },
@@ -213,7 +237,7 @@ export function normalizeToothSelectionGroups(value: unknown): ToothSelectionGro
if (teeth.length === 0) continue;
out.push({
groupId,
- kind: kind === 'connected' && teeth.length < 2 ? 'single' : kind,
+ kind: normalizeGroupKind(kind, teeth),
teeth,
});
}
diff --git a/frontend/src/components/ui/lab/CasesPage.tsx b/frontend/src/components/ui/lab/CasesPage.tsx
index 2e3c124..6758654 100644
--- a/frontend/src/components/ui/lab/CasesPage.tsx
+++ b/frontend/src/components/ui/lab/CasesPage.tsx
@@ -38,7 +38,7 @@ import type {
PaginatedLabCases,
} from '@/types/cases';
-const PAGE_SIZE = 20;
+const PAGE_SIZE = 10;
export function CasesPage() {
const t = useTranslations('cases');
@@ -308,9 +308,9 @@ export function CasesPage() {
{t('subtitle')}
-