Skip to content

Commit 2e7bfe1

Browse files
committed
refactor: simplify component props and remove unused className
1 parent 2c5a51e commit 2e7bfe1

File tree

6 files changed

+11
-28
lines changed

6 files changed

+11
-28
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import type { EmptyObject, PrimitiveProps } from "../../primitives";
2-
import { tx } from "../../utils";
32
import { CollapsibleContent } from "../collapsible/collapsible-content";
43

54
export const AccordionContent = (props: PrimitiveProps<"div", EmptyObject, "id" | "role">) => {
6-
const { className, children, ...rest } = props;
7-
8-
return (
9-
<CollapsibleContent role={"region"} className={tx("", className)} {...rest}>
10-
{children}
11-
</CollapsibleContent>
12-
);
5+
return <CollapsibleContent role={"region"} {...props} />;
136
};
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import { Polymorphic, type PolymorphicProps } from "../../primitives";
2-
import { tx } from "../../utils";
32

43
export const AccordionHeader = (props: PolymorphicProps<"h3">) => {
5-
const { render, className, children, ...rest } = props;
4+
const { render, ...rest } = props;
65

7-
return (
8-
<Polymorphic<"h3"> as={"h3"} render={render} className={tx("", className)} {...rest}>
9-
{children}
10-
</Polymorphic>
11-
);
6+
return <Polymorphic<"h3"> as={"h3"} render={render} {...rest} />;
127
};

packages/react-ui/src/components/accordion/accordion-item.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { PrimitiveProps } from "../../primitives";
2-
import { dataAttr, tx } from "../../utils";
2+
import { dataAttr } from "../../utils";
33
import { CollapsibleRoot } from "../collapsible/collapsible-root";
44
import { useAccordion } from "./accordion-context";
55

@@ -19,7 +19,7 @@ export type AccordionItemProps = {
1919
export const AccordionItem = (props: PrimitiveProps<"div", AccordionItemProps>) => {
2020
const { disabled: accordionDisabled, duration, collapsible, openedValue, setOpenedValue } = useAccordion();
2121

22-
const { value, disabled = accordionDisabled, className, children, ...rest } = props;
22+
const { value, disabled = accordionDisabled, children, ...rest } = props;
2323

2424
const opened = Array.isArray(openedValue) ? openedValue.includes(value) : openedValue == value;
2525

@@ -48,7 +48,6 @@ export const AccordionItem = (props: PrimitiveProps<"div", AccordionItemProps>)
4848
duration={duration}
4949
disabled={disabled}
5050
data-open={dataAttr(opened)}
51-
className={tx("", className)}
5251
{...rest}
5352
>
5453
{children}

packages/react-ui/src/components/alert/alert.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ export const Alert = (props: PrimitiveProps<"div", AlertProps, "role">) => {
1616
};
1717

1818
export const AlertContent = (props: PrimitiveProps<"div">) => {
19-
const { className, ...rest } = props;
20-
21-
return <div className={className} {...rest} />;
19+
return <div {...props} />;
2220
};
2321

2422
export const AlertTitle = (props: PrimitiveProps<"div">) => {

packages/react-ui/src/components/tabs/tabs-tab.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useButtonProps, useIsomorphicEffect, useMergeRefs } from "../../hooks";
44
import { Polymorphic, type PolymorphicProps } from "../../primitives";
55
import { useComposite } from "../../primitives/composite/composite-context";
66
import { ariaAttr, dataAttr, tx } from "../../utils";
7-
import { getTabId, useTabs } from "./tabs-context";
7+
import { getPanelId, getTabId, useTabs } from "./tabs-context";
88

99
type TabsTabProps = {
1010
/**
@@ -27,6 +27,7 @@ export const TabsTab = (props: PolymorphicProps<"button", TabsTabProps, "type" |
2727
const { activeIndex, setActiveIndex } = useComposite();
2828

2929
const tabId = getTabId(baseId, value);
30+
const panelId = getPanelId(baseId, value);
3031
const selected = selectedValue === value;
3132

3233
useIsomorphicEffect(() => {
@@ -70,6 +71,7 @@ export const TabsTab = (props: PolymorphicProps<"button", TabsTabProps, "type" |
7071
ref={refs}
7172
{...buttonProps}
7273
id={tabId}
74+
aria-controls={selected ? panelId : undefined}
7375
aria-selected={ariaAttr(selected)}
7476
data-active={dataAttr(selected)}
7577
className={tx(orientation == "horizontal" ? "-mb-px" : "-me-px", disabled && "opacity-60", className)}

packages/react-ui/src/components/visually-hidden/visually-hidden.tsx

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import type { PrimitiveProps } from "../../primitives";
22
import { tx } from "../../utils";
33

44
export const VisuallyHidden = (props: PrimitiveProps<"span">) => {
5-
const { children, className, ...rest } = props;
5+
const { className, ...rest } = props;
66

7-
return (
8-
<span {...rest} className={tx("sr-only", className)}>
9-
{children}
10-
</span>
11-
);
7+
return <span className={tx("sr-only", className)} {...rest} />;
128
};

0 commit comments

Comments
 (0)