From ee27ac6ead693de6417291226b28388944a1fe4e Mon Sep 17 00:00:00 2001 From: Vincent Baaij Date: Thu, 9 Nov 2023 14:21:08 +0100 Subject: [PATCH] Fix cherry pick errors, update docs, etc --- .../Demo/Shared/Infrastructure/DemoIcons.cs | 2 +- .../Microsoft.Fast.Components.FluentUI.xml | 19 +++++++++++++++++++ examples/Demo/Shared/Pages/Index/Index.razor | 2 +- .../Shared/Pages/Splitter/SplitterPage.razor | 9 +++++++++ .../Demo/Shared/Shared/DemoMainLayout.razor | 2 +- examples/Demo/Shared/libman.json | 10 ---------- examples/Demo/Shared/wwwroot/css/site.css | 1 + examples/Demo/Shared/wwwroot/docs/WhatsNew.md | 6 +++++- .../Components/Splitter/FluentSplitter.razor | 10 ++++++---- src/Core/Events/SplitterCollapsedEventArgs.cs | 2 +- src/Core/Events/SplitterResizedEventArgs.cs | 2 +- ...oft.Fast.Components.FluentUI.lib.module.js | 2 -- 12 files changed, 45 insertions(+), 22 deletions(-) delete mode 100644 examples/Demo/Shared/libman.json diff --git a/examples/Demo/Shared/Infrastructure/DemoIcons.cs b/examples/Demo/Shared/Infrastructure/DemoIcons.cs index 4305a8ec92..6f75d55d71 100644 --- 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 index 0efaa64e70..057806411a 100644 --- 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) + + + @@ -5641,6 +5644,12 @@ See mdn web docs for more information + + + 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. + + The horizontal alignment of the components in the stack. @@ -10883,6 +10892,16 @@ whenever a user attempts to execute the default action on a . + + + Gets the size of panel 1 (top/left) after a resize operation + + + + + Gets the size of the panel 2 (bottom/right) after a resize operation + + Determines whether two sets of attributes are equal when rendered. The compared set diff --git a/examples/Demo/Shared/Pages/Index/Index.razor b/examples/Demo/Shared/Pages/Index/Index.razor index af589520b2..030e756030 100644 --- a/examples/Demo/Shared/Pages/Index/Index.razor +++ b/examples/Demo/Shared/Pages/Index/Index.razor @@ -6,7 +6,7 @@

Welcome to the Fluent UI Blazor components library

-

This is the demo and documentation site for version 3.3.0 of the library. This is the version that supports .NET 6 and 7.

+

This is the demo and documentation site for version 3.4.0 of the library. This version only supports .NET 6 and 7.


The version 4 demo and documentation 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 index 99828d3a96..9b08d61eb0 100644 --- a/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor +++ b/examples/Demo/Shared/Pages/Splitter/SplitterPage.razor @@ -31,6 +31,15 @@ + + +

+ The FluentSplitter component has a Collapsed 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. +

+ +

Documentation

diff --git a/examples/Demo/Shared/Shared/DemoMainLayout.razor b/examples/Demo/Shared/Shared/DemoMainLayout.razor index c32db30296..5bcda35858 100644 --- a/examples/Demo/Shared/Shared/DemoMainLayout.razor +++ b/examples/Demo/Shared/Shared/DemoMainLayout.razor @@ -30,7 +30,7 @@
diff --git a/examples/Demo/Shared/libman.json b/examples/Demo/Shared/libman.json deleted file mode 100644 index c221233dff..0000000000 --- a/examples/Demo/Shared/libman.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": "1.0", - "defaultProvider": "cdnjs", - "libraries": [ - { - "library": "monaco-editor@0.34.1", - "destination": "wwwroot/lib/monaco-editor/" - } - ] -} \ No newline at end of file diff --git a/examples/Demo/Shared/wwwroot/css/site.css b/examples/Demo/Shared/wwwroot/css/site.css index a94f8968f5..cd952bd280 100644 --- 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 index 08b72dd193..1be40f5f4d 100644 --- 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 index 67c30a92c2..dfb63aae81 100644 --- a/src/Core/Components/Splitter/FluentSplitter.razor +++ b/src/Core/Components/Splitter/FluentSplitter.razor @@ -13,8 +13,10 @@
@Panel1
- -
- @Panel2 -
+ @if (!Collapsed) + { +
+ @Panel2 +
+ } \ No newline at end of file diff --git a/src/Core/Events/SplitterCollapsedEventArgs.cs b/src/Core/Events/SplitterCollapsedEventArgs.cs index 62463ab9ff..a5b1188d06 100644 --- 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 index 884b15904a..0590769f8c 100644 --- 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 index 6f160a524a..4a45c64fe5 100644 --- 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) {