From 0ad6290250eff0b623f775d685cd7c778b9a41f0 Mon Sep 17 00:00:00 2001 From: Elijah Date: Mon, 16 Nov 2026 15:30:53 -0700 Subject: [PATCH] Smooth share-link drawer opening; number fields can be cleared - Share links: opening the assistant focused its composer while the drawer was still sliding in from off-screen, so the browser scrolled the whole page 680px sideways and back. The composer now focuses without scrolling, and both page rows clip sideways overflow so a sliding drawer can never widen or scroll the page. - Number fields clamped on every keystroke, so clearing one snapped it to its minimum (1, or 256 for max output tokens). A shared NumberInput keeps the text as typed while focused, passes on in-range values as they are typed, and fits the value into its limits when the field is left or Enter is pressed (an empty field returns to its last value). Used for question and card counts, med math count, timers, review limits, template counts and model settings. Co-Authored-By: Claude Opus 5.5 --- web/src/app/Shell.tsx | 2 +- web/src/features/AiSettings.tsx | 6 +- web/src/features/GenerateDialog.tsx | 8 +-- web/src/features/SharedAssistant.tsx | 2 +- web/src/features/SharedGenerate.tsx | 4 +- web/src/features/TemplateSettings.tsx | 4 +- web/src/pages/QuizPage.tsx | 4 +- web/src/pages/SettingsPage.tsx | 6 +- web/src/pages/SharedPage.tsx | 7 ++- web/src/ui/index.tsx | 79 +++++++++++++++++++++++++++ 10 files changed, 101 insertions(+), 21 deletions(-) diff --git a/web/src/app/Shell.tsx b/web/src/app/Shell.tsx index 875198a..9291eb0 100644 --- a/web/src/app/Shell.tsx +++ b/web/src/app/Shell.tsx @@ -577,7 +577,7 @@ export function Shell() { const showDrawer = assistantOpen && isDesktop && !onAssistantPage; return ( -
+
Skip to content diff --git a/web/src/features/AiSettings.tsx b/web/src/features/AiSettings.tsx index 9fee796..c30643f 100644 --- a/web/src/features/AiSettings.tsx +++ b/web/src/features/AiSettings.tsx @@ -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({ - onChange({ ...config, temperature: e.target.value === '' ? null : Math.max(0, Math.min(2, Number(e.target.value))) })} /> + onChange({ ...config, temperature: n })} /> - onChange({ ...config, maxOutputTokens: e.target.value === '' ? null : Math.max(256, Math.round(Number(e.target.value))) })} /> + onChange({ ...config, maxOutputTokens: n })} />
diff --git a/web/src/features/GenerateDialog.tsx b/web/src/features/GenerateDialog.tsx index e61077b..bffa190 100644 --- a/web/src/features/GenerateDialog.tsx +++ b/web/src/features/GenerateDialog.tsx @@ -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
{!fixedSource && ( - setCount(Math.max(1, Math.min(100, Number(e.target.value) || 1)))} /> + n !== null && setCount(n)} /> )} @@ -293,7 +293,7 @@ export function GenerateDialog({ open, onClose, classId, folderId, preset }: { o
{mathOn && ( - setMathCount(Math.max(1, Math.min(25, Number(e.target.value) || 1)))} aria-label="Med math questions" /> + n !== null && setMathCount(n)} aria-label="Med math questions" /> )}
@@ -306,7 +306,7 @@ export function GenerateDialog({ open, onClose, classId, folderId, preset }: { o
{!fixedSource && ( - setCount(Math.max(1, Math.min(200, Number(e.target.value) || 1)))} /> + n !== null && setCount(n)} /> )} diff --git a/web/src/features/SharedAssistant.tsx b/web/src/features/SharedAssistant.tsx index ab5fa53..2b2638e 100644 --- a/web/src/features/SharedAssistant.tsx +++ b/web/src/features/SharedAssistant.tsx @@ -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( diff --git a/web/src/features/SharedGenerate.tsx b/web/src/features/SharedGenerate.tsx index 5a04429..9762651 100644 --- a/web/src/features/SharedGenerate.tsx +++ b/web/src/features/SharedGenerate.tsx @@ -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({ )}
- setCount(Math.max(1, Math.min(max, Number(e.target.value) || 1)))} /> + n !== null && setCount(n)} /> set({ count: Math.max(1, Math.min(200, Number(e.target.value) || 1)) })} className="w-28" /> + n !== null && set({ count: n })} className="w-28" /> )} {kind === 'quiz' && ( diff --git a/web/src/pages/QuizPage.tsx b/web/src/pages/QuizPage.tsx index cc5d21b..0232e83 100644 --- a/web/src/pages/QuizPage.tsx +++ b/web/src/pages/QuizPage.tsx @@ -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 }) { {timed && (
- setMinutes(Math.max(1, Math.min(600, Number(e.target.value) || 1)))} className="w-24" aria-label="Minutes" /> + n !== null && setMinutes(n)} className="w-24" aria-label="Minutes" /> minutes
)} diff --git a/web/src/pages/SettingsPage.tsx b/web/src/pages/SettingsPage.tsx index ddfbeef..a95ab1a 100644 --- a/web/src/pages/SettingsPage.tsx +++ b/web/src/pages/SettingsPage.tsx @@ -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() {
New cards per day
How many never-seen cards are introduced each day, across all decks. Reviews of cards you already know are never limited.
- 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" /> + n !== null && setForm({ ...form, newCardsPerDay: n })} onCommit={(n) => n !== null && save({ newCardsPerDay: n })} aria-label="New cards per day" />
@@ -113,7 +113,7 @@ function StudySettings() {
Daily goal
Cards reviewed plus questions answered that make a day count toward your streak.
- 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" /> + n !== null && setForm({ ...form, dailyGoal: n })} onCommit={(n) => n !== null && save({ dailyGoal: n })} aria-label="Daily goal" />
diff --git a/web/src/pages/SharedPage.tsx b/web/src/pages/SharedPage.tsx index add6961..16a5bfb 100644 --- a/web/src/pages/SharedPage.tsx +++ b/web/src/pages/SharedPage.tsx @@ -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 && ( )} @@ -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 ( -
+
{page}
{assistant}
diff --git a/web/src/ui/index.tsx b/web/src/ui/index.tsx index 4395c69..41749f9 100644 --- a/web/src/ui/index.tsx +++ b/web/src/ui/index.tsx @@ -123,6 +123,85 @@ export const Input = forwardRef; }); +/** 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, '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(function NumberInput( + { value, min, max, integer = true, allowEmpty = false, onValueChange, onCommit, onBlur, onKeyDown, onFocus, ...rest }, + ref, +) { + const [draft, setDraft] = useState(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 ( + { + 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 & { autoGrow?: boolean; maxRows?: number }>(function Textarea( { className, autoGrow, maxRows = 16, onChange, value, rows = 3, ...rest }, ref,