diff --git a/src/Core/Components/NumberField/FluentNumberField.razor b/src/Core/Components/NumberField/FluentNumberField.razor
index 222dd08cae..e641871d16 100644
--- a/src/Core/Components/NumberField/FluentNumberField.razor
+++ b/src/Core/Components/NumberField/FluentNumberField.razor
@@ -24,7 +24,7 @@
                      max="@(ReadOnly ? value : Max)"
                      min="@(ReadOnly ? value : Min)"
                      id=@Id
-                     current-value="@value"
+                     value="@value"
                      disabled="@Disabled"
                      name=@Name
                      required="@Required"
diff --git a/src/Core/Components/NumberField/FluentNumberField.razor.cs b/src/Core/Components/NumberField/FluentNumberField.razor.cs
index 4f3f502f9d..1543815bfc 100644
--- a/src/Core/Components/NumberField/FluentNumberField.razor.cs
+++ b/src/Core/Components/NumberField/FluentNumberField.razor.cs
@@ -102,6 +102,7 @@ private static string GetStepAttributeValue()
         // of it for us. We will only get asked to parse the T for nonempty inputs.
         var targetType = Nullable.GetUnderlyingType(typeof(TValue)) ?? typeof(TValue);
         if (targetType == typeof(sbyte) ||
+            targetType == typeof(byte) ||
             targetType == typeof(int) ||
             targetType == typeof(long) ||
             targetType == typeof(short) ||
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameter.verified.html
index e48fdba2cb..c7a1f050c5 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter-name="additional-parameter-value" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter-name="additional-parameter-value" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameters.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameters.verified.html
index 159b07e0e0..a10dfdc0cf 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameters.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AdditionalParameters.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter1-name="additional-parameter1-value" additional-parameter2-name="additional-parameter2-value" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" additional-parameter1-name="additional-parameter1-value" additional-parameter2-name="additional-parameter2-value" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Filled.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Filled.verified.html
index 72b29a1a2a..28f793a449 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Filled.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Filled.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="filled" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="filled" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Outline.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Outline.verified.html
index f8e8947210..058933242e 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Outline.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AppearanceParameter-Outline.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AutoFocusParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AutoFocusParameter.verified.html
index 550112913d..330cff173e 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AutoFocusParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_AutoFocusParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field autofocus="" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field autofocus="" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ClassParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ClassParameter.verified.html
index 874af5e450..006a594a43 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ClassParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ClassParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field class="additional-css-class" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field class="additional-css-class" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DataListParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DataListParameter.verified.html
index 3c9644a776..4519c2a639 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DataListParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DataListParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field list="datalist" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field list="datalist" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Default.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Default.verified.html
index f8e8947210..058933242e 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Default.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Default.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DisabledParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DisabledParameter.verified.html
index ffe0d8c5c1..bde1428830 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DisabledParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_DisabledParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" disabled="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" disabled="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_HideStepParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_HideStepParameter.verified.html
index 484c19f69f..cb76d344ef 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_HideStepParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_HideStepParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field hide-step="" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field hide-step="" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_IdParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_IdParameter.verified.html
index f8e8947210..058933242e 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_IdParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_IdParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Label.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Label.verified.html
index 1e081bc825..1f29fb5c8e 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Label.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_Label.verified.html
@@ -1,4 +1,4 @@
 
 <label for="xxx" class="fluent-input-label" b-hum22yrq17="">My label
 </label>
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_LabelTemplate.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_LabelTemplate.verified.html
index f646444463..01fdd58fce 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_LabelTemplate.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_LabelTemplate.verified.html
@@ -2,4 +2,4 @@
 <label for="xxx" class="fluent-input-label" b-hum22yrq17="">
   <h1>My label</h1>
 </label>
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxLengthParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxLengthParameter.verified.html
index 58c0f23e1c..dd65fade40 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxLengthParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxLengthParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="10" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="10" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxParameter.verified.html
index 9176889d6d..1563643994 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MaxParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" max="2147483647" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" max="2147483647" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinLengthParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinLengthParameter.verified.html
index 793d85fd0f..e36e64c25c 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinLengthParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinLengthParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="3" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="3" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinParameter.verified.html
index d0a6509256..41d61da637 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_MinParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" min="-2147483648" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" min="-2147483648" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_NameParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_NameParameter.verified.html
index 2b375ed994..557031e522 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_NameParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_NameParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" name="xxx" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" name="xxx" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_PlaceholderParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_PlaceholderParameter.verified.html
index 8faedfc6ff..035abfdd0a 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_PlaceholderParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_PlaceholderParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field placeholder="placeholder-value" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field placeholder="placeholder-value" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ReadOnlyParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ReadOnlyParameter.verified.html
index 83d83b4c93..a151804313 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ReadOnlyParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_ReadOnlyParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field readonly="" maxlength="14" minlength="1" size="20" step="1" max="100" min="100" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field readonly="" maxlength="14" minlength="1" size="20" step="1" max="100" min="100" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_RequiredParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_RequiredParameter.verified.html
index 955c7776b5..c6d4c72bd7 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_RequiredParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_RequiredParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" required="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" required="" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_SizeParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_SizeParameter.verified.html
index 42fb1a43f8..67d4ea994a 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_SizeParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_SizeParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="3" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="3" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StepParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StepParameter.verified.html
index 7038d22d9b..da3bba2b68 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StepParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StepParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field maxlength="14" minlength="1" size="20" step="3" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field maxlength="14" minlength="1" size="20" step="3" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StyleParameter.verified.html b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StyleParameter.verified.html
index 0827703343..8891296594 100644
--- a/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StyleParameter.verified.html
+++ b/tests/Core/NumberField/FluentNumberFieldTests.FluentNumberField_StyleParameter.verified.html
@@ -1,2 +1,2 @@
 
-<fluent-number-field style="background-color: red;" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
+<fluent-number-field style="background-color: red;" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="100" appearance="outline" blazor:onchange="1" blazor:oninput="2" blazor:elementreference="xxx">100</fluent-number-field>
\ No newline at end of file
diff --git a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnFinish.verified.razor.html b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnFinish.verified.razor.html
index c686c1e3b7..072433a178 100644
--- a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnFinish.verified.razor.html
+++ b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnFinish.verified.razor.html
@@ -1,9 +1,9 @@
 
 <div style="width: 100%; height: 400px;" class="fluent-wizard" position="left" b-l81u9o5gjc="">
   <ol b-l81u9o5gjc="">
-    <li status="previous" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="previous" blazor:onclick="1" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="2">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="4" blazor:onclick="5">
           <path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm3.22 6.97-4.47 4.47-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5c.3.3.77.3 1.06 0l5-5a.75.75 0 1 0-1.06-1.06Z"></path>
         </svg>
       </div>
@@ -12,9 +12,9 @@
         <p typo="body" class="fluent-typography fluent-wizard-summary" b-1nnnfjehkp=""></p>
       </div>
     </li>
-    <li status="current" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="current" blazor:onclick="2" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="6" blazor:onclick="7">
           <path d="M2 12a10 10 0 1120 0 10 10 0 01-20 0z"></path>
         </svg>
       </div>
@@ -26,24 +26,24 @@
   </ol>
   <div class="fluent-wizard-content" b-l81u9o5gjc="">
     <div style="display: none;" b-l81u9o5gjc="">
-      <form blazor:onsubmit="5">
-        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="5" appearance="outline" blazor:onchange="7" blazor:oninput="8" blazor:elementreference=""></fluent-number-field>
+      <form blazor:onsubmit="9">
+        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="5" appearance="outline" blazor:onchange="11" blazor:oninput="12" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
     <div style="" b-l81u9o5gjc="">
-      <form blazor:onsubmit="6">
+      <form blazor:onsubmit="10">
         <div>
           <ul class="validation-errors">
             <li class="validation-message">The field NumberBetween1and10 must be between 1 and 10.</li>
           </ul>
         </div>
-        <fluent-number-field class="invalid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="15" appearance="outline" blazor:onchange="9" blazor:oninput="10" aria-invalid="true" blazor:elementreference=""></fluent-number-field>
+        <fluent-number-field class="invalid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="15" appearance="outline" blazor:onchange="13" blazor:oninput="14" aria-invalid="true" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
   </div>
   <div class="fluent-wizard-buttons" b-l81u9o5gjc="">
-    <fluent-button style="width: 80px;;" type="button" appearance="neutral" blazor:onclick="11" b-x1200685t0="" blazor:elementreference="">Previous</fluent-button>
+    <fluent-button style="width: 80px;;" type="button" appearance="neutral" blazor:onclick="15" b-x1200685t0="" blazor:elementreference="">Previous</fluent-button>
     <span style="margin-right: 10px" b-l81u9o5gjc=""></span>
-    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="12" b-x1200685t0="" blazor:elementreference="">Done</fluent-button>
+    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="16" b-x1200685t0="" blazor:elementreference="">Done</fluent-button>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnNext.verified.razor.html b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnNext.verified.razor.html
index 60c3852be8..20b8b55b94 100644
--- a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnNext.verified.razor.html
+++ b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsInValid_OnNext.verified.razor.html
@@ -1,9 +1,9 @@
 
 <div style="width: 100%; height: 400px;" class="fluent-wizard" position="left" b-l81u9o5gjc="">
   <ol b-l81u9o5gjc="">
-    <li status="current" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="current" blazor:onclick="1" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="2">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="4" blazor:onclick="5">
           <path d="M2 12a10 10 0 1120 0 10 10 0 01-20 0z"></path>
         </svg>
       </div>
@@ -12,9 +12,9 @@
         <p typo="body" class="fluent-typography fluent-wizard-summary" b-1nnnfjehkp=""></p>
       </div>
     </li>
-    <li status="next" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="next" blazor:onclick="2" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="6" blazor:onclick="7">
           <path d="M12 3.5a8.5 8.5 0 100 17 8.5 8.5 0 000-17zM2 12a10 10 0 1120 0 10 10 0 01-20 0z"></path>
         </svg>
       </div>
@@ -26,23 +26,23 @@
   </ol>
   <div class="fluent-wizard-content" b-l81u9o5gjc="">
     <div style="" b-l81u9o5gjc="">
-      <form blazor:onsubmit="5">
+      <form blazor:onsubmit="9">
         <div>
           <ul class="validation-errors">
             <li class="validation-message">The field NumberBetween1and10 must be between 1 and 10.</li>
           </ul>
         </div>
-        <fluent-number-field class="invalid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="15" appearance="outline" blazor:onchange="7" blazor:oninput="8" aria-invalid="true" blazor:elementreference=""></fluent-number-field>
+        <fluent-number-field class="invalid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="15" appearance="outline" blazor:onchange="11" blazor:oninput="12" aria-invalid="true" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
     <div style="display: none;" b-l81u9o5gjc="">
-      <form blazor:onsubmit="6">
-        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="15" appearance="outline" blazor:onchange="9" blazor:oninput="10" blazor:elementreference=""></fluent-number-field>
+      <form blazor:onsubmit="10">
+        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="15" appearance="outline" blazor:onchange="13" blazor:oninput="14" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
   </div>
   <div class="fluent-wizard-buttons" b-l81u9o5gjc="">
     <span style="margin-right: 10px" b-l81u9o5gjc=""></span>
-    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="4" b-x1200685t0="" blazor:elementreference="">Next</fluent-button>
+    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="8" b-x1200685t0="" blazor:elementreference="">Next</fluent-button>
   </div>
 </div>
\ No newline at end of file
diff --git a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsValid.verified.razor.html b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsValid.verified.razor.html
index f8f68a27eb..1d182783ff 100644
--- a/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsValid.verified.razor.html
+++ b/tests/Core/Wizard/FluentWizardTests.FluentWizard_EditForm_EditContextIsValid.verified.razor.html
@@ -1,9 +1,9 @@
 
 <div style="width: 100%; height: 400px;" class="fluent-wizard" position="left" b-l81u9o5gjc="">
   <ol b-l81u9o5gjc="">
-    <li status="previous" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="previous" blazor:onclick="1" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="2">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="4" blazor:onclick="5">
           <path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm3.22 6.97-4.47 4.47-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5c.3.3.77.3 1.06 0l5-5a.75.75 0 1 0-1.06-1.06Z"></path>
         </svg>
       </div>
@@ -12,9 +12,9 @@
         <p typo="body" class="fluent-typography fluent-wizard-summary" b-1nnnfjehkp=""></p>
       </div>
     </li>
-    <li status="previous" style="height: 100%;" b-a5o5s1yurv="">
+    <li status="previous" blazor:onclick="2" style="height: 100%;" b-a5o5s1yurv="">
       <div class="fluent-wizard-icon" b-a5o5s1yurv="">
-        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="3">
+        <svg style="width: 24px; fill: var(--accent-fill-rest); width: var(--fluent-wizard-circle-size);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="6" blazor:onclick="7">
           <path d="M12 2a10 10 0 1 1 0 20 10 10 0 0 1 0-20Zm3.22 6.97-4.47 4.47-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5c.3.3.77.3 1.06 0l5-5a.75.75 0 1 0-1.06-1.06Z"></path>
         </svg>
       </div>
@@ -26,19 +26,19 @@
   </ol>
   <div class="fluent-wizard-content" b-l81u9o5gjc="">
     <div style="display: none;" b-l81u9o5gjc="">
-      <form blazor:onsubmit="5">
-        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="5" appearance="outline" blazor:onchange="7" blazor:oninput="8" blazor:elementreference=""></fluent-number-field>
+      <form blazor:onsubmit="9">
+        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="5" appearance="outline" blazor:onchange="11" blazor:oninput="12" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
     <div style="" b-l81u9o5gjc="">
-      <form blazor:onsubmit="6">
-        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" current-value="7" appearance="outline" blazor:onchange="9" blazor:oninput="10" blazor:elementreference=""></fluent-number-field>
+      <form blazor:onsubmit="10">
+        <fluent-number-field class="valid" maxlength="14" minlength="1" size="20" step="1" id="xxx" value="7" appearance="outline" blazor:onchange="13" blazor:oninput="14" blazor:elementreference=""></fluent-number-field>
       </form>
     </div>
   </div>
   <div class="fluent-wizard-buttons" b-l81u9o5gjc="">
-    <fluent-button style="width: 80px;;" type="button" appearance="neutral" blazor:onclick="11" b-x1200685t0="" blazor:elementreference="">Previous</fluent-button>
+    <fluent-button style="width: 80px;;" type="button" appearance="neutral" blazor:onclick="15" b-x1200685t0="" blazor:elementreference="">Previous</fluent-button>
     <span style="margin-right: 10px" b-l81u9o5gjc=""></span>
-    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="12" b-x1200685t0="" blazor:elementreference="">Done</fluent-button>
+    <fluent-button style="width: 80px;;" type="button" appearance="accent" blazor:onclick="16" b-x1200685t0="" blazor:elementreference="">Done</fluent-button>
   </div>
 </div>
\ No newline at end of file