refactor(CNavbar): improve and clean-up syntax

Author: mrholek

packages/coreui-react/src/components/navbar/CNavbar.tsx

@@ -53,15 +53,6 @@ export const CNavbar = forwardRef<HTMLDivElement, CNavbarProps>(
     },
     ref,
   ) => {
-    let content
-    if (container) {
-      content = (
-        <div className={`container${container !== true ? '-' + container : ''}`}>{children}</div>
-      )
-    } else {
-      content = children
-    }
-
     return (
       <Component
         className={classNames(
@@ -77,7 +68,13 @@ export const CNavbar = forwardRef<HTMLDivElement, CNavbarProps>(
         {...rest}
         ref={ref}
       >
-        {content}
+        {container ? (
+          <div className={typeof container === 'string' ? `container-${container}` : 'container'}>
+            {children}
+          </div>
+        ) : (
+          <>{children}</>
+        )}
       </Component>
     )
   },

packages/coreui-react/src/components/navbar/CNavbarBrand.tsx

@@ -20,7 +20,7 @@ export interface CNavbarBrandProps extends HTMLAttributes<HTMLAnchorElement | HT
 
 export const CNavbarBrand = forwardRef<HTMLAnchorElement | HTMLSpanElement, CNavbarBrandProps>(
   ({ children, component, className, ...rest }, ref) => {
-    const Component = component ? component : rest.href ? 'a' : 'span'
+    const Component = component ?? (rest.href ? 'a' : 'span')
 
     return (
       <Component className={classNames('navbar-brand', className)} {...rest} ref={ref}>

packages/coreui-react/src/components/navbar/CNavbarToggler.tsx

@@ -13,7 +13,7 @@ export const CNavbarToggler = forwardRef<HTMLButtonElement, CNavbarTogglerProps>
   ({ children, className, ...rest }, ref) => {
     return (
       <button type="button" className={classNames('navbar-toggler', className)} {...rest} ref={ref}>
-        {children ? children : <span className="navbar-toggler-icon"></span>}
+        {children ?? <span className="navbar-toggler-icon"></span>}
       </button>
     )
   },