diff --git a/demo/Ursa.Demo.Android/Ursa.Demo.Android.csproj b/demo/Ursa.Demo.Android/Ursa.Demo.Android.csproj
index 4071d05..f5730c1 100644
--- a/demo/Ursa.Demo.Android/Ursa.Demo.Android.csproj
+++ b/demo/Ursa.Demo.Android/Ursa.Demo.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0-android</TargetFramework>
+        <TargetFramework>net8.0-android</TargetFramework>
         <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
         <ApplicationId>com.irihitech.Ursa</ApplicationId>
diff --git a/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj b/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
index f51b5fb..31ef39b 100644
--- a/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
+++ b/demo/Ursa.Demo.Browser/Ursa.Demo.Browser.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
         <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
         <OutputType>Exe</OutputType>
diff --git a/demo/Ursa.Demo.iOS/Ursa.Demo.iOS.csproj b/demo/Ursa.Demo.iOS/Ursa.Demo.iOS.csproj
index 5f70ccb..65fad79 100644
--- a/demo/Ursa.Demo.iOS/Ursa.Demo.iOS.csproj
+++ b/demo/Ursa.Demo.iOS/Ursa.Demo.iOS.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0-ios</TargetFramework>
+        <TargetFramework>net8.0-ios</TargetFramework>
         <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml
index afe4496..753a232 100644
--- a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml
+++ b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml
@@ -8,19 +8,170 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
+
     <UserControl.Styles>
         <Style Selector=":is(u|NumericUpDown)">
-            <Setter Property="Width" Value="240"></Setter>
+            <Setter Property="Width" Value="240" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
         </Style>
     </UserControl.Styles>
-    <StackPanel HorizontalAlignment="Left">
-        <u:NumericIntUpDown Name="input" InnerLeftContent="Age" Step="1" Value="2" Watermark="Input Value" Classes="ClearButton" />
-        <TextBlock Text="{Binding #input.Value}" ></TextBlock>
-        <u:NumericDoubleUpDown Name="inputDouble" Step="0.5" Value="3.1" EmptyInputValue="1"></u:NumericDoubleUpDown>
-        <TextBlock Text="{Binding #inputDouble.Value}"></TextBlock>
-        <u:NumericByteUpDown Name="inputByte" Step="1" Value="3" EmptyInputValue="1"></u:NumericByteUpDown>
-        <TextBlock Text="{Binding #inputByte.Value}"></TextBlock>
-        <TextBlock Text="Drag"></TextBlock>
-        <u:NumericIntUpDown  Step="1" Value="2" Watermark="Input Value" AllowDrag="True" />
-    </StackPanel>
+
+    <Grid ColumnDefinitions="*,*">
+        <Grid
+            Grid.Column="0"
+            HorizontalAlignment="Left"
+            RowDefinitions="200,*">
+            <StackPanel>
+                <u:Divider Content="Change Right ->" />
+                <u:NumericUIntUpDown
+                    Name="numd"
+                    HorizontalContentAlignment="{Binding HorizontalContentAlignment}"
+                    AllowDrag="{Binding AllowDrag}"
+                    AllowSpin="{Binding AllowSpin}"
+                    FontFamily="{Binding FontFamily, Mode=OneWay}"
+                    FormatString="{Binding FormatString}"
+                    InnerLeftContent="{Binding InnerLeftContent}"
+                    IsEnabled="{Binding IsEnable}"
+                    IsReadOnly="{Binding IsReadOnly}"
+                    Maximum="{Binding Maximum}"
+                    Minimum="{Binding Minimum}"
+                    ParsingNumberStyle="{Binding ParsingNumberStyle}"
+                    ShowButtonSpinner="{Binding ShowButtonSpinner}"
+                    Step="{Binding Step}"
+                    Watermark="{Binding Watermark}"
+                    Value="{Binding Value}" />
+                <u:Divider Content="Demo" />
+            </StackPanel>
+
+            <StackPanel Grid.Row="1">
+                <u:Divider Content="{Binding #input.Value, StringFormat='Int = {0}'}" />
+                <u:NumericIntUpDown
+                    Name="input"
+                    Classes="ClearButton"
+                    InnerLeftContent="Age"
+                    Step="1"
+                    Watermark="Input Value"
+                    Value="2" />
+                <u:Divider Content="{Binding #inputDouble.Value, StringFormat='Double = {0}'}" />
+                <u:NumericDoubleUpDown
+                    Name="inputDouble"
+                    EmptyInputValue="1"
+                    Step="0.5"
+                    Value="3.1" />
+                <u:Divider Content="{Binding #inputByte.Value, StringFormat='Byte = {0}'}" />
+                <u:NumericByteUpDown
+                    Name="inputByte"
+                    EmptyInputValue="1"
+                    Step="1"
+                    Value="3" />
+                <u:Divider Content="{Binding #Drag_Int.Value, StringFormat='Drag Int = {0}'}" />
+                <u:NumericIntUpDown
+                    Name="Drag_Int"
+                    AllowDrag="True"
+                    InnerLeftContent="Drag"
+                    Step="1"
+                    Watermark="Input Value"
+                    Value="2" />
+
+                <!--  hex demo  -->
+
+                <u:Divider Content="{Binding #uint_HexNumber.Value, StringFormat='Don‘t Use = {0}, hex={0:X}'}" />
+                <!--  =================this is error usage  -->
+                <u:NumericUIntUpDown
+                    Name="uint_HexNumber"
+                    AllowDrag="False"
+                    FormatString="{}{0:X8}"
+                    InnerLeftContent="HexNumber"
+                    ParsingNumberStyle="HexNumber"
+                    Step="1"
+                    Watermark="Input Value"
+                    Value="2" />
+
+                <!--  =================we should use AllowHexSpecifier  -->
+                <u:Divider Content="{Binding #uint_AllowHexSpecifier.Value, StringFormat='uint = {0}, hex={0:X}'}" />
+                <u:NumericUIntUpDown
+                    Name="uint_AllowHexSpecifier"
+                    HorizontalContentAlignment="Right"
+                    AllowDrag="False"
+                    FontFamily="Consolas"
+                    FormatString="{}{0:X8}"
+                    InnerLeftContent="AllowHexSpecifier"
+                    ParsingNumberStyle="AllowHexSpecifier"
+                    Step="1"
+                    Watermark="AllowHexSpecifier"
+                    Value="2" />
+
+                <u:Divider Content="{Binding #Consolas_uint.Value, StringFormat='Font=Consolas {0}, hex={0:X}'}" />
+                <u:NumericUIntUpDown
+                    Name="Consolas_uint"
+                    HorizontalContentAlignment="Right"
+                    AllowDrag="False"
+                    FontFamily="Consolas"
+                    FormatString="X8"
+                    InnerLeftContent="0x"
+                    ParsingNumberStyle="AllowHexSpecifier"
+                    Step="1"
+                    Watermark="AllowHexSpecifier"
+                    Value="2" />
+            </StackPanel>
+        </Grid>
+        <StackPanel Grid.Column="1" HorizontalAlignment="Left">
+
+            <Label Content="FontFamily" />
+            <TextBox Text="{Binding FontFamily}" />
+
+            <Label Content="AllowDrag" />
+            <CheckBox IsChecked="{Binding AllowDrag}" />
+
+            <Label Content="IsReadOnly" />
+            <CheckBox IsChecked="{Binding IsReadOnly}" />
+
+            <Label Content="HorizontalContentAlignment" />
+            <ComboBox ItemsSource="{Binding Array_HorizontalContentAlignment}" SelectedItem="{Binding HorizontalContentAlignment}" />
+
+            <Label Content="InnerLeftContent" />
+            <TextBox Text="{Binding InnerLeftContent}" />
+
+
+            <Label Content="Watermark" />
+            <TextBox Text="{Binding Watermark}" />
+
+
+            <Label Content="FormatString" />
+            <TextBox
+                MinWidth="100"
+                MaxLength="100"
+                Text="{Binding FormatString}" />
+
+            <Label Content="ParsingNumberStyle" />
+            <ComboBox ItemsSource="{Binding Array_ParsingNumberStyle}" SelectedItem="{Binding ParsingNumberStyle}" />
+
+
+            <Label Content="AllowSpin" />
+            <CheckBox IsChecked="{Binding AllowSpin}" />
+
+            <Label Content="ShowButtonSpinner" />
+            <CheckBox IsChecked="{Binding ShowButtonSpinner}" />
+
+            <u:NumericUIntUpDown
+                Name="nudV"
+                AllowSpin="True"
+                InnerLeftContent="Value"
+                IsEnabled="True"
+                IsReadOnly="False"
+                Value="{Binding Value, Mode=TwoWay}" />
+
+            <u:NumericUIntUpDown InnerLeftContent="Max" Value="{Binding Maximum}" />
+
+            <u:NumericUIntUpDown InnerLeftContent="Min" Value="{Binding Minimum}" />
+
+            <Label Content="Step" />
+            <Slider Minimum="1" Value="{Binding Step}" />
+
+            <Label Content="IsEnable" />
+            <CheckBox IsChecked="{Binding IsEnable}" />
+
+        </StackPanel>
+    </Grid>
 </UserControl>
diff --git a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs
index 4bdf06d..8ca1387 100644
--- a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs
+++ b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs
@@ -1,6 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
+using System;
+using System.Diagnostics;
+using Ursa.Controls;
 using Ursa.Demo.ViewModels;
 
 namespace Ursa.Demo.Pages;
@@ -11,5 +14,12 @@ public partial class NumericUpDownDemo : UserControl
     {
         InitializeComponent();
         DataContext = new NumericUpDownDemoViewModel();
+        numd.ValueChanged += Numd_ValueChanged;
+    }
+
+    private void Numd_ValueChanged(object? sender, ValueChangedEventArgs<uint> e)
+    {
+        Trace.WriteLine($"{(sender as NumericUIntUpDown).Name} {e.OldValue} {e.NewValue}");
+
     }
 }
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Ursa.Demo.csproj b/demo/Ursa.Demo/Ursa.Demo.csproj
index 736e24e..e4926a7 100644
--- a/demo/Ursa.Demo/Ursa.Demo.csproj
+++ b/demo/Ursa.Demo/Ursa.Demo.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
@@ -18,7 +18,7 @@
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
         <PackageReference Include="Semi.Avalonia" Version="11.0.7" />
     </ItemGroup>
 
diff --git a/demo/Ursa.Demo/ViewModels/NumericUpDownDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/NumericUpDownDemoViewModel.cs
index 9840cca..9cf7651 100644
--- a/demo/Ursa.Demo/ViewModels/NumericUpDownDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/NumericUpDownDemoViewModel.cs
@@ -1,8 +1,50 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Globalization;
+using Ursa.Controls;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Ursa.Demo.ViewModels;
 
-public class NumericUpDownDemoViewModel: ObservableObject
+public partial class NumericUpDownDemoViewModel : ObservableObject
 {
-    
+
+    [ObservableProperty] private uint _Value;
+    [ObservableProperty] private string _FontFamily = "Consolas";
+    [ObservableProperty] private bool _AllowDrag = false;
+    [ObservableProperty] private bool _IsReadOnly = false;
+
+    [ObservableProperty] private Array _Array_HorizontalContentAlignment;
+    [ObservableProperty] private HorizontalAlignment _HorizontalContentAlignment = HorizontalAlignment.Center;
+    [ObservableProperty] private object? _InnerLeftContent = "obj:0x";
+    [ObservableProperty] private string _Watermark = "Water mark showed";
+    [ObservableProperty] private string _FormatString = "X8";
+    [ObservableProperty] private Array _Array_ParsingNumberStyle;
+    [ObservableProperty] private NumberStyles _ParsingNumberStyle = NumberStyles.AllowHexSpecifier;
+    [ObservableProperty] private bool _AllowSpin = true;
+    [ObservableProperty] private bool _ShowButtonSpinner = true;
+
+    [ObservableProperty] private UInt32 _Maximum = UInt32.MaxValue;
+    [ObservableProperty] private UInt32 _Minimum = UInt32.MinValue;
+    [ObservableProperty] private UInt32 _Step = 1;
+
+    [ObservableProperty] private bool _IsEnable = true;
+
+
+    public NumericUpDownDemoViewModel()
+    {
+        Array_HorizontalContentAlignment = Enum.GetValues(typeof(HorizontalAlignment));
+        Array_ParsingNumberStyle = Enum.GetValues(typeof(NumberStyles));
+        NumericUIntUpDown numericUIntUpDown;
+        TextBox textBox;
+
+    }
+
+    partial void OnValueChanging(uint oldValue, uint newValue)
+    {
+        Console.WriteLine(oldValue);
+    }
+
 }
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml b/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml
index bb3cb95..d15bc7c 100644
--- a/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml
+++ b/src/Ursa.Themes.Semi/Controls/NumericUpDown.axaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa">
     <!--  Add Resources Here  -->
-    
+
     <ControlTheme x:Key="InputClearButton" TargetType="Button">
         <Setter Property="Button.Foreground" Value="{DynamicResource TextBoxButtonDefaultForeground}" />
         <Setter Property="Button.Cursor" Value="Hand" />
@@ -23,7 +23,7 @@
             <Setter Property="Foreground" Value="{DynamicResource TextBoxButtonPointeroverForeground}" />
         </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="{x:Type u:NumericUpDown}" TargetType="{x:Type u:NumericUpDown}">
         <Setter Property="NumericUpDown.VerticalContentAlignment" Value="Center" />
         <Setter Property="NumericUpDown.CornerRadius" Value="{DynamicResource NumericUpDownCornerRadius}" />
@@ -35,24 +35,25 @@
                         MinWidth="0"
                         HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
-                        ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
                         AllowSpin="{TemplateBinding AllowSpin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
                         <Panel>
                             <TextBox
                                 Name="PART_TextBox"
                                 Height="{TemplateBinding Height}"
                                 MinHeight="{DynamicResource NumericUpDownWrapperDefaultHeight}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 AcceptsReturn="False"
                                 CornerRadius="{TemplateBinding CornerRadius}"
                                 DataValidationErrors.Errors="{ReflectionBinding $parent[NumericUpDown].(DataValidationErrors.Errors)}"
                                 FontSize="{TemplateBinding FontSize}"
                                 Foreground="{TemplateBinding Foreground}"
+                                InnerLeftContent="{TemplateBinding InnerLeftContent}"
                                 IsReadOnly="{TemplateBinding IsReadOnly}"
                                 TextWrapping="NoWrap"
-                                InnerLeftContent="{TemplateBinding InnerLeftContent}"
                                 Theme="{DynamicResource NonErrorTextBox}"
                                 Watermark="{TemplateBinding Watermark}" />
                             <Panel
@@ -64,18 +65,18 @@
                                 IsVisible="{TemplateBinding AllowDrag}" />
                             <Button
                                 Name="PART_ClearButton"
-                                Command="{Binding $parent[u:NumericUpDown].Clear}"
+                                Margin="0,0,8,0"
                                 HorizontalAlignment="Right"
-                                Margin="0 0 8 0"
-                                IsVisible="False"
+                                Command="{Binding $parent[u:NumericUpDown].Clear}"
                                 Focusable="False"
+                                IsVisible="False"
                                 Theme="{StaticResource InputClearButton}" />
                         </Panel>
                     </ButtonSpinner>
                 </DataValidationErrors>
             </ControlTemplate>
         </Setter>
-        
+
         <Style Selector="^.clearButton, ^.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
diff --git a/src/Ursa/Controls/NumericUpDown/IntUpDown.cs b/src/Ursa/Controls/NumericUpDown/IntUpDown.cs
index 4feedcb..eabbe4a 100644
--- a/src/Ursa/Controls/NumericUpDown/IntUpDown.cs
+++ b/src/Ursa/Controls/NumericUpDown/IntUpDown.cs
@@ -18,7 +18,10 @@ public class NumericIntUpDown : NumericUpDownBase<int>
     protected override bool ParseText(string? text, out int number) =>
         int.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
 
-    protected override string? ValueToString(int? value) => value?.ToString(FormatString, NumberFormat);
+    protected override string? ValueToString(int? value)
+    {
+        return value?.ToString(FormatString, NumberFormat);
+    }
 
     protected override int Zero => 0;
 
@@ -27,6 +30,34 @@ public class NumericIntUpDown : NumericUpDownBase<int>
     protected override int? Minus(int? a, int? b) => a - b;
 }
 
+public class NumericUIntUpDown : NumericUpDownBase<uint>
+{
+    protected override Type StyleKeyOverride { get; } = typeof(NumericUpDown);
+
+    static NumericUIntUpDown()
+    {
+        MaximumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MaxValue);
+        MinimumProperty.OverrideDefaultValue<NumericUIntUpDown>(uint.MinValue);
+        StepProperty.OverrideDefaultValue<NumericUIntUpDown>(1);
+    }
+
+    protected override bool ParseText(string? text, out uint number)
+    {
+        return uint.TryParse(text, ParsingNumberStyle, NumberFormat, out number);
+    }
+
+    protected override string? ValueToString(uint? value)
+    {
+        return value?.ToString(FormatString, NumberFormat);
+    }
+
+    protected override uint Zero => 0;
+
+    protected override uint? Add(uint? a, uint? b) => a + b;
+
+    protected override uint? Minus(uint? a, uint? b) => a - b;
+}
+
 public class NumericDoubleUpDown : NumericUpDownBase<double>
 {
     protected override Type StyleKeyOverride { get; } = typeof(NumericUpDown);
@@ -68,9 +99,9 @@ public class NumericByteUpDown : NumericUpDownBase<byte>
 
     protected override byte Zero => 0;
 
-    protected override byte? Add(byte? a, byte? b) => (byte?) (a + b);
+    protected override byte? Add(byte? a, byte? b) => (byte?)(a + b);
 
-    protected override byte? Minus(byte? a, byte? b) => (byte?) (a - b);
+    protected override byte? Minus(byte? a, byte? b) => (byte?)(a - b);
 }
 
 public class NumericSByteUpDown : NumericUpDownBase<sbyte>
@@ -91,9 +122,9 @@ public class NumericSByteUpDown : NumericUpDownBase<sbyte>
 
     protected override sbyte Zero => 0;
 
-    protected override sbyte? Add(sbyte? a, sbyte? b) => (sbyte?) (a + b);
+    protected override sbyte? Add(sbyte? a, sbyte? b) => (sbyte?)(a + b);
 
-    protected override sbyte? Minus(sbyte? a, sbyte? b) => (sbyte?) (a - b);
+    protected override sbyte? Minus(sbyte? a, sbyte? b) => (sbyte?)(a - b);
 }
 
 public class NumericShortUpDown : NumericUpDownBase<short>
@@ -114,9 +145,9 @@ public class NumericShortUpDown : NumericUpDownBase<short>
 
     protected override short Zero => 0;
 
-    protected override short? Add(short? a, short? b) => (short?) (a + b);
+    protected override short? Add(short? a, short? b) => (short?)(a + b);
 
-    protected override short? Minus(short? a, short? b) => (short?) (a - b);
+    protected override short? Minus(short? a, short? b) => (short?)(a - b);
 }
 
 public class NumericUShortUpDown : NumericUpDownBase<ushort>
@@ -137,9 +168,9 @@ public class NumericUShortUpDown : NumericUpDownBase<ushort>
 
     protected override ushort Zero => 0;
 
-    protected override ushort? Add(ushort? a, ushort? b) => (ushort?) (a + b);
+    protected override ushort? Add(ushort? a, ushort? b) => (ushort?)(a + b);
 
-    protected override ushort? Minus(ushort? a, ushort? b) => (ushort?) (a - b);
+    protected override ushort? Minus(ushort? a, ushort? b) => (ushort?)(a - b);
 }
 
 public class NumericLongUpDown : NumericUpDownBase<long>
@@ -233,4 +264,3 @@ public class NumericDecimalUpDown : NumericUpDownBase<decimal>
 
     protected override decimal? Minus(decimal? a, decimal? b) => a - b;
 }
-
diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
index 928fdfa..5a3af7a 100644
--- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
+++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs
@@ -1,522 +1,577 @@
-using System.Diagnostics;
-using System.Globalization;
-using System.Net.Mime;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Metadata;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Irihi.Avalonia.Shared.Contracts;
-
-namespace Ursa.Controls;
-
-[TemplatePart(PART_Spinner, typeof(ButtonSpinner))]
-[TemplatePart(PART_TextBox, typeof(TextBox))]
-[TemplatePart(PART_DragPanel, typeof(Panel))]
-public abstract class NumericUpDown : TemplatedControl, IClearControl
-{
-    public const string PART_Spinner = "PART_Spinner";
-    public const string PART_TextBox = "PART_TextBox";
-    public const string PART_DragPanel = "PART_DragPanel";
-    
-    protected internal ButtonSpinner? _spinner;
-    protected internal TextBox? _textBox;
-    protected internal Panel? _dragPanel;
-
-    private Point? _point;
-    protected internal bool _updateFromTextInput;
-    
-    public static readonly StyledProperty<bool> AllowDragProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
-        nameof(AllowDrag), defaultValue: false);
-
-    public bool AllowDrag
-    {
-        get => GetValue(AllowDragProperty);
-        set => SetValue(AllowDragProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> IsReadOnlyProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
-        nameof(IsReadOnly));
-
-    public bool IsReadOnly
-    {
-        get => GetValue(IsReadOnlyProperty);
-        set => SetValue(IsReadOnlyProperty, value);
-    }
-
-    public static readonly StyledProperty<object?> InnerLeftContentProperty = AvaloniaProperty.Register<NumericUpDown, object?>(
-        nameof(InnerLeftContent));
-
-    public object? InnerLeftContent
-    {
-        get => GetValue(InnerLeftContentProperty);
-        set => SetValue(InnerLeftContentProperty, value);
-    }
-
-    public static readonly StyledProperty<string?> WatermarkProperty = AvaloniaProperty.Register<NumericUpDown, string?>(
-        nameof(Watermark));
-
-    public string? Watermark
-    {
-        get => GetValue(WatermarkProperty);
-        set => SetValue(WatermarkProperty, value);
-    }
-
-    public static readonly StyledProperty<NumberFormatInfo?> NumberFormatProperty = AvaloniaProperty.Register<NumericUpDown, NumberFormatInfo?>(
-        nameof(NumberFormat), defaultValue: NumberFormatInfo.CurrentInfo);
-
-    public NumberFormatInfo? NumberFormat
-    {
-        get => GetValue(NumberFormatProperty);
-        set => SetValue(NumberFormatProperty, value);
-    }
-
-    public static readonly StyledProperty<string> FormatStringProperty = AvaloniaProperty.Register<NumericUpDown, string>(
-        nameof(FormatString), string.Empty);
-
-    public string FormatString
-    {
-        get => GetValue(FormatStringProperty);
-        set => SetValue(FormatStringProperty, value);
-    }
-
-    public static readonly StyledProperty<NumberStyles> ParsingNumberStyleProperty = AvaloniaProperty.Register<NumericUpDown, NumberStyles>(
-        nameof(ParsingNumberStyle), defaultValue: NumberStyles.Any);
-
-    public NumberStyles ParsingNumberStyle
-    {
-        get => GetValue(ParsingNumberStyleProperty);
-        set => SetValue(ParsingNumberStyleProperty, value);
-    }
-
-    public static readonly StyledProperty<IValueConverter?> TextConverterProperty = AvaloniaProperty.Register<NumericUpDown, IValueConverter?>(
-        nameof(TextConverter));
-
-    public IValueConverter? TextConverter
-    {
-        get => GetValue(TextConverterProperty);
-        set => SetValue(TextConverterProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> AllowSpinProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
-        nameof(AllowSpin), true);
-
-    public bool AllowSpin
-    {
-        get => GetValue(AllowSpinProperty);
-        set => SetValue(AllowSpinProperty, value);
-    }
-
-    public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
-        ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<NumericUpDown>();
-
-    public bool ShowButtonSpinner
-    {
-        get => GetValue(ShowButtonSpinnerProperty);
-        set => SetValue(ShowButtonSpinnerProperty, value);
-    }
-
-    public event EventHandler<SpinEventArgs>? Spinned;
-    
-    static NumericUpDown()
-    {
-        NumberFormatProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
-        FormatStringProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
-        IsReadOnlyProperty.Changed.AddClassHandler<NumericUpDown>((o,e)=>o.ChangeToSetSpinDirection(e));
-        TextConverterProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
-    }
-
-    protected void ChangeToSetSpinDirection(AvaloniaPropertyChangedEventArgs avaloniaPropertyChangedEventArgs, bool afterInitialization = false)
-    {
-        if (afterInitialization)
-        {
-            if (IsInitialized)
-            {
-                SetValidSpinDirection();
+using System.Diagnostics;
+using System.Globalization;
+using System.Net.Mime;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Metadata;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using Irihi.Avalonia.Shared.Contracts;
+
+namespace Ursa.Controls;
+
+[TemplatePart(PART_Spinner, typeof(ButtonSpinner))]
+[TemplatePart(PART_TextBox, typeof(TextBox))]
+[TemplatePart(PART_DragPanel, typeof(Panel))]
+public abstract class NumericUpDown : TemplatedControl, IClearControl
+{
+    public const string PART_Spinner = "PART_Spinner";
+    public const string PART_TextBox = "PART_TextBox";
+    public const string PART_DragPanel = "PART_DragPanel";
+
+    protected internal ButtonSpinner? _spinner;
+    protected internal TextBox? _textBox;
+    protected internal Panel? _dragPanel;
+
+    private Point? _point;
+    protected internal bool _updateFromTextInput;
+
+
+    protected internal bool _canIncrease = true;
+
+    protected internal bool _canDecrease = true;
+
+
+    public static readonly StyledProperty<bool> AllowDragProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
+        nameof(AllowDrag), defaultValue: false);
+
+    public bool AllowDrag
+    {
+        get => GetValue(AllowDragProperty);
+        set => SetValue(AllowDragProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> IsReadOnlyProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
+        nameof(IsReadOnly));
+
+    public bool IsReadOnly
+    {
+        get => GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, value);
+    }
+
+    public static readonly StyledProperty<HorizontalAlignment> HorizontalContentAlignmentProperty =
+       ContentControl.HorizontalContentAlignmentProperty.AddOwner<NumericUpDown>();
+    public HorizontalAlignment HorizontalContentAlignment
+    {
+        get => GetValue(HorizontalContentAlignmentProperty);
+        set => SetValue(HorizontalContentAlignmentProperty, value);
+    }
+
+    public static readonly StyledProperty<object?> InnerLeftContentProperty = AvaloniaProperty.Register<NumericUpDown, object?>(
+        nameof(InnerLeftContent));
+
+    public object? InnerLeftContent
+    {
+        get => GetValue(InnerLeftContentProperty);
+        set => SetValue(InnerLeftContentProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> WatermarkProperty = AvaloniaProperty.Register<NumericUpDown, string?>(
+        nameof(Watermark));
+
+    public string? Watermark
+    {
+        get => GetValue(WatermarkProperty);
+        set => SetValue(WatermarkProperty, value);
+    }
+
+    public static readonly StyledProperty<NumberFormatInfo?> NumberFormatProperty = AvaloniaProperty.Register<NumericUpDown, NumberFormatInfo?>(
+        nameof(NumberFormat), defaultValue: NumberFormatInfo.CurrentInfo);
+
+    public NumberFormatInfo? NumberFormat
+    {
+        get => GetValue(NumberFormatProperty);
+        set => SetValue(NumberFormatProperty, value);
+    }
+
+    public static readonly StyledProperty<string> FormatStringProperty = AvaloniaProperty.Register<NumericUpDown, string>(
+        nameof(FormatString), string.Empty);
+
+    public string FormatString
+    {
+        get => GetValue(FormatStringProperty);
+        set => SetValue(FormatStringProperty, value);
+    }
+
+    public static readonly StyledProperty<NumberStyles> ParsingNumberStyleProperty = AvaloniaProperty.Register<NumericUpDown, NumberStyles>(
+        nameof(ParsingNumberStyle), defaultValue: NumberStyles.Any);
+
+    public NumberStyles ParsingNumberStyle
+    {
+        get => GetValue(ParsingNumberStyleProperty);
+        set => SetValue(ParsingNumberStyleProperty, value);
+    }
+
+    public static readonly StyledProperty<IValueConverter?> TextConverterProperty = AvaloniaProperty.Register<NumericUpDown, IValueConverter?>(
+        nameof(TextConverter));
+
+    public IValueConverter? TextConverter
+    {
+        get => GetValue(TextConverterProperty);
+        set => SetValue(TextConverterProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> AllowSpinProperty = AvaloniaProperty.Register<NumericUpDown, bool>(
+        nameof(AllowSpin), true);
+
+    public bool AllowSpin
+    {
+        get => GetValue(AllowSpinProperty);
+        set => SetValue(AllowSpinProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> ShowButtonSpinnerProperty =
+        ButtonSpinner.ShowButtonSpinnerProperty.AddOwner<NumericUpDown>();
+
+    public bool ShowButtonSpinner
+    {
+        get => GetValue(ShowButtonSpinnerProperty);
+        set => SetValue(ShowButtonSpinnerProperty, value);
+    }
+
+    public event EventHandler<SpinEventArgs>? Spinned;
+
+    static NumericUpDown()
+    {
+        NumberFormatProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
+        FormatStringProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
+        IsReadOnlyProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.ChangeToSetSpinDirection(e));
+        TextConverterProperty.Changed.AddClassHandler<NumericUpDown>((o, e) => o.OnFormatChange(e));
+    }
+
+    protected void ChangeToSetSpinDirection(AvaloniaPropertyChangedEventArgs avaloniaPropertyChangedEventArgs, bool afterInitialization = false)
+    {
+        if (afterInitialization)
+        {
+            if (IsInitialized)
+            {
+                SetValidSpinDirection();
+            }
+        }
+        else
+        {
+            SetValidSpinDirection();
+        }
+    }
+
+    protected virtual void OnFormatChange(AvaloniaPropertyChangedEventArgs arg)
+    {
+        if (IsInitialized)
+        {
+            SyncTextAndValue(false, null);
+        }
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        if (_spinner is not null)
+        {
+            _spinner.Spin -= OnSpin;
+        }
+        if (_dragPanel is not null)
+        {
+            _dragPanel.PointerPressed -= OnDragPanelPointerPressed;
+            _dragPanel.PointerMoved -= OnDragPanelPointerMoved;
+            _dragPanel.PointerReleased -= OnDragPanelPointerReleased;
+        }
+        _spinner = e.NameScope.Find<ButtonSpinner>(PART_Spinner);
+        _textBox = e.NameScope.Find<TextBox>(PART_TextBox);
+        _dragPanel = e.NameScope.Find<Panel>(PART_DragPanel);
+        if (_spinner is not null)
+        {
+            _spinner.Spin += OnSpin;
+        }
+        if (_dragPanel is not null)
+        {
+            _dragPanel.PointerPressed += OnDragPanelPointerPressed;
+            _dragPanel.PointerMoved += OnDragPanelPointerMoved;
+            _dragPanel.PointerReleased += OnDragPanelPointerReleased;
+        }
+
+    }
+
+    protected override void OnLostFocus(RoutedEventArgs e)
+    {
+        CommitInput(true);
+        base.OnLostFocus(e);
+        if (AllowDrag && _dragPanel is not null)
+        {
+            _dragPanel.IsVisible = true;
+        }
+    }
+
+    protected override void OnKeyDown(KeyEventArgs e)
+    {
+        if (e.Key == Key.Enter)
+        {
+            var commitSuccess = CommitInput(true);
+            e.Handled = !commitSuccess;
+        }
+
+        if (e.Key == Key.Escape)
+        {
+            if (AllowDrag && _dragPanel is not null)
+            {
+                _dragPanel.IsVisible = true;
+                _dragPanel.Focus();
+            }
+        }
+    }
+
+    private void OnDragPanelPointerPressed(object sender, PointerPressedEventArgs e)
+    {
+        _point = e.GetPosition(this);
+        if (e.ClickCount == 2 && _dragPanel is not null && AllowDrag)
+        {
+            _dragPanel.IsVisible = false;
+            _textBox.IsReadOnly = false;
+        }
+        else
+        {
+            _textBox?.Focus();
+            _textBox!.IsReadOnly = true;
+        }
+    }
+
+    protected override void OnTextInput(TextInputEventArgs e)
+    {
+        _textBox?.RaiseEvent(e);
+    }
+
+    private void OnDragPanelPointerReleased(object sender, PointerReleasedEventArgs e)
+    {
+        _point = null;
+    }
+
+    private void OnDragPanelPointerMoved(object sender, PointerEventArgs e)
+    {
+        if (!AllowDrag || IsReadOnly) return;
+        if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
+        var point = e.GetPosition(this);
+        var delta = point - _point;
+        if (delta is null)
+        {
+            return;
+        }
+        int d = GetDelta(delta.Value);
+        if (d > 0)
+        {
+            if (_canIncrease)
+                Increase();
+        }
+        else if (d < 0)
+        {
+            if (_canDecrease)
+                Decrease();
+        }
+        _point = point;
+    }
+
+    private int GetDelta(Point point)
+    {
+        bool horizontal = Math.Abs(point.X) > Math.Abs(point.Y);
+        var value = horizontal ? point.X : -point.Y;
+        return value switch
+        {
+            > 0 => 1,
+            < 0 => -1,
+            _ => 0
+        };
+    }
+
+    private void OnSpin(object sender, SpinEventArgs e)
+    {
+        if (AllowSpin && !IsReadOnly)
+        {
+            var spin = !e.UsingMouseWheel;
+            spin |= _textBox is { IsFocused: true };
+            if (spin)
+            {
+                e.Handled = true;
+                var handler = Spinned;
+                handler?.Invoke(this, e);
+                if (e.Direction == SpinDirection.Increase)
+                {
+                    Increase();
+                }
+                else
+                {
+                    Decrease();
+                }
+            }
+        }
+    }
+
+    protected abstract void SetValidSpinDirection();
+
+    protected abstract void Increase();
+    protected abstract void Decrease();
+
+    protected virtual bool CommitInput(bool forceTextUpdate = false)
+    {
+        return SyncTextAndValue(true, _textBox?.Text, forceTextUpdate);
+    }
+
+    protected abstract bool SyncTextAndValue(bool fromTextToValue = false, string? text = null,
+        bool forceTextUpdate = false);
+
+    public abstract void Clear();
+}
+
+public abstract class NumericUpDownBase<T> : NumericUpDown where T : struct, IComparable<T>
+{
+    protected static string TrimString(string? text, NumberStyles numberStyles)
+    {
+        text = text!.Trim();
+        if (text.Contains("_")) // support _ like 0x1024_1024(hex), 10_24 (normal)
+        {
+            text = text.Replace("_", "");
+        }
+
+        if ((numberStyles & NumberStyles.AllowHexSpecifier) != 0)
+        {
+            if (text.StartsWith("0X") || text.StartsWith("0x")) // support 0x hex while user input
+            {
+                text = text.Substring(2);
             }
-        }
-        else
-        {
-            SetValidSpinDirection();
-        }
-    }
-
-    protected virtual void OnFormatChange(AvaloniaPropertyChangedEventArgs arg)
-    {
-        if (IsInitialized)
-        {
-            SyncTextAndValue(false, null);
-        }
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        if(_spinner is not null)
-        {
-            _spinner.Spin -= OnSpin;
-        }
-        if (_dragPanel is not null)
-        {
-            _dragPanel.PointerPressed -= OnDragPanelPointerPressed;
-            _dragPanel.PointerMoved -= OnDragPanelPointerMoved;
-            _dragPanel.PointerReleased -= OnDragPanelPointerReleased;
-        }
-        _spinner = e.NameScope.Find<ButtonSpinner>(PART_Spinner);
-        _textBox = e.NameScope.Find<TextBox>(PART_TextBox);
-        _dragPanel = e.NameScope.Find<Panel>(PART_DragPanel);
-        if (_spinner is not null)
-        {
-            _spinner.Spin += OnSpin;
-        }
-        if (_dragPanel is not null)
-        {
-            _dragPanel.PointerPressed+= OnDragPanelPointerPressed;
-            _dragPanel.PointerMoved += OnDragPanelPointerMoved;
-            _dragPanel.PointerReleased += OnDragPanelPointerReleased;
-        }
-        
-    }
-
-    protected override void OnLostFocus(RoutedEventArgs e)
-    {
-        CommitInput(true);
-        base.OnLostFocus(e);
-        if(AllowDrag && _dragPanel is not null)
-        {
-            _dragPanel.IsVisible = true;
-        }
-    }
-
-    protected override void OnKeyDown(KeyEventArgs e)
-    {
-        if (e.Key == Key.Enter)
-        {
-            var commitSuccess = CommitInput(true);
-            e.Handled = !commitSuccess;
-        }
-
-        if (e.Key == Key.Escape)
-        {
-            if (AllowDrag && _dragPanel is not null)
-            {
-                _dragPanel.IsVisible = true;
-                _dragPanel.Focus();
+            else if (text.StartsWith("h") || text.StartsWith("H")) // support  hex while user input
+            {
+                text = text.Substring(1);
+            }
+            else if (text.StartsWith("h'") || text.StartsWith("H'")) // support  hex while user input
+            {
+                text = text.Substring(2);
             }
-        }
-    }
-
-    private void OnDragPanelPointerPressed(object sender, PointerPressedEventArgs e)
-    {
-        _point = e.GetPosition(this);
-        if (e.ClickCount == 2 && _dragPanel is not null && AllowDrag)
-        {
-            _dragPanel.IsVisible = false;
-            _textBox.IsReadOnly = false;
-        }
-        else
-        {
-            _textBox?.Focus();
-            _textBox!.IsReadOnly = true;
-        }
-    }
-
-    protected override void OnTextInput(TextInputEventArgs e)
-    {
-        _textBox?.RaiseEvent(e);
-    }
-
-    private void OnDragPanelPointerReleased(object sender, PointerReleasedEventArgs e)
-    {
-        _point = null;
-    }
-    
-    private void OnDragPanelPointerMoved(object sender, PointerEventArgs e)
-    {
-        if (!AllowDrag || IsReadOnly) return;
-        if(!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return;
-        var point = e.GetPosition(this);
-        var delta = point - _point;
-        if (delta is null)
-        {
-            return;
-        }
-        int d = GetDelta(delta.Value);
-        if(d > 0)
-        {
-            Increase();
-        }
-        else if (d < 0)
-        {
-            Decrease();
-        }
-        _point = point;
-    }
-
-    private int GetDelta(Point point)
-    {
-        bool horizontal = Math.Abs(point.X) > Math.Abs(point.Y);
-        var value = horizontal ? point.X : -point.Y;
-        return value switch
-        {
-            > 0 => 1,
-            < 0 => -1,
-            _ => 0
-        };
-    }
-    
-    private void OnSpin(object sender, SpinEventArgs e)
-    {
-        if (AllowSpin && !IsReadOnly)
-        {
-            var spin = !e.UsingMouseWheel;
-            spin |= _textBox is { IsFocused: true };
-            if (spin)
-            {
-                e.Handled = true;
-                var handler = Spinned;
-                handler?.Invoke(this, e);
-                if (e.Direction == SpinDirection.Increase)
-                {
-                    Increase();
-                }
-                else
-                {
-                    Decrease();
-                }
-            }
-        }
-    }
-
-    protected abstract void SetValidSpinDirection();
-
-    protected abstract void Increase();
-    protected abstract void Decrease();
-
-    protected virtual bool CommitInput(bool forceTextUpdate = false)
-    {
-        return SyncTextAndValue(true, _textBox?.Text, forceTextUpdate);
-    }
-
-    protected abstract bool SyncTextAndValue(bool fromTextToValue = false, string? text = null,
-        bool forceTextUpdate = false);
-
-    public abstract void Clear();
-}
-
-public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComparable<T>
-{
-    public static readonly StyledProperty<T?> ValueProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T?>(
-        nameof(Value), defaultBindingMode: BindingMode.TwoWay);
-
-    public T? Value
-    {
-        get => GetValue(ValueProperty);
-        set => SetValue(ValueProperty, value);
-    }
-
-    public static readonly StyledProperty<T> MaximumProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
-        nameof(Maximum), defaultBindingMode:BindingMode.TwoWay, coerce: CoerceMaximum);
-    
-    public T Maximum
-    {
-        get => GetValue(MaximumProperty);
-        set => SetValue(MaximumProperty, value);
-    }
-
-    public static readonly StyledProperty<T> MinimumProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
-        nameof(Minimum), defaultBindingMode:BindingMode.TwoWay, coerce: CoerceMinimum);
-
-    public T Minimum
-    {
-        get => GetValue(MinimumProperty);
-        set => SetValue(MinimumProperty, value);
-    }
-    
-    #region Max and Min Coerce
-    private static T CoerceMaximum(AvaloniaObject instance, T value)
-    {
-        if (instance is NumericUpDownBase<T> n)
-        {
-            return n.CoerceMaximum(value);
-        }
-
-        return value;
-    } 
-    
-    private T CoerceMaximum(T value) 
-    {
-        if (value.CompareTo(Minimum) < 0)
-        {
-            return Minimum;
-        }
-        return value;
-    }
-    
-    private static T CoerceMinimum(AvaloniaObject instance, T value)
-    {
-        if (instance is NumericUpDownBase<T> n)
-        {
-            return n.CoerceMinimum(value);
-        }
-
-        return value;
-    }
-    
-    private T CoerceMinimum(T value) 
-    {
-        if (value.CompareTo(Maximum) > 0)
-        {
-            return Maximum;
-        }
-        return value;
-    }
-    
-    #endregion
-
-    public static readonly StyledProperty<T> StepProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
-        nameof(Step));
-
-    public T Step
-    {
-        get => GetValue(StepProperty);
-        set => SetValue(StepProperty, value);
-    }
-
-    public static readonly StyledProperty<T?> EmptyInputValueProperty =
-        AvaloniaProperty.Register<NumericUpDownBase<T>, T?>(
-            nameof(EmptyInputValue), defaultValue: null);
-
-    public T? EmptyInputValue
-    {
-        get => GetValue(EmptyInputValueProperty);
-        set => SetValue(EmptyInputValueProperty, value);
-    }
-    
-    /// <summary>
-    /// Defines the <see cref="ValueChanged"/> event.
-    /// </summary>
-    public static readonly RoutedEvent<ValueChangedEventArgs<T>> ValueChangedEvent =
-        RoutedEvent.Register<NumericUpDown, ValueChangedEventArgs<T>>(nameof(ValueChanged), RoutingStrategies.Bubble);
-
-    /// <summary>
-    /// Raised when the <see cref="Value"/> changes.
-    /// </summary>
-    public event EventHandler<ValueChangedEventArgs<T>>? ValueChanged
-    {
-        add => AddHandler(ValueChangedEvent, value);
-        remove => RemoveHandler(ValueChangedEvent, value);
-    }
-
-    static NumericUpDownBase()
-    {
-        StepProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.ChangeToSetSpinDirection(e));
-        MaximumProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnConstraintChanged(e));
-        MinimumProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnConstraintChanged(e));
-        ValueProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnValueChanged(e) );
-    }
-    
-    private void OnConstraintChanged(AvaloniaPropertyChangedEventArgs avaloniaPropertyChangedEventArgs)
-    {
-        if (IsInitialized)
-        {
-            SetValidSpinDirection();
-        }
-        if (Value.HasValue)
-        {
-            SetCurrentValue(ValueProperty, Clamp(Value, Maximum, Minimum));
-        }
-    }
-    
-    private void OnValueChanged(AvaloniaPropertyChangedEventArgs args)
-    {
-        if (IsInitialized)
-        {
-            SyncTextAndValue(false, null, true);
-        }
-        SetValidSpinDirection();
-        T? oldValue = args.GetOldValue<T?>();
-        T? newValue = args.GetNewValue<T?>();
-        var e = new ValueChangedEventArgs<T>(ValueChangedEvent, oldValue, newValue);
-        RaiseEvent(e);
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        if (_textBox != null)
-        {
-            _textBox.Text = ConvertValueToText(Value);
-        }
-        SetValidSpinDirection();
-    }
-
-    protected virtual T? Clamp(T? value, T max, T min)
-    {
-        if (value is null)
-        {
-            return null;
-        }
-        if (value.Value.CompareTo(max) > 0)
-        {
-            return max;
-        }
-        if (value.Value.CompareTo(min) < 0)
-        {
-            return min;
-        }
-        return value;
-    }
-    
-    protected override void SetValidSpinDirection()
-    {
-        var validDirection = ValidSpinDirections.None;
-        if (!IsReadOnly)
-        {
-            if (Value is null)
-            {
-                validDirection = ValidSpinDirections.Increase | ValidSpinDirections.Decrease;
-            }
-            if (Value.HasValue && Value.Value.CompareTo(Maximum) < 0)
-            {
-                validDirection |= ValidSpinDirections.Increase;
-            }
-
-            if (Value.HasValue && Value.Value.CompareTo(Minimum) > 0)
-            {
-                validDirection |= ValidSpinDirections.Decrease;
-            }
-        }
-        if (_spinner != null)
-        {
-            _spinner.ValidSpinDirection = validDirection;
-        }
-    }
-
-    private bool _isSyncingTextAndValue;
-    
-    protected override bool SyncTextAndValue(bool fromTextToValue = false, string? text = null, bool forceTextUpdate = false)
-    {
-        if (_isSyncingTextAndValue) return true;
-        _isSyncingTextAndValue = true;
-        var parsedTextIsValid = true;
-        try
-        {
-            if (fromTextToValue)
-            {
-                try
-                {
-                    var newValue = ConvertTextToValue(text);
-                    if (EmptyInputValue is not null && newValue is null)
-                    {
-                        newValue = EmptyInputValue;
-                    }
-                    if (!Equals(newValue, Value))
-                    {
-                        SetCurrentValue(ValueProperty, newValue);
+        }
+
+        return text;
+    }
+
+    public static readonly StyledProperty<T?> ValueProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T?>(
+        nameof(Value), defaultBindingMode: BindingMode.TwoWay);
+
+    public T? Value
+    {
+        get => GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
+    }
+
+    public static readonly StyledProperty<T> MaximumProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
+        nameof(Maximum), defaultBindingMode: BindingMode.TwoWay, coerce: CoerceMaximum);
+
+    public T Maximum
+    {
+        get => GetValue(MaximumProperty);
+        set => SetValue(MaximumProperty, value);
+    }
+
+    public static readonly StyledProperty<T> MinimumProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
+        nameof(Minimum), defaultBindingMode: BindingMode.TwoWay, coerce: CoerceMinimum);
+
+    public T Minimum
+    {
+        get => GetValue(MinimumProperty);
+        set => SetValue(MinimumProperty, value);
+    }
+
+    #region Max and Min Coerce
+    private static T CoerceMaximum(AvaloniaObject instance, T value)
+    {
+        if (instance is NumericUpDownBase<T> n)
+        {
+            return n.CoerceMaximum(value);
+        }
+
+        return value;
+    }
+
+    private T CoerceMaximum(T value)
+    {
+        if (value.CompareTo(Minimum) < 0)
+        {
+            return Minimum;
+        }
+        return value;
+    }
+
+    private static T CoerceMinimum(AvaloniaObject instance, T value)
+    {
+        if (instance is NumericUpDownBase<T> n)
+        {
+            return n.CoerceMinimum(value);
+        }
+
+        return value;
+    }
+
+    private T CoerceMinimum(T value)
+    {
+        if (value.CompareTo(Maximum) > 0)
+        {
+            return Maximum;
+        }
+        return value;
+    }
+
+    #endregion
+
+    public static readonly StyledProperty<T> StepProperty = AvaloniaProperty.Register<NumericUpDownBase<T>, T>(
+        nameof(Step));
+
+    public T Step
+    {
+        get => GetValue(StepProperty);
+        set => SetValue(StepProperty, value);
+    }
+
+    public static readonly StyledProperty<T?> EmptyInputValueProperty =
+        AvaloniaProperty.Register<NumericUpDownBase<T>, T?>(
+            nameof(EmptyInputValue), defaultValue: null);
+
+    public T? EmptyInputValue
+    {
+        get => GetValue(EmptyInputValueProperty);
+        set => SetValue(EmptyInputValueProperty, value);
+    }
+
+    /// <summary>
+    /// Defines the <see cref="ValueChanged"/> event.
+    /// </summary>
+    public static readonly RoutedEvent<ValueChangedEventArgs<T>> ValueChangedEvent =
+        RoutedEvent.Register<NumericUpDown, ValueChangedEventArgs<T>>(nameof(ValueChanged), RoutingStrategies.Bubble);
+
+    /// <summary>
+    /// Raised when the <see cref="Value"/> changes.
+    /// </summary>
+    public event EventHandler<ValueChangedEventArgs<T>>? ValueChanged
+    {
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
+    }
+
+    static NumericUpDownBase()
+    {
+        StepProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.ChangeToSetSpinDirection(e));
+        MaximumProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnConstraintChanged(e));
+        MinimumProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnConstraintChanged(e));
+        ValueProperty.Changed.AddClassHandler<NumericUpDownBase<T>>((o, e) => o.OnValueChanged(e));
+    }
+
+    private void OnConstraintChanged(AvaloniaPropertyChangedEventArgs avaloniaPropertyChangedEventArgs)
+    {
+        if (IsInitialized)
+        {
+            SetValidSpinDirection();
+        }
+        if (Value.HasValue)
+        {
+            SetCurrentValue(ValueProperty, Clamp(Value, Maximum, Minimum));
+        }
+    }
+
+    private void OnValueChanged(AvaloniaPropertyChangedEventArgs args)
+    {
+        if (IsInitialized)
+        {
+            SyncTextAndValue(false, null, true);
+        }
+        SetValidSpinDirection();
+        T? oldValue = args.GetOldValue<T?>();
+        T? newValue = args.GetNewValue<T?>();
+        var e = new ValueChangedEventArgs<T>(ValueChangedEvent, oldValue, newValue);
+        RaiseEvent(e);
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+        if (_textBox != null)
+        {
+            _textBox.Text = ConvertValueToText(Value);
+        }
+        SetValidSpinDirection();
+    }
+
+    protected virtual T? Clamp(T? value, T max, T min)
+    {
+        if (value is null)
+        {
+            return null;
+        }
+        if (value.Value.CompareTo(max) > 0)
+        {
+            return max;
+        }
+        if (value.Value.CompareTo(min) < 0)
+        {
+            return min;
+        }
+        return value;
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+        var validDirection = ValidSpinDirections.None;
+        _canIncrease = false;
+        _canDecrease = false;
+        if (!IsReadOnly)
+        {
+            if (Value is null)
+            {
+                validDirection = ValidSpinDirections.Increase | ValidSpinDirections.Decrease;
+            }
+            if (Value.HasValue && Value.Value.CompareTo(Maximum) < 0)
+            {
+                validDirection |= ValidSpinDirections.Increase;
+                _canIncrease = true;
+            }
+
+            if (Value.HasValue && Value.Value.CompareTo(Minimum) > 0)
+            {
+                validDirection |= ValidSpinDirections.Decrease;
+                _canDecrease = true;
+            }
+        }
+        if (_spinner != null)
+        {
+            _spinner.ValidSpinDirection = validDirection;
+        }
+    }
+
+    private bool _isSyncingTextAndValue;
+
+    protected override bool SyncTextAndValue(bool fromTextToValue = false, string? text = null, bool forceTextUpdate = false)
+    {
+        if (_isSyncingTextAndValue) return true;
+        _isSyncingTextAndValue = true;
+        var parsedTextIsValid = true;
+        try
+        {
+            if (fromTextToValue)
+            {
+                try
+                {
+                    var newValue = ConvertTextToValue(text);
+                    if (EmptyInputValue is not null && newValue is null)
+                    {
+                        newValue = EmptyInputValue;
+                    }
+                    if (!Equals(newValue, Value))
+                    {
+                        if (Equals(Clamp(newValue, Maximum, Minimum), newValue))
+                        {
+                            SetCurrentValue(ValueProperty, newValue);
+                        }
+                        else
+                        {
+                            parsedTextIsValid = false;
+                        }
                     }
                 }
                 catch
@@ -530,7 +585,7 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
                 if (forceTextUpdate)
                 {
                     var newText = ConvertValueToText(Value);
-                    if (_textBox!= null && !Equals(_textBox.Text, newText))
+                    if (_textBox != null && !Equals(_textBox.Text, newText))
                     {
                         _textBox.Text = newText;
                         _textBox.CaretIndex = newText?.Length ?? 0;
@@ -538,99 +593,100 @@ public abstract class NumericUpDownBase<T>: NumericUpDown where T: struct, IComp
                 }
             }
 
-            if (_updateFromTextInput && !parsedTextIsValid)
-            {
-                if (_spinner is not null)
-                {
-                    _spinner.ValidSpinDirection = ValidSpinDirections.None;
-                }
-            }
-            else
-            {
-                SetValidSpinDirection();
-            }
-        }
-        finally
-        {
-            _isSyncingTextAndValue = false;
-        }
-        return parsedTextIsValid;
-    }
-
-    protected virtual T? ConvertTextToValue(string? text)
-    {
-        T? result;
-        if (string.IsNullOrWhiteSpace(text)) return null;
-        if (TextConverter != null)
-        {
-            var valueFromText = TextConverter.Convert(text, typeof(T?), null, CultureInfo.CurrentCulture);
-            return (T?)valueFromText;
-        }
-        else
-        {
-            if (!ParseText(text, out var outputValue))
-            {
-                throw new InvalidDataException("Input string was not in a correct format.");
-            }
-
-            result = outputValue;
-        }
-        return result;
-    }
-
-    protected virtual string? ConvertValueToText(T? value)
-    {
-        if (TextConverter is not null)
-        {
-            return TextConverter.ConvertBack(Value, typeof(int), null, CultureInfo.CurrentCulture)?.ToString();
-        }
-
-        if (FormatString.Contains("{0"))
-        {
-            return string.Format(NumberFormat, FormatString, value);
-        }
-
-        return ValueToString(Value);
-    }
-    
-    protected override void Increase()
-    {
-        T? value;
-        if (Value is not null)
-        {
-            value = Add(Value.Value, Step);
-        }
-        else
-        {
-            value = IsSet(MinimumProperty) ? Minimum : Zero;
-        }
-        SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum));
-    }
-
-    protected override void Decrease()
-    {
-        T? value;
-        if (Value is not null)
-        {
-            value = Minus(Value.Value, Step);
-        }
-        else
-        {
-            value = IsSet(MaximumProperty) ? Maximum : Zero;
-        }
-
-        SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum));
-    }
-    
-    protected abstract bool ParseText(string? text, out T number);
-    protected abstract string? ValueToString(T? value);
-    protected abstract T Zero { get; }
-    protected abstract T? Add(T? a, T? b);
-    protected abstract T? Minus(T? a, T? b);
-
-    public override void Clear()
-    {
-        SetCurrentValue(ValueProperty, EmptyInputValue);
-        SyncTextAndValue(false, forceTextUpdate: true);
-    }
+            if (_updateFromTextInput && !parsedTextIsValid)
+            {
+                if (_spinner is not null)
+                {
+                    _spinner.ValidSpinDirection = ValidSpinDirections.None;
+                }
+            }
+            else
+            {
+                SetValidSpinDirection();
+            }
+        }
+        finally
+        {
+            _isSyncingTextAndValue = false;
+        }
+        return parsedTextIsValid;
+    }
+
+    protected virtual T? ConvertTextToValue(string? text)
+    {
+        T? result;
+        if (string.IsNullOrWhiteSpace(text)) return null;
+        if (TextConverter != null)
+        {
+            var valueFromText = TextConverter.Convert(text, typeof(T?), null, CultureInfo.CurrentCulture);
+            return (T?)valueFromText;
+        }
+        else
+        {
+            text = TrimString(text, ParsingNumberStyle);
+            if (!ParseText(text, out var outputValue))
+            {
+                throw new InvalidDataException("Input string was not in a correct format.");
+            }
+
+            result = outputValue;
+        }
+        return result;
+    }
+
+    protected virtual string? ConvertValueToText(T? value)
+    {
+        if (TextConverter is not null)
+        {
+            return TextConverter.ConvertBack(Value, typeof(int), null, CultureInfo.CurrentCulture)?.ToString();
+        }
+
+        if (FormatString.Contains("{0"))
+        {
+            return string.Format(NumberFormat, FormatString, value);
+        }
+
+        return ValueToString(Value);
+    }
+
+    protected override void Increase()
+    {
+        T? value;
+        if (Value is not null)
+        {
+            value = Add(Value.Value, Step);
+        }
+        else
+        {
+            value = IsSet(MinimumProperty) ? Minimum : Zero;
+        }
+        SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum));
+    }
+
+    protected override void Decrease()
+    {
+        T? value;
+        if (Value is not null)
+        {
+            value = Minus(Value.Value, Step);
+        }
+        else
+        {
+            value = IsSet(MaximumProperty) ? Maximum : Zero;
+        }
+
+        SetCurrentValue(ValueProperty, Clamp(value, Maximum, Minimum));
+    }
+
+    protected abstract bool ParseText(string? text, out T number);
+    protected abstract string? ValueToString(T? value);
+    protected abstract T Zero { get; }
+    protected abstract T? Add(T? a, T? b);
+    protected abstract T? Minus(T? a, T? b);
+
+    public override void Clear()
+    {
+        SetCurrentValue(ValueProperty, EmptyInputValue);
+        SyncTextAndValue(false, forceTextUpdate: true);
+    }
 }
\ No newline at end of file