Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
vnbaaij committed Nov 13, 2024
2 parents 675b5a9 + a288ed0 commit 3d97d42
Show file tree
Hide file tree
Showing 67 changed files with 567 additions and 123 deletions.
4 changes: 2 additions & 2 deletions .config/tsaoptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"[email protected]"
],
"projectName": "DEVDIV",
"repositoryName": "microsoft-fluentui-blazor",
"repositoryName": "fluentui-blazor",
"template": "TFSDEVDIV"
}
}
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

<VersionFile>4.10.3</VersionFile>
<VersionPrefix>4.10.3</VersionPrefix>
<VersionFile>4.10.4</VersionFile>
<VersionPrefix>4.10.4</VersionPrefix>
<VersionSuffix></VersionSuffix>
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
<FileVersion>$(VersionFile)</FileVersion>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<RuntimeVersion8>8.0.0</RuntimeVersion8>
<AspNetCoreVersion8>8.0.10</AspNetCoreVersion8>
<EfCoreVersion8>8.0.10</EfCoreVersion8>
<RuntimeVersion9>9.0.0-rc.2.24473.5</RuntimeVersion9>
<AspNetCoreVersion9>9.0.0-rc.2.24474.3</AspNetCoreVersion9>
<EfCoreVersion9>9.0.0-rc.2.24474.1</EfCoreVersion9>
<RuntimeVersion9>9.0.0</RuntimeVersion9>
<AspNetCoreVersion9>9.0.0</AspNetCoreVersion9>
<EfCoreVersion9>9.0.0</EfCoreVersion9>
</PropertyGroup>
<ItemGroup>
<!-- For Sample Apps -->
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ maintaining accessibility. This is accomplished through setting various "design
You can use this library in **Blazor Hybrid** (MAUI/WPF/Windows Forms) projects. Setup is almost the same as described in the "Getting started" section above, but to get everything to work you'll need to take one extra steps (for now) described below.

### Temporary workaround for MAUI/WPF/Windows Forms issues

> [!NOTE]
> The workaround below only applies to .NET 8 (and below). As of .NET 9 this workaround is no longer needed. If you have this workaround in place for .NET 9 your Blazor Hybrid project **will not load**.
Currently when using the WebView to run Blazor (so all Hybrid variants) the web-components script is not imported automatically (see [#404](https://github.com/microsoft/fluentui-blazor/issues/404)).
There is also an issue with loading the custom event handlers that are being configured by the web-components script. Until these are fixed on the WebView side, there is a workaround available, namely to intercept `'_framework/blazor.modules.json'` and provide proper JS initializers file (created by build). The needed `initializersLoader.webview.js` has been added to the library and needs to be included with a script tag **before** the `_framework/blazor.webview.js` script tag:

Expand Down Expand Up @@ -186,6 +190,14 @@ and offers support, like most other open source projects, on a best effort base
We offer some guidelines on how you can get started [contributing to the project](https://github.com/microsoft/fluentui-blazor/blob/main/docs/contributing.md).
We also have a document that explains and shows how to [write and develop unit tests](https://github.com/microsoft/fluentui-blazor/blob/main/docs/unit-tests.md)

### 🏆 Contributors

<a href="https://github.com/microsoft/fluentui-blazor/graphs/contributors">
<img src="https://contrib.rocks/image?repo=microsoft/fluentui-blazor" />
</a>

Made with [contrib.rocks](https://contrib.rocks).

## Joining the Community

Looking to get answers to questions or engage with us in real-time? Our community is active on [Gitter](https://app.gitter.im/#/room/#fluentui-blazor:gitter.im) and [Discord](https://discord.gg/FcSNfg4). Submit requests
Expand Down
69 changes: 69 additions & 0 deletions WHATSNEW.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,72 @@
## V4.10.4

### General
- \[General\] Supports .NET 9 GA version

### Components
- \[Accordion\] Fix RTL specific styling ([#2917](https://github.com/microsoft/fluentui-blazor/pull/2917))
- \[Autocomplete\] Fix Icon Titles (Dismiss and Search) and delete predefined element ([#2891](https://github.com/microsoft/fluentui-blazor/pull/2891))
- \[Autocomplete\] Fix the Autocomplete Clear button ([#2906](https://github.com/microsoft/fluentui-blazor/pull/2906))
- \[Calendar\] Fix the Calendar disabled day in RTL direction ([#2909](https://github.com/microsoft/fluentui-blazor/pull/2909))
- \[DataGrid\] Fix `SelectAll` after reloading data when the `Virtualize` is set ([#2915](https://github.com/microsoft/fluentui-blazor/pull/2915))
- \[DataGrid\] Remove optimalization check as it can break in certain scenarios ([#2875](https://github.com/microsoft/fluentui-blazor/pull/2875))
- \[KeyCode\] Add a new `StopRepeat` property ([#2908](https://github.com/microsoft/fluentui-blazor/pull/2908))
- \[MessageBar\] Implement ClearAfterNavigation on provider level ([#2919](https://github.com/microsoft/fluentui-blazor/pull/2919))
- \[Select\] Fix ValueChanged regression [#2923](https://github.com/microsoft/fluentui-blazor/issues/2923)
- \[Tab\] Use correct color for close icon ([#2922](https://github.com/microsoft/fluentui-blazor/issues/2922))
- \[TreeItem\] Only pass initially selected state to the web component ([#2916](https://github.com/microsoft/fluentui-blazor/pull/2916))

### Demo site and documentation
- \[Docs\] Update README with Blazor Hybrid workaround note ([#2892](https://github.com/microsoft/fluentui-blazor/pull/2892))

### Icons
- Update to Fluent UI System Icons 1.1.265 (changes since 1.1.261)

**What's new (Name / Size(s) / Variant(s))**
- Animal Paw Print / 16, 20, 24, 28, 32, 48 / Filled & Regular
- Arrow Bounce / 12, 28, 48 / Filled & Regular
- Arrow Clockwise Dashes / 28, 48 / Filled & Regular
- Arrow Clockwise Dashes Settings / 16, 20, 24, 28, 32, 48 / Filled & Regular
- Arrow Down Left / 12, 28 / Filled & Regular
- Arrow Flow Diagonal Up Right / 12, 28, 48 / Filled & Regular
- Arrow Up Right / 12, 28 / Filled & Regular
- Arrow Up Right Dashes / 12, 20, 24, 28, 32, 48 / Filled & Regular
- Arrow Wrap / 32 / Filled & Regular
- Arrow Wrap Up To Down / 20, 32 / Filled & Regular
- Chat Off / 16 / Filled & Regular
- Coin Multiple / 16, 24 / Filled & Regular
- Comment Badge / 16, 20, 24 / Filled & Regular
- Connected / 24, 32 / Filled & Regular
- Data Usage / 28, 32, 48 / Filled & Regular
- Data Usage Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
- Document One Page Multiple / 16, 20, 24 / Filled & Regular
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
- Document One Page Multiple Sparkle / 16, 20, 24 / Filled & Regular
- Lightbulb / 32 / Light
- Line Horizontal 1 Dash Dot Dash / 20 / Filled & Regular
- Line Horizontal 1 Dot / 20 / Filled & Regular
- Line Horizontal 3 / 16, 24, 28, 32, 48 / Filled & Regular
- Navigation / 28, 32, 48 / Filled & Regular
- Pause Circle / 16 / Filled & Regular
- Square Text Arrow Repeat All / 16, 20, 24 / Filled & Regular
- Stack / 28, 48 / Filled & Regular
- Stack Off / 16, 20, 24, 28, 32, 48 / Filled & Regular
- Text Bullet List Square / 28 / Filled & Regular
- TextBox / 20, 28, 32, 48 / Filled & Regular
- TextBox Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
- Translate / 32 / Filled & Regular

**What's updated (Name / Size(s) / Variant(s))**
- Add Circle / 16 / Filled & Regular
- Arrow Clockwise Dashes / 16, 20, 24, 32 / Filled & Regular
- Arrow Counterclockwise Dashes / 20, 24 / Filled & Regular
- Coin Multiple / 20 / Filled & Regular
- Subtract Circle Arrow Back / 16 / Filled & Regular
- Subtract Circle Arrow Forward / 16 / Filled & Regular
- Subtract Circle / 16 / Filled & Regular
- TextBox / 16 / Filled

## V4.10.3

### Important note
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ variables:
# File and Package version
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
FileVersion: '4.10.3' # Set the next final version here.
FileVersion: '4.10.4' # Set the next final version here.
PackageSuffix: ''
21 changes: 14 additions & 7 deletions examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2002,11 +2002,6 @@
Sets <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1.GridTemplateColumns"/> to automatically fit the columns to the available width as best it can.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1.SelectColumns">
<summary>
Gets the first (optional) SelectColumn
</summary>
</member>
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1.#ctor">
<summary>
Constructs an instance of <see cref="T:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1"/>.
Expand Down Expand Up @@ -5196,6 +5191,11 @@
its default action should not be taken as it normally would be.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.StopRepeat">
<summary>
Gets or sets whether the key pressed can be repeated.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.AdditionalAttributes">
<summary>
Gets or sets a collection of additional attributes that will be applied to the created element.
Expand All @@ -5204,7 +5204,7 @@
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.OnAfterRenderAsync(System.Boolean)">
<summary />
</member>
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.OnKeyDownRaisedAsync(System.Int32,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Int32,System.String)">
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.OnKeyDownRaisedAsync(System.Int32,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Int32,System.String,System.Boolean)">
<summary>
Internal method.
</summary>
Expand All @@ -5216,9 +5216,10 @@
<param name="metaKey"></param>
<param name="location"></param>
<param name="targetId"></param>
<param name="repeat"></param>
<returns></returns>
</member>
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.OnKeyUpRaisedAsync(System.Int32,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Int32,System.String)">
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCode.OnKeyUpRaisedAsync(System.Int32,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Int32,System.String,System.Boolean)">
<summary>
Internal method.
</summary>
Expand All @@ -5230,6 +5231,7 @@
<param name="metaKey"></param>
<param name="location"></param>
<param name="targetId"></param>
<param name="repeat"></param>
<returns></returns>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCodeEventArgs.Name">
Expand Down Expand Up @@ -5284,6 +5286,11 @@
Gets the identifier of the targeted DOM element.
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCodeEventArgs.Repeat">
<summary>
Gets a boolean value that is true if the given key is being held down such that it is automatically repeating.
</summary>
</member>
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentKeyCodeEventArgs.ToString">
<summary>
Returns a string that represents the key pressed.
Expand Down
4 changes: 4 additions & 0 deletions examples/Demo/Shared/Pages/BlazorHybrid.razor
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

<h1>Blazor Hybrid</h1>

<p>
<strong>Note:</strong> The workaround below only applies to .NET 8 (and below). As of .NET 9 this workaround is no longer needed. If you have this workaround in place for .NET 9 your Blazor Hybrid project <strong>will not load</strong>.
</p>

<p>
It is possible to use this library in your Blazor Hybrid projects. Setup is almost the same as described in the "Getting started" section above,
however to get everything to work you'll need to take one extra step:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
</li>
<li><span>Location:</span> <code>@LastKeyCode?.Location.ToString()</code></li>
<li><span>TargetId:</span> <code>@LastKeyCode?.TargetId</code></li>
<li><span>Repeat:</span> <code>@LastKeyCode?.Repeat</code></li>
</ul>
</FluentStack>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
@inject IKeyCodeService KeyCodeService
@implements IAsyncDisposable

<FluentSwitch @bind-Value="@IncludeKeyUp"
CheckedMessage="KeyDown and KeyUp"
UncheckedMessage="KeyDown only"
Style="margin-bottom: 10px;" />
<FluentStack Style="margin-bottom: 10px;">
<FluentSwitch @bind-Value="@IncludeKeyUp"
CheckedMessage="KeyDown and KeyUp"
UncheckedMessage="KeyDown only" />
<FluentSwitch @bind-Value="@StopRepeat"
CheckedMessage="Stop Repeat"
UncheckedMessage="Allow Repeat" />
</FluentStack>

<FluentCard>
@if (!KeyPressed.Any())
Expand All @@ -21,6 +25,7 @@
@code
{
private bool IncludeKeyUp = false;
private bool StopRepeat = false;
private List<(string Key, string Event)> KeyPressed = new();

protected override void OnInitialized()
Expand All @@ -36,6 +41,11 @@
return Task.CompletedTask;
}

if (StopRepeat && args.Repeat)
{
return Task.CompletedTask;
}

KeyPressed.Add((args.ToString(), args.Name));
StateHasChanged();
return Task.CompletedTask;
Expand Down
41 changes: 40 additions & 1 deletion examples/Demo/Shared/Pages/Lab/IssueTester.razor
Original file line number Diff line number Diff line change
@@ -1 +1,40 @@

@page "/counter"


<FluentSelect Value="@_test.BMAddress" Items="@_ddval"
ValueChanged="UpdateSelect2" />
@foreach (var t in _test.CBVal)
{
<FluentCheckbox Value="t.Rval" />
}


@code {

private readonly test _test = new();
private readonly List<string> _ddval = new() { "one", "two" };

private readonly List<Row> _t2 = new() { new Row { Rval = true }, new Row { Rval = false }, new Row { Rval = false }, new Row { Rval = true } };
private readonly List<Row> _t3 = new() { new Row { Rval = false }, new Row { Rval = true }, new Row { Rval = true }, new Row { Rval = true } };

private void UpdateSelect2(string newVal)
{
_test.BMAddress = newVal;
if (newVal == "one") _test.CBVal = _t3;
if (newVal == "two") _test.CBVal = _t2;
if (newVal == null) _test.CBVal = new List<Row>();
}

public class test

Check warning on line 28 in examples/Demo/Shared/Pages/Lab/IssueTester.razor

View workflow job for this annotation

GitHub Actions / Build and deploy Demo site

The type name 'test' only contains lower-cased ascii characters. Such names may become reserved for the language.

Check warning on line 28 in examples/Demo/Shared/Pages/Lab/IssueTester.razor

View workflow job for this annotation

GitHub Actions / Build and deploy Demo site

The type name 'test' only contains lower-cased ascii characters. Such names may become reserved for the language.
{
public string BMAddress { get; set; } = "one";
public List<Row> CBVal { get; set; } = new();
}

public class Row
{
public bool Rval { get; set; }
}


}
21 changes: 20 additions & 1 deletion examples/Demo/Shared/Pages/MessageBar/MessageBarPage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,23 @@
)
</CodeSnippet>

<h2 id="sections">Sections</h2>
<p>
You can use multiple message bar providers in a single page/app. In the example below you can add a message bar on the top of the window, but also
in the notification center or in a dialog. An area to display messages in is called a <code>Section</code>.

You can specify in wich <code>Section</code> you want your message to appear in through the <code>MessageOptions</code>.

</p>

<h2 id="clear">Clear message bars on navigation</h2>
<p>
By default, message bars will not be removed when navigating to another page. This can be changed by setting the <code>ClearAfterNavigation</code>
parameter to true on a <code>FluentMenuProvider</code>. When using multiple providers (see Sections above), the parameter needs to be set for each
provider individually.
You can also set the behavior on a per message basis by using the same parameter of the <code>MessageOptions</code> class.
</p>

<h2 id="example">Examples</h2>

<DemoSection Title="Message Service" Component="typeof(MessageBarDefault)">
Expand All @@ -44,7 +61,7 @@
If you click on "Add in a dialog" multiple times, you will see that only one message is displayed.
Once you dismiss that one, the next one will be displayed.
</p>
<p>This is the advised way to use MessageBars </p>
<p>Using the <code>MessageService</code> is the advised way to use message bars.</p>
</DemoSection>

<DemoSection Title="Timed Messages" Component="typeof(MessageBarTimed)">
Expand Down Expand Up @@ -100,3 +117,5 @@
<ApiDocumentation Component="typeof(MessageService)" />

<ApiDocumentation Component="typeof(Message)" />

<ApiDocumentation Component="typeof(MessageOptions)" />
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Shared/DemoMainLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<div class="content">
<article id="article">

<FluentMessageBarProvider Section="@App.MESSAGES_TOP" />
<FluentMessageBarProvider Section="@App.MESSAGES_TOP" ClearAfterNavigation="true" />


<CascadingValue Value=@OnRefreshTableOfContents>
Expand Down
Loading

0 comments on commit 3d97d42

Please sign in to comment.