feat: make navbar optional for modal (#54 #44)

AvaloniaInside · Sep 11, 2024 · 934a6ed · 934a6ed
1 parent e6d7e11
commit 934a6ed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/AvaloniaInside.Shell/Page.cs b/src/AvaloniaInside.Shell/Page.cs
@@ -11,6 +11,7 @@
 namespace AvaloniaInside.Shell;
 
 [PseudoClasses(":modal")]
+[TemplatePart("PART_TabStripPlaceHolder", typeof(ContentPresenter))]
 public class Page : UserControl, INavigationLifecycle, INavigatorLifecycle, INavigationBarProvider
 {
 	private ContentPresenter? _navigationBarPlaceHolder;
@@ -344,6 +345,9 @@ private void ApplyNavigationBar()
 		if (Shell?.NavigationBarAttachType is not ({ } type and not NavigationBarAttachType.ToShell))
 			return;
 
+		if (IsModal && !Shell.NavigationBarForModal)
+			return;
+
 		if ((type == NavigationBarAttachType.ToLastPage && Chain is HostNavigationChain) ||
 		    (type == NavigationBarAttachType.ToFirstHostThenPage && Chain.Back is HostNavigationChain))
 			return;

diff --git a/src/AvaloniaInside.Shell/ShellView.cs b/src/AvaloniaInside.Shell/ShellView.cs
@@ -169,6 +169,27 @@ public NavigationBarAttachType NavigationBarAttachType
 
     #endregion
 
+    #region NavigationBarForModal
+
+    /// <summary>
+    /// Defines the <see cref="NavigationBarAttachTypeProperty"/> property.
+    /// </summary>
+    public static readonly StyledProperty<bool> NavigationBarForModalProperty =
+	    AvaloniaProperty.Register<ShellView, bool>(
+		    nameof(NavigationBarForModal),
+		    defaultValue: false);
+
+    /// <summary>
+    /// Gets or sets the type of attach navigation bar.
+    /// </summary>
+    public bool NavigationBarForModal
+    {
+	    get => GetValue(NavigationBarForModalProperty);
+	    set => SetValue(NavigationBarForModalProperty, value);
+    }
+
+    #endregion
+
     #endregion
 
     #region Safe area properties