fix package reference, add INavigation interface

AvaloniaUI · Sep 21, 2023 · b9aaf07 · b9aaf07
1 parent 4926d19
commit b9aaf07
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/src/Avalonia.Labs.Controls/Avalonia.Labs.Controls.csproj b/src/Avalonia.Labs.Controls/Avalonia.Labs.Controls.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-preview8" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview8" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Avalonia.Labs.Controls/Page/INavigation.cs b/src/Avalonia.Labs.Controls/Page/INavigation.cs
@@ -0,0 +1,8 @@
+namespace Avalonia.Labs.Controls
+{
+    public interface INavigation
+    {
+        object? Pop();
+        void Push(object page);
+    }
+}
diff --git a/src/Avalonia.Labs.Controls/Page/NavigationPage.cs b/src/Avalonia.Labs.Controls/Page/NavigationPage.cs
@@ -17,7 +17,7 @@ namespace Avalonia.Labs.Controls
     [TemplatePart("PART_BackButton", typeof(Button))]
     [TemplatePart("PART_ForwardButton", typeof(Button))]
     [TemplatePart("PART_ContentPresenter", typeof(TransitioningContentControl))]
-    public class NavigationPage : MultiPage
+    public class NavigationPage : MultiPage, INavigation
     {
         private Button? _backButton;
 
@@ -213,6 +213,8 @@ public void Push(object page)
 
             if (page is Page p && !p.IsSet(TitleViewProperty))
             {
+                p.Navigation = this;
+
                 SetTitleView(p, new Label()
                 {
                     Content = p.Title,
@@ -242,6 +244,9 @@ public void Push(object page)
 
             UpdateActivePage();
 
+            if (old is Page p)
+                p.Navigation = null;
+
             return old;
         }
 

diff --git a/src/Avalonia.Labs.Controls/Page/Page.cs b/src/Avalonia.Labs.Controls/Page/Page.cs
@@ -23,6 +23,10 @@ public abstract class Page : TemplatedControl, IStyleable
         public static readonly RoutedEvent<RoutedEventArgs> PageNavigationSystemBackButtonPressedEvent =
             RoutedEvent.Register<Page, RoutedEventArgs>(nameof(PageNavigationSystemBackButtonPressed), RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
 
+        public static readonly DirectProperty<Page, INavigation?> NavigationProperty = AvaloniaProperty.RegisterDirect<Page, INavigation?>(nameof(Navigation), o => o.Navigation, (o, v) => o.Navigation = v);
+
+        private INavigation? _navigation;
+
         static Page()
         {
             PageNavigationSystemBackButtonPressedEvent.AddClassHandler<Page>((page, args) =>
@@ -57,6 +61,12 @@ public Page? ActiveChildPage
             set => SetValue(ActiveChildPageProperty, value);
         }
 
+        public INavigation? Navigation
+        {
+            get => _navigation;
+            set => SetAndRaise(NavigationProperty, ref _navigation, value);
+        }
+
         public event EventHandler<RoutedEventArgs> PageNavigationSystemBackButtonPressed
         {
             add => AddHandler(PageNavigationSystemBackButtonPressedEvent, value);
@@ -74,9 +84,9 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             }
         }
 
-        protected override void OnLoaded()
+        protected override void OnLoaded(RoutedEventArgs e)
         {
-            base.OnLoaded();
+            base.OnLoaded(e);
 
             UpdateContentSafeAreaPadding();
         }