Fix label overlap issue when value is provided (#1348)

#1330
ironmansoftware · Dec 5, 2019 · 758079e · 758079e
1 parent 2c9ff55
commit 758079e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/UniversalDashboard.Materialize/Tests/textbox.tests.ps1 b/src/UniversalDashboard.Materialize/Tests/textbox.tests.ps1
@@ -0,0 +1,20 @@
+Describe "Textbox" {
+
+    Context "textbox no value" {
+        Set-TestDashboard -Content {
+            New-UDTextbox -Id 'EndTimestamp' -Label 'EndTimestamp'   
+        }
+        It "should not be active" {
+            Find-SeElement -ClassName 'active' -Driver $Driver | should be $null
+        }
+    }
+
+    Context "textbox value" {
+        Set-TestDashboard -Content {
+            New-UDTextbox -Id 'EndTimestamp' -Label 'EndTimestamp' -Value (Get-Date).ToString('yyyy.MM.dd HH:mm:ss.fff')  
+        }
+        It "should be active" {
+            Find-SeElement -ClassName 'active' -Driver $Driver | should be $true
+        }
+    }
+}
diff --git a/src/UniversalDashboard/Controls/src/textbox.ps1 b/src/UniversalDashboard/Controls/src/textbox.ps1
@@ -39,6 +39,11 @@ function New-UDTextbox {
         $Attributes.disabled = $true
     }
 
+    $LabelClassName = ""
+    if($Value){
+        $LabelClassName = "active"
+    }
+
     New-UDElement -Tag "div" -Attributes @{ className = 'input-field'} -Content {
 
         if ($PSBoundParameters.ContainsKey('Icon')) {
@@ -50,8 +55,9 @@ function New-UDTextbox {
         New-UDElement -Id $Id -Tag "input" -Attributes $Attributes
 
         if ($PSBoundParameters.ContainsKey('Label')) {
-            New-UDElement -Tag "label" -Attributes @{
+            New-UDElement -Tag "label" -Attributes @{                
                 'for' = $Id 
+                className = $LabelClassName
             } -Content { $Label }
         }
     }