Skip to content

Commit 0fe96cf

Browse files
committed
refactor(react): Use CVA buttonVariant from styles
1 parent 7026f66 commit 0fe96cf

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

packages/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
},
3636
"peerDependencies": {
3737
"@firebase-ui/core": "workspace:*",
38-
"@firebase-ui/styles": "workspace:*",
3938
"firebase": "catalog:peerDependencies",
4039
"react": "catalog:peerDependencies",
4140
"react-dom": "catalog:peerDependencies"
4241
},
4342
"dependencies": {
43+
"@firebase-ui/styles": "workspace:*",
4444
"@nanostores/react": "^0.8.4",
4545
"@radix-ui/react-slot": "^1.2.3",
4646
"@tanstack/react-form": "^0.41.3",

packages/react/src/components/button.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,15 @@
1616

1717
import { ComponentProps } from "react";
1818
import { Slot } from "@radix-ui/react-slot";
19+
import { buttonVariant, type ButtonVariant } from "@firebase-ui/styles";
1920
import { cn } from "~/utils/cn";
2021

21-
const buttonVariants = {
22-
primary: "fui-button",
23-
secondary: "fui-button fui-button--secondary",
24-
} as const;
25-
26-
type ButtonVariant = keyof typeof buttonVariants;
27-
2822
export type ButtonProps = ComponentProps<"button"> & {
2923
variant?: ButtonVariant;
3024
asChild?: boolean;
3125
};
3226

3327
export function Button({ className, variant = "primary", asChild, ...props }: ButtonProps) {
3428
const Comp = asChild ? Slot : "button";
35-
36-
return <Comp className={cn(buttonVariants[variant], className)} {...props} />;
29+
return <Comp className={cn(buttonVariant({ variant }), className)} {...props} />;
3730
}

packages/react/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"baseUrl": ".",
2525
"paths": {
2626
"~/*": ["./src/*"],
27-
"@firebase-ui/core": ["../core/src/index.ts"]
27+
"@firebase-ui/core": ["../core/src/index.ts"],
28+
"@firebase-ui/styles": ["../styles/src/index.ts"]
2829
}
2930
},
3031
"include": ["src"]

packages/react/tsconfig.node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"baseUrl": ".",
2323
"paths": {
2424
"~/*": ["./src/*"],
25-
"@firebase-ui/core": ["../core/src/index.ts"]
25+
"@firebase-ui/core": ["../core/src/index.ts"],
26+
"@firebase-ui/styles": ["../styles/src/index.ts"]
2627
}
2728
},
2829
"include": ["vite.config.ts"]

0 commit comments

Comments
 (0)