always unlink parent (#7087)

microsoft · May 18, 2022 · 7fedf3d · 7fedf3d
1 parent 8516763
commit 7fedf3d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/dev/NavigationView/NavigationViewItemsFactory.cpp b/dev/NavigationView/NavigationViewItemsFactory.cpp
@@ -130,15 +130,12 @@ void NavigationViewItemsFactory::RecycleElementCore(winrt::ElementFactoryRecycle
 
         // Do not recycle SettingsItem
         bool isSettingsItem = m_settingsItem && m_settingsItem == args.Element();
-
+
+        UnlinkElementFromParent(args);
         if (m_itemTemplateWrapper && !isSettingsItem)
         {
             m_itemTemplateWrapper.RecycleElement(args);
         }
-        else
-        {
-            UnlinkElementFromParent(args);
-        }
     }
 }
 
@@ -153,6 +150,7 @@ void NavigationViewItemsFactory::UnlinkElementFromParent(winrt::ElementFactoryRe
         if (children.IndexOf(args.Element(), childIndex))
         {
             children.RemoveAt(childIndex);
+            args.Parent(nullptr);
         }
     }
 }