Skip to content

fix: improve tiered pricing number input editing #4536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Calcium-Ion merged 2 commits into from
Apr 30, 2026
Merged

fix: improve tiered pricing number input editing #4536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d393172
fix: follow required marker styling convention
yyhhyyyyyy Apr 29, 2026
182dd3b
fix: improve tiered pricing number input editing
yyhhyyyyyy Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion web/default/src/components/ui/label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,48 @@ import * as React from 'react'
import * as LabelPrimitive from '@radix-ui/react-label'
import { cn } from '@/lib/utils'

const requiredMarkerPattern = /\s\*$/

function renderRequiredMarker(text: string, key?: React.Key) {
if (!requiredMarkerPattern.test(text)) {
return text
}

return (
<span key={key}>
{text.slice(0, -1)}
<span className='text-destructive'>*</span>
Comment on lines +7 to +17

@coderabbitai coderabbitai Bot Apr 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Required-marker detection misses Label* (no-space suffix).

The current regex only matches "<text> *". Labels like Email* won’t be styled.

Suggested fix 
-const requiredMarkerPattern = /\s\*$/
+const requiredMarkerPattern = /\s*\*$/
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@web/default/src/components/ui/label.tsx` around lines 7 - 17, The
required-marker regex only matches a trailing space before '*' so labels like
"Email*" are missed; update requiredMarkerPattern in this file to match an
optional space before the asterisk (e.g., use /\s*\*$/) and change
renderRequiredMarker to remove the marker robustly (for example, strip the
trailing space+asterisk via replace or trimEnd()+slice) before rendering the
label text and the <span className='text-destructive'>*</span>; refer to
requiredMarkerPattern and renderRequiredMarker to locate and apply the fix.

</span>
)
}

function renderLabelChildren(children: React.ReactNode) {
const childArray = React.Children.toArray(children)

if (childArray.length === 0) {
return children
}

if (
childArray.every(
(child) => typeof child === 'string' || typeof child === 'number'
)
) {
return renderRequiredMarker(childArray.join(''))
}

return childArray.map((child, index) => {
if (typeof child === 'string' || typeof child === 'number') {
return renderRequiredMarker(String(child), index)
}

return child
})
}

function Label({
className,
children,
...props
}: React.ComponentProps<typeof LabelPrimitive.Root>) {
return (
Expand All @@ -16,7 +56,9 @@ function Label({
className
)}
{...props}
/>
>
{renderLabelChildren(children)}
</LabelPrimitive.Root>
)
}

Expand Down
163 changes: 123 additions & 40 deletions web/default/src/features/system-settings/models/tiered-pricing-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
import {
memo,
useCallback,
useEffect,
useMemo,
useRef,
useState,
type ChangeEvent,
type FocusEvent,
type InputHTMLAttributes,
type MouseEvent as ReactMouseEvent,
} from 'react'
import { Copy, Plus, Trash2 } from 'lucide-react'
import { useTranslation } from 'react-i18next'
import { toast } from 'sonner'
Expand Down Expand Up @@ -285,6 +296,93 @@ function formatTokenHint(n: number | string | null | undefined): string {
return `= ${v.toLocaleString()} tokens`
}

function formatNumberDraft(value: number | string): string {
if (value === '') return ''
if (typeof value === 'number')
return Number.isFinite(value) ? String(value) : '0'
return value
}

function parseNumberDraft(value: string): number {
if (value.trim() === '') return 0
const next = Number(value)
return Number.isFinite(next) ? next : 0
}

function isZeroDraft(value: string): boolean {
return value.trim() !== '' && parseNumberDraft(value) === 0
}

type DraftNumberInputProps = Omit<
InputHTMLAttributes<HTMLInputElement>,
'type' | 'value' | 'onChange'
> & {
value: number | string
onValueChange: (next: number) => void
selectZeroOnFocus?: boolean
}

function DraftNumberInput({
value,
onValueChange,
selectZeroOnFocus = true,
onBlur,
onFocus,
onMouseUp,
...props
}: DraftNumberInputProps) {
const [draft, setDraft] = useState(() => formatNumberDraft(value))
const [focused, setFocused] = useState(false)

useEffect(() => {
if (!focused) {
setDraft(formatNumberDraft(value))
}
}, [focused, value])

const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
const nextDraft = event.target.value
setDraft(nextDraft)
onValueChange(parseNumberDraft(nextDraft))
}

const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
setFocused(true)
onFocus?.(event)
if (selectZeroOnFocus && isZeroDraft(event.currentTarget.value)) {
event.currentTarget.select()
}
}

const handleMouseUp = (event: ReactMouseEvent<HTMLInputElement>) => {
onMouseUp?.(event)
if (selectZeroOnFocus && isZeroDraft(event.currentTarget.value)) {
event.preventDefault()
event.currentTarget.select()
}
}

const handleBlur = (event: FocusEvent<HTMLInputElement>) => {
const normalized = parseNumberDraft(event.currentTarget.value)
setFocused(false)
setDraft(String(normalized))
onValueChange(normalized)
onBlur?.(event)
}

return (
<Input
{...props}
type='number'
value={draft}
onChange={handleChange}
onFocus={handleFocus}
onMouseUp={handleMouseUp}
onBlur={handleBlur}
/>
)
}

// ---------------------------------------------------------------------------
// Tier condition row
// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -332,13 +430,10 @@ function ConditionRow({ condition, onChange, onRemove }: ConditionRowProps) {
))}
</SelectContent>
</Select>
<Input
type='number'
<DraftNumberInput
min={0}
value={condition.value === '' ? '' : Number(condition.value)}
onChange={(event) =>
onChange({ ...condition, value: event.target.value })
}
value={condition.value}
onValueChange={(value) => onChange({ ...condition, value })}
placeholder='tokens'
className='w-32'
/>
Expand Down Expand Up @@ -381,12 +476,11 @@ function PriceField({
<div className='space-y-1'>
<Label className='text-xs'>{label}</Label>
<div className='flex items-center gap-2'>
<Input
type='number'
<DraftNumberInput
min={0}
step={0.01}
value={Number.isFinite(value) ? value : 0}
onChange={(event) => onChange(Number(event.target.value) || 0)}
onValueChange={onChange}
className='w-32'
/>
{showSuffix && (
Expand Down Expand Up @@ -802,32 +896,29 @@ function RuleConditionRow({
</Select>
{timeCond.mode === MATCH_RANGE ? (
<>
<Input
type='number'
<DraftNumberInput
value={timeCond.rangeStart}
onChange={(event) =>
onChange({ ...timeCond, rangeStart: event.target.value })
onValueChange={(value) =>
onChange({ ...timeCond, rangeStart: String(value) })
}
placeholder='start'
className='w-20'
/>
<span className='text-muted-foreground text-xs'>~</span>
<Input
type='number'
<DraftNumberInput
value={timeCond.rangeEnd}
onChange={(event) =>
onChange({ ...timeCond, rangeEnd: event.target.value })
onValueChange={(value) =>
onChange({ ...timeCond, rangeEnd: String(value) })
}
placeholder='end'
className='w-20'
/>
</>
) : (
<Input
type='number'
<DraftNumberInput
value={timeCond.value}
onChange={(event) =>
onChange({ ...timeCond, value: event.target.value })
onValueChange={(value) =>
onChange({ ...timeCond, value: String(value) })
}
placeholder='value'
className='w-24'
Expand Down Expand Up @@ -991,13 +1082,12 @@ function RuleGroupCard({

<div className='flex items-center gap-2'>
<Label className='text-xs'>{t('Multiplier')}</Label>
<Input
type='number'
<DraftNumberInput
min={0}
step={0.01}
value={group.multiplier}
onChange={(event) =>
onChange({ ...group, multiplier: event.target.value })
onValueChange={(value) =>
onChange({ ...group, multiplier: String(value) })
}
className='w-32'
placeholder='1.0'
Expand Down Expand Up @@ -1114,24 +1204,18 @@ function CostEstimator({ effectiveExpr }: EstimatorProps) {
<div className='grid grid-cols-2 gap-3'>
<div className='space-y-1'>
<Label className='text-xs'>{t('Input tokens')} (p)</Label>
<Input
type='number'
<DraftNumberInput
min={0}
value={promptTokens}
onChange={(event) =>
setPromptTokens(Number(event.target.value) || 0)
}
onValueChange={setPromptTokens}
/>
</div>
<div className='space-y-1'>
<Label className='text-xs'>{t('Output tokens')} (c)</Label>
<Input
type='number'
<DraftNumberInput
min={0}
value={completionTokens}
onChange={(event) =>
setCompletionTokens(Number(event.target.value) || 0)
}
onValueChange={setCompletionTokens}
/>
</div>
</div>
Expand All @@ -1151,14 +1235,13 @@ function CostEstimator({ effectiveExpr }: EstimatorProps) {
<Label className='text-xs'>
{variable.shortLabel} ({variable.key})
</Label>
<Input
type='number'
<DraftNumberInput
min={0}
value={extras[stateKey]}
onChange={(event) =>
onValueChange={(value) =>
setExtras((prev) => ({
...prev,
[stateKey]: Number(event.target.value) || 0,
[stateKey]: value,
}))
}
/>
Expand Down