Skip to content

Commit b566dad

Browse files
committed
Merging from master.
2 parents 83c65b7 + be4c236 commit b566dad

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

BlazorMaterialWeb.Demo/Pages/IconButton.razor

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,27 @@
3131
{
3232
<div class="col">
3333
<p>
34-
<MdIconButton @bind-Selected="@(selected)"
35-
@onclick="@(() => clicked = style.ToString())"
34+
<MdIconButton @bind-Selected="@(selected)" @bind-Selected:after="() => ++toggleCount"
35+
@onclick="@(() => clicked = style.ToString())"
3636
ButtonStyle="@(style)"
3737
Href="@(hasHref ? "https://github.com/datvm/BlazorMaterialWeb/" : null)"
3838
Target="@(hasHref && targetBlank ? "_blank" : null)"
3939
Toggle="@(toggle)"
4040
Disabled="@(disabled)"
4141
FlipIconInRtl="isRtl">
4242
<MdIcon>@(icon)</MdIcon>
43-
</MdIconButton>
44-
</p>
45-
<p>@(style)</p>
43+
</MdIconButton>
44+
</p>
45+
<p>@(style)</p>
4646
</div>
4747
}
4848
</div>
4949
}
5050

5151
<div>
5252
You have clicked: @(clicked ?? "Not yet")<br />
53-
Selected (Toggle button): @selected.ToString()
53+
Selected (Toggle button): @selected.ToString()<br />
54+
Toggle changed count: @(toggleCount)
5455
</div>
5556
</ComponentDemo>
5657
<Tweaks>
@@ -78,21 +79,23 @@
7879
</Tweaks>
7980
</ComponentDemoPage>
8081

81-
@code {
82+
@code {
8283
const string icon = "send";
8384

8485
string function = "Button";
8586
bool selected;
8687
bool disabled;
8788

8889
string? clicked;
89-
90+
9091
bool button = true;
9192
bool toggle;
9293
bool hasHref;
9394

9495
bool targetBlank;
9596

97+
int toggleCount;
98+
9699
void SetTo()
97100
{
98101
button = function == "Button";

BlazorMaterialWeb/MdIconButton.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ partial class MdIconButton
5050
_ => throw new NotImplementedException("Unknown style: " + ButtonStyle.ToString()),
5151
};
5252

53-
async Task OnSelectedChanged(MdCheckedEventArgs e)
53+
async Task OnSelectedChanged(MdCheckboxChangeEventArgs e)
5454
{
5555
Selected = e.Checked;
5656
await SelectedChanged.InvokeAsync(Selected);

pack.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ foreach($file in $files) {
44
rm $file.FullName
55
}
66

7-
$version="--property:Version=1.3.0.0"
7+
$version="--property:Version=2.0.0.0"
88

99
dotnet pack .\BlazorMaterialWeb\BlazorMaterialWeb.csproj -c Release "--property:PackageOutputPath=.\bin\nuget" "$version"
1010
dotnet pack .\BlazorMaterialWeb.Bundled\BlazorMaterialWeb.Bundled.csproj -c Release "--property:PackageOutputPath=.\bin\nuget" "$version"

0 commit comments

Comments
 (0)