Compare commits
2 commits
f738fbe7be
...
fe94dbf876
| Author | SHA1 | Date | |
|---|---|---|---|
| fe94dbf876 | |||
| 0ad6290250 |
14 changed files with 112 additions and 27 deletions
|
|
@ -109,9 +109,13 @@ Select-all items have exactly 6 choices with 2 to 5 correct, most often 3 or 4.
|
|||
appear in the batch prompt, the planner, the review and proofread rewrites, "improve questions"
|
||||
and the outside-chatbot instructions.
|
||||
|
||||
**Rationales** are asked for as Markdown: one bold key sentence, then 2 to 4 short bullet points,
|
||||
**Rationales** are asked for as Markdown: one bold key sentence, then 1 to 4 short bullet points,
|
||||
without repeating the per-choice "why" (`RATIONALE_FORMAT`, also in the question schema, the
|
||||
review's rewrite schema, "improve questions" and the outside-chatbot instructions). The web app
|
||||
review's rewrite schema, "improve questions" and the outside-chatbot instructions). Every bullet
|
||||
must be about what the question tests; fewer bullets are preferred to padding with monitoring or
|
||||
side effects. Med math rationales explain only the calculation (conversion, method and an
|
||||
arithmetic check), and the second review rewrites a rationale that brings in facts the question
|
||||
does not test (such as TSH monitoring in a levothyroxine tablet calculation). The web app
|
||||
lays out older one-paragraph rationales the same way when it shows them (`formatRationale`).
|
||||
|
||||
Then a **second review**: a fresh model call with no Python reads the whole quiz as a careful
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ export function plainChoice(text: string): string {
|
|||
|
||||
/** How a rationale is laid out, so it reads at a glance instead of as one block of text. */
|
||||
const RATIONALE_FORMAT =
|
||||
'Format the rationale in Markdown for quick reading: one bold sentence with the key point, then 2 to 4 short bullet points (one idea each, such as the principle or framework, the physiology or drug action, the safety point). No long paragraphs, and do not repeat the choices\' "why" text, which is shown beside each choice.';
|
||||
'Format the rationale in Markdown for quick reading: one bold sentence with the key point, then 1 to 4 short bullet points (one idea each, such as the principle or framework, the physiology or drug action, the safety point). Every bullet must be about what this question tests: never add monitoring, lab values, side effects or other facts the question does not ask about just to fill out the list, and use fewer bullets rather than pad. No long paragraphs, and do not repeat the choices\' "why" text, which is shown beside each choice.';
|
||||
|
||||
const QUESTION_SCHEMA = {
|
||||
type: 'object',
|
||||
|
|
@ -955,7 +955,7 @@ async function runGeneration(app: AppContext, draftId: string, req: GenerateRequ
|
|||
`Write ${want} medication math (dosage calculation) questions, all of type "numeric": the student types the number.`,
|
||||
`Difficulty ${difficulty}: ${MATH_LEVELS[difficulty] ?? MATH_LEVELS.mixed}.`,
|
||||
'These do not need to come from the course material: write standard nursing med math with realistic orders, labels and client weights, using generic drug names (drugs from the material are welcome where they fit).',
|
||||
'Each stem gives the order and what is on hand, and states the unit and the rounding rule ("Round to the nearest tenth."). Exactly one option: the correct answer with its unit, marked correct, with "why" showing the working step by step (dimensional analysis or desired over have). The rationale explains the method and one safety check.',
|
||||
'Each stem gives the order and what is on hand, and states the unit and the rounding rule ("Round to the nearest tenth."). Exactly one option: the correct answer with its unit, marked correct, with "why" showing the working step by step (dimensional analysis or desired over have). The rationale explains only the calculation: the conversion, the method (dimensional analysis or desired over have) and a quick check that the answer is reasonable for the arithmetic (for example "75 mcg is three 25 mcg tablets"). Do not add drug monitoring, lab values, side effects or dose-limit checks unless the stem asks about them.',
|
||||
'Set the topic to "Dosage calculation". Vary the problem types.',
|
||||
]
|
||||
: isQuiz
|
||||
|
|
|
|||
|
|
@ -460,7 +460,8 @@ Flag a question only for a real problem:
|
|||
- the writer changed its mind or left a note in the text (for example "A 78 kg? No — an 80 kg client", "Actually,", "wait"), or the wording is garbled, truncated or repeated;
|
||||
- data needed to answer is missing, or the stem contradicts itself, the options or the rationale;
|
||||
- two options are defensible, or none is correct; the rationale disagrees with the keyed answer;
|
||||
- an option gives the answer away, or the content is clinically wrong or outdated.
|
||||
- an option gives the answer away, or the content is clinically wrong or outdated;
|
||||
- the rationale or a choice's "why" brings in facts the question does not test (for example lab monitoring or dose limits in a plain dosage calculation): rewrite it to explain only what the question asks.
|
||||
For each problem give the complete corrected question with rewrite (same type, the same clinical point, following the rules for its type: single = 4 options with exactly one correct; multi = 6 options with 2 to 5 correct and a stem ending "Select all that apply."; a short plain stem; choices concise and parallel, with no explanation tacked on; numeric = one option, the correct answer with its unit, and "why" showing the working), or remove it if it cannot be saved. Do not flag style preferences or answer order. Call submit_proofread once; an empty list is the right answer when every question is sound.`;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ Rules:
|
|||
- Use "numeric" for calculations (dosages, IV rates, drip rates, conversions, intake and output). Its "options" holds only the correct answer, e.g. [{ "text": "12.5 mL", "correct": true, "why": "Show the calculation" }]. The stem states the unit and how to round, e.g. "Round to the nearest tenth." Only the number is checked, so units in the answer are optional.
|
||||
- Write NCLEX-style questions that test clinical judgment: a short, plain stem of usually 15 to 30 words with only the cues needed (vary how stems open so they do not all start the same way, and use no bold in stems), then one direct question such as "Which action should the nurse take first?" or "Which statement by the parent indicates a need for further teaching?". About a third may ask directly about a fact the nurse uses ("Which injection site is most appropriate?"). Never refer to the material itself in a question.
|
||||
- Answer choices are concise and parallel: a term or value when the question asks for one, otherwise a short action or finding (about 4 to 12 words), or one or two sentences of quoted speech for client statements and nurse responses. No explanation tacked on, and the correct one never stands out as the longest or most detailed. Build distractors from related facts (a similar condition, a different stage, another drug or test) so they are plausible but wrong for a specific reason. Never use "all of the above" or "none of the above".
|
||||
- Every option needs a "why" of 1 or 2 sentences with its specific clinical reason. The "rationale" explains the principle behind the correct answer, laid out for quick reading: one bold key sentence, then 2 to 4 short bullet points (use \\n between lines).
|
||||
- Every option needs a "why" of 1 or 2 sentences with its specific clinical reason. The "rationale" explains the principle behind the correct answer, laid out for quick reading: one bold key sentence, then 1 to 4 short bullet points (use \\n between lines), each about what the question tests. Do not pad it with monitoring or facts the question does not ask about.
|
||||
- "topic" is a short label. Reuse the same label for related questions and keep the number of different topics small.
|
||||
- "difficulty" is "easy", "medium" or "hard".
|
||||
- Markdown is allowed inside strings (bold, lists, tables). Write line breaks inside strings as \\n.
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ export function Shell() {
|
|||
const showDrawer = assistantOpen && isDesktop && !onAssistantPage;
|
||||
|
||||
return (
|
||||
<div className="flex min-h-dvh">
|
||||
<div className="flex min-h-dvh overflow-x-clip">
|
||||
<a href="#main" className="sr-only focus:not-sr-only focus:fixed focus:top-3 focus:left-3 focus:z-[90] focus:rounded-lg focus:bg-ink focus:px-3 focus:py-2 focus:text-paper">
|
||||
Skip to content
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import { McpSettings } from './McpSettings';
|
|||
import { SemanticSettings } from './SemanticSettings';
|
||||
import { REASONING_EFFORTS, type AdapterMeta, type AiModel, type AiStatus, type Provider, type ProviderKind, type TaskConfig, type TaskName, type TaskSettings } from '@/lib/types';
|
||||
import { cx, formatCost, formatTokens, plural, timeAgo } from '@/lib/util';
|
||||
import { Badge, Button, Callout, Dialog, EmptyState, Field, IconButton, Input, Menu, MenuItem, MenuSeparator, Section, Select, Skeleton, Switch, Textarea, Tooltip, useConfirm } from '@/ui';
|
||||
import { Badge, Button, Callout, Dialog, EmptyState, Field, IconButton, Input, NumberInput, Menu, MenuItem, MenuSeparator, Section, Select, Skeleton, Switch, Textarea, Tooltip, useConfirm } from '@/ui';
|
||||
|
||||
interface Meta {
|
||||
adapters: AdapterMeta[];
|
||||
|
|
@ -558,10 +558,10 @@ function TaskRow({
|
|||
</Select>
|
||||
</Field>
|
||||
<Field label="Temperature" hint={model && !model.capabilities.temperature ? 'Ignored by this model' : '0 to 2'}>
|
||||
<Input type="number" min={0} max={2} step={0.1} value={config.temperature ?? ''} placeholder={same ?? 'Model default'} onChange={(e) => onChange({ ...config, temperature: e.target.value === '' ? null : Math.max(0, Math.min(2, Number(e.target.value))) })} />
|
||||
<NumberInput min={0} max={2} step={0.1} integer={false} allowEmpty value={config.temperature ?? null} placeholder={same ?? 'Model default'} onValueChange={(n) => onChange({ ...config, temperature: n })} />
|
||||
</Field>
|
||||
<Field label="Output limit" hint="Tokens per response">
|
||||
<Input type="number" min={256} step={256} value={config.maxOutputTokens ?? ''} placeholder={same ?? 'Automatic'} onChange={(e) => onChange({ ...config, maxOutputTokens: e.target.value === '' ? null : Math.max(256, Math.round(Number(e.target.value))) })} />
|
||||
<NumberInput min={256} step={256} allowEmpty value={config.maxOutputTokens ?? null} placeholder={same ?? 'Automatic'} onValueChange={(n) => onChange({ ...config, maxOutputTokens: n })} />
|
||||
</Field>
|
||||
</div>
|
||||
</details>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { api, errorMessage } from '@/lib/api';
|
|||
import { qk, useAiModels, useAiStatus, useClass } from '@/lib/queries';
|
||||
import type { DocumentItem, Template } from '@/lib/types';
|
||||
import { cx, formatTokens, useLocalStorage } from '@/lib/util';
|
||||
import { Button, Callout, Dialog, Field, Input, Segmented, Select, Switch, Textarea } from '@/ui';
|
||||
import { Button, Callout, Dialog, Field, Input, NumberInput, Segmented, Select, Switch, Textarea } from '@/ui';
|
||||
|
||||
export interface GeneratePreset {
|
||||
kind?: 'quiz' | 'deck' | 'note';
|
||||
|
|
@ -273,7 +273,7 @@ export function GenerateDialog({ open, onClose, classId, folderId, preset }: { o
|
|||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
{!fixedSource && (
|
||||
<Field label="Questions">
|
||||
<Input type="number" min={1} max={100} value={count} onChange={(e) => setCount(Math.max(1, Math.min(100, Number(e.target.value) || 1)))} />
|
||||
<NumberInput min={1} max={100} value={count} onValueChange={(n) => n !== null && setCount(n)} />
|
||||
</Field>
|
||||
)}
|
||||
<Field label="Difficulty">
|
||||
|
|
@ -293,7 +293,7 @@ export function GenerateDialog({ open, onClose, classId, folderId, preset }: { o
|
|||
</div>
|
||||
{mathOn && (
|
||||
<Field label="How many" className="w-24 shrink-0">
|
||||
<Input type="number" min={1} max={Math.min(25, count)} value={mathCount} onChange={(e) => setMathCount(Math.max(1, Math.min(25, Number(e.target.value) || 1)))} aria-label="Med math questions" />
|
||||
<NumberInput min={1} max={25} value={mathCount} onValueChange={(n) => n !== null && setMathCount(n)} aria-label="Med math questions" />
|
||||
</Field>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -306,7 +306,7 @@ export function GenerateDialog({ open, onClose, classId, folderId, preset }: { o
|
|||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
{!fixedSource && (
|
||||
<Field label="Cards">
|
||||
<Input type="number" min={1} max={200} value={count} onChange={(e) => setCount(Math.max(1, Math.min(200, Number(e.target.value) || 1)))} />
|
||||
<NumberInput min={1} max={200} value={count} onValueChange={(n) => n !== null && setCount(n)} />
|
||||
</Field>
|
||||
)}
|
||||
<Field label="Card style">
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ export function SharedAssistant({ token, title, item, hidden }: { token: string;
|
|||
if (el && stick.current) el.scrollTop = el.scrollHeight;
|
||||
}, [turns, open]);
|
||||
useEffect(() => {
|
||||
if (open && !hidden) inputRef.current?.focus();
|
||||
if (open && !hidden) inputRef.current?.focus({ preventScroll: true }); // the drawer is still sliding in from off-screen
|
||||
}, [open, hidden]);
|
||||
|
||||
const send = useCallback(
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import { useEffect, useState } from 'react';
|
|||
import { api, errorMessage } from '@/lib/api';
|
||||
import type { PublicCollection, SharedGenerated } from '@/lib/types';
|
||||
import { cx } from '@/lib/util';
|
||||
import { Button, Callout, Dialog, Field, IconButton, Input, ProgressBar, Segmented, Select, Switch } from '@/ui';
|
||||
import { Button, Callout, Dialog, Field, IconButton, Input, NumberInput, ProgressBar, Segmented, Select, Switch } from '@/ui';
|
||||
|
||||
type Kind = 'quiz' | 'deck';
|
||||
|
||||
|
|
@ -212,7 +212,7 @@ function GenerateDialog({
|
|||
)}
|
||||
<div className="grid gap-4 sm:grid-cols-2">
|
||||
<Field label={kind === 'quiz' ? `Questions (max ${max})` : `Cards (max ${max})`}>
|
||||
<Input type="number" min={1} max={max} value={count} onChange={(e) => setCount(Math.max(1, Math.min(max, Number(e.target.value) || 1)))} />
|
||||
<NumberInput min={1} max={max} value={count} onValueChange={(n) => n !== null && setCount(n)} />
|
||||
</Field>
|
||||
<Field label="Difficulty">
|
||||
<Select value={difficulty} onChange={(e) => setDifficulty(e.target.value as typeof difficulty)}>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { api, errorMessage } from '@/lib/api';
|
|||
import { qk, useRefresh } from '@/lib/queries';
|
||||
import type { Template } from '@/lib/types';
|
||||
import { cx, plural } from '@/lib/util';
|
||||
import { Badge, Button, Dialog, Field, IconButton, Input, Section, Segmented, Select, Skeleton, Textarea, useConfirm } from '@/ui';
|
||||
import { Badge, Button, Dialog, Field, IconButton, Input, NumberInput, Section, Segmented, Select, Skeleton, Textarea, useConfirm } from '@/ui';
|
||||
|
||||
/* ------------------------------ shared text editor ------------------------------ */
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ function PresetDialog({ template, onClose }: { template: Template | null; onClos
|
|||
/>
|
||||
{kind !== 'note' && (
|
||||
<Field label={kind === 'quiz' ? 'Questions' : 'Cards'}>
|
||||
<Input type="number" min={1} max={200} value={payload.count ?? (kind === 'quiz' ? 15 : 30)} onChange={(e) => set({ count: Math.max(1, Math.min(200, Number(e.target.value) || 1)) })} className="w-28" />
|
||||
<NumberInput min={1} max={200} value={payload.count ?? (kind === 'quiz' ? 15 : 30)} onValueChange={(n) => n !== null && set({ count: n })} className="w-28" />
|
||||
</Field>
|
||||
)}
|
||||
{kind === 'quiz' && (
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import { cx, downloadFile, formatDateTime, formatMinutes, gradeTone, pct, plural
|
|||
import { Markdown } from '@/ui/Markdown';
|
||||
import { formatRationale } from '@shared/rationale';
|
||||
import { SortableList } from '@/ui/Sortable';
|
||||
import { Badge, Button, Callout, ClassDot, Dialog, EmptyState, ErrorState, Field, IconButton, Input, Menu, MenuItem, MenuSeparator, Segmented, Skeleton, Switch, Textarea, useConfirm } from '@/ui';
|
||||
import { Badge, Button, Callout, ClassDot, Dialog, EmptyState, ErrorState, Field, IconButton, Input, NumberInput, Menu, MenuItem, MenuSeparator, Segmented, Skeleton, Switch, Textarea, useConfirm } from '@/ui';
|
||||
|
||||
interface StartPrefs {
|
||||
mode: 'practice' | 'exam';
|
||||
|
|
@ -79,7 +79,7 @@ function StartOptionsFields({ o }: { o: ReturnType<typeof useStartOptions> }) {
|
|||
{timed && (
|
||||
<div className="flex items-center gap-2">
|
||||
<Timer className="size-4 text-ink-3" />
|
||||
<Input type="number" min={1} max={600} value={minutes} onChange={(e) => setMinutes(Math.max(1, Math.min(600, Number(e.target.value) || 1)))} className="w-24" aria-label="Minutes" />
|
||||
<NumberInput min={1} max={600} value={minutes} onValueChange={(n) => n !== null && setMinutes(n)} className="w-24" aria-label="Minutes" />
|
||||
<span className="text-sm text-ink-2">minutes</span>
|
||||
</div>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import { api, ApiError, errorMessage, uploadWithProgress } from '@/lib/api';
|
|||
import { qk, useRefresh } from '@/lib/queries';
|
||||
import type { AppSettings, ShareAiSettings, ShareListItem, Template } from '@/lib/types';
|
||||
import { copyText, cx, downloadFile, formatBytes, formatDateTime, plural, timeAgo, useDocumentTitle, useTheme } from '@/lib/util';
|
||||
import { Badge, Button, Callout, ClassDot, EmptyState, Field, IconButton, Input, PageHeader, PageLoading, ProgressBar, Section, Segmented, Select, Skeleton, Switch, useConfirm } from '@/ui';
|
||||
import { Badge, Button, Callout, ClassDot, EmptyState, Field, IconButton, Input, NumberInput, PageHeader, PageLoading, ProgressBar, Section, Segmented, Select, Skeleton, Switch, useConfirm } from '@/ui';
|
||||
|
||||
const AiSettings = lazy(() => import('@/features/AiSettings'));
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ function StudySettings() {
|
|||
<div className="text-sm font-medium">New cards per day</div>
|
||||
<div className="text-[13px] text-ink-3">How many never-seen cards are introduced each day, across all decks. Reviews of cards you already know are never limited.</div>
|
||||
</div>
|
||||
<Input type="number" min={0} max={500} value={form.newCardsPerDay} onChange={(e) => setForm({ ...form, newCardsPerDay: Number(e.target.value) })} onBlur={() => save({ newCardsPerDay: Math.max(0, Math.min(500, Math.round(form.newCardsPerDay) || 0)) })} aria-label="New cards per day" />
|
||||
<NumberInput min={0} max={500} value={form.newCardsPerDay} onValueChange={(n) => n !== null && setForm({ ...form, newCardsPerDay: n })} onCommit={(n) => n !== null && save({ newCardsPerDay: n })} aria-label="New cards per day" />
|
||||
</div>
|
||||
<div className="grid items-center gap-3 p-4 sm:grid-cols-[1fr_160px]">
|
||||
<div>
|
||||
|
|
@ -113,7 +113,7 @@ function StudySettings() {
|
|||
<div className="text-sm font-medium">Daily goal</div>
|
||||
<div className="text-[13px] text-ink-3">Cards reviewed plus questions answered that make a day count toward your streak.</div>
|
||||
</div>
|
||||
<Input type="number" min={1} max={1000} value={form.dailyGoal} onChange={(e) => setForm({ ...form, dailyGoal: Number(e.target.value) })} onBlur={() => save({ dailyGoal: Math.max(1, Math.min(1000, Math.round(form.dailyGoal) || 1)) })} aria-label="Daily goal" />
|
||||
<NumberInput min={1} max={1000} value={form.dailyGoal} onValueChange={(n) => n !== null && setForm({ ...form, dailyGoal: n })} onCommit={(n) => n !== null && save({ dailyGoal: n })} aria-label="Daily goal" />
|
||||
</div>
|
||||
<div className="grid items-center gap-3 p-4 sm:grid-cols-[1fr_260px]">
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import { api, ApiError } from '@/lib/api';
|
|||
import type { AnswerState, PublicCollection, PublicDeck, PublicDocument, PublicNote, PublicPayload, PublicQuiz, ShareAi, SnapshotQuestion } from '@/lib/types';
|
||||
import { cx, formatBytes, plural, useDocumentTitle, useLocalStorage, useMediaQuery, useTheme } from '@/lib/util';
|
||||
import { Markdown } from '@/ui/Markdown';
|
||||
import { Badge, Button, EmptyState, IconButton, Input, PageLoading, Segmented, Switch } from '@/ui';
|
||||
import { Badge, Button, EmptyState, IconButton, Input, NumberInput, PageLoading, Segmented, Switch } from '@/ui';
|
||||
|
||||
/* ------------------------------ frame ------------------------------ */
|
||||
|
||||
|
|
@ -275,7 +275,7 @@ function SharedQuiz({ quiz, storageKey, back, explainUrl, onImmersive }: { quiz:
|
|||
{prefs.timed && (
|
||||
<label className="flex items-center gap-2 text-sm text-ink-2">
|
||||
<Timer className="size-4 text-ink-3" />
|
||||
<Input type="number" min={1} max={600} value={minutes} onChange={(e) => setPrefs((p) => ({ ...p, minutes: Math.max(1, Math.min(600, Math.round(Number(e.target.value)) || 1)) }))} className="w-24" aria-label="Minutes" />
|
||||
<NumberInput min={1} max={600} value={minutes} onValueChange={(n) => n !== null && setPrefs((p) => ({ ...p, minutes: n }))} className="w-24" aria-label="Minutes" />
|
||||
minutes
|
||||
</label>
|
||||
)}
|
||||
|
|
@ -593,8 +593,9 @@ export default function SharedPage() {
|
|||
}
|
||||
})();
|
||||
// A row, so the assistant drawer can sit beside the page on wide screens (it floats over it below 1360px).
|
||||
// Clipped sideways so the drawer sliding in from off-screen never widens or scrolls the page.
|
||||
return (
|
||||
<div className="flex min-h-dvh">
|
||||
<div className="flex min-h-dvh overflow-x-clip">
|
||||
<div className="min-w-0 flex-1">{page}</div>
|
||||
{assistant}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -123,6 +123,85 @@ export const Input = forwardRef<HTMLInputElement, InputHTMLAttributes<HTMLInputE
|
|||
return <input ref={ref} className={cx(CONTROL, 'h-10', className)} {...rest} />;
|
||||
});
|
||||
|
||||
/** Fits a typed number into a field's limits; null when the text is not a number. */
|
||||
export function settleNumber(text: string, opts: { min?: number; max?: number; integer?: boolean }): number | null {
|
||||
if (text.trim() === '') return null;
|
||||
const n = Number(text);
|
||||
if (!Number.isFinite(n)) return null;
|
||||
const whole = opts.integer === false ? n : Math.round(n);
|
||||
return Math.min(opts.max ?? Infinity, Math.max(opts.min ?? -Infinity, whole));
|
||||
}
|
||||
|
||||
type NumberInputProps = Omit<InputHTMLAttributes<HTMLInputElement>, 'value' | 'onChange' | 'type' | 'min' | 'max'> & {
|
||||
value: number | null;
|
||||
min?: number;
|
||||
max?: number;
|
||||
/** Whole numbers only (the default). */
|
||||
integer?: boolean;
|
||||
/** An empty field means "no value" (null) instead of going back to the last number. */
|
||||
allowEmpty?: boolean;
|
||||
/** Every value within the limits as it is typed, and the settled value when the field is left. */
|
||||
onValueChange: (value: number | null) => void;
|
||||
/** The settled value when the field is left or Enter is pressed (for fields that save on blur). */
|
||||
onCommit?: (value: number | null) => void;
|
||||
};
|
||||
|
||||
/**
|
||||
* A number field that can be cleared and retyped freely. While it has focus the text is kept as
|
||||
* typed (empty, or out of range part-way through "150"); values within the limits are passed on
|
||||
* as they are typed. On leaving the field (or Enter) the value is fitted into the limits, and an
|
||||
* empty field goes back to the last value unless `allowEmpty`.
|
||||
*/
|
||||
export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(function NumberInput(
|
||||
{ value, min, max, integer = true, allowEmpty = false, onValueChange, onCommit, onBlur, onKeyDown, onFocus, ...rest },
|
||||
ref,
|
||||
) {
|
||||
const [draft, setDraft] = useState<string | null>(null);
|
||||
const shown = draft ?? (value === null ? '' : String(value));
|
||||
const settle = () => {
|
||||
if (draft === null) return;
|
||||
const fitted = settleNumber(draft, { min, max, integer });
|
||||
const next = fitted ?? (allowEmpty ? null : value);
|
||||
setDraft(null);
|
||||
if (next !== value) onValueChange(next);
|
||||
onCommit?.(next);
|
||||
};
|
||||
return (
|
||||
<Input
|
||||
ref={ref}
|
||||
type="number"
|
||||
inputMode={integer ? 'numeric' : 'decimal'}
|
||||
min={min}
|
||||
max={max}
|
||||
value={shown}
|
||||
onFocus={(e) => {
|
||||
setDraft(shown);
|
||||
onFocus?.(e);
|
||||
}}
|
||||
onChange={(e) => {
|
||||
const text = e.target.value;
|
||||
setDraft(text);
|
||||
if (text.trim() === '') {
|
||||
if (allowEmpty && value !== null) onValueChange(null);
|
||||
return;
|
||||
}
|
||||
const n = Number(text);
|
||||
const whole = integer ? Math.round(n) : n;
|
||||
if (Number.isFinite(n) && whole >= (min ?? -Infinity) && whole <= (max ?? Infinity) && whole !== value) onValueChange(whole);
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
settle();
|
||||
onBlur?.(e);
|
||||
}}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter') settle();
|
||||
onKeyDown?.(e);
|
||||
}}
|
||||
{...rest}
|
||||
/>
|
||||
);
|
||||
});
|
||||
|
||||
export const Textarea = forwardRef<HTMLTextAreaElement, TextareaHTMLAttributes<HTMLTextAreaElement> & { autoGrow?: boolean; maxRows?: number }>(function Textarea(
|
||||
{ className, autoGrow, maxRows = 16, onChange, value, rows = 3, ...rest },
|
||||
ref,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue