feat(theme): adding theme prop to components

themesberg · Jan 26, 2023 · 8cbb0ae · 8cbb0ae
1 parent ffe5480
commit 8cbb0ae
Show file tree

Hide file tree

Showing 13 changed files with 135 additions and 88 deletions.
diff --git a/src/lib/components/Accordion/AccordionTitle.tsx b/src/lib/components/Accordion/AccordionTitle.tsx
@@ -9,10 +9,7 @@ import { useAccordionContext } from './AccordionPanelContext';
 export interface FlowbiteAccordionTitleTheme {
   arrow: {
     base: string;
-    open: {
-      off: string;
-      on: string;
-    };
+    open: FlowbiteBoolean;
   };
   base: string;
   flush: FlowbiteBoolean;

diff --git a/src/lib/components/Avatar/Avatar.tsx b/src/lib/components/Avatar/Avatar.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import type { ComponentProps, FC, PropsWithChildren, ReactElement } from 'react';
 import { DeepPartial } from '..';
 import { mergeDeep } from '../../helpers/mergeDeep';
-import type { FlowbiteColors, FlowbitePositions, FlowbiteSizes } from '../Flowbite/FlowbiteTheme';
+import type { FlowbiteBoolean, FlowbiteColors, FlowbitePositions, FlowbiteSizes } from '../Flowbite/FlowbiteTheme';
 import { useTheme } from '../Flowbite/ThemeContext';
 import AvatarGroup from './AvatarGroup';
 import AvatarGroupCounter from './AvatarGroupCounter';
@@ -24,9 +24,7 @@ export interface FlowbiteAvatarRootTheme {
   statusPosition: FlowbitePositions;
 }
 
-export interface FlowbiteAvatarImageTheme {
-  off: string;
-  on: string;
+export interface FlowbiteAvatarImageTheme extends FlowbiteBoolean {
   placeholder: string;
 }
 

diff --git a/src/lib/components/Badge/Badge.tsx b/src/lib/components/Badge/Badge.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import type { ComponentProps, FC, PropsWithChildren } from 'react';
 import { DeepPartial } from '..';
 import { mergeDeep } from '../../helpers/mergeDeep';
-import type { FlowbiteColors, FlowbiteSizes } from '../Flowbite/FlowbiteTheme';
+import type { FlowbiteBoolean, FlowbiteColors, FlowbiteSizes } from '../Flowbite/FlowbiteTheme';
 import { useTheme } from '../Flowbite/ThemeContext';
 
 export interface FlowbiteBadgeTheme {
@@ -17,9 +17,7 @@ export interface FlowbiteBadgeRootTheme {
   size: BadgeSizes;
 }
 
-export interface FlowbiteBadgeIconTheme {
-  off: string;
-  on: string;
+export interface FlowbiteBadgeIconTheme extends FlowbiteBoolean {
   size: BadgeSizes;
 }
 

diff --git a/src/lib/components/Breadcrumb/BreadcrumbItem.tsx b/src/lib/components/Breadcrumb/BreadcrumbItem.tsx
@@ -3,15 +3,13 @@ import { ComponentProps, FC, forwardRef, PropsWithChildren } from 'react';
 import { HiOutlineChevronRight } from 'react-icons/hi';
 import { DeepPartial } from '..';
 import { mergeDeep } from '../../helpers/mergeDeep';
+import { FlowbiteBoolean } from '../Flowbite/FlowbiteTheme';
 import { useTheme } from '../Flowbite/ThemeContext';
 
 export interface FlowbiteBreadcrumbItemTheme {
   base: string;
   chevron: string;
-  href: {
-    off: string;
-    on: string;
-  };
+  href: FlowbiteBoolean;
   icon: string;
 }
 

diff --git a/src/lib/components/Button/Button.tsx b/src/lib/components/Button/Button.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import { forwardRef, type ComponentProps, type ReactNode } from 'react';
+import { mergeDeep } from '../../helpers/mergeDeep';
 import type {
   FlowbiteBoolean,
   FlowbiteColors,
@@ -18,20 +19,24 @@ export interface FlowbiteButtonTheme {
   disabled: string;
   gradient: ButtonGradientColors;
   gradientDuoTone: ButtonGradientDuoToneColors;
-  inner: {
-    base: string;
-    position: PositionInButtonGroup;
-    outline: string;
-  };
+  inner: FlowbiteButtonInnerTheme;
   label: string;
-  outline: FlowbiteBoolean & {
-    color: ButtonOutlineColors;
-    pill: FlowbiteBoolean;
-  };
+  outline: FlowbiteButtonOutlineTheme;
   pill: FlowbiteBoolean;
   size: ButtonSizes;
 }
 
+export interface FlowbiteButtonInnerTheme {
+  base: string;
+  position: PositionInButtonGroup;
+  outline: string;
+}
+
+export interface FlowbiteButtonOutlineTheme extends FlowbiteBoolean {
+  color: ButtonOutlineColors;
+  pill: FlowbiteBoolean;
+}
+
 export interface ButtonColors
   extends Pick<FlowbiteColors, 'dark' | 'failure' | 'gray' | 'info' | 'light' | 'purple' | 'success' | 'warning'> {
   [key: string]: string;
@@ -64,6 +69,7 @@ export interface ButtonProps extends Omit<ComponentProps<'button'>, 'color' | 'r
   pill?: boolean;
   positionInGroup?: keyof PositionInButtonGroup;
   size?: keyof ButtonSizes;
+  theme?: FlowbiteButtonTheme;
 }
 
 const ButtonComponent = forwardRef<HTMLButtonElement | HTMLAnchorElement, ButtonProps>(
@@ -82,14 +88,14 @@ const ButtonComponent = forwardRef<HTMLButtonElement | HTMLAnchorElement, Button
       positionInGroup = 'none',
       size = 'md',
       className,
+      theme: customTheme = {},
       ...props
     },
     ref,
   ) => {
-    const isLink = typeof href !== 'undefined';
-
-    const { buttonGroup: groupTheme, button: theme } = useTheme().theme;
+    const { buttonGroup: groupTheme, button: theme } = mergeDeep(useTheme().theme, customTheme);
 
+    const isLink = typeof href !== 'undefined';
     const Component = isLink ? 'a' : 'button';
     const theirProps = props as object;
 

diff --git a/src/lib/components/Card/Card.tsx b/src/lib/components/Card/Card.tsx
@@ -2,6 +2,7 @@ import classNames from 'classnames';
 import type { ComponentProps, FC, PropsWithChildren } from 'react';
 import { DeepPartial } from '..';
 import { mergeDeep } from '../../helpers/mergeDeep';
+import { FlowbiteBoolean } from '../Flowbite/FlowbiteTheme';
 import { useTheme } from '../Flowbite/ThemeContext';
 
 export interface FlowbiteCardTheme {
@@ -12,19 +13,13 @@ export interface FlowbiteCardTheme {
 export interface FlowbiteCardRootTheme {
   base: string;
   children: string;
-  horizontal: {
-    off: string;
-    on: string;
-  };
+  horizontal: FlowbiteBoolean;
   href: string;
 }
 
 export interface FlowbiteCardImageTheme {
   base: string;
-  horizontal: {
-    off: string;
-    on: string;
-  };
+  horizontal: FlowbiteBoolean;
 }
 
 export interface CardProps extends PropsWithChildren<ComponentProps<'div'>> {

diff --git a/src/lib/components/Carousel/Carousel.tsx b/src/lib/components/Carousel/Carousel.tsx
@@ -3,33 +3,44 @@ import type { ComponentProps, FC, PropsWithChildren, ReactElement, ReactNode } f
 import { Children, cloneElement, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { HiOutlineChevronLeft, HiOutlineChevronRight } from 'react-icons/hi';
 import ScrollContainer from 'react-indiana-drag-scroll';
+import { mergeDeep } from '../../helpers/mergeDeep';
 import windowExists from '../../helpers/window-exists';
+import { FlowbiteBoolean } from '../Flowbite/FlowbiteTheme';
 import { useTheme } from '../Flowbite/ThemeContext';
 
 export interface FlowbiteCarouselTheme {
+  root: FlowbiteCarouselRootTheme;
+  indicators: FlowbiteCarouselIndicatorsTheme;
+  item: FlowbiteCarouselItemTheme;
+  control: FlowbiteCarouselControlTheme;
+  scrollContainer: FlowbiteCarouselScrollContainer;
+}
+
+export interface FlowbiteCarouselRootTheme {
   base: string;
-  indicators: {
-    active: {
-      off: string;
-      on: string;
-    };
-    base: string;
-    wrapper: string;
-  };
-  item: {
-    base: string;
-    wrapper: string;
-  };
-  control: {
-    base: string;
-    icon: string;
-  };
   leftControl: string;
   rightControl: string;
-  scrollContainer: {
-    base: string;
-    snap: string;
-  };
+}
+
+export interface FlowbiteCarouselIndicatorsTheme {
+  active: FlowbiteBoolean;
+  base: string;
+  wrapper: string;
+}
+
+export interface FlowbiteCarouselItemTheme {
+  base: string;
+  wrapper: string;
+}
+
+export interface FlowbiteCarouselControlTheme {
+  base: string;
+  icon: string;
+}
+
+export interface FlowbiteCarouselScrollContainer {
+  base: string;
+  snap: string;
 }
 
 export interface CarouselProps extends PropsWithChildren<ComponentProps<'div'>> {
@@ -38,6 +49,7 @@ export interface CarouselProps extends PropsWithChildren<ComponentProps<'div'>>
   rightControl?: ReactNode;
   slide?: boolean;
   slideInterval?: number;
+  theme?: FlowbiteCarouselTheme;
 }
 
 export const Carousel: FC<CarouselProps> = ({
@@ -48,14 +60,15 @@ export const Carousel: FC<CarouselProps> = ({
   slide = true,
   slideInterval,
   className,
+  theme: customTheme = {},
   ...props
 }): JSX.Element => {
-  const isDeviceMobile = windowExists() && navigator.userAgent.indexOf('IEMobile') !== -1;
+  const theme = mergeDeep(useTheme().theme.carousel, customTheme);
 
+  const isDeviceMobile = windowExists() && navigator.userAgent.indexOf('IEMobile') !== -1;
   const carouselContainer = useRef<HTMLDivElement>(null);
   const [activeItem, setActiveItem] = useState(0);
   const [isDragging, setIsDragging] = useState(false);
-  const theme = useTheme().theme.carousel;
 
   const items = useMemo(
     () =>
@@ -96,7 +109,7 @@ export const Carousel: FC<CarouselProps> = ({
   const handleDragging = (dragging: boolean) => () => setIsDragging(dragging);
 
   return (
-    <div className={classNames(theme.base, className)} data-testid="carousel" {...props}>
+    <div className={classNames(theme.root.base, className)} data-testid="carousel" {...props}>
       <ScrollContainer
         className={classNames(
           theme.scrollContainer.base,
@@ -141,7 +154,7 @@ export const Carousel: FC<CarouselProps> = ({
 
       {items && (
         <>
-          <div className={theme.leftControl}>
+          <div className={theme.root.leftControl}>
             <button
               className="group"
               data-testid="carousel-left-control"
@@ -151,7 +164,7 @@ export const Carousel: FC<CarouselProps> = ({
               {leftControl ? leftControl : <DefaultLeftControl />}
             </button>
           </div>
-          <div className={theme.rightControl}>
+          <div className={theme.root.rightControl}>
             <button
               className="group"
               data-testid="carousel-right-control"

diff --git a/src/lib/components/DarkThemeToggle/DarkThemeToggle.tsx b/src/lib/components/DarkThemeToggle/DarkThemeToggle.tsx
@@ -2,32 +2,41 @@ import classNames from 'classnames';
 import type { ComponentProps, FC } from 'react';
 import { useContext } from 'react';
 import { HiMoon, HiSun } from 'react-icons/hi';
+import { DeepPartial } from '..';
+import { mergeDeep } from '../../helpers/mergeDeep';
 import { ThemeContext, useTheme } from '../Flowbite/ThemeContext';
 
 export interface FlowbiteDarkThemeToggleTheme {
+  root: FlowbiteDarkThemeToggleRootTheme;
+}
+
+export interface FlowbiteDarkThemeToggleRootTheme {
   base: string;
   icon: string;
 }
 
-export type DarkThemeToggleProps = ComponentProps<'button'>;
+export interface DarkThemeToggleProps extends ComponentProps<'button'> {
+  theme?: DeepPartial<FlowbiteDarkThemeToggleTheme>;
+}
+
+export const DarkThemeToggle: FC<DarkThemeToggleProps> = ({ className, theme: customTheme = {}, ...props }) => {
+  const theme = mergeDeep(useTheme().theme.darkThemeToggle, customTheme);
 
-export const DarkThemeToggle: FC<DarkThemeToggleProps> = ({ className, ...props }) => {
-  const theme = useTheme().theme.darkThemeToggle;
   const { mode, toggleMode } = useContext(ThemeContext);
 
   return (
     <button
-      className={classNames(theme.base, className)}
+      className={classNames(theme.root.base, className)}
       data-testid="dark-theme-toggle"
       onClick={toggleMode}
       type="button"
       aria-label="Toggle dark mode"
       {...props}
     >
       {mode === 'dark' ? (
-        <HiSun aria-label="Currently dark mode" className={theme.icon} />
+        <HiSun aria-label="Currently dark mode" className={theme.root.icon} />
       ) : (
-        <HiMoon aria-label="Currently light mode" className={theme.icon} />
+        <HiMoon aria-label="Currently light mode" className={theme.root.icon} />
       )}
     </button>
   );

diff --git a/src/lib/components/FileInput/FileInput.tsx b/src/lib/components/FileInput/FileInput.tsx
@@ -8,14 +8,20 @@ import { HelperText } from '../HelperText';
 import type { TextInputColors, TextInputSizes } from '../TextInput';
 
 export interface FlowbiteFileInputTheme {
+  root: FlowbiteFileInputRootTheme;
+  field: FlowbiteFileInputFieldTheme;
+}
+
+export interface FlowbiteFileInputRootTheme {
+  base: string;
+}
+
+export interface FlowbiteFileInputFieldTheme {
   base: string;
-  field: {
+  input: {
     base: string;
-    input: {
-      base: string;
-      sizes: TextInputSizes;
-      colors: TextInputColors;
-    };
+    sizes: TextInputSizes;
+    colors: TextInputColors;
   };
 }
 
@@ -27,12 +33,12 @@ export interface FileInputProps extends Omit<ComponentProps<'input'>, 'type' | '
 }
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  ({ theme: customTheme = {}, sizing = 'md', helperText, color = 'gray', className, ...props }, ref) => {
+  ({ sizing = 'md', helperText, color = 'gray', className, theme: customTheme = {}, ...props }, ref) => {
     const theme = mergeDeep(useTheme().theme.fileInput, customTheme);
 
     return (
       <>
-        <div className={classNames(theme.base, className)}>
+        <div className={classNames(theme.root.base, className)}>
           <div className={theme.field.base}>
             <input
               className={classNames(