Skip to content

Commit ad49d4e

Browse files
committed
Util function to solve className issue
1 parent 787c234 commit ad49d4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+130
-104
lines changed

package-lock.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
},
130130
"dependencies": {
131131
"@floating-ui/react": "^0.26.20",
132+
"clsx": "^2.1.1",
132133
"react": "^18.2.0",
133134
"react-dom": "^18.2.0"
134135
},

src/components/ui/Accordion/fragments/AccordionContent.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useContext } from 'react';
22
import { AccordionContext } from '../contexts/AccordionContext';
33
import { AccordionItemContext } from '../contexts/AccordionItemContext';
4+
import { clsx } from 'clsx';
45

56
type AccordionContentProps = {
67
children: React.ReactNode;
@@ -16,7 +17,7 @@ const AccordionContent: React.FC<AccordionContentProps> = ({ children, index, ac
1617

1718
return (
1819
<div
19-
className={`${rootClass}-content ${className}`}
20+
className={clsx(`${rootClass}-content`, className)}
2021
id={`content-${index}`}
2122
role="region"
2223
aria-labelledby={`section-${index}`}

src/components/ui/Accordion/fragments/AccordionHeader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import { clsx } from 'clsx';
23

34
export type AccordionHeaderProps = {
45
children: React.ReactNode;
@@ -7,7 +8,7 @@ export type AccordionHeaderProps = {
78

89
const AccordionHeader: React.FC<AccordionHeaderProps> = ({ children, className = '' }) => {
910
return (
10-
<div className={className}>
11+
<div className={clsx(className)}>
1112
{children}
1213
</div>
1314
);

src/components/ui/Accordion/fragments/AccordionItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useContext, useId, useEffect, useRef } from 'react';
2-
2+
import { clsx } from 'clsx';
33
import { AccordionContext } from '../contexts/AccordionContext';
44
import { AccordionItemContext } from '../contexts/AccordionItemContext';
55

@@ -61,7 +61,7 @@ const AccordionItem: React.FC<AccordionItemProps> = ({ children, value, classNam
6161
<AccordionItemContext.Provider value={{ itemValue, setItemValue, handleBlurEvent, handleClickEvent, handleFocusEvent }}>
6262
<div
6363
ref={accordionItemRef}
64-
className={`${rootClass}-item ${className}`} {...props}
64+
className={clsx(`${rootClass}-item`, className)} {...props}
6565
id={`accordion-data-item-${id}`}
6666
role="region"
6767
aria-labelledby={`accordion-trigger-${id}`}

src/components/ui/Accordion/fragments/AccordionRoot.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState, useRef, useEffect } from 'react';
2-
2+
import { clsx } from 'clsx';
33
import { customClassSwitcher } from '~/core';
44
import { AccordionContext } from '../contexts/AccordionContext';
55
import { getAllBatchElements, getNextBatchItem, getPrevBatchItem } from '~/core/batches';
@@ -55,7 +55,7 @@ const AccordionRoot = ({ children, customRootClass }: AccordionRootProps) => {
5555
accordionRef
5656

5757
}}>
58-
<div className={`${rootClass}-root`} ref={accordionRef} >
58+
<div className={clsx(${rootClass}-root)} ref={accordionRef} >
5959
{children}
6060
</div>
6161
</AccordionContext.Provider>

src/components/ui/Accordion/fragments/AccordionTrigger.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useContext } from 'react';
22
import { AccordionContext } from '../contexts/AccordionContext';
33
import { AccordionItemContext } from '../contexts/AccordionItemContext';
4+
import { clsx } from 'clsx';
45

56
type AccordionTriggerProps = {
67
children: React.ReactNode;
@@ -31,7 +32,7 @@ const AccordionTrigger: React.FC<AccordionTriggerProps> = ({ children, index, cl
3132

3233
<button
3334
type="button"
34-
className={`${rootClass}-trigger ${className}`}
35+
className={clsx(`${rootClass}-trigger`, className)}
3536
onBlur={handleBlurEvent}
3637
onFocus={onFocusHandler}
3738
onKeyDown={(e) => {

src/components/ui/AlertDialog/fragments/AlertDialogContent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useContext } from 'react';
22
import { AlertDialogContext } from '../contexts/AlertDialogContext';
3-
3+
import { clsx } from 'clsx';
44
export type AlertDialogContentProps = {
55
children: React.ReactNode;
66
}
@@ -11,7 +11,7 @@ const AlertDialogContent = ({ children } : AlertDialogContentProps) => {
1111
return (
1212
<>
1313
{isOpen && (
14-
<div className={`${rootClass}-content`}>
14+
<div className={clsx(`${rootClass}-content`)}>
1515
{children}
1616
</div>
1717
)}

src/components/ui/AlertDialog/fragments/AlertDialogOverlay.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React, { useContext } from 'react';
22
import Floater from '~/core/primitives/Floater';
33
import { AlertDialogContext } from '../contexts/AlertDialogContext';
4-
4+
import { clsx } from 'clsx';
55
const AlertDialogOverlay = () => {
66
const { isOpen, rootClass, handleOverlayClick } = useContext(AlertDialogContext);
77
return (
88
<>
99
{isOpen && (
1010
<Floater.Overlay
11-
className={`${rootClass}-overlay`} onClick={handleOverlayClick}>
11+
className={clsx(`${rootClass}-overlay`)} onClick={handleOverlayClick}>
1212

1313
</Floater.Overlay>
1414
)}

src/components/ui/AlertDialog/fragments/AlertDialogRoot.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState } from 'react';
22
import { customClassSwitcher } from '~/core';
33
import { AlertDialogContext } from '../contexts/AlertDialogContext';
4-
4+
import { clsx } from 'clsx';
55
import Floater from '~/core/primitives/Floater';
66

77
export type AlertDialogRootProps = {
@@ -31,7 +31,7 @@ const AlertDialogRoot = ({ children, customRootClass = '', open, onOpenChange, o
3131
const props = { isOpen, handleOpenChange, floaterContext, rootClass, handleOverlayClick };
3232
return (
3333
<AlertDialogContext.Provider value={props}>
34-
<div className={rootClass} >
34+
<div className={clsx(rootClass)} >
3535
{children}
3636
</div>
3737
</AlertDialogContext.Provider>

0 commit comments

Comments
 (0)