Zimin A.N.
5007e0f4eb
Все font cascade bugs из последних MR были вызваны @nstart/ui pollution
(Tektur inheritance от Card parent'ов, Onest font в Button, font-primary
class overrides). Решили обрезать раньше plan'а.
What changed:
New primitives (8 файлов в src/ui/components/):
- panel.tsx — container с border/surface
- field.tsx — FieldLabel/Hint/Error typography helpers
- text-input.tsx — Input + label/hint/error composite
- table.tsx — Table/TableHeader/Body/Row/HeaderCell/Cell/Empty
- date-picker.tsx — native <input type=date> wrapper с label/hint/error
- multi-select.tsx — Radix Popover + inline checkboxes
- single-select.tsx — native <select> с label/hint/error chrome
- language-switch.tsx — segmented control в Tektur uppercase
Compatibility shims (existing components extended):
- checkbox.tsx — + label/description/error/onChange (nstart-compat
synthetic event), wrap в <label> когда есть chrome
- modal.tsx — + panelClassName / bodyClassName props
- form-actions.tsx — + align prop (start/end/between)
- tabs-simple.tsx — TabItem.count alias for .trailing (nstart-compat)
- table TableHead — alias TableHeaderCell с align prop
Barrel rewrite (src/ui/index.ts):
- Удалён 'export * from @nstart/ui'
- Explicit exports для всех 45+ нужных символов
- SelectOption / MultiSelectOption / LanguageOption теперь {id, label}
с optional 'value' alias — nstart-compat без массового codemod call-sites
styles.css cleanup:
- Removed @import @nstart/ui/styles/{fonts,theme}.css
- Removed @source nstart/dist directive (Tailwind v4 scan)
- Removed --text-sm: 13px override (был костыль для @nstart/ui dist)
- Legacy color tokens (--color-carbon/ultramarain/orbit/regolith/asteroid)
sсодержали fallback mappings — оставлены, но callsites больше не используют
Codemod: 9 файлов конвертированы legacy colors → handoff tokens
carbon → ink, ultramarain → accent, orbit → warn, regolith → line, asteroid → mute
main.tsx:
- NStartUiProvider → TooltipProvider (Radix)
- DatePickerProvider убран (наш DatePicker native, no provider needed)
routes/dictionaries.$name.tsx:
- Removed useRef-based <input>.indeterminate hack
- Radix Checkbox принимает checked='indeterminate' declaratively
package.json: -@nstart/ui (was 0.1.3)
Bundle impact:
before: vendor-nstart-ui chunk = 1228 KB
after: no nstart chunk, всё в vendor-misc (+~70 KB Radix wrappers)
net savings: ~1.15 MB minified, ~440 KB gzip
Tests: 116 pass (1 fixed: tab role from 'button' → 'tab', Radix semantically correct).
TS strict: clean.
Browser-verified (preview): 7 utilities computed correctly, nstart bundle absent.
53 lines
1.7 KiB
TypeScript
53 lines
1.7 KiB
TypeScript
import * as React from 'react'
|
|
import { Input } from './input'
|
|
import { FieldLabel, FieldHint, FieldError } from './field'
|
|
import { cn } from '@/lib/utils'
|
|
|
|
/**
|
|
* TextInput — composite field: label + input + hint/error.
|
|
*
|
|
* Замена @nstart/ui TextInput (тот же API): label, hint, error, required.
|
|
* Внутри использует наш shadcn Input primitive.
|
|
*/
|
|
|
|
export type TextInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'size'> & {
|
|
label?: React.ReactNode
|
|
hint?: React.ReactNode
|
|
error?: React.ReactNode
|
|
required?: boolean
|
|
/** Wrapper className (label + input + hint stack). */
|
|
rootClassName?: string
|
|
}
|
|
|
|
export const TextInput = React.forwardRef<HTMLInputElement, TextInputProps>(
|
|
function TextInput(
|
|
{ label, hint, error, required, rootClassName, className, id, ...props },
|
|
ref,
|
|
) {
|
|
const autoId = React.useId()
|
|
const inputId = id ?? autoId
|
|
const hintId = hint ? `${inputId}-hint` : undefined
|
|
const errorId = error ? `${inputId}-error` : undefined
|
|
return (
|
|
<div className={cn('flex flex-col gap-1', rootClassName)}>
|
|
{label && (
|
|
<FieldLabel htmlFor={inputId} required={required}>
|
|
{label}
|
|
</FieldLabel>
|
|
)}
|
|
<Input
|
|
ref={ref}
|
|
id={inputId}
|
|
aria-invalid={error ? true : undefined}
|
|
aria-describedby={[hintId, errorId].filter(Boolean).join(' ') || undefined}
|
|
className={cn(error ? 'border-pink focus-visible:ring-pink/40' : '', className)}
|
|
required={required}
|
|
{...props}
|
|
/>
|
|
{hint && !error && <FieldHint id={hintId}>{hint}</FieldHint>}
|
|
{error && <FieldError id={errorId}>{error}</FieldError>}
|
|
</div>
|
|
)
|
|
},
|
|
)
|