[@mantine/core] Tooltip: Remove extra markup from disabled Tooltip.Fl…

…oating (#2220)
mantinedev · Aug 27, 2022 · ae47009 · ae47009
1 parent 42098c2
commit ae47009
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/mantine-core/src/Tooltip/Tooltip.story.tsx b/src/mantine-core/src/Tooltip/Tooltip.story.tsx
@@ -51,7 +51,7 @@ export const Controlled = () => {
 
 export const Floating = () => (
   <div style={{ padding: 0 }}>
-    <Tooltip.Floating label="Tooltip" disabled>
+    <Tooltip.Floating label="Tooltip">
       <button type="button" style={{ width: 200, height: 200 }}>
         target
       </button>

diff --git a/src/mantine-core/src/Tooltip/TooltipFloating/TooltipFloating.tsx b/src/mantine-core/src/Tooltip/TooltipFloating/TooltipFloating.tsx
@@ -71,6 +71,10 @@ export function TooltipFloating(props: TooltipFloatingProps) {
     setOpened(false);
   };
 
+  if (disabled) {
+    return <>{children}</>;
+  }
+
   return (
     <>
       <OptionalPortal withinPortal={withinPortal}>
@@ -81,7 +85,7 @@ export function TooltipFloating(props: TooltipFloatingProps) {
           style={{
             ...style,
             zIndex,
-            display: opened && !disabled ? 'block' : 'none',
+            display: opened ? 'block' : 'none',
             top: y ?? '',
             left: Math.round(x) ?? '',
           }}