Skip to content

Commit ccfd1c9

Browse files
vnbaaijvnbaaij
authored
Merge branch 'dev' into fix-slider-issue
2 parents 277bd0b + c5c844c commit ccfd1c9

8 files changed

+38
-21
lines changed

‎examples/Demo/Shared/Pages/Toolbar/Examples/ToolbarDefault.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
{
5757
if (firstRender)
5858
{
59-
await FillColor.SetValueFor(Toolbar!.Element, "#333".ToSwatch());
59+
await FillColor.SetValueFor(Toolbar!.Element, "#333");
6060
await BaseLayerLuminance.SetValueFor(Toolbar!.Element, (float)0.15);
6161

6262
StateHasChanged();

‎tests/Core/Dialog/FluentDialogServiceTests.FluentDialogService_Default.verified.razor.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

2-
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: 200px;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" b-dsxskpj5rr="" blazor:elementreference="">
2+
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: 200px;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" tabindex="-1" b-dsxskpj5rr="" blazor:elementreference="">
33
<div class="stack-horizontal fluent-dialog-header" style="justify-content: start; align-items: start; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
44
<div style="width: 100%;">
55
<h4 typo="pane-header" class="fluent-typography" b-1nnnfjehkp="">Sample title</h4>
66
</div>
7-
<fluent-button type="button" aria-label="Close" appearance="stealth" blazor:onclick="6" b-x1200685t0="" blazor:elementreference="xxx">
8-
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="8">
7+
<fluent-button type="button" id="xxx" appearance="stealth" blazor:onclick="7" aria-label="Close" b-x1200685t0="" blazor:elementreference="xxx">
8+
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="9" blazor:onclick="10">
99
<path d="m4.4 4.55.07-.08a.75.75 0 0 1 .98-.07l.08.07L12 10.94l6.47-6.47a.75.75 0 1 1 1.06 1.06L13.06 12l6.47 6.47c.27.27.3.68.07.98l-.07.08a.75.75 0 0 1-.98.07l-.08-.07L12 13.06l-6.47 6.47a.75.75 0 0 1-1.06-1.06L10.94 12 4.47 5.53a.75.75 0 0 1-.07-.98l.07-.08-.07.08Z"></path>
1010
</svg>
1111
</fluent-button>
1212
</div>
1313
<div class="stack-horizontal fluent-dialog-footer" style="justify-content: end; align-items: end; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
14-
<fluent-button type="button" appearance="accent" blazor:onclick="7" b-x1200685t0="" blazor:elementreference="xxx">Close</fluent-button>
14+
<fluent-button type="button" appearance="accent" blazor:onclick="8" b-x1200685t0="" blazor:elementreference="xxx">Close</fluent-button>
1515
</div>
1616
<div class="fluent-dialog-body">
1717
My body
1818
</div>
19-
</fluent-dialog>
19+
</fluent-dialog>

‎tests/Core/Dialog/FluentDialogServiceTests.FluentDialogService_HeightUnset.verified.razor.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

2-
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" b-dsxskpj5rr="" blazor:elementreference="">
2+
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" tabindex="-1" b-dsxskpj5rr="" blazor:elementreference="">
33
<div class="stack-horizontal fluent-dialog-header" style="justify-content: start; align-items: start; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
44
<div style="width: 100%;">
55
<h4 typo="pane-header" class="fluent-typography" b-1nnnfjehkp="">Sample title</h4>
66
</div>
7-
<fluent-button type="button" aria-label="Close" appearance="stealth" blazor:onclick="6" b-x1200685t0="" blazor:elementreference="xxx">
8-
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="8">
7+
<fluent-button type="button" id="xxx" appearance="stealth" blazor:onclick="7" aria-label="Close" b-x1200685t0="" blazor:elementreference="xxx">
8+
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="9" blazor:onclick="10">
99
<path d="m4.4 4.55.07-.08a.75.75 0 0 1 .98-.07l.08.07L12 10.94l6.47-6.47a.75.75 0 1 1 1.06 1.06L13.06 12l6.47 6.47c.27.27.3.68.07.98l-.07.08a.75.75 0 0 1-.98.07l-.08-.07L12 13.06l-6.47 6.47a.75.75 0 0 1-1.06-1.06L10.94 12 4.47 5.53a.75.75 0 0 1-.07-.98l.07-.08-.07.08Z"></path>
1010
</svg>
1111
</fluent-button>
1212
</div>
1313
<div class="stack-horizontal fluent-dialog-footer" style="justify-content: end; align-items: end; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
14-
<fluent-button type="button" appearance="accent" blazor:onclick="7" b-x1200685t0="" blazor:elementreference="xxx">Close</fluent-button>
14+
<fluent-button type="button" appearance="accent" blazor:onclick="8" b-x1200685t0="" blazor:elementreference="xxx">Close</fluent-button>
1515
</div>
1616
<div class="fluent-dialog-body">
1717
My body
1818
</div>
19-
</fluent-dialog>
19+
</fluent-dialog>

‎tests/Core/Dialog/FluentDialogServiceTests.FluentDialog_RenderFragment.verified.razor.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" b-dsxskpj5rr="" blazor:elementreference="">
2+
<fluent-dialog id="xxx" class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" blazor:ondialogdismiss="1" tabindex="-1" b-dsxskpj5rr="" blazor:elementreference="">
33
<div class="stack-horizontal fluent-dialog-header" style="justify-content: start; align-items: start; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
44
<div style="width: 100%;">
55
<h4 typo="pane-header" class="fluent-typography" b-1nnnfjehkp="">Render Fragment Example</h4>
66
</div>
7-
<fluent-button type="button" aria-label="Close" aria-label="Close" appearance="stealth" blazor:onclick="2" b-x1200685t0="" blazor:elementreference="xxx">
8-
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="5">
7+
<fluent-button type="button" id="xxx" appearance="stealth" blazor:onclick="2" aria-label="Close" b-x1200685t0="" blazor:elementreference="xxx">
8+
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="5" blazor:onclick="6">
99
<path d="m4.4 4.55.07-.08a.75.75 0 0 1 .98-.07l.08.07L12 10.94l6.47-6.47a.75.75 0 1 1 1.06 1.06L13.06 12l6.47 6.47c.27.27.3.68.07.98l-.07.08a.75.75 0 0 1-.98.07l-.08-.07L12 13.06l-6.47 6.47a.75.75 0 0 1-1.06-1.06L10.94 12 4.47 5.53a.75.75 0 0 1-.07-.98l.07-.08-.07.08Z"></path>
1010
</svg>
1111
</fluent-button>
@@ -17,4 +17,4 @@ <h4 typo="pane-header" class="fluent-typography" b-1nnnfjehkp="">Render Fragment
1717
<fluent-button type="button" aria-label="OK" title="OK" appearance="accent" blazor:onclick="3" b-x1200685t0="" blazor:elementreference="xxx">OK</fluent-button>
1818
<fluent-button type="button" aria-label="Cancel" title="Cancel" appearance="neutral" blazor:onclick="4" b-x1200685t0="" blazor:elementreference="xxx">Cancel</fluent-button>
1919
</div>
20-
</fluent-dialog>
20+
</fluent-dialog>

‎tests/Core/Dialog/FluentDialogServiceTests.razor‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
@inherits TestContext
33
@code
44
{
5+
[Inject]
6+
private LibraryConfiguration LibraryConfiguration { get; set; } = new LibraryConfiguration();
7+
8+
public FluentDialogServiceTests()
9+
{
10+
Services.AddSingleton(LibraryConfiguration);
11+
}
12+
513
[Fact]
614
public async Task FluentDialogService_Default()
715
{

‎tests/Core/Dialog/FluentDialogTests.FluentDialog_Default.verified.razor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
<fluent-dialog class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" b-dsxskpj5rr="" blazor:elementreference="xxx">My dialog content</fluent-dialog>
2+
<fluent-dialog class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" tabindex="-1" b-dsxskpj5rr="" blazor:elementreference="xxx">My dialog content</fluent-dialog>

‎tests/Core/Dialog/FluentDialogTests.FluentDialog_HeaderFooter.verified.razor.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11

2-
<fluent-dialog class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" b-dsxskpj5rr="" blazor:elementreference="">
2+
<fluent-dialog class="fluent-dialog-main prevent-scroll" style="position: absolute; z-index: 999; top: 50%; left: 50%; --dialog-width: 500px; --dialog-height: unset;" modal="true" trap-focus="true" tabindex="-1" b-dsxskpj5rr="" blazor:elementreference="">
33
<div class="stack-horizontal fluent-dialog-header" style="justify-content: start; align-items: start; column-gap: 10px; row-gap: 10px; width: 100%;" b-0nr62qx0mz="">
44
<div style="width: 100%;">
55
Header content
66
</div>
7-
<fluent-button type="button" appearance="stealth" blazor:onclick="1" b-x1200685t0="" blazor:elementreference="">
8-
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onclick="2">
7+
<fluent-button type="button" id="xxx" appearance="stealth" blazor:onclick="1" b-x1200685t0="" blazor:elementreference="">
8+
<svg style="width: 16px; fill: var(--accent-fill-rest);" focusable="false" viewBox="0 0 24 24" aria-hidden="true" blazor:onkeydown="3" blazor:onclick="4">
99
<path d="m4.4 4.55.07-.08a.75.75 0 0 1 .98-.07l.08.07L12 10.94l6.47-6.47a.75.75 0 1 1 1.06 1.06L13.06 12l6.47 6.47c.27.27.3.68.07.98l-.07.08a.75.75 0 0 1-.98.07l-.08-.07L12 13.06l-6.47 6.47a.75.75 0 0 1-1.06-1.06L10.94 12 4.47 5.53a.75.75 0 0 1-.07-.98l.07-.08-.07.08Z"></path>
1010
</svg>
1111
</fluent-button>
12+
<fluent-tooltip anchor="xxx" delay="300" blazor:ontooltipdismiss="2" placement="Placement.Bottom" blazor:elementreference=""></fluent-tooltip>
1213
</div>
1314
<div class="fluent-dialog-body">
1415
Body content

‎tests/Core/Dialog/FluentDialogTests.razor‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
@using Xunit;
1+
@using Xunit;
22
@inherits TestContext
33
@code
44
{
5+
[Inject]
6+
private LibraryConfiguration LibraryConfiguration { get; set; } = new LibraryConfiguration();
7+
8+
public FluentDialogTests()
9+
{
10+
Services.AddSingleton(LibraryConfiguration);
11+
}
12+
513
[Fact]
614
public void FluentDialog_Default()
715
{
@@ -65,4 +73,4 @@
6573
var result = cut.Markup;
6674
});
6775
}
68-
}
76+
}

0 commit comments

Comments
 (0)