diff --git a/GridBlazor/CGrid.cs b/GridBlazor/CGrid.cs index 675ca7f2..842ab5e4 100644 --- a/GridBlazor/CGrid.cs +++ b/GridBlazor/CGrid.cs @@ -343,6 +343,11 @@ public bool EnablePaging /// public GridMode Mode { get; internal set; } + /// + /// Grid direction + /// + public GridDirection Direction { get; set; } = GridDirection.LTR; + /// /// Get and set export to an Excel file /// diff --git a/GridBlazor/Client/GridClient.cs b/GridBlazor/Client/GridClient.cs index 77cdecd9..c9fc8f7e 100644 --- a/GridBlazor/Client/GridClient.cs +++ b/GridBlazor/Client/GridClient.cs @@ -668,6 +668,12 @@ public IGridClient AddToOnAfterRender(Func, bool, Task> OnAf return this; } + public IGridClient SetDirection(GridDirection dir) + { + _source.Direction = dir; + return this; + } + /// /// Get grid object /// diff --git a/GridBlazor/Client/IGridClient.cs b/GridBlazor/Client/IGridClient.cs index f01ac1b2..0c34c292 100644 --- a/GridBlazor/Client/IGridClient.cs +++ b/GridBlazor/Client/IGridClient.cs @@ -471,6 +471,11 @@ IGridClient AddButtonComponent(string name, string label, IList IGridClient AddToOnAfterRender(Func, bool, Task> OnAfterRender); + /// + /// Setup the direction of grid + /// + IGridClient SetDirection(GridDirection dir); + /// /// Get grid object /// diff --git a/GridBlazor/GridOptions.cs b/GridBlazor/GridOptions.cs index b92bc9b7..411082eb 100644 --- a/GridBlazor/GridOptions.cs +++ b/GridBlazor/GridOptions.cs @@ -1,33 +1,33 @@ -namespace GridBlazor -{ - public class GridOptions - { - public GridOptions(string gridName) - { - GridName = gridName; - Selectable = false; - MultiSelectable = false; - AllowMultipleFilters = false; - ShowGridItemsCount = false; - RenderRowsOnly = false; - Striped = false; - } - - public GridOptions() - : this(string.Empty) - { - } - - /// - /// Is multiple filters allowed - /// - public bool AllowMultipleFilters { get; set; } - - /// - /// Gets or set grid items selectable - /// - public bool Selectable { get; set; } - +namespace GridBlazor +{ + public class GridOptions + { + public GridOptions(string gridName) + { + GridName = gridName; + Selectable = false; + MultiSelectable = false; + AllowMultipleFilters = false; + ShowGridItemsCount = false; + RenderRowsOnly = false; + Striped = false; + } + + public GridOptions() + : this(string.Empty) + { + } + + /// + /// Is multiple filters allowed + /// + public bool AllowMultipleFilters { get; set; } + + /// + /// Gets or set grid items selectable + /// + public bool Selectable { get; set; } + /// /// Gets or sets a value indicating whether multiple grid items are selectable /// @@ -36,44 +36,44 @@ public GridOptions() /// /// /// TODO Edit XML Comment Template for MultiSelectable - public bool MultiSelectable {get;set;} - - /// - /// Gets or set init selection on selectable grids - /// - public bool InitSelection { get; set; } - - /// - /// Specify grid Id on the client side - /// - public string GridName { get; set; } - - - /// - /// Specify to render grid body only - /// - public bool RenderRowsOnly { get; set; } - - /// - /// Does items count need to show - /// - Author Jeeva J - /// - public bool ShowGridItemsCount { get; set; } - - /// - /// To show string while show grid items count - /// - Author Jeeva J - /// - public string GridCountDisplayName { get; set; } - - /// - /// Get value for striped grid - /// - public bool Striped { get; set; } - - public static GridOptions Create(string gridName) - { - return new GridOptions(gridName); - } - } + public bool MultiSelectable {get;set;} + + /// + /// Gets or set init selection on selectable grids + /// + public bool InitSelection { get; set; } + + /// + /// Specify grid Id on the client side + /// + public string GridName { get; set; } + + + /// + /// Specify to render grid body only + /// + public bool RenderRowsOnly { get; set; } + + /// + /// Does items count need to show + /// - Author Jeeva J + /// + public bool ShowGridItemsCount { get; set; } + + /// + /// To show string while show grid items count + /// - Author Jeeva J + /// + public string GridCountDisplayName { get; set; } + + /// + /// Get value for striped grid + /// + public bool Striped { get; set; } + + public static GridOptions Create(string gridName) + { + return new GridOptions(gridName); + } + } } \ No newline at end of file diff --git a/GridBlazor/Pages/BooleanFilterComponent.razor b/GridBlazor/Pages/BooleanFilterComponent.razor index c3cdfed4..edf439ce 100644 --- a/GridBlazor/Pages/BooleanFilterComponent.razor +++ b/GridBlazor/Pages/BooleanFilterComponent.razor @@ -4,8 +4,8 @@ @if (Visible) { -
-
+
0 ? "margin-left:-" + _offset.ToString() + "px;" : "")" @ref="boolFilter" @onkeyup="FilterKeyup" @onclick:stopPropagation @onkeyup:stopPropagation> +
0 ? "margin-left:" + _offset.ToString() + "px" : "")">
@@ -22,7 +22,7 @@ -
+
@if (_clearVisible) diff --git a/GridBlazor/Pages/BooleanFilterComponent.razor.cs b/GridBlazor/Pages/BooleanFilterComponent.razor.cs index 3a3ff727..62960c01 100644 --- a/GridBlazor/Pages/BooleanFilterComponent.razor.cs +++ b/GridBlazor/Pages/BooleanFilterComponent.razor.cs @@ -44,10 +44,21 @@ protected override async Task OnAfterRenderAsync(bool firstRender) { await jSRuntime.InvokeVoidAsync("gridJsFunctions.focusElement", boolFilter); ScreenPosition sp = await jSRuntime.InvokeAsync("gridJsFunctions.getPosition", boolFilter); - if (sp != null && sp.X + sp.Width > sp.InnerWidth) + if (GridHeaderComponent.GridComponent.Grid.Direction == GridShared.GridDirection.RTL) { - _offset = sp.X + sp.Width - sp.InnerWidth + 25; - StateHasChanged(); + if (sp != null && sp.X < 0) + { + _offset = -sp.X + 25; + StateHasChanged(); + } + } + else + { + if (sp != null && sp.X + sp.Width > sp.InnerWidth) + { + _offset = sp.X + sp.Width - sp.InnerWidth + 25; + StateHasChanged(); + } } } } diff --git a/GridBlazor/Pages/DateTimeFilterComponent.razor b/GridBlazor/Pages/DateTimeFilterComponent.razor index fccda55f..1d8abfb7 100644 --- a/GridBlazor/Pages/DateTimeFilterComponent.razor +++ b/GridBlazor/Pages/DateTimeFilterComponent.razor @@ -4,8 +4,8 @@ @if (Visible) { -
-
+
0 ? "margin-left:-" + _offset.ToString() + "px;" : "")" @ref="dateTimeFilter" @onkeyup="FilterKeyup" @onclick:stopPropagation @onkeyup:stopPropagation> +
0 ? "margin-left:" + _offset.ToString() + "px" : "")">
@@ -14,8 +14,8 @@ int j = i; if (j == 1) { -
-
+
+
@@ -85,26 +85,26 @@
} -
-
+
+
-
+
@if (_filters.Length > 1) { - + }
-
+
@if (_clearVisible) { -