#33 allow override side menu behave (#34)

AvaloniaInside · Jul 10, 2024 · 9ccf014 · 9ccf014
1 parent 44f6ae7
commit 9ccf014
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/src/AvaloniaInside.Shell/NavigationBar.cs b/src/AvaloniaInside.Shell/NavigationBar.cs
@@ -140,7 +140,7 @@ public static void SetHeader(AvaloniaObject element, object parameter) =>
 
 	#endregion
 
-	#region Hide
+	#region Visible
 
 	public static readonly AttachedProperty<bool> VisibleProperty =
 		AvaloniaProperty.RegisterAttached<NavigationBar, AvaloniaObject, bool>("Visible", defaultValue: true);
@@ -240,10 +240,10 @@ protected virtual void UpdateItems(object view, ContentControl itemPresenter)
 
 			if (itemPresenter.Content is StyledElement elementContent)
 				elementContent.DataContext = element.DataContext ?? element;
-			
+
 			return;
-		} 
-		
+		}
+
 		itemPresenter.Content = view;
 	}
 

diff --git a/src/AvaloniaInside.Shell/ShellView.SideMenu.cs b/src/AvaloniaInside.Shell/ShellView.SideMenu.cs
@@ -20,7 +20,6 @@ public partial class ShellView
 
 	public double SideMenuSize => ScreenSize == ScreenSizeType.Small ? DesiredSize.Width - 35 : DefaultSideMenuSize;
 
-
 	public static readonly StyledProperty<double> DefaultSideMenuSizeProperty = AvaloniaProperty.Register<ShellView,double>(nameof(DefaultSideMenuSize), 250);
 
 	public double DefaultSideMenuSize
@@ -233,6 +232,24 @@ public SideMenuItem? SideMenuSelectedItem
 
 	#endregion
 
+	#region Attached properties
+
+	#region OverrideSideMenuBehave
+
+	public static readonly AttachedProperty<SideMenuBehaveType?> OverrideSideMenuBehaveProperty =
+		AvaloniaProperty.RegisterAttached<ShellView, AvaloniaObject, SideMenuBehaveType?>("OverrideSideMenuBehave",
+			defaultValue: null);
+
+	public static SideMenuBehaveType? GetOverrideSideMenuBehave(AvaloniaObject element) =>
+		element.GetValue(OverrideSideMenuBehaveProperty);
+
+	public static void SetOverrideSideMenuBehave(AvaloniaObject element, SideMenuBehaveType? parameter) =>
+		element.SetValue(OverrideSideMenuBehaveProperty, parameter);
+
+	#endregion
+
+	#endregion
+
 	#region Behavior
 
 	protected virtual Task MenuActionAsync(CancellationToken cancellationToken)
@@ -273,6 +290,11 @@ protected virtual void UpdateSideMenu()
 
 	private SideMenuBehaveType GetCurrentBehave()
 	{
+		var view = this._contentView?.CurrentView;
+
+		if (view is StyledElement element && GetOverrideSideMenuBehave(element) is { } overrideBehave)
+			return overrideBehave;
+
 		return ScreenSize switch
 		{
 			ScreenSizeType.Small => SmallScreenSideMenuBehave,

diff --git a/src/AvaloniaInside.Shell/ShellView.cs b/src/AvaloniaInside.Shell/ShellView.cs
@@ -363,6 +363,7 @@ public async Task PushViewAsync(object view,
         await (_contentView?.PushViewAsync(view, navigateType, cancellationToken) ?? Task.CompletedTask);
         SelectSideMenuItem();
         UpdateBindings();
+        UpdateSideMenu();
     }
 
     public async Task RemoveViewAsync(object view,

diff --git a/src/Example/ShellExample/ShellExample/Views/WelcomeView.axaml b/src/Example/ShellExample/ShellExample/Views/WelcomeView.axaml
@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ShellExample.Views.WelcomeView"
-             NavigationBar.Visible="False">
+             NavigationBar.Visible="False"
+             ShellView.OverrideSideMenuBehave="Removed">
 	<Grid>
 		<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="14">
 			<TextBlock Text="Welcome to AvaloniaInside" FontSize="18" HorizontalAlignment="Center"></TextBlock>