Radzen.Blazor updated

Fix #98

Radzen.Blazor/Radzen.Blazor.csproj

@@ -8,7 +8,7 @@
     <IsPackable>true</IsPackable>
     <PackageId>Radzen.Blazor</PackageId>
     <Product>Radzen.Blazor</Product>
-    <Version>3.2.2</Version>
+    <Version>3.2.3</Version>
     <Copyright>Radzen Ltd.</Copyright>
     <Authors>Radzen Ltd.</Authors>
     <Description>Native Blazor UI components by Radzen Ltd.</Description>

Radzen.Blazor/RadzenDropDownDataGrid.razor

@@ -21,12 +21,6 @@
                 @Template(selectedItem)
             </label>
         }
-        else if (SelectedValue != null)
-        {
-            <label class="rz-dropdown-label rz-inputtext rz-corner-all" onclick="@OpenPopupScript()" style="width:100%;">
-                @PropertyAccess.GetItemOrValueFromProperty(SelectedValue, TextProperty)
-            </label>
-        }
         else if (selectedItem != null)
         {
             <label class="rz-dropdown-label rz-inputtext " onclick="@OpenPopupScript()" style="width:100%;">
@@ -56,6 +50,12 @@
                 }
             </label>
         }
+        else if (SelectedValue != null)
+        {
+            <label class="rz-dropdown-label rz-inputtext rz-corner-all" onclick="@OpenPopupScript()" style="width:100%;">
+                @PropertyAccess.GetItemOrValueFromProperty(SelectedValue, TextProperty)
+            </label>
+        }
         else if (!string.IsNullOrEmpty(Placeholder))
         {
             <label class="rz-dropdown-label rz-inputtext  rz-placeholder" onclick="@OpenPopupScript()" style="width:100%;">
@@ -197,7 +197,8 @@
 
     private string GetPropertyFilterExpression(string property, string filterCaseSensitivityOperator)
     {
-        return $"{property}{filterCaseSensitivityOperator}.{Enum.GetName(typeof(StringFilterOperator), FilterOperator)}(@0)";
+        var p = $@"({property} == null ? """" : {property})";
+        return $"{p}{filterCaseSensitivityOperator}.{Enum.GetName(typeof(StringFilterOperator), FilterOperator)}(@0)";
     }
 
     private bool IsColumnFilterPropertyTypeString(RadzenGridColumn<object> column)
@@ -224,7 +225,7 @@
 
                 if (AllowFilteringByAllStringColumns)
                 {
-                    query = query.Where(string.Join(" || ", grid.ColumnsCollection.Where(c => IsColumnFilterPropertyTypeString(c))
+                    query = query.Where(string.Join(" || ", grid.ColumnsCollection.Where(c => c.Filterable && IsColumnFilterPropertyTypeString(c))
                         .Select(c => GetPropertyFilterExpression(c.GetFilterProperty(), filterCaseSensitivityOperator))),
                             FilterCaseSensitivity == FilterCaseSensitivity.CaseInsensitive ? searchText.ToLower() : searchText);
                 }

Radzen.Blazor/RadzenGrid.razor

@@ -977,6 +977,7 @@
         column.SetFilterValue(null);
         column.SetFilterValue(null, false);
         skip = 0;
+        CurrentPage = 0;
         await InvokeAsync(Reload);
     }
 
@@ -1202,6 +1203,7 @@
             {
                 column.SetFilterValue(args.Value, isFirst);
                 skip = 0;
+                CurrentPage = 0;
                 InvokeAsync(Reload);
             }
         }
@@ -1241,6 +1243,7 @@
     {
         var p = IsOData() ? property.Replace('.', '/') : PropertyAccess.GetProperty(property);
         skip = 0;
+        CurrentPage = 0;
         orderBy = orderBy == $"{p} desc" || orderBy == null || orderBy.IndexOf(p) == -1 ? $"{p} asc" : $"{p} desc";
         InvokeAsync(Reload);
     }
@@ -1249,6 +1252,7 @@
     {
         var p = IsOData() ? property.Replace('.', '/') : PropertyAccess.GetProperty(property);
         skip = 0;
+        CurrentPage = 0;
         orderBy = $"{p} desc";
         InvokeAsync(Reload);
     }

Radzen.Blazor/RadzenTree.razor

@@ -6,16 +6,16 @@
 @if (Visible)
 {
     <div @ref="@Element" @attributes="Attributes" class="@GetCssClass()" style="@Style" id="@GetId()">
-        <ul class="rz-tree-container">
+    <ul class="rz-tree-container">
         <CascadingValue Value=this>
             @ChildContent
         </CascadingValue>
         @if (Data != null && Levels.Any())
-        {
-            <CascadingValue Value=this>
-                @RenderChildren(Data, 0)
-            </CascadingValue>
-        }
+            {
+                <CascadingValue Value=this>
+                    @RenderChildren(Data, 0)
+                </CascadingValue>
+            }
         </ul>
     </div>
 }
@@ -43,13 +43,14 @@
     public IEnumerable Data { get; set; }
 
     [Parameter]
-    public object Value { get; set;}
+    public object Value { get; set; }
 
     [Parameter]
     public EventCallback<object> ValueChanged { get; set; }
 
-    void RenderTreeItem(RenderTreeBuilder builder, object data, RenderFragment<RadzenTreeItem> template, Func<object, string> text, 
-        Func<object, bool> hasChildren, Func<object, bool> expanded, Func<object, bool> selected)
+    void RenderTreeItem(RenderTreeBuilder builder, object data, RenderFragment<RadzenTreeItem> template, Func<object,
+    string> text,
+    Func<object, bool> hasChildren, Func<object, bool> expanded, Func<object, bool> selected)
     {
         builder.OpenComponent<RadzenTreeItem>(0);
         builder.AddAttribute(1, nameof(RadzenTreeItem.Text), text(data));
@@ -162,12 +163,19 @@
         return PropertyAccess.Getter<T>(data, property);
     }
 
-    protected override void OnParametersSet()
+    public override async Task SetParametersAsync(ParameterView parameters)
     {
-        if (Value == null)
+        if (parameters.DidParameterChange(nameof(Value), Value))
         {
-            SelectedItem = null;
+            var value = parameters.GetValueOrDefault<object>(nameof(Value));
+            
+            if (value == null)
+            {
+                SelectedItem = null;
+            }
         }
+
+        await base.SetParametersAsync(parameters);
     }
 
     internal void AddLevel(RadzenTreeLevel level)

Radzen.Blazor/themes/components/blazor/_numeric.scss

@@ -1,5 +1,5 @@
 $numeric-line-height: 1.5rem !default;
-$numeric-input-padding: 1px 12px 1px 1px;
+$numeric-input-padding: 1px 12px 1px 0.5rem;
 $numeric-button-width: 0.875rem !default;
 $numeric-button-height: $numeric-button-width !default;
 $numeric-button-border-radius: 2px !default;
@@ -14,20 +14,19 @@ $numeric-button-color: $white !default;
 
   @extend %input;
 
+  padding: 0px;
+
   input[type='number'],
   input[type='text'] {
     -moz-appearance: textfield;
     width: 100%;
+    height: 100%;
     border: none;
     background-color: transparent;
     line-height: $numeric-line-height;
     text-align: inherit;
     padding: $numeric-input-padding;
 
-    &:focus {
-      outline: none;
-    }
-
     &::-webkit-inner-spin-button,
     &::-webkit-outer-spin-button {
       -webkit-appearance: none;

RadzenBlazorDemos/Pages/DataGridFooterTotalsPage.razor

@@ -3,7 +3,7 @@
 @using RadzenBlazorDemos.Data
 @using RadzenBlazorDemos.Models.Northwind
 @using Microsoft.EntityFrameworkCore
-
+@using System.Linq 
 @inject NorthwindContext dbContext
 
 <h1>DataGrid Footer Totals</h1>
@@ -18,8 +18,13 @@
 else
 {
     <RadzenGrid @ref="ordersGrid" AllowFiltering="true" AllowPaging="true" PageSize="3" AllowSorting="true" 
-                Data="@dbContext.Orders.Include("Customer").Include("Employee")" TItem="Order">
+                Data="@orders" TItem="Order">
         <Columns>
+            <RadzenGridColumn Width="50px" TItem="Order" Title="Nr." Filterable="false" Sortable="false" TextAlign="TextAlign.Center">
+                <Template>
+                    @(orders.IndexOf(context) + 1)
+                </Template>
+            </RadzenGridColumn>
             <RadzenGridColumn Width="200px" TItem="Order" Property="OrderID" Title="Order ID">
                 <FooterTemplate>
                     Displayed orders: <b>@ordersGrid.View.Count()</b> of <b>@orders.Count()</b>
@@ -56,7 +61,7 @@ else
 
 @code {
     RadzenGrid<Order> ordersGrid;
-    IEnumerable<Order> orders;
+    IList<Order> orders;
 
     protected override void OnInitialized()
     {

RadzenBlazorDemos/RadzenBlazorDemos.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Radzen.Blazor" Version="3.2.2" />
+    <PackageReference Include="Radzen.Blazor" Version="3.2.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />