Fix cherry pick errors, update docs, etc

microsoft · Nov 9, 2023 · ee27ac6 · ee27ac6
1 parent 99617a7
commit ee27ac6
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 22 deletions.
diff --git a/examples/Demo/Shared/Infrastructure/DemoIcons.cs b/examples/Demo/Shared/Infrastructure/DemoIcons.cs
@@ -1,4 +1,4 @@
-using Microsoft.FluentUI.AspNetCore.Components;
+using Microsoft.Fast.Components.FluentUI;
 
 namespace FluentUI.Demo.Shared
 {

diff --git a/examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml b/examples/Demo/Shared/Microsoft.Fast.Components.FluentUI.xml
@@ -5606,6 +5606,9 @@
             Gets or sets the width of the spacer (in pixels)
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentSplitter.InlineStyleValue">
+            <summary />
+        </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentSplitter.ClassValue">
             <summary />
         </member>
@@ -5641,6 +5644,12 @@
             See <see href="https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns">mdn web docs</see> for more information 
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.FluentSplitter.Collapsed">
+            <summary>
+            Gets or sets a value indicating whether the splitter is collapsed.
+            If set to true, Panel1 will take up all the space and Panel2 as well as the splitter bar will be hidden.
+            </summary>
+        </member>
         <member name="P:Microsoft.Fast.Components.FluentUI.FluentStack.HorizontalAlignment">
             <summary>
             The horizontal alignment of the components in the stack. 
@@ -10883,6 +10892,16 @@
             whenever a user attempts to execute the default action on a <see cref="T:Microsoft.Fast.Components.FluentUI.FluentNavMenuItemBase"/>.
             </summary>
         </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.SplitterResizedEventArgs.Panel1Size">
+            <summary>
+            Gets the size of panel 1 (top/left) after a resize operation
+            </summary>
+        </member>
+        <member name="P:Microsoft.Fast.Components.FluentUI.SplitterResizedEventArgs.Panel2Size">
+            <summary>
+            Gets the size of the panel 2 (bottom/right) after a resize operation
+            </summary>  
+        </member>
         <member name="M:Microsoft.Fast.Components.FluentUI.AdditionalAttributesExtensions.RenderedAttributesEqual(System.Collections.Generic.IReadOnlyDictionary{System.String,System.Object},System.Collections.Generic.IReadOnlyDictionary{System.String,System.Object})">
             <summary> Determines whether two sets of attributes are equal when rendered. </summary>
             <param name="x">The compared set</param>

diff --git a/examples/Demo/Shared/Pages/Index/Index.razor b/examples/Demo/Shared/Pages/Index/Index.razor
@@ -6,7 +6,7 @@
 
 <h1>Welcome to the Fluent UI Blazor components library</h1>
 <div class="demopanel" style="margin: 1rem 0; padding: 2.5rem; text-align: center">
-	<p>This is the demo and documentation site for version <strong>3.3.0</strong> of the library. This is the version that supports .NET 6 and 7.</p>
+	<p>This is the demo and documentation site for version <strong>3.4.0</strong> of the library. This version <strong>only</strong> supports .NET 6 and 7.</p>
 	<br />
 	<p>
 		The <a href="https://www.fluentui-blazor.net/"> version 4 demo and documentation</a> site (supporting .NET 8) is available as well.

diff --git a/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor b/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor
@@ -31,6 +31,15 @@
 
 <DemoSection Component="typeof(SplitterCustomSizes)" Title="Custom sizes for panels" />
 
+<DemoSection Component="typeof(SplitterCollapse)" Title="Collapse Splitter">
+    <Description>
+        <p>
+            The <code>FluentSplitter</code> component has a <code>Collapsed</code> parameter that can be set to hide the splitter bar
+            and the contents of Panel2. This can be useful for things like a Summary/Detail view where you don't always want the splitter
+            to be visible.
+        </p>
+    </Description>
+</DemoSection> 
 <h2 id="documentation">Documentation</h2>
 
 <ApiDocumentation Component="typeof(FluentSplitter)" />

diff --git a/examples/Demo/Shared/Shared/DemoMainLayout.razor b/examples/Demo/Shared/Shared/DemoMainLayout.razor
@@ -30,7 +30,7 @@
             <FluentSpacer />
             <div class="links">
                 <FluentAnchor Appearance="Appearance.Hypertext"
-                              Href="http://github.com/microsoft/fluentui-blazor" Target="_blank" Rel="noreferrer noopener"
+                              Href="https://github.com/microsoft/fluentui-blazor/tree/archives/v3" Target="_blank" Rel="noreferrer noopener"
                               title="FluentUI Blazor source on GitHub" aria-label="FluentUI Blazor Repo">
                     <FluentIcon Value="@(new DemoIcons.Size20.GitHub())" Color="Color.FillInverse" />
                 </FluentAnchor>

diff --git a/examples/Demo/Shared/libman.json b/examples/Demo/Shared/libman.json
diff --git a/examples/Demo/Shared/wwwroot/css/site.css b/examples/Demo/Shared/wwwroot/css/site.css
@@ -131,6 +131,7 @@ article {
 
 aside {
     padding: 1.5rem 1rem;
+    top: 0px;
     height: 100vh;
     position: sticky;
     width: 18rem;

diff --git a/examples/Demo/Shared/wwwroot/docs/WhatsNew.md b/examples/Demo/Shared/wwwroot/docs/WhatsNew.md
@@ -1,4 +1,8 @@
-## V3.3.0
+## V3.4.0
+- FluentSplitter: Add support for collapsing panel 2 (right/bottom), add `OnCollapsed`, `OnExpanded` and  `OnResized` event callbacks
+- Move CacheStorageAccessor and StaticAssetService to Demo.Shared project as these are specific to the demo site and not the library
+
+## V3.3.0
 - This version no longer supports .NET 8.0 (use `Microsoft.FluentUI.AspNetCore.Components` in that case)
 - Update all input component to use `ReadOnly` instead of a mix of possible spellings
 - Update demo site styling (nav menu and body now scroll independently)

diff --git a/src/Core/Components/Splitter/FluentSplitter.razor b/src/Core/Components/Splitter/FluentSplitter.razor
@@ -13,8 +13,10 @@
     <div slot="1">
         @Panel1
     </div>
-
-    <div slot="2">
-        @Panel2
-    </div>
+    @if (!Collapsed)
+    {
+        <div slot="2">
+            @Panel2
+        </div>
+    }
 </split-panels>
diff --git a/src/Core/Events/SplitterCollapsedEventArgs.cs b/src/Core/Events/SplitterCollapsedEventArgs.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.FluentUI.AspNetCore.Components;
+namespace Microsoft.Fast.Components.FluentUI;
 
 public class SplitterCollapsedEventArgs : EventArgs
 {

diff --git a/src/Core/Events/SplitterResizedEventArgs.cs b/src/Core/Events/SplitterResizedEventArgs.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.FluentUI.AspNetCore.Components;
+namespace Microsoft.Fast.Components.FluentUI;
 
 public class SplitterResizedEventArgs : EventArgs
 {

diff --git a/src/Core/wwwroot/Microsoft.Fast.Components.FluentUI.lib.module.js b/src/Core/wwwroot/Microsoft.Fast.Components.FluentUI.lib.module.js
@@ -163,8 +163,6 @@ export function afterStarted(blazor) {
             }
         }
     });
-
-    afterStartedCalled = true;
 }
 
 export function beforeStart(options, extensions) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,8 +163,6 @@ export function afterStarted(blazor) { @@
                 }
             }
         });
-        afterStartedCalled = true;
     }
     export function beforeStart(options, extensions) {
@@ Expand Down @@