Skip to content

Commit 3e08640

Browse files
authored
chore: consistency pass (#3701)
1 parent 1c511cf commit 3e08640

38 files changed

+38
-284
lines changed

packages/skeleton-react/src/components/accordion/anatomy/accordion-content.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ export default function (props: AccordionContentProps) {
1313
const { element, children, ...restAttributes } = props;
1414
const attributes = mergeProps(
1515
rootContext.api.getItemContentProps(itemContext.itemProps),
16-
{
17-
className: classesAccordion.content
18-
},
16+
{ className: classesAccordion.content },
1917
restAttributes
2018
);
2119
return element ? element({ attributes }) : <div {...attributes}>{children}</div>;

packages/skeleton-react/src/components/accordion/anatomy/accordion-heading.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ export interface AccordionHeadingProps extends PropsWithChildren, PropsWithEleme
1515
export default function (props: AccordionHeadingProps) {
1616
const { level = 3, element, children, ...restAttributes } = props;
1717
const Tag: keyof JSX.IntrinsicElements = `h${level}`;
18-
const attributes = mergeProps(
19-
{
20-
className: classesAccordion.heading
21-
},
22-
restAttributes
23-
);
18+
const attributes = mergeProps({ className: classesAccordion.heading }, restAttributes);
2419
return element ? element({ attributes }) : <Tag {...attributes}>{children}</Tag>;
2520
}

packages/skeleton-react/src/components/accordion/anatomy/accordion-indicator.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ export default function (props: AccordionIndicatorProps) {
1313
const { element, children, ...restAttributes } = props;
1414
const attributes = mergeProps(
1515
rootContext.api.getItemIndicatorProps(itemContext.itemProps),
16-
{
17-
className: classesAccordion.indicator
18-
},
16+
{ className: classesAccordion.indicator },
1917
restAttributes
2018
);
2119
return element ? element({ attributes }) : <div {...attributes}>{children}</div>;

packages/skeleton-react/src/components/accordion/anatomy/accordion-item.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,7 @@ export default function (props: AccordionItemProps) {
1212
const rootContext = useContext(AccordionRootContext);
1313
const [itemProps, componentProps] = splitItemProps(props);
1414
const { element, children, ...restAttributes } = componentProps;
15-
const attributes = mergeProps(
16-
rootContext.api.getItemProps(itemProps),
17-
{
18-
className: classesAccordion.item
19-
},
20-
restAttributes
21-
);
15+
const attributes = mergeProps(rootContext.api.getItemProps(itemProps), { className: classesAccordion.item }, restAttributes);
2216
return (
2317
<AccordionItemContext.Provider value={{ itemProps, itemState: rootContext.api.getItemState(itemProps) }}>
2418
{element ? element({ attributes }) : <div {...attributes}>{children}</div>}

packages/skeleton-react/src/components/accordion/anatomy/accordion-root.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ export default function (props: AccordionRootProps) {
1919
...machineProps
2020
});
2121
const api = connect(service, normalizeProps);
22-
const attributes = mergeProps(
23-
api.getRootProps(),
24-
{
25-
className: classesAccordion.root
26-
},
27-
restAttributes
28-
);
22+
const attributes = mergeProps(api.getRootProps(), { className: classesAccordion.root }, restAttributes);
2923
return (
3024
<AccordionRootContext.Provider value={{ api }}>
3125
{element ? element({ attributes }) : <div {...attributes}>{children}</div>}

packages/skeleton-react/src/components/accordion/anatomy/accordion-trigger.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ export default function (props: AccordionTriggerProps) {
1313
const { element, children, ...restAttributes } = props;
1414
const attributes = mergeProps(
1515
rootContext.api.getItemTriggerProps(itemContext.itemProps),
16-
{
17-
className: classesAccordion.trigger
18-
},
16+
{ className: classesAccordion.trigger },
1917
restAttributes
2018
);
2119
return element ? element({ attributes }) : <button {...attributes}>{children}</button>;

packages/skeleton-react/src/components/avatar/anatomy/avatar-fallback.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export interface AvatarFallbackProps extends PropsWithElement, ComponentProps<'s
99
export default function (props: AvatarFallbackProps) {
1010
const rootContext = useContext(AvatarRootContext);
1111
const { element, children, ...restAttributes } = props;
12-
const attributes = mergeProps(
13-
rootContext.api.getFallbackProps(),
14-
{
15-
className: classesAvatar.fallback
16-
},
17-
restAttributes
18-
);
12+
const attributes = mergeProps(rootContext.api.getFallbackProps(), { className: classesAvatar.fallback }, restAttributes);
1913
return element ? element({ attributes }) : <span {...attributes}>{children}</span>;
2014
}

packages/skeleton-react/src/components/avatar/anatomy/avatar-image.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export interface AvatarImageProps extends PropsWithElement, Omit<ComponentProps<
99
export default function (props: AvatarImageProps) {
1010
const rootContext = useContext(AvatarRootContext);
1111
const { element, ...restAttributes } = props;
12-
const attributes = mergeProps(
13-
rootContext.api.getImageProps(),
14-
{
15-
className: classesAvatar.image
16-
},
17-
restAttributes
18-
);
12+
const attributes = mergeProps(rootContext.api.getImageProps(), { className: classesAvatar.image }, restAttributes);
1913
return element ? element({ attributes }) : <img {...attributes} />;
2014
}

packages/skeleton-react/src/components/avatar/anatomy/avatar-root.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ export default function (props: AvatarRootProps) {
1515
...machineProps
1616
});
1717
const api = connect(service, normalizeProps);
18-
const attributes = mergeProps(
19-
api.getRootProps(),
20-
{
21-
className: classesAvatar.root
22-
},
23-
restAttributes
24-
);
18+
const attributes = mergeProps(api.getRootProps(), { className: classesAvatar.root }, restAttributes);
2519
return (
2620
<AvatarRootContext.Provider value={{ api }}>
2721
{element ? element({ attributes }) : <div {...attributes}>{children}</div>}

packages/skeleton-react/src/components/rating-group/anatomy/rating-group-control.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export interface RatingGroupControlProps extends PropsWithElement, Omit<Componen
99
export default function (props: RatingGroupControlProps) {
1010
const rootContext = useContext(RatingGroupRootContext);
1111
const { element, children, ...restAttributes } = props;
12-
const attributes = mergeProps(
13-
rootContext.api.getControlProps(),
14-
{
15-
className: classesRatingGroup.control
16-
},
17-
restAttributes
18-
);
12+
const attributes = mergeProps(rootContext.api.getControlProps(), { className: classesRatingGroup.control }, restAttributes);
1913
return element ? element({ attributes }) : <div {...attributes}>{children}</div>;
2014
}

0 commit comments

Comments
 (0)