1. Bugs fixed:
- Backup schema now accepts theme: "aero" so backups exported under
Frutiger Aero pass parseBackup on import, and applyImport in "replace"
mode replaces SRS schedules, answer history, and chats instead of
merging into existing SRS or skipping empty arrays.
- Typed FillBlank cards bind the input value to chosen ?? value instead
of chosen ?? "", and normalise() preserves Unicode letters (\p{L}\p{N})
when grading non-ASCII answers.
- OpenAI-compatible vision calls (contentFor in lib/openai-compat.ts)
prefix data:image/jpeg;base64, when routes pass stripped base64.
- Streaming calls (ollamaChatStream, providerChatStream) keep their
AbortController active across the entire body stream and API routes
forward request.signal so stopping a chat or cancelling a run aborts
the upstream request immediately.
- HomeworkCard uses homeworkModeLabelKey so "check" records display the
Checked label instead of Step-by-step guide.
- Desktop dropzones on /create and /homework accept dropped documents as
well as images.
- LibraryScreen filters reported questions out of its due and mistake
counts to match ReviewClient.
- Clearing a provider key resets generation if it pointed at that
provider; chat conversations persist and restore provider; ModelPicker
keys items by provider:name.
- RouteTransition no longer mutates module-level lastPath during render.
- Service worker asset handler falls back to Response.error() when an
uncached asset fetch fails offline.
- Confetti and .ice-orb / .ice-bubble respect the in-app reduce-motion
toggle.
2. Performance & cleanup:
- Deduplicate window storage listeners across all six localStorage
stores (one listener while subscribed instead of N^2 notifications).
- Use todayAnswerCount in LibraryScreen and pass sorted folders to
DeckCard.
- Memoize MessageRow with stable callbacks in ChatScreen and compute
last message IDs in a single pass.
- Close ImageBitmap after drawing in lib/image.ts and destroy pdf.js
documents in finally in lib/documents.ts.
- Avoid re-parsing serialized sync payloads in POST /api/sync.
- Deduplicate copyText (lib/share.ts -> lib/clipboard.ts), chatMessageId,
describeExtraction, ALL_FOLDERS, useIsPhone, and remove unused helpers
and boilerplate public/*.svg files.
Version 0.5.8, SW -> freezmo-v80.
141 lines
5.2 KiB
TypeScript
141 lines
5.2 KiB
TypeScript
"use client";
|
|
|
|
import { Reorder } from "framer-motion";
|
|
import { useMemo, useState } from "react";
|
|
|
|
import { useI18n } from "@/lib/i18n";
|
|
import type { Activity } from "@/lib/schemas";
|
|
import { cn, shuffle } from "@/lib/utils";
|
|
import { Button } from "@/components/ui";
|
|
|
|
import {
|
|
ActivityHeader,
|
|
FeedbackPanel,
|
|
Hint,
|
|
PromptCard,
|
|
type ActivityComponentProps,
|
|
} from "./shared";
|
|
|
|
type OrderingActivity = Extract<Activity, { type: "ordering" }>;
|
|
|
|
export function Ordering({ activity, onAnswered, onNext, isLast, nextLabel }: ActivityComponentProps<OrderingActivity>) {
|
|
const { t } = useI18n();
|
|
const initial = useMemo(() => {
|
|
const out = shuffle(activity.items);
|
|
if (out.length > 1 && out.every((item, index) => item === activity.items[index])) {
|
|
[out[0], out[1]] = [out[1], out[0]];
|
|
}
|
|
return out;
|
|
}, [activity]);
|
|
const [items, setItems] = useState<string[]>(initial);
|
|
const [checked, setChecked] = useState(false);
|
|
const [correct, setCorrect] = useState(false);
|
|
|
|
const isRight = (list: string[]) => list.every((item, index) => item === activity.items[index]);
|
|
|
|
const check = () => {
|
|
if (checked) return;
|
|
const result = isRight(items);
|
|
setChecked(true);
|
|
setCorrect(result);
|
|
onAnswered(result, { userAnswer: items.join(" → ") });
|
|
};
|
|
|
|
const move = (index: number, direction: -1 | 1) => {
|
|
if (checked) return;
|
|
const target = index + direction;
|
|
if (target < 0 || target >= items.length) return;
|
|
const next = [...items];
|
|
[next[index], next[target]] = [next[target], next[index]];
|
|
setItems(next);
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<ActivityHeader type="ordering" topic={activity.topic} />
|
|
<PromptCard className="py-4">
|
|
<p className="text-lg font-bold text-frost-950 dark:text-frost-50">{activity.instruction}</p>
|
|
<Hint>
|
|
{checked ? t("ordering.correctOrder") : t("ordering.hint")}
|
|
</Hint>
|
|
</PromptCard>
|
|
|
|
{checked ? (
|
|
<ol className="flex flex-col gap-2.5">
|
|
{activity.items.map((item, index) => {
|
|
const wasRight = items[index] === item;
|
|
return (
|
|
<li
|
|
key={`solution-${item}`}
|
|
className={cn(
|
|
"flex items-center gap-3 rounded-2xl border-2 px-4 py-3 text-sm font-semibold",
|
|
wasRight
|
|
? "border-emerald-200/80 bg-emerald-50/85 text-emerald-900 dark:border-emerald-400/40 dark:bg-emerald-400/15 dark:text-emerald-100"
|
|
: "border-rose-200/80 bg-rose-50/85 text-rose-900 dark:border-rose-400/40 dark:bg-rose-400/15 dark:text-rose-100",
|
|
)}
|
|
>
|
|
<span className="grid size-7 shrink-0 place-items-center rounded-full bg-white/70 text-xs font-extrabold dark:bg-white/15">
|
|
{index + 1}
|
|
</span>
|
|
<span className="flex-1">{item}</span>
|
|
</li>
|
|
);
|
|
})}
|
|
</ol>
|
|
) : (
|
|
<Reorder.Group axis="y" values={items} onReorder={setItems} className="flex flex-col gap-2.5">
|
|
{items.map((item, index) => (
|
|
<Reorder.Item
|
|
key={item}
|
|
value={item}
|
|
className="flex cursor-grab items-center gap-2 rounded-2xl border border-white/60 bg-white/60 px-3 py-3 text-sm font-semibold text-frost-950 shadow-sm backdrop-blur-xl active:cursor-grabbing dark:border-white/12 dark:bg-white/[0.08] dark:text-frost-50"
|
|
>
|
|
<span className="grid size-7 shrink-0 place-items-center rounded-full bg-frost-100 text-xs font-extrabold text-frost-700 dark:bg-white/15 dark:text-frost-100">
|
|
{index + 1}
|
|
</span>
|
|
<span className="flex-1">{item}</span>
|
|
<span className="flex flex-col">
|
|
<button
|
|
type="button"
|
|
aria-label={t("ordering.moveUp", { item })}
|
|
onClick={() => move(index, -1)}
|
|
disabled={index === 0}
|
|
className="rounded px-1.5 text-xs text-frost-700 transition hover:bg-frost-100 disabled:opacity-30 dark:text-frost-100 dark:hover:bg-white/10"
|
|
>
|
|
▲
|
|
</button>
|
|
<button
|
|
type="button"
|
|
aria-label={t("ordering.moveDown", { item })}
|
|
onClick={() => move(index, 1)}
|
|
disabled={index === items.length - 1}
|
|
className="rounded px-1.5 text-xs text-frost-700 transition hover:bg-frost-100 disabled:opacity-30 dark:text-frost-100 dark:hover:bg-white/10"
|
|
>
|
|
▼
|
|
</button>
|
|
</span>
|
|
<span aria-hidden className="text-frost-400">
|
|
⠿
|
|
</span>
|
|
</Reorder.Item>
|
|
))}
|
|
</Reorder.Group>
|
|
)}
|
|
|
|
{!checked ? (
|
|
<Button size="lg" onClick={check} disabled={items.length < 2}>
|
|
{t("ordering.check")}
|
|
</Button>
|
|
) : (
|
|
<FeedbackPanel
|
|
correct={correct}
|
|
explanation={activity.explanation}
|
|
xp={activity.xp}
|
|
isLast={isLast}
|
|
nextLabel={nextLabel}
|
|
onNext={onNext}
|
|
/>
|
|
)}
|
|
</>
|
|
);
|
|
}
|