NavigationViewItem input handling fixes (#2625)

* NavigationViewItem fixes including WinUI3 26317023 * Applying PR feedback & merging with master.
microsoft · Jun 10, 2020 · f3da94f · f3da94f
1 parent 52c6013
commit f3da94f
Show file tree

Hide file tree

Showing 18 changed files with 474 additions and 141 deletions.
diff --git a/dev/Generated/NavigationViewItemBase.properties.cpp b/dev/Generated/NavigationViewItemBase.properties.cpp
@@ -31,7 +31,7 @@ void NavigationViewItemBaseProperties::EnsureProperties()
                 winrt::name_of<winrt::NavigationViewItemBase>(),
                 false /* isAttached */,
                 ValueHelper<bool>::BoxedDefaultValue(),
-                nullptr);
+                winrt::PropertyChangedCallback(&OnIsSelectedPropertyChanged));
     }
 }
 
@@ -40,6 +40,14 @@ void NavigationViewItemBaseProperties::ClearProperties()
     s_IsSelectedProperty = nullptr;
 }
 
+void NavigationViewItemBaseProperties::OnIsSelectedPropertyChanged(
+    winrt::DependencyObject const& sender,
+    winrt::DependencyPropertyChangedEventArgs const& args)
+{
+    auto owner = sender.as<winrt::NavigationViewItemBase>();
+    winrt::get_self<NavigationViewItemBase>(owner)->OnPropertyChanged(args);
+}
+
 void NavigationViewItemBaseProperties::IsSelected(bool value)
 {
     static_cast<NavigationViewItemBase*>(this)->SetValue(s_IsSelectedProperty, ValueHelper<bool>::BoxValueIfNecessary(value));

diff --git a/dev/Generated/NavigationViewItemBase.properties.h b/dev/Generated/NavigationViewItemBase.properties.h
@@ -18,4 +18,8 @@ class NavigationViewItemBaseProperties
 
     static void EnsureProperties();
     static void ClearProperties();
+
+    static void OnIsSelectedPropertyChanged(
+        winrt::DependencyObject const& sender,
+        winrt::DependencyPropertyChangedEventArgs const& args);
 };
diff --git a/dev/NavigationView/NavigationView.h b/dev/NavigationView/NavigationView.h
@@ -93,8 +93,6 @@ class NavigationView :
 
 private:
 
-    void OnRepeaterGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args);
-
     // Selection handling functions
     void OnNavigationViewItemIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args);
     void OnSelectionModelSelectionChanged(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelSelectionChangedEventArgs& e);
@@ -261,7 +259,6 @@ class NavigationView :
     void OnNavigationViewItemOnGotFocus(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& e);
     void OnNavigationViewItemExpandedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args);
 
-    void OnOverflowItemSelectionChanged(const winrt::IInspectable& sender, const winrt::SelectionChangedEventArgs& args);
     void RaiseSelectionChangedEvent(winrt::IInspectable const& nextItem, 
         bool isSettingsItem,
         NavigationRecommendedTransitionDirection recommendedDirection = NavigationRecommendedTransitionDirection::Default);

diff --git a/dev/NavigationView/NavigationView.idl b/dev/NavigationView/NavigationView.idl
@@ -301,12 +301,15 @@ unsealed runtimeclass NavigationView : Windows.UI.Xaml.Controls.ContentControl
 [webhosthidden]
 [WUXC_INTERFACE_NAME("INavigationViewItemBase", edf04eb1-37d1-471f-8570-3829ee5b2bc6)]
 [WUXC_CONSTRUCTOR_NAME("INavigationViewItemBaseFactory", eb014cef-7890-4ebb-8245-02e8510f321d)]
+[MUX_PROPERTY_CHANGED_CALLBACK_METHODNAME("OnPropertyChanged")]
 [default_interface]
 unsealed runtimeclass NavigationViewItemBase : Windows.UI.Xaml.Controls.ContentControl
 {
     [WUXC_VERSION_MUXONLY]
     {
+        [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
         Boolean IsSelected{ get; set; };
+
         static Windows.UI.Xaml.DependencyProperty IsSelectedProperty { get; };
     }
 }

diff --git a/dev/NavigationView/NavigationViewHelper.h b/dev/NavigationView/NavigationViewHelper.h
@@ -36,7 +36,7 @@ class NavigationViewItemHelper
     {
     }
 
-    winrt::UIElement GetSelectionIndicator() { return m_selectionIndicator.get(); }
+    winrt::UIElement GetSelectionIndicator() const { return m_selectionIndicator.get(); }
 
     void Init(const winrt::IControlProtected & controlProtected)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ class NavigationViewItemHelper @@
         {
         }
-        winrt::UIElement GetSelectionIndicator() { return m_selectionIndicator.get(); }
+        winrt::UIElement GetSelectionIndicator() const { return m_selectionIndicator.get(); }
         void Init(const winrt::IControlProtected & controlProtected)
         {
@@ Expand Down @@