Skip to content

Commit 14fe1cd

Browse files
authored
Merge pull request #14945 from TylerAPfledderer/fix/ButtonTwoLines-outline-variant-prop
fix(ButtonTwoLines): ensure variant prop reaches base button component
2 parents 7d5880f + e576419 commit 14fe1cd

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

src/components/ui/__stories__/ButtonTwoLines.stories.tsx

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { BiCircle } from "react-icons/bi"
22
import { Meta, StoryObj } from "@storybook/react"
33

44
import { ButtonTwoLines as ButtonTwoLinesComponent } from "../buttons/ButtonTwoLines"
5-
import { Stack } from "../flex"
5+
import { HStack, Stack } from "../flex"
66

77
const meta = {
88
title: "Atoms / Form / Buttons / ButtonTwoLines",
@@ -21,14 +21,26 @@ export const ButtonTwoLines: Story = {
2121
className: "w-[300px]",
2222
},
2323
render: (args) => (
24-
<Stack className="gap-8">
25-
<ButtonTwoLinesComponent {...args} />
26-
<ButtonTwoLinesComponent
27-
{...args}
28-
iconAlignment="end"
29-
size="sm"
30-
reverseTextOrder
31-
/>
32-
</Stack>
24+
<HStack className="gap-2">
25+
<Stack className="gap-8">
26+
<ButtonTwoLinesComponent {...args} />
27+
<ButtonTwoLinesComponent
28+
{...args}
29+
iconAlignment="end"
30+
size="sm"
31+
reverseTextOrder
32+
/>
33+
</Stack>
34+
<Stack className="gap-8">
35+
<ButtonTwoLinesComponent variant="outline" {...args} />
36+
<ButtonTwoLinesComponent
37+
variant="outline"
38+
{...args}
39+
iconAlignment="end"
40+
size="sm"
41+
reverseTextOrder
42+
/>
43+
</Stack>
44+
</HStack>
3345
),
3446
}

src/components/ui/buttons/ButtonTwoLines.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@ export const ButtonTwoLines = ({
4545
className,
4646
iconAlignment = "start",
4747
size = "md",
48+
variant,
4849
...props
4950
}: ButtonTwoLinesProps) => {
5051
const isIconLeft = ["left", "start"].includes(iconAlignment)
5152

5253
const [childProps, ownProps] = createSplitProps<ButtonTwoLinesProps>()(
53-
{ ...props, isIconLeft, size },
54+
{ ...props, isIconLeft, size, variant },
5455
[
5556
"reverseTextOrder",
5657
"mainText",
@@ -70,6 +71,7 @@ export const ButtonTwoLines = ({
7071
size === "md" ? "py-4" : "py-2",
7172
className
7273
)}
74+
variant={variant}
7375
{...ownProps}
7476
>
7577
<ChildContent {...childProps} />
@@ -86,12 +88,13 @@ export const ButtonLinkTwoLines = ({
8688
className,
8789
iconAlignment = "start",
8890
size = "md",
91+
variant,
8992
...props
9093
}: ButtonLinkTwoLinesProps) => {
9194
const isIconLeft = ["left", "start"].includes(iconAlignment)
9295

9396
const [childProps, ownProps] = createSplitProps<ButtonLinkTwoLinesProps>()(
94-
{ ...props, isIconLeft, size },
97+
{ ...props, isIconLeft, size, variant },
9598
[
9699
"reverseTextOrder",
97100
"mainText",
@@ -111,6 +114,7 @@ export const ButtonLinkTwoLines = ({
111114
size === "md" ? "py-4" : "py-2",
112115
className
113116
)}
117+
variant={variant}
114118
{...ownProps}
115119
>
116120
<ChildContent {...childProps} />

0 commit comments

Comments
 (0)