"Terribly high CPU usage, the MacBook gets really hot" - a fanless MacBook Air on a 144Hz screen. Measured on that machine with headed engines (process CPU plus the per-process GPU time macOS keeps): an idle Aero library cost LibreWolf ~110% CPU and ~230ms/s of GPU, the study feed ~130%, Chromium up to ~57% CPU and ~350ms/s of GPU, Safari ~220-250ms/s of WindowServer GPU. Priced one by one: - the gradient mask on .ice-floats re-rendered the animated layer offscreen on every frame (~75 points of Gecko CPU). The floats now rise through a plain rectangular band clear of the header, the bottom chrome and the rail, and fade in and out inside it, so the clip never cuts a visible one; - the overlay grain forced a backdrop readback per frame for a texture that measured a mean <=0.11/255 difference: removed; - the invisible blob drift made every frame a full-screen redraw: the blobs are painted once; - static glass (answer tiles, feedback panel, chips, inputs, dropzones, lists, segmented controls, Aero hint chips) re-blurred the moving scene every frame: only floating glass blurs now, and Aero's baked chat chrome drops a live blur that never showed under the bake; - the scene also parks while the window has no focus and under any dialog or sheet scrim (.scene-pause); the loading icon is a compositor-run CSS animation instead of a framer-motion main-thread loop. After, focused and animating: LibreWolf library 109% -> 33% CPU, study 134% -> 34%, chat 130% -> 42%; Chromium GPU 2.5-4.4x lower with 7-22 points less CPU; Safari's WindowServer GPU -20-26% in Aero, about half in dark. Unfocused or under a sheet: nothing. bubbles-test sweeps every float through 41 phases against the band and pins the parking and the cost contract; tests/heat-probe.mjs (macOS) repeats the measurement; the suites find Playwright's Chromium on macOS. All 15 suites pass, lint clean, the contrast scan lost a finding. Version 0.6.7, SW v89. Co-authored-by: Cursor <cursoragent@cursor.com>
157 lines
5.8 KiB
TypeScript
157 lines
5.8 KiB
TypeScript
"use client";
|
|
|
|
import { useMemo, useState } from "react";
|
|
|
|
import { useI18n } from "@/lib/i18n";
|
|
import type { Activity } from "@/lib/schemas";
|
|
import { cn, shuffle } from "@/lib/utils";
|
|
import { SpeakButton } from "@/components/SpeakButton";
|
|
|
|
import {
|
|
ActivityHeader,
|
|
FeedbackPanel,
|
|
Hint,
|
|
PromptCard,
|
|
type ActivityComponentProps,
|
|
} from "./shared";
|
|
|
|
type MatchingActivity = Extract<Activity, { type: "matching" }>;
|
|
|
|
export function Matching({ activity, language, onAnswered, onNext, isLast, nextLabel }: ActivityComponentProps<MatchingActivity>) {
|
|
const { t, plural } = useI18n();
|
|
const terms = useMemo(
|
|
() => shuffle(activity.pairs.map((pair, index) => ({ index, text: pair.term }))),
|
|
[activity],
|
|
);
|
|
const definitions = useMemo(
|
|
() => shuffle(activity.pairs.map((pair, index) => ({ index, text: pair.definition }))),
|
|
[activity],
|
|
);
|
|
|
|
const [selectedTerm, setSelectedTerm] = useState<number | null>(null);
|
|
const [matched, setMatched] = useState<number[]>([]);
|
|
const [misses, setMisses] = useState(0);
|
|
const [flash, setFlash] = useState<{ term: number; definition: number } | null>(null);
|
|
const [done, setDone] = useState(false);
|
|
|
|
const total = activity.pairs.length;
|
|
const complete = matched.length === total;
|
|
|
|
const onDefinitionTap = (definitionIndex: number) => {
|
|
if (done || selectedTerm === null || matched.includes(definitionIndex)) return;
|
|
if (selectedTerm === definitionIndex) {
|
|
const next = [...matched, definitionIndex];
|
|
setMatched(next);
|
|
setSelectedTerm(null);
|
|
if (next.length === total) {
|
|
const correct = misses === 0;
|
|
setDone(true);
|
|
onAnswered(correct);
|
|
}
|
|
} else {
|
|
setMisses((value) => value + 1);
|
|
setFlash({ term: selectedTerm, definition: definitionIndex });
|
|
window.setTimeout(() => setFlash(null), 500);
|
|
setSelectedTerm(null);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<>
|
|
<ActivityHeader
|
|
type="matching"
|
|
topic={activity.topic}
|
|
extra={
|
|
<span className="rounded-full bg-[var(--surface-strong)] px-3 py-1 text-xs font-bold text-frost-600 dark:text-frost-200">
|
|
{t("matching.matched", { n: matched.length, total })}
|
|
</span>
|
|
}
|
|
/>
|
|
<PromptCard className="py-4">
|
|
<div className="flex items-start justify-between gap-3">
|
|
<p className="text-lg font-bold text-frost-950 dark:text-frost-50">{activity.instruction}</p>
|
|
<SpeakButton text={activity.instruction} language={language} />
|
|
</div>
|
|
<Hint>
|
|
{done
|
|
? t("matching.allMatched")
|
|
: selectedTerm === null
|
|
? t("matching.tapTerm")
|
|
: t("matching.tapDef")}
|
|
</Hint>
|
|
</PromptCard>
|
|
|
|
<div className="grid grid-cols-2 gap-2.5">
|
|
<div className="flex flex-col gap-2.5">
|
|
{terms.map((term) => {
|
|
const isMatched = matched.includes(term.index);
|
|
const isSelected = selectedTerm === term.index;
|
|
const isFlashing = flash?.term === term.index;
|
|
return (
|
|
<button
|
|
key={`term-${term.index}`}
|
|
type="button"
|
|
disabled={isMatched || done}
|
|
onClick={() => setSelectedTerm(isSelected ? null : term.index)}
|
|
className={cn(
|
|
"min-h-16 rounded-2xl border px-3 py-2 text-left text-sm font-semibold transition-all",
|
|
isMatched
|
|
? "border-emerald-200/80 bg-emerald-50/85 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/15 dark:text-emerald-100"
|
|
: isSelected
|
|
? "border-accent-400 bg-accent-50/80 text-frost-900 dark:bg-accent-500/20 dark:text-white"
|
|
: "border-white/60 bg-white/55 text-frost-950 hover:bg-white/80 dark:border-white/12 dark:bg-white/[0.07] dark:text-frost-50",
|
|
isFlashing && "animate-wiggle border-rose-400 bg-rose-50 dark:bg-rose-400/15",
|
|
)}
|
|
>
|
|
<span className="mr-1">{isMatched ? "✓" : "•"}</span>
|
|
{term.text}
|
|
</button>
|
|
);
|
|
})}
|
|
</div>
|
|
|
|
<div className="flex flex-col gap-2.5">
|
|
{definitions.map((definition) => {
|
|
const isMatched = matched.includes(definition.index);
|
|
const isFlashing = flash?.definition === definition.index;
|
|
return (
|
|
<button
|
|
key={`def-${definition.index}`}
|
|
type="button"
|
|
disabled={isMatched || done || selectedTerm === null}
|
|
onClick={() => onDefinitionTap(definition.index)}
|
|
className={cn(
|
|
"min-h-16 rounded-2xl border-2 px-3 py-2 text-left text-sm transition-all",
|
|
isMatched
|
|
? "border-emerald-200/80 bg-emerald-50/85 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/15 dark:text-emerald-100"
|
|
: "border-white/60 bg-white/55 text-frost-700 hover:bg-white/80 disabled:opacity-60 dark:border-white/12 dark:bg-white/[0.07] dark:text-frost-200",
|
|
isFlashing && "animate-wiggle border-rose-400 bg-rose-50 dark:bg-rose-400/15",
|
|
)}
|
|
>
|
|
{definition.text}
|
|
</button>
|
|
);
|
|
})}
|
|
</div>
|
|
</div>
|
|
|
|
{complete ? (
|
|
<FeedbackPanel
|
|
activity={activity}
|
|
correct={misses === 0}
|
|
explanation={activity.explanation}
|
|
xp={activity.xp}
|
|
isLast={isLast}
|
|
nextLabel={nextLabel}
|
|
onNext={onNext}
|
|
headline={misses === 0 ? t("matching.perfect") : t("matching.slips")}
|
|
detail={
|
|
<span>
|
|
{misses === 0 ? t("matching.firstTry") : plural(misses, "matching.wrongAttempts")}
|
|
</span>
|
|
}
|
|
/>
|
|
) : null}
|
|
</>
|
|
);
|
|
}
|