Skip to content
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.

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

apr #23

Merged
merged 1 commit into from
Dec 11, 2024
Merged

apr #23

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
48 changes: 24 additions & 24 deletions src/components/primitives/Box.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
/**
* Box Component
*
* A flexible container component that serves as a fundamental building block for layouts.
* It provides various visual styles and sizing options through variants.
*
* @variants
* content:
* - xs to xl: Content size variants
*
* container:
* - true/false: Controls container behavior
*
* @compoundVariants
* The component uses compound variants to determine border radius (rounded corners):
* - When container=true: Uses both size and content values (rounded-${size}+${content})
* - When container=false: Uses only size value (rounded-${size})
*
* @example
* <Box look="soft" size="md" content="sm" container={true}>
* Content goes here
* </Box>
*/

import { tv } from "tailwind-variants";
import useThemedVariables from "../../hooks/theming/useThemedVariables";
import { mergeClass } from "../../utils/css";
Expand Down Expand Up @@ -83,6 +59,30 @@ export const boxStyles = tv({

export type BoxProps = Component<Styled<typeof boxStyles> & Themable>;

/**
* Box Component
*
* A flexible container component that serves as a fundamental building block for layouts.
* It provides various visual styles and sizing options through variants.
*
* @variants
* content:
* - xs to xl: Content size variants
*
* container:
* - true/false: Controls container behavior
*
* @compoundVariants
* The component uses compound variants to determine border radius (rounded corners):
* - When container=true: Uses both size and content values (rounded-${size}+${content})
* - When container=false: Uses only size value (rounded-${size})
*
* @example
* <Box look="soft" size="md" content="sm" container={true}>
* Content goes here
* </Box>
*/

export default function Box({
look,
size,
Expand Down
2 changes: 1 addition & 1 deletion src/components/primitives/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const buttonStyles = tv(
base: "text-main-12 border-1 border-main-11 active:border-main-10",
bold: "text-main-1 bg-main-11 active:bg-main-10",
tint: "text-main-1 bg-accent-10 active:bg-accent-9",
hype: "text-main-12 bg-accent-9 active:bg-accent-10",
hype: "text-main-1 bg-accent-11 active:bg-accent-10",
},
size: {
xs: "px-sm py-xs gap-sm text-xs",
Expand Down
7 changes: 5 additions & 2 deletions src/components/primitives/PrimitiveTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { mergeClass } from "../../utils/css";
import type { Component, Themable } from "../../utils/types";

export const primitiveTagStyles = tv({
base: "flex items-center dim select-none !leading-none rounded-full text-nowrap ease focus-visible:outline focus-visible:outline-dashed focus-visible:outline-main-12 font-text font-bold text-[clamp(15px,0.4167vw+0.78125rem,20px)]",
base: "flex items-center select-none !leading-none rounded-full text-nowrap ease focus-visible:outline focus-visible:outline-dashed focus-visible:outline-main-12 font-text font-bold text-[clamp(15px,0.4167vw+0.78125rem,20px)]",
variants: {
look: {
soft: "text-main-12 bg-transparent border-1 border-main-9",
Expand Down Expand Up @@ -36,6 +36,7 @@ export type PrimitiveTagProps = Component<
className?: string;
type?: "button" | "submit" | "reset";
disabled?: boolean;
noClick?: boolean;
},
HTMLButtonElement
>;
Expand All @@ -48,16 +49,18 @@ export default function PrimitiveTag({
children,
external,
disabled,
noClick,
...props
}: PrimitiveTagProps) {
const themeVars = useThemableProps(props);

const styleProps = primitiveTagStyles({ look, size });
const styleLabel = noClick ? "active:text-main-12 pointer-events-none" : "dim";

return (
<button
style={themeVars}
className={mergeClass(styleProps, className)}
className={mergeClass(styleProps, styleLabel, className)}
type="button"
disabled={disabled}
{...props}>
Expand Down
Loading