🆕 (Tooltip): make the Top as the default position to show tooltip

masastack · Dec 26, 2024 · 72a2e3d · 72a2e3d
1 parent d4934e6
commit 72a2e3d
Showing 1 changed file with 29 additions and 9 deletions.
diff --git a/src/Masa.Blazor/Components/Tooltip/MTooltip.razor.cs b/src/Masa.Blazor/Components/Tooltip/MTooltip.razor.cs
@@ -36,11 +36,22 @@ public MTooltip()
         private static Block _block = new("m-tooltip");
         private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
         private ModifierBuilder _contentModifierBuilder = _block.Element("content").CreateModifierBuilder();
+
+        private Position ComputedPosition
+        {
+            get
+            {
+                if (Right) return Position.Right;
+                if (Bottom) return Position.Bottom;
+                if (Left) return Position.Left;
+                return Position.Top;
+            }
+        }
 
         protected override IEnumerable<string> BuildComponentClass()
         {
             yield return _modifierBuilder
-                .Add(Top, Right, Bottom, Left)
+                .Add(ComputedPosition.ToString())
                 .Add("attached", Attach is not { AsT1: true })
                 .Build();
         }
@@ -52,18 +63,18 @@ protected double CalculatedLeft
                 var activator = Dimensions.Activator;
                 var content = Dimensions.Content;
                 if (activator == null || content == null) return 0;
-
-                var unknown = !Bottom && !Left && !Top && !Right;
+
                 var activatorLeft = !IsDefaultAttach ? activator.OffsetLeft : activator.Left;
                 double left = 0;
 
-                if (Top || Bottom || unknown)
+                if (ComputedPosition is Position.Top or Position.Bottom)
                 {
                     left = activatorLeft + (activator.Width / 2) - (content.Width / 2);
                 }
-                else if (Left || Right)
+                else if (ComputedPosition is Position.Left or Position.Right)
                 {
-                    left = activatorLeft + (Right ? activator.Width : -content.Width) + (Right ? 10 : -10);
+                    var right = ComputedPosition == Position.Right;
+                    left = activatorLeft + (right ? activator.Width : -content.Width) + (right ? 10 : -10);
                 }
 
                 if (NudgeLeft != null)
@@ -93,11 +104,12 @@ protected double CalculatedTop
                 var activatorTop = !IsDefaultAttach ? activator.OffsetTop : activator.Top;
                 double top = 0;
 
-                if (Top || Bottom)
+                if (ComputedPosition is Position.Top or Position.Bottom)
                 {
-                    top = activatorTop + (Bottom ? activator.Height : -content.Height) + (Bottom ? 10 : -10);
+                    var bottom = ComputedPosition == Position.Bottom;
+                    top = activatorTop + (bottom ? activator.Height : -content.Height) + (bottom ? 10 : -10);
                 }
-                else if (Left || Right)
+                else if (ComputedPosition is Position.Left or Position.Right)
                 {
                     top = activatorTop + (activator.Height / 2) - (content.Height / 2);
                 }
@@ -123,4 +135,12 @@ protected double CalculatedTop
             }
         }
     }
+
+    internal enum Position
+    {
+        Top,
+        Right,
+        Bottom,
+        Left
+    }
 }