-
 : imageSrc))
+
+
+
+
+
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.cs
index 8643759f39..e9f7f3d34f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.cs
@@ -54,7 +54,26 @@ public partial class _BitDropdownOptionDemo
new() { Text = "Carrot", Value = "v-car", Class = "custom-veg" },
new() { Text = "Lettuce", Value = "v-let", Class = "custom-veg" }
};
+ private readonly List> comboBoxItems = new()
+ {
+ new() { ItemType = BitDropdownItemType.Header, Text = "Fruits" },
+ new() { Text = "Apple", Value = "f-app" },
+ new() { Text = "Banana", Value = "f-ban" },
+ new() { Text = "Orange", Value = "f-ora", IsEnabled = false },
+ new() { Text = "Grape", Value = "f-gra" },
+ new() { ItemType = BitDropdownItemType.Divider },
+ new() { ItemType = BitDropdownItemType.Header, Text = "Vegetables" },
+ new() { Text = "Broccoli", Value = "v-bro" },
+ new() { Text = "Carrot", Value = "v-car" },
+ new() { Text = "Lettuce", Value = "v-let" }
+ };
+ private BitDropdownNameSelectors, string> nameSelectors = new()
+ {
+ DynamicValueGenerator = ((BitDropdownOption item) => item.Text),
+ ValueSetter = ((BitDropdownOption item, string? value) => item.Value = value),
+ TextSetter = ((string? text, BitDropdownOption item) => item.Text = text)
+ };
private string controlledValue = "f-app";
@@ -72,6 +91,9 @@ public partial class _BitDropdownOptionDemo
private string successMessage = string.Empty;
private FormValidationDropdownModel validationModel = new();
+ private string? comboBoxValue;
+ private ICollection comboBoxValues = [];
+
protected override void OnInitialized()
{
@@ -96,4 +118,9 @@ private void HandleInvalidSubmit()
{
successMessage = string.Empty;
}
+
+ private void HandleOnDynamicAdd(BitDropdownOption item)
+ {
+ comboBoxItems.Add(new() { Text = item.Text, Value = item.Value });
+ }
}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.samples.cs
index b84ed13532..0db8e9b34c 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor.samples.cs
@@ -251,8 +251,7 @@ public partial class _BitDropdownOptionDemo
Selected Value: @selectedItem2?.Value
-IsSelected: @selectedItem2?.IsSelected ";
+Selected Value: @selectedItem2?.Value ";
private readonly string example3CsharpCode = @"
private string controlledValue = ""f-app"";
private ICollection controlledValues = new[] { ""f-app"", ""f-ban"" };
@@ -653,6 +652,69 @@ private async Task HandleValidSubmit() { }
private void HandleInvalidSubmit() { }
private readonly List> basicItems = new()
+{
+ new() { ItemType = BitDropdownItemType.Header, Text = ""Fruits"" },
+ new() { Text = ""Apple"", Value = ""f-app"" },
+ new() { Text = ""Banana"", Value = ""f-ban"" },
+ new() { Text = ""Orange"", Value = ""f-ora"", IsEnabled = false },
+ new() { Text = ""Grape"", Value = ""f-gra"" },
+ new() { ItemType = BitDropdownItemType.Divider },
+ new() { ItemType = BitDropdownItemType.Header, Text = ""Vegetables"" },
+ new() { Text = ""Broccoli"", Value = ""v-bro"" },
+ new() { Text = ""Carrot"", Value = ""v-car"" },
+ new() { Text = ""Lettuce"", Value = ""v-let"" }
+};";
+
+ private readonly string example11RazorCode = @"
+ item) => HandleOnDynamicAdd(item)""
+ Combo
+ Chips
+ Dynamic
+ TItem=""BitDropdownOption"" TValue=""string"">
+ @foreach (var item in comboBoxItems)
+ {
+
+Value: @comboBoxValue
+
+ item) => HandleOnDynamicAdd(item)""
+ Combo
+ Chips
+ Dynamic
+ TItem=""BitDropdownOption"" TValue=""string"">
+ @foreach (var item in comboBoxItems)
+ {
+
+Values: @string.Join(',', comboBoxValues) ";
+ private readonly string example11CsharpCode = @"
+private string? comboBoxValue;
+private ICollection comboBoxValues = [];
+
+private BitDropdownNameSelectors, string> nameSelectors = new()
+{
+ DynamicValueGenerator = ((BitDropdownOption item) => item.Text),
+ ValueSetter = ((BitDropdownOption item, string? value) => item.Value = value),
+ TextSetter = ((string? text, BitDropdownOption item) => item.Text = text)
+};
+
+private void HandleOnDynamicAdd(BitDropdownOption item)
+{
+ comboBoxItems.Add(new() { Text = item.Text, Value = item.Value });
+}
+
+private readonly List> comboBoxItems = new()
{
new() { ItemType = BitDropdownItemType.Header, Text = ""Fruits"" },
new() { Text = ""Apple"", Value = ""f-app"" },
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor
index b1a6aaeb9f..fee98f3e69 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor
@@ -62,12 +62,12 @@
-
+
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor.cs
index 4d7013b349..3233d4db6f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/NumericTextField/BitNumericTextFieldDemo.razor.cs
@@ -135,6 +135,13 @@ public partial class BitNumericTextFieldDemo
Description = "Max value of the numeric text field. If not provided, the numeric text field has max value.",
},
new()
+ {
+ Name = "NumberFormat",
+ Type = "string",
+ DefaultValue = "{0}",
+ Description = "The format of the number in the numeric text field.",
+ },
+ new()
{
Name = "OnChange",
Type = "EventCallback",
@@ -207,13 +214,6 @@ public partial class BitNumericTextFieldDemo
Description = "Custom CSS styles for different parts of the BitNumericTextField.",
},
new()
- {
- Name = "Suffix",
- Type = "string",
- DefaultValue = "string.Empty",
- Description = "A text is shown after the numeric text field value.",
- },
- new()
{
Name = "ShowButtons",
Type = "bool",
@@ -427,8 +427,8 @@ private void HandleInvalidSubmit()
DecrementIconName=""@BitIconName.DislikeSolid"" />";
private readonly string example4RazorCode = @"
-Header Template (in Grouped mode)
-
+ RenderType=""BitNavRenderType.Grouped""
+ NameSelectors=""@(new() { Text = { Name = nameof(CarMenu.Name) },
+ Url = { Name = nameof(CarMenu.PageUrl) },
+ Target = { Name = nameof(CarMenu.UrlTarget) },
+ Title = { Name = nameof(CarMenu.Tooltip) },
+ IsExpanded = { Name = nameof(CarMenu.IsExpandedParent) },
+ CollapseAriaLabel = { Name = nameof(CarMenu.CollapsedAriaLabel) },
+ ExpandAriaLabel = { Name = nameof(CarMenu.ExpandedAriaLabel) },
+ ChildItems = { Name = nameof(CarMenu.Links) },
+ Description = { Name = nameof(CarMenu.Comment) } })"">
Item Template
- item.Name""
- IconNameFieldSelector=""item => item.Icon""
- IsExpandedFieldSelector=""item => item.IsExpanded""
- ChildItemsFieldSelector=""item => item.Childs""
- Mode=""BitNavMode.Manual"">
+
+ item.Name },
+ IconName = { Selector = item => item.Icon },
+ ChildItems = { Selector = item => item.Childs },
+ Description = { Selector = item => item.Comment } })"">
Links { get; set; } = new();
+ public List Links { get; set; } = [];
}
public class FoodMenu
@@ -1636,7 +1679,7 @@ public class FoodMenu
public string Name { get; set; } = string.Empty;
public string Icon { get; set; }
public bool IsExpanded { get; set; }
- public List Childs { get; set; } = new();
+ public List Childs { get; set; } = [];
}
private static readonly List CustomCarNavMenu = new()
@@ -1748,26 +1791,25 @@ public class FoodMenu
private readonly string example5CustomItemRazorCode = @"
item.Name""
- IconNameFieldSelector=""item => item.Icon""
- IsExpandedFieldSelector=""item => item.IsExpanded""
- ChildItemsFieldSelector=""item => item.Childs""
- DefaultSelectedItem=""CustomFoodNavMenu[0].Childs[2]""
Mode=""BitNavMode.Manual""
+ DefaultSelectedItem=""CustomFoodNavMenu[0].Childs[2]""
OnItemClick=""(FoodMenu item) => CustomClickedItem = item""
OnSelectItem=""(FoodMenu item) => CustomSelectedItem = item""
- OnItemToggle=""(FoodMenu item) => CustomToggledItem = item"" />
-
-Clicked Item: @CustomClickedItem?.Name
-Selected Item: @CustomSelectedItem?.Name
-Toggled Item: @(CustomToggledItem is null ? ""N/A"" : $""{CustomToggledItem.Name} ({(CustomToggledItem.IsExpanded ? ""Expanded"" : ""Collapsed"")})"")";
+ OnItemToggle=""(FoodMenu item) => CustomToggledItem = item""
+ NameSelectors=""@(new() { Text = { Selector = item => item.Name },
+ IconName = { Selector = item => item.Icon },
+ ChildItems = { Selector = item => item.Childs },
+ Description = { Selector = item => item.Comment } })"" />
+ Childs { get; set; } = new();
+ public List Childs { get; set; } = [];
}
private static readonly List CustomFoodNavMenu = new()
@@ -1824,13 +1866,10 @@ public class FoodMenu
private FoodMenu CustomToggledItem;";
private readonly string example6CustomItemRazorCode = @"
- Links { get; set; } = new();
+ public bool IsExpanded { get; set; }
+ public List Links { get; set; } = [];
}
-private static readonly List CustomBitPlatformNavMenu = new()
+private static readonly List CustomCustomStyleNavMenu = new()
{
new()
{
@@ -1898,6 +1938,7 @@ public class BitPlatformMenu
ExpandAriaLabel=""bit platform Expanded""
CollapseAriaLabel=""bit platform Collapsed"">
-
+
+
+
+
+
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/BitPlatformMenu.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/BitPlatformMenu.cs
index 4a162a3b1f..3aa52c873f 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/BitPlatformMenu.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/BitPlatformMenu.cs
@@ -6,6 +6,9 @@ public class BitPlatformMenu
public string? Icon { get; set; }
public string? Url { get; set; }
public bool IsEnabled { get; set; } = true;
- public List Links { get; set; } = new();
+ public bool IsExpanded { get; set; }
+ public bool IsSeparator { get; set; }
+ public List Links { get; set; } = [];
public string? Comment { get; set; }
+ public RenderFragment? Template { get; set; }
}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/CarMenu.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/CarMenu.cs
index 4b66140851..6befe3dcac 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/CarMenu.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/CarMenu.cs
@@ -9,6 +9,6 @@ public class CarMenu
public string? ExpandedAriaLabel { get; set; }
public string? CollapsedAriaLabel { get; set; }
public bool IsExpandedParent { get; set; }
- public List Links { get; set; } = new();
+ public List Links { get; set; } = [];
public string? Comment { get; set; }
}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/FoodMenu.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/FoodMenu.cs
index dad4067132..43a349cdd3 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/FoodMenu.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Nav/FoodMenu.cs
@@ -5,6 +5,6 @@ public class FoodMenu
public string Name { get; set; } = string.Empty;
public string? Icon { get; set; }
public bool IsExpanded { get; set; }
- public List Childs { get; set; } = new();
+ public List Childs { get; set; } = [];
public string? Comment { get; set; }
}
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/ProgressIndicator/BitProgressIndicatorDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/ProgressIndicator/BitProgressIndicatorDemo.razor
index 659cb1bfaf..66efd21f2b 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/ProgressIndicator/BitProgressIndicatorDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/ProgressIndicator/BitProgressIndicatorDemo.razor
@@ -6,6 +6,7 @@
Description="progressindicator component of the bit BlazorUI components" />
componentSubClasses = new()
+ {
+ new()
+ {
+ Id = "progressIndicator-class-styles",
+ Title = "BitProgressIndicatorClassStyles",
+ Parameters = new()
+ {
+ new()
+ {
+ Name = "Root",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the root element of the BitProgressIndicator."
+ },
+ new()
+ {
+ Name = "LabelContainer",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the label container of the BitProgressIndicator."
+ },
+ new()
+ {
+ Name = "IndicatorWrapper",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the indicator wrapper of the BitProgressIndicator."
+ },
+ new()
+ {
+ Name = "Tracker",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the tracker of the BitProgressIndicator."
+ },
+ new()
+ {
+ Name = "Bar",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the bar of the BitProgressIndicator."
+ },
+ new()
+ {
+ Name = "DescriptionContainer",
+ Type = "string?",
+ DefaultValue = "null",
+ Description = "Custom CSS classes/styles for the description container of the BitProgressIndicator."
+ }
+ }
}
};
@@ -77,7 +156,7 @@ public partial class BitProgressIndicatorDemo
PercentComplete=""@CompletedPercent""
BarHeight=""50"" />
-Start Progress ";
+Start Progress ";
private readonly string example1CsharpCode = @"
private int CompletedPercent;
private string Description = ""Push button to start!"";
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
index b49e026d6d..43c7304e99 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Shared/NavMenu.razor.cs
@@ -32,7 +32,7 @@ public partial class NavMenu : IDisposable
{
new() { Text = "Checkbox", Url = "/components/checkbox", AdditionalUrls = new string[] { "/components/check-box" } },
new() { Text = "ChoiceGroup", Url = "/components/choicegroup", AdditionalUrls = new string[] { "/components/choice-group" }, Description = "Radio, RadioButton" },
- new() { Text = "Dropdown", Url = "/components/dropdown", Description = "Select, MultiSelect" },
+ new() { Text = "Dropdown", Url = "/components/dropdown", Description = "Select, MultiSelect, ComboBox" },
new() { Text = "Rating", Url = "/components/rating" },
new() { Text = "SearchBox", Url = "/components/searchbox", AdditionalUrls = new string[] { "/components/search-box" } },
new() { Text = "Slider", Url = "/components/slider", Description = "Range" },
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
index ff9bbe606e..4572fc2173 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj
@@ -81,12 +81,12 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
index ad184b76e4..15123b53ac 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/Bit.BlazorUI.Demo.Client.Web.csproj
@@ -14,6 +14,7 @@
false
true
Default
+ true
@@ -26,12 +27,12 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
index 830250d093..c3e783bb88 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
// https://github.com/bitfoundation/bitplatform/tree/develop/src/Bswup
self.assetsInclude = [];
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
index c32f6b1e17..a6c91e93bd 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"vpk": {
- "version": "0.0.212",
+ "version": "0.0.276",
"commands": [
"vpk"
]
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
index ece42e811b..05c458f1e9 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj
@@ -16,17 +16,17 @@
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
PreserveNewest
diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props
index 175b9a502d..b411651108 100644
--- a/src/BlazorUI/Demo/Directory.Build.props
+++ b/src/BlazorUI/Demo/Directory.Build.props
@@ -1,4 +1,4 @@
-
+
12.0
diff --git a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj
index ca3e06ece3..66d002e1e0 100644
--- a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj
+++ b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj
@@ -6,6 +6,7 @@
enable
service-worker-assets.js
false
+ true
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
index 791512617d..770e5b4d2d 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
index 127b77f11e..0353c13851 100644
--- a/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.Demo/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
self.caseInsensitiveUrl = true;
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj
index a15cb4b613..bcf52ac28e 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj
@@ -8,6 +8,7 @@
Default
service-worker-assets.js
false
+ true
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
index a948a599dd..b67538da1f 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
index 8aef76487b..2c3e508d90 100644
--- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
self.assetsInclude = [];
self.assetsExclude = [
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
index 492d283cbd..0c73519605 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bswup.progress version'] = '8.7.4';
+window['bit-bswup.progress version'] = '8.7.5';
; (function () {
(window as any).startBswupProgress = (autoReload: boolean,
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
index b800b1d556..5d14076461 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.sw.ts
@@ -1,4 +1,4 @@
-self['bit-bswup.sw version'] = '8.7.4';
+self['bit-bswup.sw version'] = '8.7.5';
interface Window {
clients: any
diff --git a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
index bd1d232221..eebee63df2 100644
--- a/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
+++ b/src/Bswup/Bit.Bswup/Scripts/bit-bswup.ts
@@ -1,4 +1,4 @@
-window['bit-bswup version'] = '8.7.4';
+window['bit-bswup version'] = '8.7.5';
declare const Blazor: any;
diff --git a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj
index 3b3d93cfc9..f7b5d3c357 100644
--- a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj
+++ b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj
@@ -6,6 +6,7 @@
enable
service-worker-assets.js
false
+ true
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
index 036dab2772..2ecf6d6231 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
// In development, always fetch from the network and do not enable offline support.
// This is because caching would make development more difficult (changes would not
diff --git a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
index a6586ef4a9..de174d5456 100644
--- a/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
+++ b/src/Bswup/FullDemo/Client/wwwroot/service-worker.published.js
@@ -1,4 +1,4 @@
-// bit version: 8.7.4
+// bit version: 8.7.5
self.assetsInclude = [];
self.assetsExclude = [/\.scp\.css$/, /weather\.json$/];
diff --git a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj
index dfaa3989c8..bf5f369742 100644
--- a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj
+++ b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj
@@ -4,6 +4,7 @@
net8.0
enable
enable
+ true
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
index 25d85e100a..30ee801099 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.progress.ts
@@ -1,4 +1,4 @@
-window['bit-bup.progress version'] = '8.7.4';
+window['bit-bup.progress version'] = '8.7.5';
; (function () {
(window as any).startBupProgress = (showLogs: boolean, showAssets: boolean, appContainerSelector: string, hideApp: boolean, autoHide: boolean) => {
diff --git a/src/Bup/Bit.Bup/Scripts/bit-bup.ts b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
index 76eba2d0b9..496939d427 100644
--- a/src/Bup/Bit.Bup/Scripts/bit-bup.ts
+++ b/src/Bup/Bit.Bup/Scripts/bit-bup.ts
@@ -1,4 +1,4 @@
-window['bit-bup version'] = '8.7.4';
+window['bit-bup version'] = '8.7.5';
declare const Blazor: any;
diff --git a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj
index 0157da5296..f225ef5945 100644
--- a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj
+++ b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj
@@ -4,6 +4,7 @@
net8.0
enable
enable
+ true
diff --git a/src/Butil/Bit.Butil/Bit.Butil.csproj b/src/Butil/Bit.Butil/Bit.Butil.csproj
index afca1cbc5f..adedf819f4 100644
--- a/src/Butil/Bit.Butil/Bit.Butil.csproj
+++ b/src/Butil/Bit.Butil/Bit.Butil.csproj
@@ -4,6 +4,7 @@
net8.0
+ true
BeforeBuildTasks;
$(ResolveStaticWebAssetsInputsDependsOn)
diff --git a/src/Butil/Bit.Butil/BitButil.cs b/src/Butil/Bit.Butil/BitButil.cs
index a8caa76bfa..735263a3c5 100644
--- a/src/Butil/Bit.Butil/BitButil.cs
+++ b/src/Butil/Bit.Butil/BitButil.cs
@@ -11,7 +11,6 @@ public static IServiceCollection AddBitButilServices(this IServiceCollection ser
services.AddTransient();
services.AddTransient();
services.AddTransient();
- services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -19,6 +18,7 @@ public static IServiceCollection AddBitButilServices(this IServiceCollection ser
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
return services;
}
diff --git a/src/Butil/Bit.Butil/Internals/Element/FullScreenJsOptions.cs b/src/Butil/Bit.Butil/Internals/Element/FullScreenJsOptions.cs
new file mode 100644
index 0000000000..2fb353c953
--- /dev/null
+++ b/src/Butil/Bit.Butil/Internals/Element/FullScreenJsOptions.cs
@@ -0,0 +1,6 @@
+namespace Bit.Butil;
+
+internal class FullScreenJsOptions
+{
+ public string NavigationUI { get; set; } = default!;
+}
diff --git a/src/Butil/Bit.Butil/Internals/Element/ScrollIntoViewJsOptions.cs b/src/Butil/Bit.Butil/Internals/Element/ScrollIntoViewJsOptions.cs
new file mode 100644
index 0000000000..74dc02fd3d
--- /dev/null
+++ b/src/Butil/Bit.Butil/Internals/Element/ScrollIntoViewJsOptions.cs
@@ -0,0 +1,10 @@
+namespace Bit.Butil;
+
+internal class ScrollIntoViewJsOptions
+{
+ public string Behavior { get; set; } = default!;
+
+ public string Block { get; set; } = default!;
+
+ public string Inline { get; set; } = default!;
+}
diff --git a/src/Butil/Bit.Butil/Internals/Element/ScrollJsOptions.cs b/src/Butil/Bit.Butil/Internals/Element/ScrollJsOptions.cs
new file mode 100644
index 0000000000..c06166b3df
--- /dev/null
+++ b/src/Butil/Bit.Butil/Internals/Element/ScrollJsOptions.cs
@@ -0,0 +1,10 @@
+namespace Bit.Butil;
+
+internal class ScrollJsOptions
+{
+ public string Behavior { get; set; } = default!;
+
+ public double? Top { get; set; }
+
+ public double? Left { get; set; }
+}
diff --git a/src/Butil/Bit.Butil/Internals/Events/DomEventDispatcher.cs b/src/Butil/Bit.Butil/Internals/Events/DomEventDispatcher.cs
index bc15942bbe..27c62b2e69 100644
--- a/src/Butil/Bit.Butil/Internals/Events/DomEventDispatcher.cs
+++ b/src/Butil/Bit.Butil/Internals/Events/DomEventDispatcher.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
using Microsoft.JSInterop;
namespace Bit.Butil;
@@ -9,6 +10,11 @@ internal static class DomEventDispatcher
private static readonly object FalseUseCapture = false;
private static readonly object TrueUseCapture = true;
+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ButilMouseEventArgs))]
+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(ButilKeyboardEventArgs))]
+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DomEventListenersManager))]
+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DomMouseEventListenersManager))]
+ [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DomKeyboardEventListenersManager))]
internal static async Task AddEventListener(IJSRuntime js,
string elementName,
string domEvent,
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/ConsoleJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/ConsoleJsInterop.cs
deleted file mode 100644
index 948ad526b4..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/ConsoleJsInterop.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class ConsoleJsInterop
-{
- internal static async Task ConsoleAssert(this IJSRuntime js, bool? condition, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.assert", [condition, .. args]);
-
- internal static async Task ConsoleClear(this IJSRuntime js)
- => await js.InvokeVoidAsync("BitButil.console.clear");
-
- internal static async Task ConsoleCount(this IJSRuntime js, string? label)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.count")
- : js.InvokeVoidAsync("BitButil.console.count", label));
-
- internal static async Task ConsoleCountReset(this IJSRuntime js, string? label)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.countReset")
- : js.InvokeVoidAsync("BitButil.console.countReset", label));
-
- internal static async Task ConsoleDebug(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.debug", args);
-
- internal static async Task ConsoleDir(this IJSRuntime js, object? item, object? options)
- => await js.InvokeVoidAsync("BitButil.console.dir", item, options);
-
- internal static async Task ConsoleDirxml(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.dirxml", args);
-
- internal static async Task ConsoleError(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.error", args);
-
- internal static async Task ConsoleGroup(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.group", args);
-
- internal static async Task ConsoleGroupCollapsed(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.groupCollapsed", args);
-
- internal static async Task ConsoleGroupEnd(this IJSRuntime js)
- => await js.InvokeVoidAsync("BitButil.console.groupEnd");
-
- internal static async Task ConsoleInfo(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.info", args);
-
- internal static async Task ConsoleLog(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.log", args);
-
- internal static async Task ConsoleProfile(this IJSRuntime js, string? name)
- => await (name is null ? js.InvokeVoidAsync("BitButil.console.profile")
- : js.InvokeVoidAsync("BitButil.console.profile", name));
-
- internal static async Task ConsoleProfileEnd(this IJSRuntime js, string? name)
- => await (name is null ? js.InvokeVoidAsync("BitButil.console.profileEnd")
- : js.InvokeVoidAsync("BitButil.console.profileEnd", name));
-
- internal static async Task ConsoleTable(this IJSRuntime js, object? data, object? properties)
- => await (properties is null ? js.InvokeVoidAsync("BitButil.console.table", data)
- : js.InvokeVoidAsync("BitButil.console.table", data, properties));
-
- internal static async Task ConsoleTime(this IJSRuntime js, string? label)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.time")
- : js.InvokeVoidAsync("BitButil.console.time", label));
-
- internal static async Task ConsoleTimeEnd(this IJSRuntime js, string? label)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.timeEnd")
- : js.InvokeVoidAsync("BitButil.console.timeEnd", label));
-
- internal static async Task ConsoleTimeLog(this IJSRuntime js, string? label, params object?[]? args)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.timeLog")
- : js.InvokeVoidAsync("BitButil.console.timeLog", [label, .. args]));
-
- internal static async Task ConsoleTimeStamp(this IJSRuntime js, string? label)
- => await (label is null ? js.InvokeVoidAsync("BitButil.console.timeStamp")
- : js.InvokeVoidAsync("BitButil.console.timeStamp", label));
-
- internal static async Task ConsoleTrace(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.trace", args);
-
- internal static async Task ConsoleWarn(this IJSRuntime js, params object?[]? args)
- => await js.InvokeVoidAsync("BitButil.console.warn", args);
-}
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/CookieJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/CookieJsInterop.cs
deleted file mode 100644
index a8ffb2c7d4..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/CookieJsInterop.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class CookieJsInterop
-{
- internal static async Task CookieGetAll(this IJSRuntime js)
- {
- var cookie = await js.InvokeAsync("BitButil.cookie.get");
- return cookie.Split(';').Select(ButilCookie.Parse).ToArray();
- }
-
- internal static async Task CookieGet(this IJSRuntime js, string name)
- {
- var allCookies = await CookieGetAll(js);
- return allCookies.FirstOrDefault(c => c.Name == name);
- }
-
- internal static async Task CookieRemove(this IJSRuntime js, string name)
- {
- var cookie = new ButilCookie { Name = name, MaxAge = 0, Expires = null };
- await CookieSet(js, cookie);
- }
-
- internal static async Task CookieRemove(this IJSRuntime js, ButilCookie cookie)
- {
- cookie.MaxAge = 0;
- cookie.Expires = null;
- await CookieSet(js, cookie);
- }
-
- internal static async Task CookieSet(this IJSRuntime js, ButilCookie cookie)
- => await js.InvokeVoidAsync("BitButil.cookie.set", cookie.ToString());
-}
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/CryptoJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/CryptoJsInterop.cs
deleted file mode 100644
index 2e11fd0288..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/CryptoJsInterop.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class CryptoJsInterop
-{
- internal static ValueTask CryptoEncrypt(this IJSRuntime js, T algorithm, byte[] key, byte[] data, CryptoKeyHash? keyHash) where T : ICryptoAlgorithmParams
- {
- if (algorithm.GetType() == typeof(RsaOaepCryptoAlgorithmParams))
- {
- var keyHashString = keyHash switch
- {
- CryptoKeyHash.Sha384 => "SHA-384",
- CryptoKeyHash.Sha512 => "SHA-512",
- _ => "SHA-256",
- };
-
- return js.InvokeAsync("BitButil.crypto.encryptRsaOaep", algorithm, key, data, keyHashString);
- }
-
- if (algorithm.GetType() == typeof(AesCtrCryptoAlgorithmParams))
- {
- return js.InvokeAsync("BitButil.crypto.encryptAesCtr", algorithm, key, data);
- }
-
- if (algorithm.GetType() == typeof(AesCbcCryptoAlgorithmParams))
- {
- return js.InvokeAsync("BitButil.crypto.encryptAesCbc", algorithm, key, data);
- }
-
-
- return js.InvokeAsync("BitButil.crypto.encryptAesGcm", algorithm, key, data);
- }
- internal static ValueTask CryptoEncrypt(this IJSRuntime js, CryptoAlgorithm algorithm, byte[] key, byte[] data, byte[]? iv, CryptoKeyHash? keyHash)
- => algorithm switch
- {
- CryptoAlgorithm.AesCtr => CryptoEncrypt(js, new AesCtrCryptoAlgorithmParams { Counter = iv }, key, data, null),
- CryptoAlgorithm.AesCbc => CryptoEncrypt(js, new AesCbcCryptoAlgorithmParams { Iv = iv }, key, data, null),
- CryptoAlgorithm.AesGcm => CryptoEncrypt(js, new AesGcmCryptoAlgorithmParams { Iv = iv }, key, data, null),
- _ => CryptoEncrypt(js, new RsaOaepCryptoAlgorithmParams(), key, data, keyHash),
- };
-
- internal static ValueTask CryptoDecrypt(this IJSRuntime js, T algorithm, byte[] key, byte[] data, CryptoKeyHash? keyHash) where T : ICryptoAlgorithmParams
- {
- if (algorithm.GetType() == typeof(RsaOaepCryptoAlgorithmParams))
- {
- var keyHashString = keyHash switch
- {
- CryptoKeyHash.Sha384 => "SHA-384",
- CryptoKeyHash.Sha512 => "SHA-512",
- _ => "SHA-256",
- };
-
- return js.InvokeAsync("BitButil.crypto.decryptRsaOaep", algorithm, key, data, keyHashString);
- }
-
- if (algorithm.GetType() == typeof(AesCtrCryptoAlgorithmParams))
- {
- return js.InvokeAsync("BitButil.crypto.decryptAesCtr", algorithm, key, data);
- }
-
- if (algorithm.GetType() == typeof(AesCbcCryptoAlgorithmParams))
- {
- return js.InvokeAsync("BitButil.crypto.decryptAesCbc", algorithm, key, data);
- }
-
-
- return js.InvokeAsync("BitButil.crypto.decryptAesGcm", algorithm, key, data);
- }
- internal static ValueTask CryptoDecrypt(this IJSRuntime js, CryptoAlgorithm algorithm, byte[] key, byte[] data, byte[]? iv, CryptoKeyHash? keyHash)
- => algorithm switch
- {
- CryptoAlgorithm.AesCtr => CryptoDecrypt(js, new AesCtrCryptoAlgorithmParams { Counter = iv }, key, data, null),
- CryptoAlgorithm.AesCbc => CryptoDecrypt(js, new AesCbcCryptoAlgorithmParams { Iv = iv }, key, data, null),
- CryptoAlgorithm.AesGcm => CryptoDecrypt(js, new AesGcmCryptoAlgorithmParams { Iv = iv }, key, data, null),
- _ => CryptoDecrypt(js, new RsaOaepCryptoAlgorithmParams(), key, data, keyHash),
- };
-}
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/DocumentJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/DocumentJsInterop.cs
deleted file mode 100644
index 944e49104a..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/DocumentJsInterop.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class DocumentJsInterop
-{
- internal static async Task DocumentGetCharacterSet(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.characterSet");
-
- internal static async Task DocumentGetCompatMode(this IJSRuntime js)
- {
- var mode = await js.InvokeAsync("BitButil.document.compatMode");
- return mode switch
- {
- "BackCompat" => CompatMode.BackCompat,
- _ => CompatMode.CSS1Compat
- };
- }
-
- internal static async Task DocumentGetContentType(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.contentType");
-
- internal static async Task DocumentGetDocumentURI(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.documentURI");
-
- internal static async Task DocumentGetDesignMode(this IJSRuntime js)
- {
- var mode = await js.InvokeAsync("BitButil.document.getDesignMode");
- return mode switch
- {
- "on" => DesignMode.On,
- _ => DesignMode.Off
- };
- }
- internal static async Task DocumentSetDesignMode(this IJSRuntime js, DesignMode mode)
- => await js.InvokeVoidAsync("BitButil.document.setDesignMode", mode.ToString());
-
- internal static async Task DocumentGetDir(this IJSRuntime js)
- {
- var mode = await js.InvokeAsync("BitButil.document.getDir");
- return mode switch
- {
- "rtl" => DocumentDir.Rtl,
- _ => DocumentDir.Ltr
- };
- }
- internal static async Task DocumentSetDir(this IJSRuntime js, DocumentDir dir)
- => await js.InvokeVoidAsync("BitButil.document.setDir", dir.ToString());
-
- internal static async Task DocumentGetReferrer(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.referrer");
-
- internal static async Task DocumentGetTitle(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.getTitle");
- internal static async Task DocumentSetTitle(this IJSRuntime js, string title)
- => await js.InvokeVoidAsync("BitButil.document.setTitle", title);
-
- internal static async Task DocumentGetUrl(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.document.URL");
-
- internal static async Task DocumentExitFullscreen(this IJSRuntime js)
- => await js.InvokeVoidAsync("BitButil.document.exitFullscreen");
-
- internal static async Task DocumentExitPointerLock(this IJSRuntime js)
- => await js.InvokeVoidAsync("BitButil.document.exitPointerLock");
-}
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/ElementJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/ElementJsInterop.cs
deleted file mode 100644
index 4a62fed660..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/ElementJsInterop.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class ElementJsInterop
-{
- internal static async ValueTask ElementBlur(this IJSRuntime js, ElementReference element)
- => await js.InvokeVoidAsync("BitButil.element.blur", element);
-
- internal static async ValueTask ElementGetAttribute(this IJSRuntime js, ElementReference element, string name)
- => await js.InvokeAsync("BitButil.element.getAttribute", element, name);
-
- internal static async ValueTask ElementGetAttributeNames(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getAttributeNames", element);
-
- internal static async ValueTask ElementGetBoundingClientRect(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getBoundingClientRect", element);
-
- internal static async ValueTask ElementHasAttribute(this IJSRuntime js, ElementReference element, string name)
- => await js.InvokeAsync("BitButil.element.hasAttribute", element, name);
-
- internal static async ValueTask ElementHasAttributes(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.hasAttributes", element);
-
- internal static async ValueTask ElementHasPointerCapture(this IJSRuntime js, ElementReference element, int pointerId)
- => await js.InvokeAsync("BitButil.element.hasPointerCapture", element, pointerId);
-
- internal static async ValueTask ElementMatches(this IJSRuntime js, ElementReference element, string selectors)
- => await js.InvokeAsync("BitButil.element.matches", element, selectors);
-
- internal static async ValueTask ElementReleasePointerCapture(this IJSRuntime js, ElementReference element, int pointerId)
- => await js.InvokeVoidAsync("BitButil.element.releasePointerCapture", element, pointerId);
-
- internal static async ValueTask ElementRemove(this IJSRuntime js, ElementReference element)
- => await js.InvokeVoidAsync("BitButil.element.remove", element);
-
- internal static async ValueTask ElementRemoveAttribute(this IJSRuntime js, ElementReference element, string name)
- => await js.InvokeVoidAsync("BitButil.element.removeAttribute", element, name);
-
- internal static async ValueTask ElementRequestFullScreen(this IJSRuntime js, ElementReference element, FullScreenOptions? options)
- => await js.InvokeVoidAsync("BitButil.element.requestFullScreen", element, options?.ToJsObject());
-
- internal static async ValueTask ElementRequestPointerLock(this IJSRuntime js, ElementReference element)
- => await js.InvokeVoidAsync("BitButil.element.requestPointerLock", element);
-
- internal static async ValueTask ElementScroll(this IJSRuntime js, ElementReference element, ScrollToOptions? options, double? x, double? y)
- => await js.InvokeVoidAsync("BitButil.element.scroll", element, options?.ToJsObject(), x, y);
-
- internal static async ValueTask ElementScrollBy(this IJSRuntime js, ElementReference element, ScrollToOptions? options, double? x, double? y)
- => await js.InvokeVoidAsync("BitButil.element.scrollBy", element, options?.ToJsObject(), x, y);
-
- internal static async ValueTask ElementScrollIntoView(this IJSRuntime js, ElementReference element, bool? alignToTop, ScrollIntoViewOptions? options)
- => await js.InvokeVoidAsync("BitButil.element.scrollIntoView", element, alignToTop, options?.ToJsObject());
-
- internal static async ValueTask ElementSetAttribute(this IJSRuntime js, ElementReference element, string name, string value)
- => await js.InvokeVoidAsync("BitButil.element.setAttribute", element, name, value);
-
- internal static async ValueTask ElementSetPointerCapture(this IJSRuntime js, ElementReference element, int pointerId)
- => await js.InvokeVoidAsync("BitButil.element.setPointerCapture", element, pointerId);
-
- internal static async ValueTask ElementToggleAttribute(this IJSRuntime js, ElementReference element, string name, bool? force)
- => await js.InvokeAsync("BitButil.element.toggleAttribute", element, name, force);
-
- internal static async ValueTask ElementGetAccessKey(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getAccessKey", element);
- internal static async ValueTask ElementSetAccessKey(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setAccessKey", element, value);
-
- internal static async ValueTask ElementGetClassName(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getClassName", element);
- internal static async ValueTask ElementSetClassName(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setClassName", element, value);
-
- internal static async ValueTask ElementGetClientHeight(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.clientHeight", element);
-
- internal static async ValueTask ElementGetClientLeft(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.clientLeft", element);
-
- internal static async ValueTask ElementGetClientTop(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.clientTop", element);
-
- internal static async ValueTask ElementGetClientWidth(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.clientWidth", element);
-
- internal static async ValueTask ElementGetId(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getId", element);
- internal static async ValueTask ElementSetId(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setId", element, value);
-
- internal static async ValueTask ElementGetInnerHTML(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getInnerHTML", element);
- internal static async ValueTask ElementSetInnerHTML(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setInnerHTML", element, value);
-
- internal static async ValueTask ElementGetOuterHTML(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getOuterHTML", element);
- internal static async ValueTask ElementSetOuterHTML(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setOuterHTML", element, value);
-
- internal static async ValueTask ElementGetScrollHeight(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.scrollHeight", element);
-
- internal static async ValueTask ElementGetScrollLeft(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.scrollLeft", element);
-
- internal static async ValueTask ElementGetScrollTop(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.scrollTop", element);
-
- internal static async ValueTask ElementGetScrollWidth(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.scrollWidth", element);
-
- internal static async ValueTask ElementGetTagName(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.tagName", element);
-
- internal static async ValueTask ElementGetContentEditable(this IJSRuntime js, ElementReference element)
- {
- var value = await js.InvokeAsync("BitButil.element.getContentEditable", element);
- return value switch
- {
- "true" => ContentEditable.True,
- "false" => ContentEditable.False,
- "plaintext-only" => ContentEditable.PlainTextOnly,
- _ => ContentEditable.Inherit
- };
- }
- internal static async ValueTask ElementSetContentEditable(this IJSRuntime js, ElementReference element, ContentEditable value)
- {
- var v = value switch
- {
- ContentEditable.False => "false",
- ContentEditable.True => "true",
- ContentEditable.PlainTextOnly => "plaintext-only",
- _ => "inherit",
- };
- await js.InvokeVoidAsync("BitButil.element.setContentEditable", element, v);
- }
-
- internal static async ValueTask ElementIsContentEditable(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.isContentEditable", element);
-
- internal static async ValueTask ElementGetDir(this IJSRuntime js, ElementReference element)
- {
- var value = await js.InvokeAsync("BitButil.element.getDir", element);
- return value switch
- {
- "ltr" => ElementDir.Ltr,
- "rtl" => ElementDir.Rtl,
- "auto" => ElementDir.Auto,
- _ => ElementDir.NotSet,
- };
- }
- internal static async ValueTask ElementSetDir(this IJSRuntime js, ElementReference element, ElementDir value)
- {
- var v = value switch
- {
- ElementDir.Ltr => "ltr",
- ElementDir.Rtl => "rtl",
- ElementDir.Auto => "auto",
- _ => "",
- };
- await js.InvokeVoidAsync("BitButil.element.setDir", element, v);
- }
-
- internal static async ValueTask ElementGetEnterKeyHint(this IJSRuntime js, ElementReference element)
- {
- var value = await js.InvokeAsync("BitButil.element.getEnterKeyHint", element);
- return value switch
- {
- "enter" => EnterKeyHint.Enter,
- "done" => EnterKeyHint.Done,
- "go" => EnterKeyHint.Go,
- "next" => EnterKeyHint.Next,
- "previous" => EnterKeyHint.Previous,
- "search" => EnterKeyHint.Search,
- "send" => EnterKeyHint.Send,
- _ => EnterKeyHint.NotSet
- };
- }
- internal static async ValueTask ElementSetEnterKeyHint(this IJSRuntime js, ElementReference element, EnterKeyHint value)
- {
- var v = value switch
- {
- EnterKeyHint.Enter => "enter",
- EnterKeyHint.Done => "done",
- EnterKeyHint.Go => "go",
- EnterKeyHint.Next => "next",
- EnterKeyHint.Previous => "previous",
- EnterKeyHint.Search => "search",
- EnterKeyHint.Send => "send",
- _ => "",
- };
- await js.InvokeVoidAsync("BitButil.element.setEnterKeyHint", element, v);
- }
-
- internal static async ValueTask ElementGetHidden(this IJSRuntime js, ElementReference element)
- {
- var value = await js.InvokeAsync("BitButil.element.getHidden", element);
- return value switch
- {
- "true" => Hidden.True,
- "until-found" => Hidden.UntilFound,
- _ => Hidden.False
- };
- }
- internal static async ValueTask ElementSetHidden(this IJSRuntime js, ElementReference element, Hidden value)
- {
- var v = value switch
- {
- Hidden.True => "true",
- Hidden.UntilFound => "until-found",
- _ => "false",
- };
- await js.InvokeVoidAsync("BitButil.element.setHidden", element, v);
- }
-
- internal static async ValueTask ElementGetInert(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getInert", element);
- internal static async ValueTask ElementSetInert(this IJSRuntime js, ElementReference element, bool value)
- => await js.InvokeVoidAsync("BitButil.element.setInert", element, value);
-
- internal static async ValueTask ElementGetInnerText(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getInnerText", element);
- internal static async ValueTask ElementSetInnerText(this IJSRuntime js, ElementReference element, string value)
- => await js.InvokeVoidAsync("BitButil.element.setInnerText", element, value);
-
- internal static async ValueTask ElementGetInputMode(this IJSRuntime js, ElementReference element)
- {
- var value = await js.InvokeAsync("BitButil.element.getInputMode", element);
- return value switch
- {
- "decimal" => InputMode.Decimal,
- "email" => InputMode.Email,
- "none" => InputMode.None,
- "numeric" => InputMode.Numeric,
- "search" => InputMode.Search,
- "tel" => InputMode.Tel,
- "text" => InputMode.Text,
- "url" => InputMode.Url,
- _ => InputMode.NotSet,
- };
- }
- internal static async ValueTask ElementSetInputMode(this IJSRuntime js, ElementReference element, InputMode value)
- {
- var v = value switch
- {
- InputMode.Decimal => "decimal",
- InputMode.Email => "email",
- InputMode.None => "none",
- InputMode.Numeric => "numeric",
- InputMode.Search => "search",
- InputMode.Tel => "tel",
- InputMode.Text => "text",
- InputMode.Url => "url",
- _ => "",
- };
- await js.InvokeVoidAsync("BitButil.element.setInputMode", element, v);
- }
-
- internal static async ValueTask ElementGetOffsetHeight(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.offsetHeight", element);
-
- internal static async ValueTask ElementGetOffsetLeft(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.offsetLeft", element);
-
- internal static async ValueTask ElementGetOffsetTop(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.offsetTop", element);
-
- internal static async ValueTask ElementGetOffsetWidth(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.offsetWidth", element);
-
- internal static async ValueTask ElementGetTabIndex(this IJSRuntime js, ElementReference element)
- => await js.InvokeAsync("BitButil.element.getTabIndex", element);
- internal static async ValueTask ElementSetTabIndex(this IJSRuntime js, ElementReference element, int value)
- => await js.InvokeVoidAsync("BitButil.element.setTabIndex", element, value);
-}
diff --git a/src/Butil/Bit.Butil/Internals/JsInterops/HistoryJsInterop.cs b/src/Butil/Bit.Butil/Internals/JsInterops/HistoryJsInterop.cs
deleted file mode 100644
index c9cefc5d42..0000000000
--- a/src/Butil/Bit.Butil/Internals/JsInterops/HistoryJsInterop.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.JSInterop;
-
-namespace Bit.Butil;
-
-internal static class HistoryJsInterop
-{
- internal static async Task HistoryGetLength(this IJSRuntime js)
- => await js.InvokeAsync("BitButil.history.length");
-
- internal static async Task HistoryGetScrollRestoration(this IJSRuntime js)
- {
- var value = await js.InvokeAsync("BitButil.history.scrollRestoration");
- return value == "auto" ? ScrollRestoration.Auto : ScrollRestoration.Manual;
- }
-
- internal static async Task HistorySetScrollRestoration(this IJSRuntime js, ScrollRestoration value)
- => await js.InvokeVoidAsync("BitButil.history.setScrollRestoration", value.ToString().ToLowerInvariant());
-
- internal static async Task
-
+
+ @if (IsEnabled && ShowClearButton && CurrentValue.HasValue)
+ {
+
+ }
+
@if (IconTemplate is not null)
{
@IconTemplate
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.razor.cs
index a08f0ad3dd..e9fca3f404 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.razor.cs
@@ -112,12 +112,13 @@ private int _minuteView
private bool _isTimePickerOverlayOnTop;
private bool _showTimePickerAsOverlayInternal;
private DotNetObjectReference _dotnetObj = default!;
- private int[,] _daysOfCurrentMonth = new int[DEFAULT_WEEK_COUNT, DEFAULT_DAY_COUNT_PER_WEEK];
+ private readonly int[,] _daysOfCurrentMonth = new int[DEFAULT_WEEK_COUNT, DEFAULT_DAY_COUNT_PER_WEEK];
private string _datePickerId = string.Empty;
private string _calloutId = string.Empty;
private string? _labelId;
private string? _inputId;
+ private ElementReference _inputRef = default!;
private ElementReference _inputTimeHourRef = default!;
private ElementReference _inputTimeMinuteRef = default!;
@@ -383,9 +384,9 @@ public bool IsUnderlined
[Parameter] public EventCallback OnFocusOut { get; set; }
///
- /// The callback for selecting a date in the DatePicker.
+ /// The callback for when the value changes in the DatePicker.
///
- [Parameter] public EventCallback OnSelectDate { get; set; }
+ [Parameter] public EventCallback OnChange { get; set; }
///
/// The text of selected date aria-atomic of the DatePicker.
@@ -467,6 +468,11 @@ public bool IsUnderlined
///
[Parameter] public bool ShowTimePickerAsOverlay { get; set; }
+ ///
+ /// Whether the clear button should be shown or not when the BitDatePicker has a value.
+ ///
+ [Parameter] public bool ShowClearButton { get; set; }
+
public Task OpenCallout()
{
@@ -642,7 +648,22 @@ private async Task HandleOnChange(ChangeEventArgs e)
}
}
- await OnSelectDate.InvokeAsync(CurrentValue);
+ await OnChange.InvokeAsync(CurrentValue);
+ }
+
+ private async Task HandleOnClearButtonClick()
+ {
+ if (IsEnabled is false) return;
+
+ CurrentValue = null;
+
+ _hour = 0;
+ _minute = 0;
+
+ _selectedDateWeek = null;
+ _selectedDateDayOfWeek = null;
+
+ await _inputRef.FocusAsync();
}
private async Task SelectDate(int dayIndex, int weekIndex)
@@ -656,12 +677,14 @@ private async Task SelectDate(int dayIndex, int weekIndex)
int selectedMonth = FindMonth(weekIndex, dayIndex);
var isNotInCurrentMonth = IsInCurrentMonth(weekIndex, dayIndex) is false;
- if (selectedMonth < _currentMonth && _currentMonth == 12 && isNotInCurrentMonth)
+ //The number of days displayed in the picker is about 34 days, and if the selected day is less than 15, it means that the next month has been selected in next year.
+ if (selectedMonth < _currentMonth && _currentMonth == 12 && isNotInCurrentMonth && _currentDay < 15)
{
_currentYear++;
}
- if (selectedMonth > _currentMonth && _currentMonth == 1 && isNotInCurrentMonth)
+ //The number of days displayed in the picker is about 34 days, and if the selected day is greater than 15, it means that the previous month has been selected in previous year.
+ if (selectedMonth > _currentMonth && _currentMonth == 1 && isNotInCurrentMonth && _currentDay > 15)
{
_currentYear--;
}
@@ -679,7 +702,7 @@ private async Task SelectDate(int dayIndex, int weekIndex)
GenerateMonthData(_currentYear, _currentMonth);
- await OnSelectDate.InvokeAsync(CurrentValue);
+ await OnChange.InvokeAsync(CurrentValue);
}
private void SelectMonth(int month)
@@ -1195,7 +1218,7 @@ private async Task UpdateCurrentValue()
var currentValueDay = Culture.Calendar.GetDayOfMonth(CurrentValue.Value.LocalDateTime);
CurrentValue = new DateTimeOffset(Culture.Calendar.ToDateTime(currentValueYear, currentValueMonth, currentValueDay, _hour, _minute, 0, 0), DateTimeOffset.Now.Offset);
- await OnSelectDate.InvokeAsync(CurrentValue);
+ await OnChange.InvokeAsync(CurrentValue);
}
private async Task HandleOnTimeHourFocus()
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.scss b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.scss
index 76646cc614..1874074c7e 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePicker.scss
@@ -81,6 +81,31 @@
color: $color-foreground-secondary;
}
+.bit-dtp-clr {
+ display: flex;
+ width: spacing(3.75);
+ height: spacing(3.75);
+ justify-content: center;
+ align-items: center;
+ background-color: $color-background-secondary;
+ cursor: pointer;
+
+ i {
+ speak: none;
+ width: unset;
+ pointer-events: none;
+ display: inline-block;
+ font-size: spacing(1.5);
+ color: $color-foreground-secondary;
+ }
+
+ @media (hover: hover) {
+ &:hover {
+ background-color: $color-action-hover-background-primary;
+ }
+ }
+}
+
.bit-dtp-inp {
margin: 0;
outline: 0;
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePickerClassStyles.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePickerClassStyles.cs
index 3a631a91e7..0e9e0cca6c 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePickerClassStyles.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DatePicker/BitDatePickerClassStyles.cs
@@ -386,4 +386,14 @@ public class BitDatePickerClassStyles
/// Custom CSS classes/styles for each year button of the BitDatePicker.
///
public string? YearButton { get; set; }
+
+ ///
+ /// Custom CSS classes/styles for the BitDatePicker's clear button.
+ ///
+ public string? ClearButton { get; set; }
+
+ ///
+ /// Custom CSS classes/styles for the BitDatePicker's clear button icon.
+ ///
+ public string? ClearButtonIcon { get; set; }
}
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor
index 11ec9884b2..63413190b3 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor
@@ -20,7 +20,8 @@
}
+
+
+
\ No newline at end of file
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.cs
index 8fe4928308..12952d0d0e 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.cs
@@ -60,7 +60,26 @@ public partial class _BitDropdownItemDemo
new() { Text = "Carrot", Value = "v-car", Class = "custom-veg" },
new() { Text = "Lettuce", Value = "v-let", Class = "custom-veg" }
};
+ private List> comboBoxItems = new()
+ {
+ new() { ItemType = BitDropdownItemType.Header, Text = "Fruits" },
+ new() { Text = "Apple", Value = "f-app" },
+ new() { Text = "Banana", Value = "f-ban" },
+ new() { Text = "Orange", Value = "f-ora", IsEnabled = false },
+ new() { Text = "Grape", Value = "f-gra" },
+ new() { ItemType = BitDropdownItemType.Divider },
+ new() { ItemType = BitDropdownItemType.Header, Text = "Vegetables" },
+ new() { Text = "Broccoli", Value = "v-bro" },
+ new() { Text = "Carrot", Value = "v-car" },
+ new() { Text = "Lettuce", Value = "v-let" }
+ };
+ private BitDropdownNameSelectors, string> nameSelectors = new()
+ {
+ DynamicValueGenerator = ((BitDropdownItem item) => item.Text),
+ ValueSetter = ((BitDropdownItem item, string? value) => item.Value = value),
+ TextSetter = ((string? text, BitDropdownItem item) => item.Text = text)
+ };
private string controlledValue = "f-app";
@@ -78,6 +97,8 @@ public partial class _BitDropdownItemDemo
private string successMessage = string.Empty;
private FormValidationDropdownModel validationModel = new();
+ private string? comboBoxValue;
+ private ICollection comboBoxValues = [];
protected override void OnInitialized()
{
@@ -111,6 +132,11 @@ private void HandleInvalidSubmit()
successMessage = string.Empty;
}
+ private void HandleOnDynamicAdd(BitDropdownItem item)
+ {
+ comboBoxItems.Add(item);
+ }
+
private async ValueTask>> LoadItems(
BitDropdownItemsProviderRequest> request)
{
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.samples.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.samples.cs
index 23e3b8b029..efb88d5a42 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.samples.cs
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownItemDemo.razor.samples.cs
@@ -175,8 +175,7 @@ public partial class _BitDropdownItemDemo
Placeholder=""Select items""
IsMultiSelect=""true""
OnSelectItem=""(BitDropdownItem item) => selectedItem2 = item"" />
-Selected Value: @selectedItem2?.Value
-IsSelected: @selectedItem2?.IsSelected ";
+Selected Value: @selectedItem2?.Value ";
private readonly string example3CsharpCode = @"
private string controlledValue = ""f-app"";
private ICollection controlledValues = new[] { ""f-app"", ""f-ban"" };
@@ -592,6 +591,54 @@ private async Task HandleValidSubmit() { }
private void HandleInvalidSubmit() { }
private List> GetBasicItems() => new()
+{
+ new() { ItemType = BitDropdownItemType.Header, Text = ""Fruits"" },
+ new() { Text = ""Apple"", Value = ""f-app"" },
+ new() { Text = ""Banana"", Value = ""f-ban"" },
+ new() { Text = ""Orange"", Value = ""f-ora"", IsEnabled = false },
+ new() { Text = ""Grape"", Value = ""f-gra"" },
+ new() { ItemType = BitDropdownItemType.Divider },
+ new() { ItemType = BitDropdownItemType.Header, Text = ""Vegetables"" },
+ new() { Text = ""Broccoli"", Value = ""v-bro"" },
+ new() { Text = ""Carrot"", Value = ""v-car"" },
+ new() { Text = ""Lettuce"", Value = ""v-let"" }
+};";
+
+ private readonly string example12RazorCode = @"
+ item) => HandleOnDynamicAdd(item)""
+ Combo
+ Chips
+ Dynamic />
+Value: @comboBoxValue
+
+ item) => HandleOnDynamicAdd(item)""
+ Combo
+ Chips
+ Dynamic />
+Values: @string.Join(',', comboBoxValues) ";
+ private readonly string example12CsharpCode = @"
+private string? comboBoxValue;
+private ICollection comboBoxValues = [];
+
+private BitDropdownNameSelectors, string> nameSelectors = new()
+{
+ DynamicValueGenerator = ((BitDropdownItem item) => item.Text),
+ ValueSetter = ((BitDropdownItem item, string? value) => item.Value = value),
+ TextSetter = ((string? text, BitDropdownItem item) => item.Text = text)
+};
+
+private List> comboBoxItems = new()
{
new() { ItemType = BitDropdownItemType.Header, Text = ""Fruits"" },
new() { Text = ""Apple"", Value = ""f-app"" },
diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor
index 63d352d59b..0f31f175ce 100644
--- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor
+++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/Components/Inputs/Dropdown/_BitDropdownOptionDemo.razor
@@ -210,7 +210,6 @@
}
Selected Value: @selectedItem2?.Value
- IsSelected: @selectedItem2?.IsSelected
@@ -528,3 +527,46 @@
-
+ @if (IsEnabled && ShowClearButton && CurrentValue?.StartDate is not null)
+ {
+
+ }
+
@if (IconTemplate is not null)
{
@IconTemplate
@@ -460,15 +473,15 @@
}
- var startTimeIncreaseHourDisabled = CanChangeTime(true, true, true);
- var startTimeDecreaseHourDisabled = CanChangeTime(false, true, true);
- var startTimeIncreaseMinuteDisabled = CanChangeTime(true, false, true);
- var startTimeDecreaseMinuteDisabled = CanChangeTime(false, false, true);
+ var startTimeIncreaseHourDisabled = IsIncreaseOrDecreaseButtonDisabled(true, true, true);
+ var startTimeDecreaseHourDisabled = IsIncreaseOrDecreaseButtonDisabled(false, true, true);
+ var startTimeIncreaseMinuteDisabled = IsIncreaseOrDecreaseButtonDisabled(true, false, true);
+ var startTimeDecreaseMinuteDisabled = IsIncreaseOrDecreaseButtonDisabled(false, false, true);
- var endTimeIncreaseHourDisabled = CanChangeTime(true, true, false);
- var endTimeDecreaseHourDisabled = CanChangeTime(false, true, false);
- var endTimeIncreaseMinuteDisabled = CanChangeTime(true, false, false);
- var endTimeDecreaseMinuteDisabled = CanChangeTime(false, false, false);
+ var endTimeIncreaseHourDisabled = IsIncreaseOrDecreaseButtonDisabled(true, true, false);
+ var endTimeDecreaseHourDisabled = IsIncreaseOrDecreaseButtonDisabled(false, true, false);
+ var endTimeIncreaseMinuteDisabled = IsIncreaseOrDecreaseButtonDisabled(true, false, false);
+ var endTimeDecreaseMinuteDisabled = IsIncreaseOrDecreaseButtonDisabled(false, false, false);
@@ -404,3 +403,36 @@
+
+
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor.cs
index 31c327fb26..6cd926305f 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.razor.cs
@@ -183,6 +183,7 @@ private int _endTimeMinuteView
private string _calloutId = string.Empty;
private string? _labelId;
private string? _inputId;
+ private ElementReference _inputRef = default!;
private ElementReference _startTimeHourInputRef = default!;
private ElementReference _startTimeMinuteInputRef = default!;
private ElementReference _endTimeHourInputRef = default!;
@@ -444,9 +445,9 @@ public bool IsUnderlined
[Parameter] public EventCallback OnFocusOut { get; set; }
///
- /// The callback for selecting a date in the DateRangePicker.
+ /// Callback for when the value changes in the DateRangePicker.
///
- [Parameter] public EventCallback OnSelectDate { get; set; }
+ [Parameter] public EventCallback OnChange { get; set; }
///
/// The placeholder text of the DateRangePicker's input.
@@ -533,6 +534,11 @@ public bool IsUnderlined
///
[Parameter] public TimeSpan? MaxTimeRange { get; set; }
+ ///
+ /// Whether the clear button should be shown or not when the DateRangePicker has a value.
+ ///
+ [Parameter] public bool ShowClearButton { get; set; }
+
public Task OpenCallout()
{
@@ -714,7 +720,27 @@ private async Task HandleOnChange(ChangeEventArgs e)
CurrentValueAsString = e.Value?.ToString();
- await OnSelectDate.InvokeAsync(CurrentValue);
+ await OnChange.InvokeAsync(CurrentValue);
+ }
+
+ private async Task HandleOnClearButtonClick()
+ {
+ if (IsEnabled is false) return;
+
+ CurrentValue = new();
+
+ _startTimeHour = 0;
+ _startTimeMinute = 0;
+
+ _endTimeHour = MaxTimeRange.HasValue ? MaxTimeRange.Value.Hours : 23;
+ _endTimeMinute = MaxTimeRange.HasValue ? MaxTimeRange.Value.Minutes : 59;
+
+ _selectedStartDateWeek = null;
+ _selectedEndDateWeek = null;
+ _selectedStartDateDayOfWeek = null;
+ _selectedEndDateDayOfWeek = null;
+
+ await _inputRef.FocusAsync();
}
private async Task SelectDate(int dayIndex, int weekIndex)
@@ -735,12 +761,14 @@ private async Task SelectDate(int dayIndex, int weekIndex)
int selectedMonth = FindMonth(weekIndex, dayIndex);
var isNotInCurrentMonth = IsInCurrentMonth(weekIndex, dayIndex) is false;
- if (selectedMonth < _currentMonth && _currentMonth == 12 && isNotInCurrentMonth)
+ //The number of days displayed in the picker is about 34 days, and if the selected day is less than 15, it means that the next month has been selected in next year.
+ if (selectedMonth < _currentMonth && _currentMonth == 12 && isNotInCurrentMonth && currentDay < 15)
{
_currentYear++;
}
- if (selectedMonth > _currentMonth && _currentMonth == 1 && isNotInCurrentMonth)
+ //The number of days displayed in the picker is about 34 days, and if the selected day is greater than 15, it means that the previous month has been selected in previous year.
+ if (selectedMonth > _currentMonth && _currentMonth == 1 && isNotInCurrentMonth && currentDay > 15)
{
_currentYear--;
}
@@ -782,7 +810,7 @@ private async Task SelectDate(int dayIndex, int weekIndex)
GenerateMonthData(_currentYear, _currentMonth);
- await OnSelectDate.InvokeAsync(CurrentValue);
+ await OnChange.InvokeAsync(CurrentValue);
}
private void SelectMonth(int month)
@@ -1476,7 +1504,10 @@ private void UpdateTime()
if (CurrentValue is null) return;
if (CurrentValue.StartDate.HasValue is false && CurrentValue.EndDate.HasValue is false) return;
- if (CurrentValue.StartDate!.Value.Date == CurrentValue.EndDate!.Value.Date && new TimeSpan(_startTimeHour, _startTimeMinute, 0) > new TimeSpan(_endTimeHour, _endTimeMinute, 0))
+ var isEndTimeBiggerInOneDayRange = CurrentValue.StartDate.HasValue && CurrentValue.EndDate.HasValue &&
+ CurrentValue.StartDate!.Value.Date == CurrentValue.EndDate!.Value.Date &&
+ new TimeSpan(_startTimeHour, _startTimeMinute, 0) > new TimeSpan(_endTimeHour, _endTimeMinute, 0);
+ if (isEndTimeBiggerInOneDayRange)
{
_startTimeHour = _endTimeHour;
_startTimeMinute = _endTimeMinute;
@@ -1487,6 +1518,8 @@ private void UpdateTime()
StartDate = GetDateTimeOffset(CurrentValue.StartDate, _startTimeHour, _startTimeMinute),
EndDate = GetDateTimeOffset(CurrentValue.EndDate, _endTimeHour, _endTimeMinute)
};
+
+ _ = OnChange.InvokeAsync(CurrentValue);
}
private DateTimeOffset? GetDateTimeOffset(DateTimeOffset? date, int hour, int minute)
@@ -1711,9 +1744,9 @@ private bool CanChangeTime(int? startTimeHour = null, int? startTimeMinute = nul
return MaxTimeRange.Value.TotalMinutes > Math.Abs((startTime - endTime).TotalMinutes);
}
- private bool CanChangeTime(bool isNext, bool isHour, bool isStartTime)
+ private bool IsIncreaseOrDecreaseButtonDisabled(bool isNext, bool isHour, bool isStartTime)
{
- if (MaxTimeRange.HasValue is false) return true;
+ if (MaxTimeRange.HasValue is false) return false;
var startTimeHour = _startTimeHour;
var endTimeHour = _endTimeHour;
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.scss b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.scss
index f5338b8426..5db47ba0f9 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.scss
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePicker.scss
@@ -81,6 +81,31 @@
color: $color-foreground-secondary;
}
+.bit-dtrp-clr {
+ display: flex;
+ width: spacing(3.75);
+ height: spacing(3.75);
+ justify-content: center;
+ align-items: center;
+ background-color: $color-background-secondary;
+ cursor: pointer;
+
+ i {
+ speak: none;
+ width: unset;
+ pointer-events: none;
+ display: inline-block;
+ font-size: spacing(1.5);
+ color: $color-foreground-secondary;
+ }
+
+ @media (hover: hover) {
+ &:hover {
+ background-color: $color-action-hover-background-primary;
+ }
+ }
+}
+
.bit-dtrp-inp {
margin: 0;
outline: 0;
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePickerClassStyles.cs b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePickerClassStyles.cs
index 57072f51c6..a9264f64c9 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePickerClassStyles.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/DateRangePicker/BitDateRangePickerClassStyles.cs
@@ -491,4 +491,14 @@ public class BitDateRangePickerClassStyles
/// Custom CSS classes/styles for each year button of the BitDateRangePicker.
///
public string? YearButton { get; set; }
+
+ ///
+ /// Custom CSS classes/styles for the BitDatePicker's clear button.
+ ///
+ public string? ClearButton { get; set; }
+
+ ///
+ /// Custom CSS classes/styles for the BitDatePicker's clear button icon.
+ ///
+ public string? ClearButtonIcon { get; set; }
}
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor
index a3ec2a9a1e..8c04b2b063 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Inputs/Dropdown/BitDropdown.razor
@@ -47,7 +47,11 @@
aria-atomic="true"
aria-invalid="false">
- @if (_text.HasValue())
+ @{
+ var text = GetText();
+ }
+
+ @if (Chips is false && text.HasValue())
{
@if (TextTemplate is not null)
{
@@ -55,10 +59,10 @@
}
else
{
- @_text
+ @text
}
}
- else
+ else if (Combo is false)
{
@if (PlaceholderTemplate is not null)
{
@@ -69,11 +73,35 @@
@Placeholder
}
}
+ else if (Chips)
+ {
+ @foreach (var item in _selectedItems)
+ {
+
+ @GetText(item)
+
+
+ }
+ }
+
+ @if (Combo)
+ {
+
+ }
- @if (ShowClearButton && SelectedItems.Count > 0 && IsEnabled)
+ @if (IsEnabled && ShowClearButton && SelectedItems.Count > 0)
{
-
+
+
+
+ Value: @comboBoxValue
+
+ +
+ Values: @string.Join(',', comboBoxValues)
+
+
+
+
+
+
+ @foreach (var item in comboBoxItems)
+ {
+
+ Value: @comboBoxValue
+
+ +
+
+ @foreach (var item in comboBoxItems)
+ {
+
+ Values: @string.Join(',', comboBoxValues)
+
+
-
-
-
Clicked Item: @CustomClickedItem?.Name
+Selected Item: @CustomSelectedItem?.Name
+Toggled Item: @(CustomToggledItem is null ? ""N/A"" : $""{CustomToggledItem.Name} ({(CustomToggledItem.IsExpanded ? ""Expanded"" : ""Collapsed"")})"")
";
private readonly string example5CustomItemCsharpCode = @"
public class FoodMenu
{
public string Name { get; set; } = string.Empty;
public string Icon { get; set; }
public bool IsExpanded { get; set; }
- public List