From b86925ae30a40de98152d8c32a4b5f5488a6c5e6 Mon Sep 17 00:00:00 2001 From: sramaswami11 Date: Wed, 7 Apr 2021 11:24:56 -0400 Subject: [PATCH 1/8] MatSlider and MatNumeric components changed to rename some paramters to Max,Min --- src/MatBlazor.Demo/Demo/DemoMatSlider.razor | 38 +++++++++---------- .../Demo/DemoNumericUpDownField.razor | 24 ++++++------ .../Doc/DocMatNumericUpDownField.razor | 4 +- src/MatBlazor.Demo/Doc/DocMatSlider.razor | 4 +- .../BaseMatNumericUpDownFieldInternal.cs | 16 ++++---- .../Components/MatSlider/BaseMatSlider.cs | 12 +++--- .../Components/MatSlider/MatSlider.razor | 2 +- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/MatBlazor.Demo/Demo/DemoMatSlider.razor b/src/MatBlazor.Demo/Demo/DemoMatSlider.razor index f10d6233..2ff2e0e0 100644 --- a/src/MatBlazor.Demo/Demo/DemoMatSlider.razor +++ b/src/MatBlazor.Demo/Demo/DemoMatSlider.razor @@ -3,7 +3,7 @@
Continuous Slider: @Val
- + @code { @@ -50,7 +50,7 @@
Initializing the slider with custom ranges/values: @Val2
- + @code { @@ -71,7 +71,7 @@ + @code { @@ -98,7 +98,7 @@

Pin will round to nearest 3 digit. Pin only works with Discrete.

- + @code { @@ -119,7 +119,7 @@ + @code { @@ -145,7 +145,7 @@

Markers only work with Discrete

- + @code { @@ -166,7 +166,7 @@ + @code { @@ -193,7 +193,7 @@

Changes to the slider will immediately reflect in changes to the value.

- + @code { @@ -214,7 +214,7 @@ + @code { @@ -288,16 +288,16 @@ - - - + + + @code { public decimal Value { get; set; } = 50; - public decimal ValueMin { get; set; } = 0; - public decimal ValueMax { get; set; } = 100; + public decimal Min { get; set; } = 0; + public decimal Max { get; set; } = 100; public void OnValueChanged2(decimal val) { @@ -310,16 +310,16 @@ - - - + + + @code { public decimal Value { get; set; } = 50; - public decimal ValueMin { get; set; } = 0; - public decimal ValueMax { get; set; } = 100; + public decimal Min { get; set; } = 0; + public decimal Max { get; set; } = 100; public void OnValueChanged2(decimal val) { diff --git a/src/MatBlazor.Demo/Demo/DemoNumericUpDownField.razor b/src/MatBlazor.Demo/Demo/DemoNumericUpDownField.razor index 444fd55c..e6d70590 100644 --- a/src/MatBlazor.Demo/Demo/DemoNumericUpDownField.razor +++ b/src/MatBlazor.Demo/Demo/DemoNumericUpDownField.razor @@ -18,7 +18,7 @@ + Min=null Max=null>

@@ -35,7 +35,7 @@ @bind-Value=@testingNullableDecimal1 FieldType="MatNumericUpDownFieldType.Percent" DecimalPlaces=0 - Minimum=null Maximum=null> + Min=null Max=null>

@@ -44,7 +44,7 @@ @bind-Value=@testingNullableDecimal2 DecimalPlaces=0 Disabled=true - Minimum=null Maximum=null> + Min=null Max=null>

@@ -53,7 +53,7 @@ @bind-Value=@testingNullableDecimal3 DecimalPlaces=0 Icon="favorite" - Minimum=null Maximum=null> + Min=null Max=null>

@@ -62,7 +62,7 @@ @bind-Value=@testingNullableDecimal4 DecimalPlaces=0 Outlined="true" - Minimum=null Maximum=null> + Min=null Max=null>

@@ -79,7 +79,7 @@ DecimalPlaces=0 Outlined="true" FullWidth="true" - Minimum=null Maximum=null> + Min=null Max=null>

@@ -122,7 +122,7 @@ + Min=null Max=null>

@@ -139,7 +139,7 @@ @bind-Value=@testingNullableDecimal1 FieldType=""MatNumericUpDownFieldType.Percent"" DecimalPlaces=0 - Minimum=null Maximum=null> + Minimum=null Max=null>

@@ -148,7 +148,7 @@ @bind-Value=@testingNullableDecimal2 DecimalPlaces=0 Disabled=true - Minimum=null Maximum=null> + Min=null Max=null>

@@ -157,7 +157,7 @@ @bind-Value=@testingNullableDecimal3 DecimalPlaces=0 Icon=""favorite"" - Minimum=null Maximum=null> + Min=null Max=null>

@@ -166,7 +166,7 @@ @bind-Value=@testingNullableDecimal4 DecimalPlaces=0 Outlined=""true"" - Minimum=null Maximum=null> + Min=null Max=null>

@@ -183,7 +183,7 @@ DecimalPlaces=0 Outlined=""true"" FullWidth=""true"" - Minimum=null Maximum=null> + Min=null Max=null>

diff --git a/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor b/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor index c57918fe..01ef41e1 100644 --- a/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor +++ b/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor @@ -135,12 +135,12 @@ - Maximum + Max TValue - Minimum + Min TValue diff --git a/src/MatBlazor.Demo/Doc/DocMatSlider.razor b/src/MatBlazor.Demo/Doc/DocMatSlider.razor index 55901e4b..4b6378c5 100644 --- a/src/MatBlazor.Demo/Doc/DocMatSlider.razor +++ b/src/MatBlazor.Demo/Doc/DocMatSlider.razor @@ -105,12 +105,12 @@ Gets or sets an expression that identifies the bound value. - ValueMax + Max TValue - ValueMin + Min TValue diff --git a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs index 1ef3fa4b..b514762e 100644 --- a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs +++ b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs @@ -18,12 +18,12 @@ protected override EventCallback OnKeyDownEvent() protected void Increase() { - CurrentValue = SwitchT.Increase(CurrentValue, Step, Maximum); + CurrentValue = SwitchT.Increase(CurrentValue, Step, Max); } protected void Decrease() { - CurrentValue = SwitchT.Decrease(CurrentValue, Step, Minimum); + CurrentValue = SwitchT.Decrease(CurrentValue, Step, Min); } protected override TValue CurrentValue @@ -37,10 +37,10 @@ protected override TValue CurrentValue [Parameter] - public TValue Maximum { get; set; } + public TValue Max { get; set; } [Parameter] - public TValue Minimum { get; set; } + public TValue Min { get; set; } [Parameter] public int DecimalPlaces { get; set; } = 0; @@ -77,8 +77,8 @@ public BaseMatNumericUpDownFieldInternal() Decrease(); } }); - Maximum = SwitchT.GetMaximum(); - Minimum = SwitchT.GetMinimum(); + Max = SwitchT.GetMaximum(); + Min = SwitchT.GetMinimum(); ClassMapper.Add("mat-numeric-up-down-field"); ClassMapper.Add("mat-text-field-with-actions-container"); @@ -148,8 +148,8 @@ protected override bool TryParseValueFromString(string value, out TValue result, if (result != null) // Snap to Min/Max { var comparer = Comparer.Default; - if (Maximum != null && comparer.Compare(result, Maximum) > 0) result = Maximum; - if (Minimum != null && comparer.Compare(result, Minimum) < 0) result = Minimum; + if (Max != null && comparer.Compare(result, Max) > 0) result = Max; + if (Min != null && comparer.Compare(result, Min) < 0) result = Min; } return success; diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 9ece8463..23ef94c5 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -21,8 +21,8 @@ public BaseMatSlider() { jsHelper = new MatDotNetObjectReference(new MatSliderJsHelper()); jsHelper.Value.OnChangeEvent += Value_OnChangeEvent; - ValueMin = SwitchT.GetMinimum(); - ValueMax = SwitchT.GetMaximum(); + Min = SwitchT.GetMinimum(); + Max = SwitchT.GetMaximum(); Step = SwitchT.GetStep(); ClassMapper @@ -67,7 +67,7 @@ public override void Dispose() [Parameter] - public TValue ValueMin + public TValue Min { get => valueMin; set @@ -91,7 +91,7 @@ public TValue ValueMin } [Parameter] - public TValue ValueMax + public TValue Max { get => valueMax; set @@ -168,8 +168,8 @@ public string MarkerStyle { try { - decimal.TryParse(ValueMin.ToString(), out var min); - decimal.TryParse(ValueMax.ToString(), out var max); + decimal.TryParse(Min.ToString(), out var min); + decimal.TryParse(Max.ToString(), out var max); if (!decimal.TryParse(Step.ToString(), out var step)) { step = 1; diff --git a/src/MatBlazor/Components/MatSlider/MatSlider.razor b/src/MatBlazor/Components/MatSlider/MatSlider.razor index e47fafb5..58c366ad 100644 --- a/src/MatBlazor/Components/MatSlider/MatSlider.razor +++ b/src/MatBlazor/Components/MatSlider/MatSlider.razor @@ -4,7 +4,7 @@
From 147e87be62cdb67c8254308c318edbd3dbdfa487 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Thu, 16 Sep 2021 23:56:44 +0600 Subject: [PATCH 2/8] Add property ValueMin and method SetValueMin --- .../Components/MatSlider/BaseMatSlider.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 23ef94c5..93dbba97 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -65,6 +65,15 @@ public override void Dispose() jsHelper.Dispose(); } + [Parameter] + public TValue ValueMin + { + get => valueMin; + set + { + valueMin = SetValueMin(value); + } + } [Parameter] public TValue Min @@ -89,6 +98,24 @@ public TValue Min valueMin = value; } } + private TValue SetValueMin(TValue value) + { + if (!EqualityComparer.Default.Equals(valueMin, value) && Rendered) + { + InvokeAsync(async () => + { + try + { + await Js.InvokeVoidAsync("matBlazor.matSlider.updateValueMin", Ref, value); + } + catch (Exception e) + { + Console.WriteLine(e.Message); + } + }); + } + return value; + } [Parameter] public TValue Max From fa441bac05ab4fe6e5b789398fbbc6d3517c8858 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Thu, 16 Sep 2021 23:59:08 +0600 Subject: [PATCH 3/8] Set SetValueMin for valueMin --- .../Components/MatSlider/BaseMatSlider.cs | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 93dbba97..8e4a0680 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -81,21 +81,7 @@ public TValue Min get => valueMin; set { - if (!EqualityComparer.Default.Equals(valueMin, value) && Rendered) - { - InvokeAsync(async () => - { - try - { - await Js.InvokeVoidAsync("matBlazor.matSlider.updateValueMin", Ref, value); - } - catch (Exception e) - { - Console.WriteLine(e.Message); - } - }); - } - valueMin = value; + valueMin = SetValueMin(value); } } private TValue SetValueMin(TValue value) From 4a5beae22acb6f0276575a7edb8b2042a534cb20 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:03:23 +0600 Subject: [PATCH 4/8] Add method SetValueMax and property ValueMax --- .../Components/MatSlider/BaseMatSlider.cs | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 8e4a0680..4dac6fc6 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -103,28 +103,41 @@ private TValue SetValueMin(TValue value) return value; } + [Parameter] + public TValue ValueMax + { + get => valueMax; + set + { + valueMax = SetValueMax(value); + } + } [Parameter] public TValue Max { get => valueMax; set { - if (!EqualityComparer.Default.Equals(valueMax, value) && Rendered) + valueMax = SetValueMax(value); + } + } + private TValue SetValueMax(TValue value) + { + if (!EqualityComparer.Default.Equals(valueMax, value) && Rendered) + { + InvokeAsync(async () => { - InvokeAsync(async () => + try { - try - { - await Js.InvokeVoidAsync("matBlazor.matSlider.updateValueMax", Ref, value); - } - catch (Exception e) - { - Console.WriteLine(e.Message); - } - }); - } - valueMax = value; + await Js.InvokeVoidAsync("matBlazor.matSlider.updateValueMax", Ref, value); + } + catch (Exception e) + { + Console.WriteLine(e.Message); + } + }); } + return value; } [Parameter] From aff02a76378ac1c1dfdb460a722055705709d681 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:07:53 +0600 Subject: [PATCH 5/8] Add atributes --- src/MatBlazor/Components/MatSlider/BaseMatSlider.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 4dac6fc6..648d6654 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -66,6 +66,7 @@ public override void Dispose() } [Parameter] + [Obsolete] public TValue ValueMin { get => valueMin; @@ -104,6 +105,7 @@ private TValue SetValueMin(TValue value) } [Parameter] + [Obsolete] public TValue ValueMax { get => valueMax; From beaf540195e10193b56786900ac34f7ebd68e806 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Fri, 1 Oct 2021 11:34:45 +0600 Subject: [PATCH 6/8] Add parameters to MatNumericUpDownField --- .../BaseMatNumericUpDownFieldInternal.cs | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs index b514762e..84b7eb98 100644 --- a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs +++ b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -11,6 +12,8 @@ namespace MatBlazor /// sbyte, byte, short, ushort, int, uint, long, ulong, char, float, double, decimal, decimal? public class BaseMatNumericUpDownFieldInternal : MatInputTextComponent { + private TValue minimum; + private TValue maximum; protected override EventCallback OnKeyDownEvent() { return OnKeyDownEvent2; @@ -35,12 +38,46 @@ protected override TValue CurrentValue [Parameter] public bool AllowInput { get; set; } = true; + [Parameter] + public TValue Min + { + get => minimum; + set + { + minimum = value; + } + } [Parameter] - public TValue Max { get; set; } + [Obsolete] + public TValue Minimum + { + get => minimum; + set + { + minimum = value; + } + } + [Parameter] + public TValue Max + { + get => maximum; + set + { + maximum = value; + } + } [Parameter] - public TValue Min { get; set; } + [Obsolete] + public TValue Maximum + { + get => maximum; + set + { + maximum = value; + } + } [Parameter] public int DecimalPlaces { get; set; } = 0; From 2b792a6b14ee2557940fd197f808ad536864081a Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Fri, 1 Oct 2021 11:43:36 +0600 Subject: [PATCH 7/8] Add comment to obsolete --- src/MatBlazor/Components/MatSlider/BaseMatSlider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs index 648d6654..9bbf91f3 100644 --- a/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs +++ b/src/MatBlazor/Components/MatSlider/BaseMatSlider.cs @@ -66,7 +66,7 @@ public override void Dispose() } [Parameter] - [Obsolete] + [Obsolete("Use parameter Min")] public TValue ValueMin { get => valueMin; @@ -105,7 +105,7 @@ private TValue SetValueMin(TValue value) } [Parameter] - [Obsolete] + [Obsolete("Use parameter Max")] public TValue ValueMax { get => valueMax; From 82d0a1564ae26dc10e3e9bc1c118a51c5842ae44 Mon Sep 17 00:00:00 2001 From: AikelKocherbaeva <80120596+AikelKocherbaeva@users.noreply.github.com> Date: Fri, 1 Oct 2021 11:50:53 +0600 Subject: [PATCH 8/8] Change some docs --- .../Doc/DocMatNumericUpDownField.razor | 14 ++++++++++++-- src/MatBlazor.Demo/Doc/DocMatSlider.razor | 14 ++++++++++++-- src/MatBlazor.Demo/Shared/Sponsors.razor | 2 +- .../BaseMatNumericUpDownFieldInternal.cs | 4 ++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor b/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor index 01ef41e1..c0e6571d 100644 --- a/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor +++ b/src/MatBlazor.Demo/Doc/DocMatNumericUpDownField.razor @@ -135,12 +135,22 @@ - Max + Max TValue - Min + Maximum + TValue + + + + Min + TValue + + + + Minimum TValue diff --git a/src/MatBlazor.Demo/Doc/DocMatSlider.razor b/src/MatBlazor.Demo/Doc/DocMatSlider.razor index 4b6378c5..2f11cf53 100644 --- a/src/MatBlazor.Demo/Doc/DocMatSlider.razor +++ b/src/MatBlazor.Demo/Doc/DocMatSlider.razor @@ -64,6 +64,16 @@ Boolean + + Max + TValue + + + + Min + TValue + + Pin Boolean @@ -105,12 +115,12 @@ Gets or sets an expression that identifies the bound value. - Max + ValueMax TValue - Min + ValueMin TValue diff --git a/src/MatBlazor.Demo/Shared/Sponsors.razor b/src/MatBlazor.Demo/Shared/Sponsors.razor index 36acf9a1..ad247c43 100644 --- a/src/MatBlazor.Demo/Shared/Sponsors.razor +++ b/src/MatBlazor.Demo/Shared/Sponsors.razor @@ -33,7 +33,7 @@ The development is active and we are working hard to release great things for yo
  • Maurizio Verde
  • Adam Salvo
  • Dorana
    • -
  • Yevhen Shmakov
    • +
  • Eugene Shmakov
  • Jacobus Terhorst
  • Xiao Song
  • Martin Friesenbichler
    • diff --git a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs index 84b7eb98..92eb7059 100644 --- a/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs +++ b/src/MatBlazor/Components/MatNumericUpDownField/BaseMatNumericUpDownFieldInternal.cs @@ -49,7 +49,7 @@ public TValue Min } [Parameter] - [Obsolete] + [Obsolete("Use parameter Min")] public TValue Minimum { get => minimum; @@ -69,7 +69,7 @@ public TValue Max } [Parameter] - [Obsolete] + [Obsolete("Use parameter Max")] public TValue Maximum { get => maximum;