Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions src/__cosmos__/fixtures/Input.fixture.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ export default function InputFixture() {
title="Input Sizes"
code={`<div className="lsd:space-y-6">
<div>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Large (Default)</h3>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Large</h3>
<Input size="large" placeholder="Large input" />
</div>
<div>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Medium</h3>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Medium (Default)</h3>
<Input size="medium" placeholder="Medium input" />
</div>
<div>
Expand All @@ -73,13 +73,13 @@ export default function InputFixture() {
>
<div className="lsd:space-y-6">
<div>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">
Large (Default)
</h3>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Large</h3>
<Input size="large" placeholder="Large input" />
</div>
<div>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">Medium</h3>
<h3 className="lsd:text-lg lsd:font-medium lsd:mb-2">
Medium (Default)
</h3>
<Input size="medium" placeholder="Medium input" />
</div>
<div>
Expand Down
45 changes: 29 additions & 16 deletions src/components/ui/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
{
className,
variant = 'underlined',
size = 'large',
size = 'medium',
label,
supportingText,
error,
Expand All @@ -29,29 +29,42 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
const inputId = React.useId();
const finalId = id || inputId;

const getSizeClasses = () => {
const getTextSizeClasses = () => {
switch (size) {
case 'large':
return 'lsd:w-52';
return 'lsd:text-lg file:lsd:text-lg';
case 'medium':
return 'lsd:w-44';
return 'lsd:text-base file:lsd:text-base';
case 'small':
return 'lsd:w-40';
return 'lsd:text-sm file:lsd:text-sm';
default:
return 'lsd:w-52';
return 'lsd:text-base file:lsd:text-base';
}
};

const getPaddingClasses = () => {
const getVerticalPaddingClasses = () => {
switch (size) {
case 'large':
return 'lsd:px-4 lsd:py-4';
return 'lsd:py-4';
case 'medium':
return 'lsd:px-3 lsd:py-3';
return 'lsd:py-3';
case 'small':
return 'lsd:px-3 lsd:py-3';
return 'lsd:py-2';
default:
return 'lsd:px-4 lsd:py-4';
return 'lsd:py-3';
}
};

const getLabelSizeClasses = () => {
switch (size) {
case 'large':
return 'lsd:text-base';
case 'medium':
return 'lsd:text-sm';
case 'small':
return 'lsd:text-xs';
default:
return 'lsd:text-sm';
}
};

Expand All @@ -60,7 +73,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
{label && (
<label
htmlFor={finalId}
className="lsd:pb-1.5 lsd:text-sm lsd:font-medium"
className={cn('lsd:font-medium', getLabelSizeClasses())}
>
{label}
</label>
Expand All @@ -72,18 +85,18 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
? 'lsd:border lsd:border-lsd-border-primary lsd:rounded'
: 'lsd:border lsd:border-transparent lsd:border-b-lsd-border-primary',
error && 'lsd:border-lsd-destructive',
getSizeClasses(),
)}
>
<input
ref={ref}
type={type}
id={finalId}
className={cn(
'file:lsd:text-lsd-text placeholder:lsd:text-lsd-text-primary placeholder:lsd:opacity-30 selection:lsd:bg-lsd-primary selection:lsd:text-lsd-surface-primary lsd:border-none lsd:outline-none lsd:bg-transparent lsd:text-lsd-text-primary lsd:w-full lsd:h-full lsd:text-base file:lsd:inline-flex file:lsd:h-7 file:lsd:border-0 file:lsd:bg-transparent file:lsd:text-base file:lsd:font-medium lsd:disabled:pointer-events-none lsd:disabled:cursor-not-allowed lsd:disabled:opacity-34',
'focus-visible:lsd:outline-none',
'file:lsd:text-lsd-text placeholder:lsd:text-lsd-text-primary placeholder:lsd:opacity-30 selection:lsd:bg-lsd-primary selection:lsd:text-lsd-surface-primary lsd:border-none lsd:outline-none lsd:bg-transparent lsd:text-lsd-text-primary lsd:w-full lsd:h-full file:lsd:inline-flex file:lsd:h-7 file:lsd:border-0 file:lsd:bg-transparent file:lsd:font-medium lsd:disabled:pointer-events-none lsd:disabled:cursor-not-allowed lsd:disabled:opacity-34',
'focus-visible:lsd:outline-none lsd:px-4',
error && 'lsd:line-through',
getPaddingClasses(),
getTextSizeClasses(),
getVerticalPaddingClasses(),
)}
{...props}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function TabsContent({
return (
<TabsPrimitive.Content
data-slot="tabs-content"
className={cn('lsd:mt-4 lsd:outline-none', className)}
className={cn('lsd:outline-none', className)}
{...props}
/>
);
Expand Down