@coreui/react 5.0.0-rc.0 → 5.0.0-rc.2

package/src/components/modal/CModal.tsx

@@ -200,10 +200,7 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
     }, [_visible])
 
     const handleClickOutside = (event: Event) => {
-      if (
-        modalContentRef.current &&
-        !modalContentRef.current.contains(event.target as HTMLElement)
-      ) {
+      if (modalRef.current && modalRef.current == event.target) {
         handleDismiss()
       }
     }

package/src/components/modal/CModalTitle.tsx

@@ -2,6 +2,8 @@ import React, { ElementType, forwardRef, HTMLAttributes } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
 export interface CModalTitleProps extends HTMLAttributes<HTMLHeadingElement> {
   /**
    * A string of all className you want applied to the base component.
@@ -10,23 +12,24 @@ export interface CModalTitleProps extends HTMLAttributes<HTMLHeadingElement> {
   /**
    * Component used for the root node. Either a string to use a HTML element or a component.
    */
-  component?: string | ElementType
+  as?: ElementType
 }
 
-export const CModalTitle = forwardRef<HTMLHeadElement, CModalTitleProps>(
-  ({ children, component: Component = 'h5', className, ...rest }, ref) => {
-    return (
-      <Component className={classNames('modal-title', className)} {...rest} ref={ref}>
-        {children}
-      </Component>
-    )
-  },
-)
+export const CModalTitle: PolymorphicRefForwardingComponent<'h5', CModalTitleProps> = forwardRef<
+  HTMLHeadElement,
+  CModalTitleProps
+>(({ children, as: Component = 'h5', className, ...rest }, ref) => {
+  return (
+    <Component className={classNames('modal-title', className)} {...rest} ref={ref}>
+      {children}
+    </Component>
+  )
+})
 
 CModalTitle.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
-  component: PropTypes.elementType,
 }
 
 CModalTitle.displayName = 'CModalTitle'

package/src/components/modal/__tests__/CModalTitle.spec.tsx

@@ -10,7 +10,7 @@ test('loads and displays CModalTitle component', async () => {
 
 test('CModalTitle customize', async () => {
   const { container } = render(
-    <CModalTitle className="bazinga" component="h3">
+    <CModalTitle className="bazinga" as="h3">
       Test
     </CModalTitle>,
   )

package/src/components/nav/CNav.tsx

@@ -2,16 +2,18 @@ import React, { ElementType, forwardRef, HTMLAttributes } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
 export interface CNavProps
   extends HTMLAttributes<HTMLDivElement | HTMLUListElement | HTMLOListElement> {
   /**
-   * A string of all className you want applied to the base component.
+   * Component used for the root node. Either a string to use a HTML element or a component.
    */
-  className?: string
+  as?: ElementType
   /**
-   * Component used for the root node. Either a string to use a HTML element or a component.
+   * A string of all className you want applied to the base component.
    */
-  component?: string | ElementType
+  className?: string
   /**
    * Specify a layout type for component.
    */
@@ -22,32 +24,33 @@ export interface CNavProps
   variant?: 'pills' | 'tabs' | 'underline' | 'underline-border'
 }
 
-export const CNav = forwardRef<HTMLDivElement | HTMLUListElement | HTMLOListElement, CNavProps>(
-  ({ children, className, component: Component = 'ul', layout, variant, ...rest }, ref) => {
-    return (
-      <Component
-        className={classNames(
-          'nav',
-          {
-            [`nav-${layout}`]: layout,
-            [`nav-${variant}`]: variant,
-          },
-          className,
-        )}
-        role="navigation"
-        {...rest}
-        ref={ref}
-      >
-        {children}
-      </Component>
-    )
-  },
-)
+export const CNav: PolymorphicRefForwardingComponent<'ul', CNavProps> = forwardRef<
+  HTMLDivElement | HTMLUListElement | HTMLOListElement,
+  CNavProps
+>(({ children, as: Component = 'ul', className, layout, variant, ...rest }, ref) => {
+  return (
+    <Component
+      className={classNames(
+        'nav',
+        {
+          [`nav-${layout}`]: layout,
+          [`nav-${variant}`]: variant,
+        },
+        className,
+      )}
+      role="navigation"
+      {...rest}
+      ref={ref}
+    >
+      {children}
+    </Component>
+  )
+})
 
 CNav.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
-  component: PropTypes.elementType,
   layout: PropTypes.oneOf(['fill', 'justified']),
   variant: PropTypes.oneOf(['pills', 'tabs', 'underline', 'underline-border']),
 }

package/src/components/nav/CNavGroup.tsx

@@ -1,6 +1,8 @@
 import React, {
   CSSProperties,
+  ElementType,
   forwardRef,
+  HTMLAttributes,
   ReactNode,
   useContext,
   useEffect,
@@ -12,9 +14,17 @@ import classNames from 'classnames'
 import { Transition } from 'react-transition-group'
 import type { TransitionStatus } from 'react-transition-group'
 
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
 import { CNavContext } from '../sidebar/CSidebarNav'
-export interface CNavGroupProps {
-  children?: ReactNode
+
+export interface CNavGroupProps extends HTMLAttributes<HTMLDivElement | HTMLLIElement> {
+  /**
+   * Component used for the root node. Either a string to use a HTML element or a component.
+   *
+   * @since 5.0.0-rc.2
+   */
+  as?: ElementType
   /**
    * A string of all className you want applied to the component.
    */
@@ -44,110 +54,111 @@ const isInVisibleGroup = (el1: string, el2: string) => {
   return array2.every((item, index) => item === array1[index])
 }
 
-export const CNavGroup = forwardRef<HTMLLIElement, CNavGroupProps>(
-  ({ children, className, compact, idx, toggler, visible, ...rest }, ref) => {
-    const [height, setHeight] = useState<number | string>()
-    const navItemsRef = useRef<HTMLUListElement>(null)
+export const CNavGroup: PolymorphicRefForwardingComponent<'li', CNavGroupProps> = forwardRef<
+  HTMLDivElement | HTMLLIElement,
+  CNavGroupProps
+>(({ children, as: Component = 'li', className, compact, idx, toggler, visible, ...rest }, ref) => {
+  const [height, setHeight] = useState<number | string>()
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const navItemsRef = useRef<any>(null)
 
-    const { visibleGroup, setVisibleGroup } = useContext(CNavContext)
+  const { visibleGroup, setVisibleGroup } = useContext(CNavContext)
 
-    const [_visible, setVisible] = useState(
-      Boolean(visible || (idx && visibleGroup && isInVisibleGroup(visibleGroup, idx))),
-    )
+  const [_visible, setVisible] = useState(
+    Boolean(visible || (idx && visibleGroup && isInVisibleGroup(visibleGroup, idx))),
+  )
 
-    useEffect(() => {
-      setVisible(Boolean(idx && visibleGroup && isInVisibleGroup(visibleGroup, idx)))
-    }, [visibleGroup])
-
-    const handleTogglerOnCLick = (event: React.MouseEvent<HTMLElement>) => {
-      event.preventDefault()
-      setVisibleGroup(
-        _visible ? (idx?.toString().includes('.') ? idx.slice(0, idx.lastIndexOf('.')) : '') : idx,
-      )
-      setVisible(!_visible)
-    }
-
-    const style: CSSProperties = {
-      height: 0,
-    }
-
-    const onEntering = () => {
-      navItemsRef.current && setHeight(navItemsRef.current.scrollHeight)
-    }
-
-    const onEntered = () => {
-      setHeight('auto')
-    }
-
-    const onExit = () => {
-      navItemsRef.current && setHeight(navItemsRef.current.scrollHeight)
-    }
-
-    const onExiting = () => {
-      // @ts-expect-error reflow is necessary to get correct height of the element
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const reflow = navItemsRef.current?.offsetHeight
-      setHeight(0)
-    }
-
-    const onExited = () => {
-      setHeight(0)
-    }
-
-    const transitionStyles = {
-      entering: { display: 'block', height: height },
-      entered: { display: 'block', height: height },
-      exiting: { display: 'block', height: height },
-      exited: { height: height },
-      unmounted: {}
-    }
-
-    return (
-      <li className={classNames('nav-group', { show: _visible }, className)} {...rest} ref={ref}>
-        {toggler && (
-          <a className="nav-link nav-group-toggle" onClick={(event) => handleTogglerOnCLick(event)}>
-            {toggler}
-          </a>
-        )}
-        <Transition
-          in={_visible}
-          nodeRef={navItemsRef}
-          onEntering={onEntering}
-          onEntered={onEntered}
-          onExit={onExit}
-          onExiting={onExiting}
-          onExited={onExited}
-          timeout={300}
-        >
-          {(state) => (
-            <ul
-              className={classNames('nav-group-items', {
-                compact: compact,
-              })}
-              style={{
-                ...style,
-                ...transitionStyles[state as TransitionStatus],
-              }}
-              ref={navItemsRef}
-            >
-              {React.Children.map(children, (child, index) => {
-                if (React.isValidElement(child)) {
-                  return React.cloneElement(child as React.ReactElement<any>, {
-                    key: index,
-                    idx: `${idx}.${index}`,
-                  })
-                }
-                return
-              })}
-            </ul>
-          )}
-        </Transition>
-      </li>
+  useEffect(() => {
+    setVisible(Boolean(idx && visibleGroup && isInVisibleGroup(visibleGroup, idx)))
+  }, [visibleGroup])
+
+  const handleTogglerOnCLick = (event: React.MouseEvent<HTMLElement>) => {
+    event.preventDefault()
+    setVisibleGroup(
+      _visible ? (idx?.toString().includes('.') ? idx.slice(0, idx.lastIndexOf('.')) : '') : idx,
     )
-  },
-)
+    setVisible(!_visible)
+  }
+
+  const style: CSSProperties = {
+    height: 0,
+  }
+
+  const onEntering = () => {
+    navItemsRef.current && setHeight(navItemsRef.current.scrollHeight)
+  }
+
+  const onEntered = () => {
+    setHeight('auto')
+  }
+
+  const onExit = () => {
+    navItemsRef.current && setHeight(navItemsRef.current.scrollHeight)
+  }
+
+  const onExiting = () => {
+    // @ts-expect-error reflow is necessary to get correct height of the element
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const reflow = navItemsRef.current?.offsetHeight
+    setHeight(0)
+  }
+
+  const onExited = () => {
+    setHeight(0)
+  }
+
+  const transitionStyles = {
+    entering: { display: 'block', height: height },
+    entered: { display: 'block', height: height },
+    exiting: { display: 'block', height: height },
+    exited: { height: height },
+    unmounted: {},
+  }
+
+  const NavGroupItemsComponent = Component === 'li' ? 'ul' : 'div'
+
+  return (
+    <Component
+      className={classNames('nav-group', { show: _visible }, className)}
+      {...rest}
+      ref={ref}
+    >
+      {toggler && (
+        <a className="nav-link nav-group-toggle" onClick={(event) => handleTogglerOnCLick(event)}>
+          {toggler}
+        </a>
+      )}
+      <Transition
+        in={_visible}
+        nodeRef={navItemsRef}
+        onEntering={onEntering}
+        onEntered={onEntered}
+        onExit={onExit}
+        onExiting={onExiting}
+        onExited={onExited}
+        timeout={300}
+      >
+        {(state) => (
+          <NavGroupItemsComponent
+            className={classNames('nav-group-items', {
+              compact: compact,
+            })}
+            style={{
+              ...style,
+              ...transitionStyles[state as TransitionStatus],
+            }}
+            ref={navItemsRef}
+          >
+            {children}
+          </NavGroupItemsComponent>
+        )}
+      </Transition>
+    </Component>
+  )
+})
 
 CNavGroup.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
   compact: PropTypes.bool,

package/src/components/nav/CNavGroupItems.tsx

@@ -1,25 +1,35 @@
-import React, { forwardRef, HTMLAttributes } from 'react'
+import React, { ElementType, forwardRef, HTMLAttributes } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
-export interface CNavGroupItemsProps extends HTMLAttributes<HTMLUListElement> {
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
+export interface CNavGroupItemsProps extends HTMLAttributes<HTMLDivElement | HTMLUListElement> {
+  /**
+   * Component used for the root node. Either a string to use a HTML element or a component.
+   *
+   * @since 5.0.0-rc.2
+   */
+  as?: ElementType
   /**
    * A string of all className you want applied to the component.
    */
   className?: string
 }
 
-export const CNavGroupItems = forwardRef<HTMLUListElement, CNavGroupItemsProps>(
-  ({ children, className, ...rest }, ref) => {
-    return (
-      <ul className={classNames('nav-group-items', className)} {...rest} ref={ref}>
-        {children}
-      </ul>
-    )
-  },
-)
+export const CNavGroupItems: PolymorphicRefForwardingComponent<'ul', CNavGroupItemsProps> =
+  forwardRef<HTMLDivElement | HTMLUListElement, CNavGroupItemsProps>(
+    ({ children, as: Component = 'ul', className, ...rest }, ref) => {
+      return (
+        <Component className={classNames('nav-group-items', className)} {...rest} ref={ref}>
+          {children}
+        </Component>
+      )
+    },
+  )
 
 CNavGroupItems.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
 }

package/src/components/nav/CNavItem.tsx

@@ -1,26 +1,39 @@
-import React, { forwardRef } from 'react'
+import React, { ElementType, forwardRef } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
 import { CNavLink, CNavLinkProps } from './CNavLink'
 
-export const CNavItem = forwardRef<HTMLLIElement, CNavLinkProps>(
-  ({ children, className, ...rest }, ref) => {
-    return (
-      <li className={classNames('nav-item', className)} ref={ref}>
-        {rest.href || rest.to ? (
-          <CNavLink className={className} {...rest}>
-            {children}
-          </CNavLink>
-        ) : (
-          children
-        )}
-      </li>
-    )
-  },
-)
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
+export interface CNavItemProps extends Omit<CNavLinkProps, 'component'> {
+  /**
+   * Component used for the root node. Either a string to use a HTML element or a component.
+   *
+   * @since 5.0.0-rc.2
+   */
+  as?: ElementType
+}
+
+export const CNavItem: PolymorphicRefForwardingComponent<'li', CNavItemProps> = forwardRef<
+  HTMLLIElement,
+  CNavItemProps
+>(({ children, as: Component = 'li', className, ...rest }, ref) => {
+  return (
+    <Component className={classNames('nav-item', className)} ref={ref}>
+      {rest.href || rest.to ? (
+        <CNavLink className={className} {...rest}>
+          {children}
+        </CNavLink>
+      ) : (
+        children
+      )}
+    </Component>
+  )
+})
 
 CNavItem.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
 }

package/src/components/nav/CNavLink.tsx

@@ -1,29 +1,14 @@
-import React, { ElementType, forwardRef, useContext, useEffect, useRef } from 'react'
+import React, { forwardRef, useContext, useEffect, useRef } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
 import { CLinkProps, CLink } from '../link/CLink'
 import { CNavContext } from '../sidebar/CSidebarNav'
 
+import { PolymorphicRefForwardingComponent } from '../../helpers'
 import { useForkedRef } from '../../hooks'
 
 export interface CNavLinkProps extends Omit<CLinkProps, 'idx'> {
-  /**
-   * Toggle the active state for the component.
-   */
-  active?: boolean
-  /**
-   * A string of all className you want applied to the component.
-   */
-  className?: string
-  /**
-   * Component used for the root node. Either a string to use a HTML element or a component.
-   */
-  component?: string | ElementType
-  /**
-   * Toggle the disabled state for the component.
-   */
-  disabled?: boolean
   /**
    * @ignore
    */
@@ -34,8 +19,8 @@ export interface CNavLinkProps extends Omit<CLinkProps, 'idx'> {
   to?: string
 }
 
-export const CNavLink = forwardRef<
-  HTMLButtonElement | HTMLAnchorElement | HTMLLIElement,
+export const CNavLink: PolymorphicRefForwardingComponent<'a', CNavLinkProps> = forwardRef<
+  HTMLButtonElement | HTMLAnchorElement,
   CNavLinkProps
 >(({ children, className, idx, ...rest }, ref) => {
   const navLinkRef = useRef<HTMLAnchorElement>(null)
@@ -56,8 +41,11 @@ export const CNavLink = forwardRef<
 })
 
 CNavLink.propTypes = {
+  active: PropTypes.bool,
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
+  disabled: PropTypes.bool,
   idx: PropTypes.string,
 }
 

package/src/components/nav/CNavTitle.tsx

@@ -1,25 +1,33 @@
-import React, { forwardRef, HTMLAttributes } from 'react'
+import React, { ElementType, forwardRef, HTMLAttributes } from 'react'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
+import { PolymorphicRefForwardingComponent } from '../../helpers'
+
 export interface CNavTitleProps extends HTMLAttributes<HTMLLIElement> {
+  /**
+   * Component used for the root node. Either a string to use a HTML element or a component.
+   */
+  as?: ElementType
   /**
    * A string of all className you want applied to the component.
    */
   className?: string
 }
 
-export const CNavTitle = forwardRef<HTMLLIElement, CNavTitleProps>(
-  ({ children, className, ...rest }, ref) => {
-    return (
-      <li className={classNames('nav-title', className)} {...rest} ref={ref}>
-        {children}
-      </li>
-    )
-  },
-)
+export const CNavTitle: PolymorphicRefForwardingComponent<'li', CNavTitleProps> = forwardRef<
+  HTMLLIElement,
+  CNavTitleProps
+>(({ children, as: Component = 'li', className, ...rest }, ref) => {
+  return (
+    <Component className={classNames('nav-title', className)} {...rest} ref={ref}>
+      {children}
+    </Component>
+  )
+})
 
 CNavTitle.propTypes = {
+  as: PropTypes.elementType,
   children: PropTypes.node,
   className: PropTypes.string,
 }

package/src/components/nav/__tests__/CNav.spec.tsx

@@ -18,7 +18,7 @@ test('loads and displays CNav component', async () => {
 
 test('CNav customize', async () => {
   const { container } = render(
-    <CNav className="bazinga" component="h3" layout="justified" variant="pills">
+    <CNav className="bazinga" as="h3" layout="justified" variant="pills">
       Test
     </CNav>,
   )

package/src/components/nav/__tests__/CNavItem.spec.tsx

@@ -10,7 +10,7 @@ test('loads and displays CNavItem component', async () => {
 
 test('CNavItem customize', async () => {
   const { container } = render(
-    <CNavItem active={true} className="bazinga" component="h3" disabled={true} href="/bazinga">
+    <CNavItem active={true} className="bazinga" as="h3" disabled={true} href="/bazinga">
       Test
     </CNavItem>,
   )

package/src/components/nav/__tests__/CNavLink.spec.tsx

@@ -10,7 +10,7 @@ test('loads and displays CNavLink component', async () => {
 
 test('CNavLink customize', async () => {
   const { container } = render(
-    <CNavLink active={true} className="bazinga" component="h3" disabled={true} href="/bazinga">
+    <CNavLink active={true} className="bazinga" as="h3" disabled={true} href="/bazinga">
       Test
     </CNavLink>,
   )