Fix cherry picking

microsoft · Nov 30, 2023 · f9751fc · f9751fc
1 parent 80656a5
commit f9751fc
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 73 deletions.
diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,5 +1,9 @@
 ## V3.4.1
--Fix [#1040](https://github.com/microsoft/fluentui-blazor/issues/1040): FluentNumberField can be changedwhen ReadOnly
+- Fix [#1040](https://github.com/microsoft/fluentui-blazor/issues/1040): FluentNumberField can be changed when ReadOnly
+- Fix [#917](https://github.com/microsoft/fluentui-blazor/issues/917) Multiple Header and Footer detection in Dialog
+- FluentNavMenu: Add `Tooltip` parameter to `FluentNavMenuGroup` (fallback to `Title`) and `FluentNavLink`
+- FluentNavMenu: Expand the menu when collapsed and a navitem is clicked 
+- FluentInputFile: Add ProgressTemplate and a bindable ProgressPercent attribute
 
 ## V3.4.0
 - FluentCheckbox: Add tri-state support

diff --git a/examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml b/examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml
@@ -761,6 +761,11 @@
             Gets or sets the state of the CheckBox: true, false or null.
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentCheckbox.CheckStateChanged">
+            <summary>
+            Gets or sets a callback that updates the <see cref="P:Microsoft.Fast.Components.FluentUI.FluentCheckbox.CheckState"/>.
+            </summary>
+        </member>
         <member name="M:Microsoft.Fast.Components.FluentUI.FluentCheckbox.SetCurrentAndIntermediate(System.Nullable{System.Boolean})">
             <summary />
         </member>
@@ -1985,6 +1990,11 @@
             The event callback invoked to return the dialog result.
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentDialog.CallingFromDialogService">
+            <summary>
+            Gets True if the Dialog was called from the DialogService.
+            </summary>
+        </member>
         <member name="M:Microsoft.Fast.Components.FluentUI.FluentDialog.OnInitialized">
             <summary />
         </member>
@@ -3268,6 +3278,9 @@
         <member name="T:Microsoft.Fast.Components.FluentUI.FluentInputFile">
             <summary />
         </member>
+        <member name="M:Microsoft.Fast.Components.FluentUI.FluentInputFile.#ctor">
+            <summary />
+        </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.JSRuntime">
             <summary />
         </member>
@@ -3292,55 +3305,50 @@
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.MaximumFileCount">
             <summary>
             To select multiple files, set the maximum number of files allowed to be uploaded.
-            Default value is 10
+            Default value is 10.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.MaximumFileSize">
             <summary>
-            Maximum size of a file to be uploaded (in bytes).
+            Gets or sets the maximum size of a file to be uploaded (in bytes).
             Default value is 10 MB.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.BufferSize">
             <summary>
-            Size of buffer to read bytes from uploaded file (in bytes).
+            Gets or sets the sze of buffer to read bytes from uploaded file (in bytes).
             Default value is 10 KB.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.Accept">
             <summary>
-            Filter for what file types the user can pick from the file input dialog box.
+            Gets or sets the filter for what file types the user can pick from the file input dialog box.
             Example: ".gif, .jpg, .png, .doc", "audio/*", "video/*", "image/*"
             See <see href="https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept">https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept</see>
             for more information.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.Mode">
             <summary>
-            Type of file reading.
+            Gets or sets the type of file reading.
             For SaveToTemporaryFolder, use <see cref="P:Microsoft.Fast.Components.FluentUI.FluentInputFileEventArgs.LocalFile" /> to retrieve the file.
             For Buffer, use <see cref="P:Microsoft.Fast.Components.FluentUI.FluentInputFileEventArgs.Buffer" /> to retrieve bytes.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.DragDropZoneVisible">
             <summary>
-            Drag/Drop zone visible or not. Default is true.
-            You can.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressTitle">
-            <summary>
-            Current label display when an upload is in progress.
+            Gets or sets a value indicating whether the Drag/Drop zone is visible. 
+            Default is true.
             </summary>
         </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressPercent">
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ChildContent">
             <summary>
-            Current global value of the percentage of a current upload.
+            Gets or sets the child content of the component.
             </summary>
         </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ChildContent">
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressTemplate">
             <summary>
-            Child content of the component.
+            Gets or sets the progress content of the component.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.OnInputFileChange">
@@ -3362,7 +3370,7 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.OnFileError">
             <summary>
-            Raise when a file raised an error.
+            Raise when a file raised an error. Not yet used.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.OnCompleted">
@@ -3372,12 +3380,33 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.AnchorId">
             <summary>
-            Identifier of the source component clickable by the end user.
+            Gets or sets the identifier of the source component clickable by the end user.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressTitle">
+            <summary>
+            Gets the current label display when an upload is in progress.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressPercent">
+            <summary>
+            Gets or sets the current global value of the percentage of a current upload.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressPercentChanged">
+            <summary>
+            Gets or sets a callback that updates the <see cref="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressPercent"/>.
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressFileDetails">
+            <summary />
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.ProgressStyle">
+            <summary />
+        </member>
         <member name="M:Microsoft.Fast.Components.FluentUI.FluentInputFile.ShowFilesDialogAsync">
             <summary>
-            Open the dialogbox to select files.
+            Open the dialog-box to select files.
             Use <see cref="P:Microsoft.Fast.Components.FluentUI.FluentInputFile.AnchorId"/> instead to specify the ID of the button (for example) on which the user should click.
             ⚠️ This method doesn't work on Safari and iOS.
             </summary>
@@ -4719,15 +4748,14 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuTree.ExpanderContent">
             <summary>
-            Gets or sets the content to be rendered for the expander icon
-            when the menu is collapsible.  The default icon will be used if
-            this is not specified.
+            Gets or sets the content to be rendered for the expander icon when the menu is collapsible. 
+            The default icon will be used if this is not specified.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuTree.Title">
             <summary>
-            Gets or sets the title of the navigation menu
-            Default to "Navigation menu"
+            Gets or sets the title of the navigation menu.
+            Default to "Navigation menu".
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuTree.Width">
@@ -4755,8 +4783,7 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuTree.InitiallyExpanded">
             <summary>
-            If set to <see langword="true"/> then the tree will
-            expand when it is created.
+            If set to <see langword="true"/> then the tree will expand when it is created.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavMenuTree.ReNavigate">
@@ -4837,23 +4864,24 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Href">
             <summary>
-            URL for the group.
+            Gets or sets the URL for the group.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Target">
             <summary>
-            The target attribute specifies where to open the group, if Href is specified. 
+            Gets or sets the target attribute that specifies where to open the group, if Href is specified. 
             Possible values: _blank | _self | _parent | _top.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Icon">
             <summary>
-            Icon to use if set.
+            Gets or sets the Icon to use if set.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.IconColor">
             <summary>
-            The color of the icon. It supports the theme colors, default value uses the themes drawer icon color.
+            Gets or sets the color of the icon. 
+            It supports the theme colors, default value uses the themes drawer icon color.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Disabled">
@@ -4868,12 +4896,19 @@
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.ActiveClass">
             <summary>
-            Class names to use to indicate the item is active, separated by space.
+            Gets or sets the class names to use to indicate the item is active, separated by space.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Match">
             <summary>
-            Gets or sets how the link should be matched. Defaults to <see cref="F:Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix"/>.
+            Gets or sets how the link should be matched. 
+            Defaults to <see cref="F:Microsoft.AspNetCore.Components.Routing.NavLinkMatch.Prefix"/>.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.Tooltip">
+            <summary>
+            Gets or sets the tooltip to display when the mouse is placed over the item.
+            For  <see cref="T:Microsoft.Fast.Components.FluentUI.FluentNavGroup" /> the <c>Title</c> is used as fallback.
             </summary>
         </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentNavBase.HasIcon">
@@ -11138,42 +11173,6 @@
             If set to true, add the FluentTooltipProvider component at end of the MainLayout.razor page.
             </summary>
         </member>
-        <member name="T:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource">
-            <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.ResourceManager">
-            <summary>
-              Returns the cached ResourceManager instance used by this class.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.Culture">
-            <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.LoadingAfter">
-            <summary>
-              Looks up a localized string similar to Completed.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.LoadingBefore">
-            <summary>
-              Looks up a localized string similar to Loading....
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.LoadingCanceled">
-            <summary>
-              Looks up a localized string similar to Canceled.
-            </summary>
-        </member>
-        <member name="P:Microsoft.Fast.Components.FluentUI.Resources.FluentInputFileResource.LoadingInProgress">
-            <summary>
-              Looks up a localized string similar to Loading {0}/{1} - {2}.
-            </summary>
-        </member>
         <member name="T:Microsoft.Fast.Components.FluentUI.Resources.TimeAgoResource">
             <summary>
               A strongly-typed resource class, for looking up localized strings, etc.

diff --git a/examples/Demo/Shared/wwwroot/docs/WhatsNew.md b/examples/Demo/Shared/wwwroot/docs/WhatsNew.md
@@ -1,5 +1,9 @@
 ## V3.4.1
--Fix [#1040](https://github.com/microsoft/fluentui-blazor/issues/1040): FluentNumberField can be changedwhen ReadOnly
+- Fix [#1040](https://github.com/microsoft/fluentui-blazor/issues/1040): FluentNumberField can be changed when ReadOnly
+- Fix [#917](https://github.com/microsoft/fluentui-blazor/issues/917) Multiple Header and Footer detection in Dialog
+- FluentNavMenu: Add `Tooltip` parameter to `FluentNavMenuGroup` (fallback to `Title`) and `FluentNavLink`
+- FluentNavMenu: Expand the menu when collapsed and a navitem is clicked 
+- FluentInputFile: Add ProgressTemplate and a bindable ProgressPercent attribute
 
 ## V3.4.0
 - FluentCheckbox: Add tri-state support

diff --git a/src/Core/Components/InputFile/FluentInputFile.razor.cs b/src/Core/Components/InputFile/FluentInputFile.razor.cs
@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.Fast.Components.FluentUI.Resources;
 using Microsoft.Fast.Components.FluentUI.Utilities;
-using Microsoft.FluentUI.AspNetCore.Components.Utilities;
+
 using Microsoft.JSInterop;
 
 

diff --git a/src/Core/Components/InputFile/ProgressFileDetails.cs b/src/Core/Components/InputFile/ProgressFileDetails.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.FluentUI.AspNetCore.Components;
+namespace Microsoft.Fast.Components;
 
 public record struct ProgressFileDetails(int Index, string Name, int Percentage);