website refactor
This commit is contained in:
@@ -16,8 +16,10 @@ type Spacing = 0 | 0.5 | 1 | 1.5 | 2 | 2.5 | 3 | 3.5 | 4 | 5 | 6 | 7 | 8 | 9 | 1
|
||||
|
||||
interface ResponsiveSpacing {
|
||||
base?: Spacing;
|
||||
sm?: Spacing;
|
||||
md?: Spacing;
|
||||
lg?: Spacing;
|
||||
xl?: Spacing;
|
||||
}
|
||||
|
||||
export type ResponsiveValue<T> = {
|
||||
@@ -49,38 +51,151 @@ export interface BoxProps<T extends ElementType> {
|
||||
px?: Spacing | ResponsiveSpacing;
|
||||
py?: Spacing | ResponsiveSpacing;
|
||||
// Sizing
|
||||
w?: string | ResponsiveValue<string>;
|
||||
h?: string | ResponsiveValue<string>;
|
||||
width?: string;
|
||||
height?: string;
|
||||
w?: string | number | ResponsiveValue<string | number>;
|
||||
h?: string | number | ResponsiveValue<string | number>;
|
||||
width?: string | number;
|
||||
height?: string | number;
|
||||
maxWidth?: string | ResponsiveValue<string>;
|
||||
minWidth?: string | ResponsiveValue<string>;
|
||||
maxHeight?: string | ResponsiveValue<string>;
|
||||
minHeight?: string | ResponsiveValue<string>;
|
||||
fullWidth?: boolean;
|
||||
fullHeight?: boolean;
|
||||
aspectRatio?: string;
|
||||
// Display
|
||||
display?: 'block' | 'inline-block' | 'flex' | 'inline-flex' | 'grid' | 'none' | ResponsiveValue<'block' | 'inline-block' | 'flex' | 'inline-flex' | 'grid' | 'none'>;
|
||||
display?: 'block' | 'inline-block' | 'flex' | 'inline-flex' | 'grid' | 'none' | string | ResponsiveValue<'block' | 'inline-block' | 'flex' | 'inline-flex' | 'grid' | 'none' | string>;
|
||||
center?: boolean;
|
||||
overflow?: 'auto' | 'hidden' | 'visible' | 'scroll' | string;
|
||||
overflowX?: 'auto' | 'hidden' | 'visible' | 'scroll';
|
||||
overflowY?: 'auto' | 'hidden' | 'visible' | 'scroll';
|
||||
textAlign?: 'left' | 'center' | 'right' | 'justify' | string;
|
||||
visibility?: 'visible' | 'hidden' | 'collapse';
|
||||
// Positioning
|
||||
position?: 'static' | 'relative' | 'absolute' | 'fixed' | 'sticky';
|
||||
top?: string | number | ResponsiveValue<string | number>;
|
||||
right?: string | number | ResponsiveValue<string | number>;
|
||||
bottom?: string | number | ResponsiveValue<string | number>;
|
||||
left?: string | number | ResponsiveValue<string | number>;
|
||||
inset?: string | number;
|
||||
insetY?: string | number;
|
||||
insetX?: string | number;
|
||||
zIndex?: number;
|
||||
// Basic Styling
|
||||
rounded?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'full';
|
||||
border?: boolean;
|
||||
rounded?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | 'full' | string | boolean;
|
||||
border?: boolean | string;
|
||||
borderTop?: boolean | string;
|
||||
borderBottom?: boolean | string;
|
||||
borderLeft?: boolean | string;
|
||||
borderRight?: boolean | string;
|
||||
borderWidth?: string | number;
|
||||
borderStyle?: 'solid' | 'dashed' | 'dotted' | 'none' | string;
|
||||
borderColor?: string;
|
||||
borderOpacity?: number;
|
||||
bg?: string;
|
||||
backgroundColor?: string;
|
||||
backgroundImage?: string;
|
||||
backgroundSize?: string;
|
||||
backgroundPosition?: string;
|
||||
bgOpacity?: number;
|
||||
color?: string;
|
||||
shadow?: string;
|
||||
opacity?: number;
|
||||
blur?: 'none' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | string;
|
||||
pointerEvents?: 'auto' | 'none' | string;
|
||||
// Flex/Grid Item props
|
||||
flex?: number | string;
|
||||
flexShrink?: number;
|
||||
flexGrow?: number;
|
||||
flexDirection?: 'row' | 'row-reverse' | 'col' | 'col-reverse' | string | ResponsiveValue<string>;
|
||||
flexWrap?: 'wrap' | 'nowrap' | 'wrap-reverse' | string;
|
||||
alignItems?: 'start' | 'center' | 'end' | 'stretch' | 'baseline' | string | ResponsiveValue<string>;
|
||||
justifyContent?: 'start' | 'center' | 'end' | 'between' | 'around' | 'evenly' | string | ResponsiveValue<string>;
|
||||
alignSelf?: 'auto' | 'start' | 'end' | 'center' | 'stretch' | 'baseline';
|
||||
gap?: number | string | ResponsiveValue<number | string>;
|
||||
gridCols?: number | ResponsiveValue<number>;
|
||||
responsiveGridCols?: number | ResponsiveValue<number>;
|
||||
colSpan?: number | ResponsiveValue<number>;
|
||||
responsiveColSpan?: number | ResponsiveValue<number>;
|
||||
order?: number | string | ResponsiveValue<number | string>;
|
||||
// Transform
|
||||
transform?: string | boolean;
|
||||
translate?: string;
|
||||
translateX?: string;
|
||||
translateY?: string;
|
||||
// Animation (Framer Motion support)
|
||||
initial?: any;
|
||||
animate?: any;
|
||||
exit?: any;
|
||||
transition?: any;
|
||||
variants?: any;
|
||||
whileHover?: any;
|
||||
whileTap?: any;
|
||||
onHoverStart?: any;
|
||||
onHoverEnd?: any;
|
||||
whileInView?: any;
|
||||
viewport?: any;
|
||||
custom?: any;
|
||||
// Interaction
|
||||
group?: boolean;
|
||||
groupHoverTextColor?: string;
|
||||
groupHoverScale?: boolean;
|
||||
groupHoverOpacity?: number;
|
||||
groupHoverBorderColor?: string;
|
||||
hoverBorderColor?: string;
|
||||
hoverBg?: string;
|
||||
hoverTextColor?: string;
|
||||
hoverScale?: boolean | number;
|
||||
clickable?: boolean;
|
||||
// Events
|
||||
onMouseEnter?: React.MouseEventHandler<T>;
|
||||
onMouseLeave?: React.MouseEventHandler<T>;
|
||||
onClick?: React.MouseEventHandler<T>;
|
||||
onMouseEnter?: React.MouseEventHandler<any>;
|
||||
onMouseLeave?: React.MouseEventHandler<any>;
|
||||
onClick?: React.MouseEventHandler<any>;
|
||||
onMouseDown?: React.MouseEventHandler<any>;
|
||||
onMouseUp?: React.MouseEventHandler<any>;
|
||||
onMouseMove?: React.MouseEventHandler<any>;
|
||||
onKeyDown?: React.KeyboardEventHandler<any>;
|
||||
onBlur?: React.FocusEventHandler<any>;
|
||||
onSubmit?: React.FormEventHandler<any>;
|
||||
onScroll?: React.UIEventHandler<any>;
|
||||
style?: React.CSSProperties;
|
||||
id?: string;
|
||||
role?: string;
|
||||
role?: React.AriaRole;
|
||||
tabIndex?: number;
|
||||
// Other
|
||||
type?: 'button' | 'submit' | 'reset' | string;
|
||||
disabled?: boolean;
|
||||
cursor?: string;
|
||||
fontSize?: string | ResponsiveValue<string>;
|
||||
weight?: string;
|
||||
fontWeight?: string | number;
|
||||
letterSpacing?: string;
|
||||
lineHeight?: string | number;
|
||||
font?: string;
|
||||
ring?: string;
|
||||
hideScrollbar?: boolean;
|
||||
truncate?: boolean;
|
||||
src?: string;
|
||||
alt?: string;
|
||||
draggable?: boolean;
|
||||
min?: string | number;
|
||||
max?: string | number;
|
||||
step?: string | number;
|
||||
value?: string | number;
|
||||
onChange?: React.ChangeEventHandler<any>;
|
||||
placeholder?: string;
|
||||
title?: string;
|
||||
padding?: Spacing | ResponsiveSpacing;
|
||||
paddingLeft?: Spacing | ResponsiveSpacing;
|
||||
paddingRight?: Spacing | ResponsiveSpacing;
|
||||
paddingTop?: Spacing | ResponsiveSpacing;
|
||||
paddingBottom?: Spacing | ResponsiveSpacing;
|
||||
size?: string | number | ResponsiveValue<string | number>;
|
||||
accept?: string;
|
||||
autoPlay?: boolean;
|
||||
loop?: boolean;
|
||||
muted?: boolean;
|
||||
playsInline?: boolean;
|
||||
objectFit?: 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
|
||||
}
|
||||
|
||||
export const Box = forwardRef(<T extends ElementType = 'div'>(
|
||||
@@ -92,26 +207,126 @@ export const Box = forwardRef(<T extends ElementType = 'div'>(
|
||||
p, pt, pb, pl, pr, px, py,
|
||||
w, h, width, height,
|
||||
maxWidth, minWidth, maxHeight, minHeight,
|
||||
fullWidth, fullHeight,
|
||||
aspectRatio,
|
||||
display,
|
||||
center,
|
||||
overflow, overflowX, overflowY,
|
||||
textAlign,
|
||||
visibility,
|
||||
position,
|
||||
top, right, bottom, left,
|
||||
inset, insetY, insetX,
|
||||
zIndex,
|
||||
rounded,
|
||||
border,
|
||||
borderTop,
|
||||
borderBottom,
|
||||
borderLeft,
|
||||
borderRight,
|
||||
borderWidth,
|
||||
borderStyle,
|
||||
borderColor,
|
||||
borderOpacity,
|
||||
bg,
|
||||
backgroundColor,
|
||||
backgroundImage,
|
||||
backgroundSize,
|
||||
backgroundPosition,
|
||||
bgOpacity,
|
||||
color,
|
||||
shadow,
|
||||
opacity,
|
||||
blur,
|
||||
pointerEvents,
|
||||
flex,
|
||||
flexShrink,
|
||||
flexGrow,
|
||||
flexDirection,
|
||||
flexWrap,
|
||||
alignItems,
|
||||
justifyContent,
|
||||
alignSelf,
|
||||
gap,
|
||||
gridCols,
|
||||
responsiveGridCols,
|
||||
colSpan,
|
||||
responsiveColSpan,
|
||||
order,
|
||||
transform,
|
||||
translate,
|
||||
translateX,
|
||||
translateY,
|
||||
initial,
|
||||
animate,
|
||||
exit,
|
||||
transition,
|
||||
variants,
|
||||
whileHover,
|
||||
whileTap,
|
||||
onHoverStart,
|
||||
onHoverEnd,
|
||||
whileInView,
|
||||
viewport,
|
||||
custom,
|
||||
group,
|
||||
groupHoverTextColor,
|
||||
groupHoverScale,
|
||||
groupHoverOpacity,
|
||||
groupHoverBorderColor,
|
||||
hoverBorderColor,
|
||||
hoverBg,
|
||||
hoverTextColor,
|
||||
hoverScale,
|
||||
clickable,
|
||||
onMouseEnter,
|
||||
onMouseLeave,
|
||||
onClick,
|
||||
onMouseDown,
|
||||
onMouseUp,
|
||||
onMouseMove,
|
||||
onKeyDown,
|
||||
onBlur,
|
||||
onSubmit,
|
||||
onScroll,
|
||||
style: styleProp,
|
||||
id,
|
||||
role,
|
||||
tabIndex,
|
||||
type,
|
||||
disabled,
|
||||
cursor,
|
||||
fontSize,
|
||||
weight,
|
||||
fontWeight,
|
||||
letterSpacing,
|
||||
lineHeight,
|
||||
font,
|
||||
ring,
|
||||
hideScrollbar,
|
||||
truncate,
|
||||
src,
|
||||
alt,
|
||||
draggable,
|
||||
min,
|
||||
max,
|
||||
step,
|
||||
value,
|
||||
onChange,
|
||||
placeholder,
|
||||
title,
|
||||
padding,
|
||||
paddingLeft,
|
||||
paddingRight,
|
||||
paddingTop,
|
||||
paddingBottom,
|
||||
size,
|
||||
accept,
|
||||
autoPlay,
|
||||
loop,
|
||||
muted,
|
||||
playsInline,
|
||||
objectFit,
|
||||
...props
|
||||
}: BoxProps<T> & ComponentPropsWithoutRef<T>,
|
||||
ref: ForwardedRef<HTMLElement>
|
||||
@@ -131,14 +346,16 @@ export const Box = forwardRef(<T extends ElementType = 'div'>(
|
||||
if (typeof value === 'object') {
|
||||
const classes = [];
|
||||
if (value.base !== undefined) classes.push(`${prefix}-${spacingMap[value.base]}`);
|
||||
if (value.sm !== undefined) classes.push(`sm:${prefix}-${spacingMap[value.sm]}`);
|
||||
if (value.md !== undefined) classes.push(`md:${prefix}-${spacingMap[value.md]}`);
|
||||
if (value.lg !== undefined) classes.push(`lg:${prefix}-${spacingMap[value.lg]}`);
|
||||
if (value.xl !== undefined) classes.push(`xl:${prefix}-${spacingMap[value.xl]}`);
|
||||
return classes.join(' ');
|
||||
}
|
||||
return `${prefix}-${spacingMap[value]}`;
|
||||
};
|
||||
|
||||
const getResponsiveClasses = (prefix: string, value: string | number | ResponsiveValue<string | number> | undefined) => {
|
||||
const getResponsiveClasses = (prefix: string, value: any | ResponsiveValue<any> | undefined) => {
|
||||
if (value === undefined) return '';
|
||||
if (typeof value === 'object') {
|
||||
const classes = [];
|
||||
@@ -161,42 +378,111 @@ export const Box = forwardRef(<T extends ElementType = 'div'>(
|
||||
getSpacingClass('mr', mr),
|
||||
getSpacingClass('mx', mx),
|
||||
getSpacingClass('my', my),
|
||||
getSpacingClass('p', p),
|
||||
getSpacingClass('pt', pt),
|
||||
getSpacingClass('pb', pb),
|
||||
getSpacingClass('pl', pl),
|
||||
getSpacingClass('pr', pr),
|
||||
getSpacingClass('p', p || padding),
|
||||
getSpacingClass('pt', pt || paddingTop),
|
||||
getSpacingClass('pb', pb || paddingBottom),
|
||||
getSpacingClass('pl', pl || paddingLeft),
|
||||
getSpacingClass('pr', pr || paddingRight),
|
||||
getSpacingClass('px', px),
|
||||
getSpacingClass('py', py),
|
||||
getResponsiveClasses('w', w),
|
||||
getResponsiveClasses('h', h),
|
||||
fullWidth ? 'w-full' : getResponsiveClasses('w', w),
|
||||
fullHeight ? 'h-full' : getResponsiveClasses('h', h),
|
||||
getResponsiveClasses('max-w', maxWidth),
|
||||
getResponsiveClasses('min-w', minWidth),
|
||||
getResponsiveClasses('max-h', maxHeight),
|
||||
getResponsiveClasses('min-h', minHeight),
|
||||
getResponsiveClasses('', display),
|
||||
rounded ? `rounded-${rounded}` : '',
|
||||
border ? 'border' : '',
|
||||
center ? 'flex items-center justify-center' : '',
|
||||
overflow ? (overflow.includes(':') ? overflow : `overflow-${overflow}`) : '',
|
||||
overflowX ? `overflow-x-${overflowX}` : '',
|
||||
overflowY ? `overflow-y-${overflowY}` : '',
|
||||
textAlign ? `text-${textAlign}` : '',
|
||||
visibility ? visibility : '',
|
||||
position ? position : '',
|
||||
getResponsiveClasses('top', top),
|
||||
getResponsiveClasses('right', right),
|
||||
getResponsiveClasses('bottom', bottom),
|
||||
getResponsiveClasses('left', left),
|
||||
inset !== undefined ? `inset-${inset}` : '',
|
||||
insetY !== undefined ? `inset-y-${insetY}` : '',
|
||||
insetX !== undefined ? `inset-x-${insetX}` : '',
|
||||
zIndex !== undefined ? `z-${zIndex}` : '',
|
||||
rounded === true ? 'rounded' : (rounded === false ? 'rounded-none' : (typeof rounded === 'string' ? (rounded.includes('-') ? rounded : `rounded-${rounded}`) : '')),
|
||||
border === true ? 'border' : (typeof border === 'string' ? (border === 'none' ? 'border-none' : border) : ''),
|
||||
borderTop === true ? 'border-t' : (typeof borderTop === 'string' ? borderTop : ''),
|
||||
borderBottom === true ? 'border-b' : (typeof borderBottom === 'string' ? borderBottom : ''),
|
||||
borderLeft === true ? 'border-l' : (typeof borderLeft === 'string' ? borderLeft : ''),
|
||||
borderRight === true ? 'border-r' : (typeof borderRight === 'string' ? borderRight : ''),
|
||||
borderStyle ? `border-${borderStyle}` : '',
|
||||
borderColor ? borderColor : '',
|
||||
borderOpacity !== undefined ? `border-opacity-${borderOpacity * 100}` : '',
|
||||
bg ? bg : '',
|
||||
backgroundColor ? backgroundColor : '',
|
||||
bgOpacity !== undefined ? `bg-opacity-${bgOpacity * 100}` : '',
|
||||
color ? color : '',
|
||||
shadow ? shadow : '',
|
||||
opacity !== undefined ? `opacity-${opacity * 100}` : '',
|
||||
blur ? (blur === 'none' ? 'blur-none' : `blur-${blur}`) : '',
|
||||
pointerEvents ? `pointer-events-${pointerEvents}` : '',
|
||||
flex !== undefined ? `flex-${flex}` : '',
|
||||
flexShrink !== undefined ? `flex-shrink-${flexShrink}` : '',
|
||||
flexGrow !== undefined ? `flex-grow-${flexGrow}` : '',
|
||||
getResponsiveClasses('flex', flexDirection),
|
||||
flexWrap ? `flex-${flexWrap}` : '',
|
||||
getResponsiveClasses('items', alignItems),
|
||||
getResponsiveClasses('justify', justifyContent),
|
||||
alignSelf !== undefined ? `self-${alignSelf}` : '',
|
||||
opacity !== undefined ? `opacity-${opacity * 100}` : '',
|
||||
getResponsiveClasses('gap', gap),
|
||||
getResponsiveClasses('grid-cols', gridCols || responsiveGridCols),
|
||||
getResponsiveClasses('col-span', colSpan || responsiveColSpan),
|
||||
getResponsiveClasses('order', order),
|
||||
getResponsiveClasses('text', fontSize),
|
||||
group ? 'group' : '',
|
||||
groupHoverTextColor ? `group-hover:text-${groupHoverTextColor}` : '',
|
||||
groupHoverScale ? 'group-hover:scale-105 transition-transform' : '',
|
||||
groupHoverOpacity !== undefined ? `group-hover:opacity-${groupHoverOpacity * 100}` : '',
|
||||
groupHoverBorderColor ? `group-hover:border-${groupHoverBorderColor}` : '',
|
||||
hoverBorderColor ? `hover:border-${hoverBorderColor}` : '',
|
||||
hoverBg ? `hover:bg-${hoverBg}` : '',
|
||||
hoverTextColor ? `hover:text-${hoverTextColor}` : '',
|
||||
hoverScale === true ? 'hover:scale-105 transition-transform' : (typeof hoverScale === 'number' ? `hover:scale-${hoverScale} transition-transform` : ''),
|
||||
clickable ? 'cursor-pointer active:opacity-80 transition-all' : '',
|
||||
ring ? `ring-${ring}` : '',
|
||||
hideScrollbar ? 'scrollbar-hide' : '',
|
||||
truncate ? 'truncate' : '',
|
||||
transform === true ? 'transform' : (transform === false ? 'transform-none' : ''),
|
||||
className
|
||||
].filter(Boolean).join(' ');
|
||||
|
||||
const style: React.CSSProperties = {
|
||||
...(width ? { width } : {}),
|
||||
...(height ? { height } : {}),
|
||||
...(typeof width === 'string' || typeof width === 'number' ? { width } : {}),
|
||||
...(typeof height === 'string' || typeof height === 'number' ? { height } : {}),
|
||||
...(typeof maxWidth === 'string' ? { maxWidth } : {}),
|
||||
...(typeof minWidth === 'string' ? { minWidth } : {}),
|
||||
...(typeof maxHeight === 'string' ? { maxHeight } : {}),
|
||||
...(typeof minHeight === 'string' ? { minHeight } : {}),
|
||||
...(aspectRatio ? { aspectRatio } : {}),
|
||||
...(typeof top === 'string' || typeof top === 'number' ? { top } : {}),
|
||||
...(typeof right === 'string' || typeof right === 'number' ? { right } : {}),
|
||||
...(typeof bottom === 'string' || typeof bottom === 'number' ? { bottom } : {}),
|
||||
...(typeof left === 'string' || typeof left === 'number' ? { left } : {}),
|
||||
...(borderWidth !== undefined ? { borderWidth } : {}),
|
||||
...(typeof transform === 'string' ? { transform } : {}),
|
||||
...(translate ? { translate } : {}),
|
||||
...(translateX ? { transform: `translateX(${translateX})` } : {}),
|
||||
...(translateY ? { transform: `translateY(${translateY})` } : {}),
|
||||
...(cursor ? { cursor } : {}),
|
||||
...(fontSize && typeof fontSize === 'string' && !fontSize.includes(':') ? { fontSize } : {}),
|
||||
...(weight ? { fontWeight: weight } : {}),
|
||||
...(fontWeight ? { fontWeight } : {}),
|
||||
...(letterSpacing ? { letterSpacing } : {}),
|
||||
...(lineHeight ? { lineHeight } : {}),
|
||||
...(font ? { fontFamily: font } : {}),
|
||||
...(typeof size === 'string' || typeof size === 'number' ? { width: size, height: size } : {}),
|
||||
...(backgroundImage ? { backgroundImage } : {}),
|
||||
...(backgroundSize ? { backgroundSize } : {}),
|
||||
...(backgroundPosition ? { backgroundPosition } : {}),
|
||||
...(objectFit ? { objectFit } : {}),
|
||||
...(styleProp || {})
|
||||
};
|
||||
|
||||
@@ -205,12 +491,35 @@ export const Box = forwardRef(<T extends ElementType = 'div'>(
|
||||
ref={ref as React.ForwardedRef<HTMLElement>}
|
||||
className={classes}
|
||||
onClick={onClick}
|
||||
onMouseDown={onMouseDown}
|
||||
onMouseUp={onMouseUp}
|
||||
onMouseMove={onMouseMove}
|
||||
onKeyDown={onKeyDown}
|
||||
onBlur={onBlur}
|
||||
onSubmit={onSubmit}
|
||||
onMouseEnter={onMouseEnter}
|
||||
onMouseLeave={onMouseLeave}
|
||||
onScroll={onScroll}
|
||||
style={style}
|
||||
id={id}
|
||||
role={role}
|
||||
tabIndex={tabIndex}
|
||||
type={type}
|
||||
disabled={disabled}
|
||||
src={src}
|
||||
alt={alt}
|
||||
draggable={draggable}
|
||||
min={min}
|
||||
max={max}
|
||||
step={step}
|
||||
value={value}
|
||||
onChange={onChange}
|
||||
placeholder={placeholder}
|
||||
title={title}
|
||||
autoPlay={autoPlay}
|
||||
loop={loop}
|
||||
muted={muted}
|
||||
playsInline={playsInline}
|
||||
{...props}
|
||||
>
|
||||
{children}
|
||||
|
||||
Reference in New Issue
Block a user