fix: add tooltip to button

michibox · May 29, 2023 · 6ef0105 · 6ef0105
1 parent 7699b96
commit 6ef0105
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
@@ -129,9 +129,9 @@ const defaultProps = {
 const useTooltip = (tooltip: any) => {
     if (!tooltip) {
         return {
-            tooltipOpen: null,
+            tooltipOpen: false,
             setTooltipOpen: null,
-            toggle: null,
+            toggle: () => {},
             tooltipId: null,
         };
     }
@@ -266,7 +266,6 @@ export const Button: BsPrefixRefForwardingComponent<'button', ButtonProps> =
                     </Component>
 
                     {tooltip && tooltipId && (
-                        // @ts-ignore
                         <Tooltip2
                             placement={'top'}
                             isOpen={tooltipOpen}

diff --git a/src/components/Tooltip2.tsx b/src/components/Tooltip2.tsx
@@ -9,20 +9,26 @@ export interface ITooltipProps {
     trigger?: string;
     popperClassName?: any;
     innerClassName?: any;
+    children: React.ReactElement;
+    isOpen?: boolean;
+    target?: any;
+    toggle?: () => void;
 }
 
 export const Tooltip2: React.FC<ITooltipProps> = ({
     placement = 'top',
     autohide = true,
     placementPrefix = 'bs-tooltip',
     trigger = 'hover focus',
+    children,
     ...propsMain
 }) => {
     const props = {
         placement,
         autohide,
         placementPrefix,
         trigger,
+        children,
         ...propsMain,
     };
     const popperClasses = classNames('tooltip', 'show', props.popperClassName);