Skip to content

Checkbox sizes #33

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

Open
AaronPatterson1 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Checkbox sizes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
546bceb
Adding sizing options for button component
AaronPatterson1 Jan 4, 2025
041291c
Removing max width for button
AaronPatterson1 Jan 4, 2025
c125e08
Adding sizing options for checkbox component
AaronPatterson1 Jan 4, 2025
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
45 changes: 34 additions & 11 deletions packages/button/lib/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ enum ButtonVariants {
LINK = "link",
}

enum ButtonSizes {
SMALL = "small",
MEDIUM = "medium",
LARGE = "large",
XLARGE = "xlarge",
}
const loadingFlash = stylex.keyframes({
"0%": { opacity: 1 },
"50%": { opacity: 0.5 },
Expand Down Expand Up @@ -57,9 +63,6 @@ const styles = stylex.create({

cursor: "pointer",

// height: "2rem",
// minWidth: "4rem",

display: "flex",
justifyContent: "center",
alignItems: "center",
Expand All @@ -69,10 +72,6 @@ const styles = stylex.create({
transition: "background-color var(--transition-speed, 0.2s) ease",
},

fullWidth: {
width: "100%",
},

disabled: {
opacity: "0.75",
cursor: "not-allowed",
Expand Down Expand Up @@ -160,12 +159,36 @@ const styles = stylex.create({
backgroundColor: "var(--cds-white, #FCFCFC)",
color: "var(--cds-white, #FCFCFC)",
},

[ButtonSizes.SMALL]: {
height: "1.5rem",
minWidth: "3rem",
fontSize: "0.75rem",
},

[ButtonSizes.MEDIUM]: {
height: "2rem",
minWidth: "4rem",
fontSize: "1rem",
},

[ButtonSizes.LARGE]: {
height: "3rem",
minWidth: "6rem",
fontSize: "1.5rem",
},

[ButtonSizes.XLARGE]: {
height: "4rem",
minWidth: "8rem",
fontSize: "2rem",
},
});

export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
// size?: any;
variant?: ButtonVariants;
fullWidth?: boolean;
size?: ButtonSizes;
loading?: boolean;
disabled?: boolean;
asChild?: boolean;
Expand Down Expand Up @@ -195,11 +218,11 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps & ExtendProps>(({
extend,
variant = ButtonVariants.CREATE,
// TODO: add size variants,
fullWidth,
loading = false,
disabled,
asChild = false,
children,
size = ButtonSizes.MEDIUM,
...props
}, ref,) => {
const Comp = asChild ? Slot : "button";
Expand All @@ -210,9 +233,9 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps & ExtendProps>(({
styles.base,
// TODO: ({ size})
styles[variant],
fullWidth && styles.fullWidth,
disabled && styles.disabled,
extend,
styles[size]
)}
disabled={disabled}
{...props}
Expand All @@ -225,4 +248,4 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps & ExtendProps>(({
);
Button.displayName = "Button";

export { Button, ButtonVariants };
export { Button, ButtonVariants, ButtonSizes };
57 changes: 33 additions & 24 deletions packages/checkbox/lib/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@ import * as stylex from "@stylexjs/stylex";
import * as CheckboxPrimitive from "@radix-ui/react-checkbox";
// import { CheckIcon } from "@radix-ui/react-icons";

type ExtendProps = { extend?: stylex.StyleXStyles };
type ExtendProps = {
extend?: stylex.StyleXStyles;
size?: CheckBoxSizes;
};

enum CheckBoxSizes {
XSMALL = "xsmall",
SMALL = "small",
MEDIUM = "medium",
LARGE = "large",
}

const styles = stylex.create({
root: {
Expand Down Expand Up @@ -59,35 +69,34 @@ const styles = stylex.create({
color: "currentColor",
},

// TODO: size variants
// xsmall {
// height: "0.25rem",
// width: "0.25rem",
// }

// small {
// height: "0.5rem",
// width: "0.5rem",
// }

// medium {
// height: "0.75rem",
// width: "0.75rem",
// }

// large {
// height: "1rem",
// width: "1rem",
// }
[CheckBoxSizes.XSMALL]: {
height: "0.75rem",
width: "0.75rem",
},

[CheckBoxSizes.SMALL]: {
height: "1rem",
width: "1rem",
},

[CheckBoxSizes.MEDIUM]: {
height: "1.25rem",
width: "1.25rem",
},

[CheckBoxSizes.LARGE]: {
height: "1.5rem",
width: "1.5rem",
},
});

const Checkbox = forwardRef<
ElementRef<typeof CheckboxPrimitive.Root>,
ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root> & ExtendProps
>(({ extend, ...props }, ref) => (
>(({ extend, size = CheckBoxSizes.MEDIUM, ...props }, ref) => (
<CheckboxPrimitive.Root
ref={ref}
{...stylex.props(styles.root, props.disabled && styles.disabled, extend)}
{...stylex.props(styles.root, props.disabled && styles.disabled, styles[size], extend)}
{...props}
>
<CheckboxPrimitive.Indicator {...stylex.props(styles.indicator)}>
Expand All @@ -112,4 +121,4 @@ const Checkbox = forwardRef<
));
Checkbox.displayName = CheckboxPrimitive.Root.displayName;

export { Checkbox };
export { Checkbox, CheckBoxSizes };