Skip to content

Commit

Permalink
Fix cherry pick errors
Browse files Browse the repository at this point in the history
  • Loading branch information
vnbaaij committed Jan 17, 2024
1 parent 31b7459 commit fc75a5b
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 26 deletions.
20 changes: 20 additions & 0 deletions WHATSNEW.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
## V3.5.1
- Issue [#1323](https://github.com/microsoft/fluentui-blazor/issues/1323): Rapidly clicking between UI component throws Microsoft.JSInterop.JSException
- Issue [#1319](https://github.com/microsoft/fluentui-blazor/issues/1319): Fix FluentCheckbox issue
- Issue [#1324](https://github.com/microsoft/fluentui-blazor/issues/1324): Fix JustifyContent enum documentation description
- Issue [#1314](https://github.com/microsoft/fluentui-blazor/issues/1314): Updating FluentTabs ActiveTabId doesn't rerender if data is entered in contained FluentTextInput
- Issue [#1306](https://github.com/microsoft/fluentui-blazor/issues/1306): Better fix for #1205 / #1225 which fixes #1294
- Issue [#1305](https://github.com/microsoft/fluentui-blazor/issues/1305): Combobox component resetting bound object to null when custom content is entered
- Issue [#1283](https://github.com/microsoft/fluentui-blazor/issues/1283): Fix Combobox and Select width property
- Issue [#1279](https://github.com/microsoft/fluentui-blazor/issues/1279): Fix Combobox width without a important mark
- Issue [#1278](https://github.com/microsoft/fluentui-blazor/issues/1278): Add Id to Anchor
- Issue [#1276](https://github.com/microsoft/fluentui-blazor/issues/1276): FluentTabs shows badge although all tabs are visible
- Issue [#1274](https://github.com/microsoft/fluentui-blazor/issues/1274): Width less than 250px does not take effect] in [FluentCombobox and FluentSelect
- Issue [#1273](https://github.com/microsoft/fluentui-blazor/issues/1273): Change CalendarDay IsSelected logic
- Issue [#1270](https://github.com/microsoft/fluentui-blazor/issues/1270): Optimize Dialog CloseAsync Method
- Issue [#1267](https://github.com/microsoft/fluentui-blazor/issues/1267): Add id parameter to FluentCard and FluentStack
- Issue [#1250](https://github.com/microsoft/fluentui-blazor/issues/1250): Fix paginator icons in RTL
- Issue [#1247](https://github.com/microsoft/fluentui-blazor/issues/1247): FluentNavMenu Add OnClick invoke to OnClickHandler
- Issue [#1242](https://github.com/microsoft/fluentui-blazor/issues/1242): Implement OnDialogClosing and OnDialogOpened
- Issue [#1227](https://github.com/microsoft/fluentui-blazor/issues/1227): FluentTreeItem in that span that renders Text proprty is not conditional and adds unnecessary space when gap githubproperty is applied
- Issue [#1226](https://github.com/microsoft/fluentui-blazor/issues/1226): FluentAutocomplete does not have an ElementReference
- Issue [#1215](https://github.com/microsoft/fluentui-blazor/issues/1215): FluentTextField ignores DataList property
- Issue [#1205](https://github.com/microsoft/fluentui-blazor/issues/1205): Slider label max-width set to 30px
- Issue [#1204](https://github.com/microsoft/fluentui-blazor/issues/1204): FluentButton submit does not work outside the EditFor
- Issue [#1194](https://github.com/microsoft/fluentui-blazor/issues/1194): FluentTextField inside FluentTabs, pressing Enter re-renders FluentTab's content
Expand Down
50 changes: 38 additions & 12 deletions examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.Items">
<summary>
A queryable source of data for the grid.
Gets or sets a queryable source of data for the grid.

This could be in-memory data converted to queryable using the
<see cref="M:System.Linq.Queryable.AsQueryable(System.Collections.IEnumerable)"/> extension method,
Expand All @@ -1212,14 +1212,14 @@
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.ItemsProvider">
<summary>
A callback that supplies data for the rid.
Gets or sets a callback that supplies data for the rid.

You should supply either <see cref="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.Items"/> or <see cref="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.ItemsProvider"/>, but not both.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.ChildContent">
<summary>
Defines the child components of this instance. For example, you may define columns by adding
Gets or sets the child components of this instance. For example, you may define columns by adding
components derived from the <see cref="T:Microsoft.Fast.Components.FluentUI.ColumnBase`1"/> base class.
</summary>
</member>
Expand Down Expand Up @@ -1272,28 +1272,29 @@
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.NoTabbing">
<summary>
When true the component will not add itself to the tab queue. Default is false.
Gets or sets a value indicating whether the component will not add itself to the tab queue.
Default is false.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.GenerateHeader">
<summary>
Whether the grid should automatically generate a header row and its type
Gets or sets a value indicating whether the grid should automatically generate a header row and its type.
See <see cref="T:Microsoft.Fast.Components.FluentUI.GenerateHeaderOption"/>
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.GridTemplateColumns">
<summary>
Gets or sets the value that gets applied to the css gridTemplateColumns attribute of child rows
Gets or sets the value that gets applied to the css gridTemplateColumns attribute of child rows.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.OnRowFocus">
<summary>
Gets or sets a callback when a row is focused
Gets or sets a callback when a row is focused.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.OnCellFocus">
<summary>
Gets or sets a callback when a row is focused
Gets or sets a callback when a row is focused.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.RowClass">
Expand All @@ -1304,6 +1305,7 @@
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.RowStyle">
<summary>
Optionally defines a style to be applied to a rendered row.
Do not use to dynamically update a row style after rendering as this will interfere with the script that use this attribute. Use <see cref="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.RowClass"/> instead.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDataGrid`1.EmptyContent">
Expand Down Expand Up @@ -2294,6 +2296,24 @@
Callback function for the result.
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.DialogParameters.OnDialogClosing">
<summary>
Callback function that is called and awaited before the dialog fully closes.
</summary>
<remarks>
This is a suitable callback to use for animating the Dialog <em>before</em> it fully closes and is removed from the DOM.
This method is only called when using the <see cref="T:Microsoft.Fast.Components.FluentUI.IDialogService"/>.
</remarks>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.DialogParameters.OnDialogOpened">
<summary>
Callback function that is called and awaited after the dialog renders for the first time.
</summary>
<remarks>
This is a suitable callback to use for animating the Dialog <em>after</em> it is fully rendered in the DOM.
This method is only called when using the <see cref="T:Microsoft.Fast.Components.FluentUI.IDialogService"/>.
</remarks>
</member>
<member name="T:Microsoft.Fast.Components.FluentUI.DialogParameters`1">
<summary>
Parameters for a dialog.
Expand Down Expand Up @@ -2615,7 +2635,7 @@
</member>
<member name="E:Microsoft.Fast.Components.FluentUI.DialogService.OnShow">
<summary>
A event that will be invoked when showing a dialog with a custom component
An event that will be invoked when showing a dialog with a custom component
</summary>
</member>
<member name="M:Microsoft.Fast.Components.FluentUI.IDialogService.ShowDialogAsync``1(System.Type,``0,Microsoft.Fast.Components.FluentUI.DialogParameters)">
Expand Down Expand Up @@ -2678,7 +2698,7 @@
</member>
<member name="E:Microsoft.Fast.Components.FluentUI.IDialogService.OnShow">
<summary>
A event that will be invoked when showing a dialog with a custom component
An event that will be invoked when showing a dialog with a custom component
</summary>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentDivider.Role">
Expand Down Expand Up @@ -6147,6 +6167,13 @@
<member name="M:Microsoft.Fast.Components.FluentUI.FluentTabs.DisplayMoreTabAsync(Microsoft.Fast.Components.FluentUI.FluentTab)">
<summary />
</member>
<member name="M:Microsoft.Fast.Components.FluentUI.FluentTabs.GoToTabAsync(System.String)">
<summary>
Go to a specific tab by specifying an id
</summary>
<param name="TabId">Id of the tab to goto</param>
<returns></returns>
</member>
<member name="P:Microsoft.Fast.Components.FluentUI.FluentTextArea.Resize">
<summary>
Gets or sets if the text area is resizeable. See <see cref="T:Microsoft.Fast.Components.FluentUI.TextAreaResize"/>
Expand Down Expand Up @@ -10581,8 +10608,7 @@
</member>
<member name="T:Microsoft.Fast.Components.FluentUI.JustifyContent">
<summary>
The size of the emoji (in multiples of 32).
Defauts to Size32
Defines the alignment of items along the main axis of a flex container.
</summary>
</member>
<member name="F:Microsoft.Fast.Components.FluentUI.JustifyContent.FlexStart">
Expand Down
20 changes: 20 additions & 0 deletions examples/Demo/Shared/wwwroot/docs/WhatsNew.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,24 @@
## V3.5.1
- Issue [#1323](https://github.com/microsoft/fluentui-blazor/issues/1323): Rapidly clicking between UI component throws Microsoft.JSInterop.JSException
- Issue [#1319](https://github.com/microsoft/fluentui-blazor/issues/1319): Fix FluentCheckbox issue
- Issue [#1324](https://github.com/microsoft/fluentui-blazor/issues/1324): Fix JustifyContent enum documentation description
- Issue [#1314](https://github.com/microsoft/fluentui-blazor/issues/1314): Updating FluentTabs ActiveTabId doesn't rerender if data is entered in contained FluentTextInput
- Issue [#1306](https://github.com/microsoft/fluentui-blazor/issues/1306): Better fix for #1205 / #1225 which fixes #1294
- Issue [#1305](https://github.com/microsoft/fluentui-blazor/issues/1305): Combobox component resetting bound object to null when custom content is entered
- Issue [#1283](https://github.com/microsoft/fluentui-blazor/issues/1283): Fix Combobox and Select width property
- Issue [#1279](https://github.com/microsoft/fluentui-blazor/issues/1279): Fix Combobox width without a important mark
- Issue [#1278](https://github.com/microsoft/fluentui-blazor/issues/1278): Add Id to Anchor
- Issue [#1276](https://github.com/microsoft/fluentui-blazor/issues/1276): FluentTabs shows badge although all tabs are visible
- Issue [#1274](https://github.com/microsoft/fluentui-blazor/issues/1274): Width less than 250px does not take effect] in [FluentCombobox and FluentSelect
- Issue [#1273](https://github.com/microsoft/fluentui-blazor/issues/1273): Change CalendarDay IsSelected logic
- Issue [#1270](https://github.com/microsoft/fluentui-blazor/issues/1270): Optimize Dialog CloseAsync Method
- Issue [#1267](https://github.com/microsoft/fluentui-blazor/issues/1267): Add id parameter to FluentCard and FluentStack
- Issue [#1250](https://github.com/microsoft/fluentui-blazor/issues/1250): Fix paginator icons in RTL
- Issue [#1247](https://github.com/microsoft/fluentui-blazor/issues/1247): FluentNavMenu Add OnClick invoke to OnClickHandler
- Issue [#1242](https://github.com/microsoft/fluentui-blazor/issues/1242): Implement OnDialogClosing and OnDialogOpened
- Issue [#1227](https://github.com/microsoft/fluentui-blazor/issues/1227): FluentTreeItem in that span that renders Text proprty is not conditional and adds unnecessary space when gap githubproperty is applied
- Issue [#1226](https://github.com/microsoft/fluentui-blazor/issues/1226): FluentAutocomplete does not have an ElementReference
- Issue [#1215](https://github.com/microsoft/fluentui-blazor/issues/1215): FluentTextField ignores DataList property
- Issue [#1205](https://github.com/microsoft/fluentui-blazor/issues/1205): Slider label max-width set to 30px
- Issue [#1204](https://github.com/microsoft/fluentui-blazor/issues/1204): FluentButton submit does not work outside the EditFor
- Issue [#1194](https://github.com/microsoft/fluentui-blazor/issues/1194): FluentTextField inside FluentTabs, pressing Enter re-renders FluentTab's content
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Components/Base/FluentInputBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public abstract partial class FluentInputBase<TValue> : FluentComponentBase, IDi
/// @bind-Value="model.PropertyName"
/// </example>
[Parameter]
public TValue? Value { get; set; }
public virtual TValue? Value { get; set; }

/// <summary>
/// Gets or sets a callback that updates the bound value.
Expand Down
4 changes: 0 additions & 4 deletions src/Core/Components/DateTime/FluentCalendarBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ public virtual DateTime? Value
{
ValueChanged.InvokeAsync(value);
}
if (FieldBound)
{
EditContext?.NotifyFieldChanged(FieldIdentifier);
}
}
}

Expand Down
13 changes: 6 additions & 7 deletions src/Core/Components/Dialog/Parameters/IDialogParameters.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components;

namespace Microsoft.FluentUI.AspNetCore.Components;
namespace Microsoft.Fast.Components.FluentUI;

public interface IDialogParameters
{
Expand Down Expand Up @@ -30,9 +30,8 @@ public interface IDialogParameters
EventCallback<DialogInstance> OnDialogOpened { get; set; }
}

public interface IDialogParameters<TContent> : IDialogParameters
where TContent : class
{
TContent Content { get; set; }
}
}
public interface IDialogParameters<TContent> : IDialogParameters
where TContent : class
{
TContent Content { get; set; }
}
2 changes: 1 addition & 1 deletion src/Core/Components/List/FluentCombobox.razor.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Microsoft.AspNetCore.Components;
using Microsoft.FluentUI.AspNetCore.Components.Utilities;
using Microsoft.Fast.Components.FluentUI.Utilities;

namespace Microsoft.Fast.Components.FluentUI;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

<fluent-card style="--card-width: 350px; --card-height: 400px;" b-f8eq3wukv7="" blazor:elementreference="xxx">childcontent</fluent-card>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

<fluent-card id="xxx" b-6epdlk0xtt="" blazor:elementreference="xxx">childcontent</fluent-card>
<fluent-card id="xxx" style="--card-width: 350px; --card-height: 350px;" b-f8eq3wukv7="" blazor:elementreference="xxx">childcontent</fluent-card>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

<fluent-card style="--card-width: 400px; --card-height: 350px;" b-f8eq3wukv7="" blazor:elementreference="xxx">childcontent</fluent-card>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

<fluent-card style="--card-width: 400px; --card-height: 400px;" b-f8eq3wukv7="" blazor:elementreference="xxx">childcontent</fluent-card>

0 comments on commit fc75a5b

Please sign in to comment.