Skip to content

Commit d919415

Browse files
committed
refactor(CDropdown): dropdown toggle should be always rendered as <button>
1 parent 44c32e6 commit d919415

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

packages/coreui-react/src/components/dropdown/CDropdownToggle.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const CDropdownToggle: FC<CDropdownToggleProps> = ({
3939
trigger = 'click',
4040
...rest
4141
}) => {
42-
const { dropdownToggleRef, variant, visible, setVisible } = useContext(CDropdownContext)
42+
const { dropdownToggleRef, visible, setVisible } = useContext(CDropdownContext)
4343

4444
const triggers = {
4545
...((trigger === 'click' || trigger.includes('click')) && {
@@ -58,16 +58,14 @@ export const CDropdownToggle: FC<CDropdownToggleProps> = ({
5858
className: classNames(
5959
{
6060
'dropdown-toggle': caret,
61-
'dropdown-toggle-split': split,
62-
'nav-link': variant === 'nav-item',
61+
'dropdown-toggle-split': split
6362
},
6463
className,
6564
),
6665
'aria-expanded': visible,
6766
...(!rest.disabled && { ...triggers }),
6867
}
6968

70-
// We use any because Toggler can be `a` as well as `button`.
7169
const Toggler = () => {
7270
if (custom && React.isValidElement(children)) {
7371
return (
@@ -81,14 +79,6 @@ export const CDropdownToggle: FC<CDropdownToggleProps> = ({
8179
)
8280
}
8381

84-
if (variant === 'nav-item') {
85-
return (
86-
<a href="#" {...togglerProps} ref={dropdownToggleRef}>
87-
{children}
88-
</a>
89-
)
90-
}
91-
9282
return (
9383
<CButton type="button" {...togglerProps} tabIndex={0} {...rest} ref={dropdownToggleRef}>
9484
{children}

packages/docs/content/components/dropdown.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ And putting it to use in a navbar:
226226
<CCollapse className="navbar-collapse" visible={true}>
227227
<CNavbarNav>
228228
<CDropdown dark component="li" variant="nav-item">
229-
<CDropdownToggle>Dropdown</CDropdownToggle>
229+
<CDropdownToggle color="dark">Dropdown</CDropdownToggle>
230230
<CDropdownMenu>
231231
<CDropdownItem href="#">Action</CDropdownItem>
232232
<CDropdownItem href="#">Another action</CDropdownItem>

0 commit comments

Comments
 (0)