Update JsonNavigationService.cs

ghost1372 · ghost1372 · commit 134c8b49815c · 2024-12-27T01:33:51.000+03:30
diff --git a/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs b/dev/DevWinUI/Services/NavigationService/Services/JsonNavigationService/JsonNavigationService.cs
@@ -41,14 +41,7 @@ private void OnNavigated(object sender, NavigationEventArgs e)
         }
         else
         {
-            var currentItem = (NavigationViewItem)_navigationView.SelectedItem;
-            var currentTag = currentItem?.Tag?.ToString();
-            if (string.IsNullOrEmpty(currentTag))
-            {
-                return;
-            }
-
-            if (e.Parameter is BaseDataInfo dataInfo && dataInfo != null)
+            if (_navigationView.SelectedItem is NavigationViewItem currentItem && currentItem.Tag is string currentTag && !string.IsNullOrEmpty(currentTag) && e.Parameter is BaseDataInfo dataInfo)
             {
                 if (e.NavigationMode == NavigationMode.Back || !currentTag.Equals(dataInfo.UniqueId))
                 {
@@ -88,15 +81,13 @@ private void OnSelectionChanged(NavigationView sender, NavigationViewSelectionCh
         }
         else
         {
-            var selectedItem = args.SelectedItemContainer as NavigationViewItem;
-            var dataInfo = selectedItem.DataContext as BaseDataInfo;
-            if (_sectionPage != null && !string.IsNullOrEmpty(dataInfo?.SectionId))
+            if (args.SelectedItemContainer is NavigationViewItem selectedItem && selectedItem.DataContext is BaseDataInfo dataInfo)
             {
-                NavigateTo(SectionPageKey, dataInfo);
-            }
-            else
-            {
-                NavigateTo(dataInfo?.UniqueId, dataInfo);
+                var targetKey = !string.IsNullOrEmpty(dataInfo.SectionId) && _sectionPage != null
+                                ? SectionPageKey
+                                : dataInfo.UniqueId;
+
+                NavigateTo(targetKey, dataInfo);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,7 @@ private void OnNavigated(object sender, NavigationEventArgs e)`
`41`	`41`	`}`
`42`	`42`	`else`
`43`	`43`	`{`
`44`		`- var currentItem = (NavigationViewItem)_navigationView.SelectedItem;`
`45`		`- var currentTag = currentItem?.Tag?.ToString();`
`46`		`- if (string.IsNullOrEmpty(currentTag))`
`47`		`- {`
`48`		`- return;`
`49`		`- }`
`50`		`-`
`51`		`- if (e.Parameter is BaseDataInfo dataInfo && dataInfo != null)`
	`44`	`+ if (_navigationView.SelectedItem is NavigationViewItem currentItem && currentItem.Tag is string currentTag && !string.IsNullOrEmpty(currentTag) && e.Parameter is BaseDataInfo dataInfo)`
`52`	`45`	`{`
`53`	`46`	`if (e.NavigationMode == NavigationMode.Back \|\| !currentTag.Equals(dataInfo.UniqueId))`
`54`	`47`	`{`
`@@ -88,15 +81,13 @@ private void OnSelectionChanged(NavigationView sender, NavigationViewSelectionCh`
`88`	`81`	`}`
`89`	`82`	`else`
`90`	`83`	`{`
`91`		`- var selectedItem = args.SelectedItemContainer as NavigationViewItem;`
`92`		`- var dataInfo = selectedItem.DataContext as BaseDataInfo;`
`93`		`- if (_sectionPage != null && !string.IsNullOrEmpty(dataInfo?.SectionId))`
	`84`	`+ if (args.SelectedItemContainer is NavigationViewItem selectedItem && selectedItem.DataContext is BaseDataInfo dataInfo)`
`94`	`85`	`{`
`95`		`- NavigateTo(SectionPageKey, dataInfo);`
`96`		`- }`
`97`		`- else`
`98`		`- {`
`99`		`- NavigateTo(dataInfo?.UniqueId, dataInfo);`
	`86`	`+ var targetKey = !string.IsNullOrEmpty(dataInfo.SectionId) && _sectionPage != null`
	`87`	`+ ? SectionPageKey`
	`88`	`+ : dataInfo.UniqueId;`
	`89`	`+`
	`90`	`+ NavigateTo(targetKey, dataInfo);`
`100`	`91`	`}`
`101`	`92`	`}`
`102`	`93`	`}`