refactor(CDropdown): improve and clean-up syntax

mrholek · mrholek · commit 46c5edf9cb9d · 2023-03-21T00:23:10.000+01:00
diff --git a/packages/coreui-react/src/components/dropdown/CDropdown.tsx b/packages/coreui-react/src/components/dropdown/CDropdown.tsx
@@ -156,12 +156,10 @@ export const CDropdown = forwardRef<HTMLDivElement | HTMLLIElement, CDropdownPro
         <Component
           className={classNames(
             variant === 'nav-item' ? 'nav-item dropdown' : variant,
-            direction === 'center'
-              ? 'dropdown-center'
-              : direction === 'dropup-center'
-              ? 'dropup dropup-center'
-              : direction,
             {
+              'dropdown-center': direction === 'center',
+              'dropup dropup-center': direction === 'dropup-center',
+              direction: direction && direction !== 'center' && direction !== 'dropup-center',
               show: _visible,
             },
             className,
diff --git a/packages/coreui-react/src/components/dropdown/CDropdownToggle.tsx b/packages/coreui-react/src/components/dropdown/CDropdownToggle.tsx
@@ -72,19 +72,27 @@ export const CDropdownToggle: FC<CDropdownToggleProps> = ({
   // We use any because Toggler can be `a` as well as `button`.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const Toggler = (ref?: React.Ref<any>) => {
-    return custom && React.isValidElement(children) ? (
-      <>
-        {React.cloneElement(children as React.ReactElement<any>, {
-          'aria-expanded': visible,
-          ...(!rest.disabled && { ...triggers }),
-          ref: useForkedRef(ref, dropdownToggleRef),
-        })}
-      </>
-    ) : variant === 'nav-item' ? (
-      <a href="#" {...togglerProps} ref={useForkedRef(ref, dropdownToggleRef)}>
-        {children}
-      </a>
-    ) : (
+    if (custom && React.isValidElement(children)) {
+      return (
+        <>
+          {React.cloneElement(children as React.ReactElement<any>, {
+            'aria-expanded': visible,
+            ...(!rest.disabled && { ...triggers }),
+            ref: useForkedRef(ref, dropdownToggleRef),
+          })}
+        </>
+      )
+    }
+
+    if (variant === 'nav-item') {
+      return (
+        <a href="#" {...togglerProps} ref={useForkedRef(ref, dropdownToggleRef)}>
+          {children}
+        </a>
+      )
+    }
+
+    return (
       <CButton
         type="button"
         {...togglerProps}
