Skip to content

[pull] main from coreui:main #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 5, 2024
Merged

[pull] main from coreui:main #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
926a211
build: update API generator
mrholek Dec 5, 2024
3bef184
docs: update API table style
mrholek Dec 5, 2024
f76c46c
feat(CAccordion): allow defining custom class names and overriding ex…
mrholek Dec 5, 2024
cde36ae
Merge branch 'main' of https://github.com/coreui/coreui-react
mrholek Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(CAccordion): allow defining custom class names and overriding ex… 
…isting ones
  • Loading branch information
@mrholek
mrholek committed Dec 5, 2024
commit f76c46cc23992f539ac4d8ee105db08aa62e872c
6 changes: 3 additions & 3 deletions packages/coreui-react/src/components/accordion/CAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@ export const CAccordion = forwardRef<HTMLDivElement, CAccordionProps>(
) => {
const [_activeItemKey, setActiveKey] = useState(activeItemKey)

const _classNames = mergeClassNames<typeof ACCORDION_CLASS_NAMES>(
const mergedClassNames = mergeClassNames<typeof ACCORDION_CLASS_NAMES>(
ACCORDION_CLASS_NAMES,
customClassNames,
)

return (
<div
className={classNames(
_classNames.ACCORDION,
{ [_classNames.ACCORDION_FLUSH]: flush },
mergedClassNames.ACCORDION,
{ [mergedClassNames.ACCORDION_FLUSH]: flush },
className,
)}
{...rest}
Expand Down
6 changes: 3 additions & 3 deletions packages/coreui-react/src/components/accordion/CAccordionBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ export const CAccordionBody = forwardRef<HTMLDivElement, CAccordionBodyProps>(
({ children, className, customClassNames, ...rest }, ref) => {
const { id, visible } = useContext(CAccordionItemContext)

const _classNames = mergeClassNames<typeof ACCORDION_BODY_CLASS_NAMES>(
const mergedClassNames = mergeClassNames<typeof ACCORDION_BODY_CLASS_NAMES>(
ACCORDION_BODY_CLASS_NAMES,
customClassNames,
)

return (
<CCollapse id={id} className={_classNames.ACCORDION_COLLAPSE} visible={visible}>
<div className={classNames(_classNames.ACCORDION_BODY, className)} {...rest} ref={ref}>
<CCollapse id={id} className={mergedClassNames.ACCORDION_COLLAPSE} visible={visible}>
<div className={classNames(mergedClassNames.ACCORDION_BODY, className)} {...rest} ref={ref}>
{children}
</div>
</CCollapse>
Expand Down
9 changes: 7 additions & 2 deletions packages/coreui-react/src/components/accordion/CAccordionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,17 @@ export const CLASS_NAMES = {
export const CAccordionButton = forwardRef<HTMLButtonElement, CAccordionButtonProps>(
({ children, className, customClassNames, ...rest }, ref) => {
const { id, visible, setVisible } = useContext(CAccordionItemContext)
const _classNames = mergeClassNames<typeof CLASS_NAMES>(CLASS_NAMES, customClassNames)

const mergedClassNames = mergeClassNames<typeof CLASS_NAMES>(CLASS_NAMES, customClassNames)

return (
<button
type="button"
className={classNames(_classNames.ACCORDION_BUTTON, { collapsed: !visible }, className)}
className={classNames(
mergedClassNames.ACCORDION_BUTTON,
{ collapsed: !visible },
className,
)}
aria-controls={id}
aria-expanded={visible}
onClick={() => setVisible(!visible)}
Expand Down
8 changes: 5 additions & 3 deletions packages/coreui-react/src/components/accordion/CAccordionHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,15 @@ export const ACCORDION_HEADER_CLASS_NAMES = {

export const CAccordionHeader = forwardRef<HTMLDivElement, CAccordionHeaderProps>(
({ children, className, customClassNames, ...rest }, ref) => {
const _classNames = mergeClassNames<typeof ACCORDION_HEADER_CLASS_NAMES>(
const mergedClassNames = mergeClassNames<typeof ACCORDION_HEADER_CLASS_NAMES>(
ACCORDION_HEADER_CLASS_NAMES,
customClassNames,
)
return (
<div className={classNames(_classNames.ACCORDION_HEADER, className)} {...rest} ref={ref}>
<CAccordionButton className={_classNames.ACCORDION_HEADER}>{children}</CAccordionButton>
<div className={classNames(mergedClassNames.ACCORDION_HEADER, className)} {...rest} ref={ref}>
<CAccordionButton className={mergedClassNames.ACCORDION_HEADER}>
{children}
</CAccordionButton>
</div>
)
},
Expand Down
8 changes: 5 additions & 3 deletions packages/coreui-react/src/components/accordion/CAccordionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,23 @@ export const CAccordionItem = forwardRef<HTMLDivElement, CAccordionItemProps>(
const { _activeItemKey, alwaysOpen, setActiveKey } = useContext(CAccordionContext)
const [visible, setVisible] = useState(Boolean(_activeItemKey === _itemKey.current))

const _classNames = mergeClassNames<typeof ACCORDION_ITEM_CLASS_NAMES>(
const mergedClassNames = mergeClassNames<typeof ACCORDION_ITEM_CLASS_NAMES>(
ACCORDION_ITEM_CLASS_NAMES,
customClassNames,
)

useEffect(() => {
!alwaysOpen && visible && setActiveKey(_itemKey.current)
if (!alwaysOpen && visible) {
setActiveKey(_itemKey.current)
}
}, [visible])

useEffect(() => {
setVisible(Boolean(_activeItemKey === _itemKey.current))
}, [_activeItemKey])

return (
<div className={classNames(_classNames.ACCORDION_ITEM, className)} {...rest} ref={ref}>
<div className={classNames(mergedClassNames.ACCORDION_ITEM, className)} {...rest} ref={ref}>
<CAccordionItemContext.Provider value={{ id, setVisible, visible }}>
{children}
</CAccordionItemContext.Provider>
Expand Down