Skip to content

NavigationView: Fix regression where navigating to the different pane items via the Tab key would crash the app #3613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ranjeshj merged 13 commits into from
Dec 4, 2020
Merged

NavigationView: Fix regression where navigating to the different pane items via the Tab key would crash the app #3613

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
15d1644
Fix crash issue.
Felix-Dev Nov 3, 2020
5897f62
inner loop solution file cleanup
Felix-Dev Nov 16, 2020
d060c70
Modify interaction tests.
Felix-Dev Nov 16, 2020
ced59fd
Modified existing interaction test (part 2).
Felix-Dev Nov 16, 2020
323e7bd
Update NavigationViewPage.xaml
ranjeshj Nov 23, 2020
728cb2a
fix timing issue in nav view test
ranjeshj Nov 24, 2020
30e599b
Close opened flyout.
Felix-Dev Nov 24, 2020
c171238
inner loop VS automatic updates
Felix-Dev Dec 1, 2020
7cbf0d4
fix merge conflicts
Felix-Dev Dec 1, 2020
f0b5130
inner loop VS automatic update
Felix-Dev Dec 1, 2020
de4f0d5
Merge branch 'master' into user/Felix-Dev/navview-settingsitem-tab-fo…
Felix-Dev Dec 1, 2020
2845ea3
Another attempt to fix test failure.
Felix-Dev Dec 1, 2020
feb8cc3
Remove empty line.
Felix-Dev Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions MUXControlsInnerLoop.sln
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,6 @@ Global
dev\Materials\Acrylic\TestUI\AcrylicBrush_TestUI.projitems*{a800e818-7212-4fd7-ae3a-1dcab539db87}*SharedItemsImports = 13
dev\PagerControl\PagerControl.vcxitems*{ab3261a7-9a8d-4a27-aea2-3aac0419c889}*SharedItemsImports = 9
dev\Collections\Collections.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\ComboBox\ComboBox.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\CommonStyles\CommonStyles.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\Common\Common.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\DropDownButton\DropDownButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
Expand All @@ -647,10 +646,6 @@ Global
dev\Lights\Lights.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\Materials\Acrylic\AcrylicBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\Materials\Reveal\RevealBrush.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\NumberBox\NumberBox.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\PagerControl\PagerControl.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\PipsPager\PipsPager.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\Repeater\Repeater.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\ResourceHelper\ResourceHelper.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\SplitButton\SplitButton.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
dev\Telemetry\Telemetry.vcxitems*{ad0c90b0-4845-4d4b-88f1-86f653f8171b}*SharedItemsImports = 4
Expand Down Expand Up @@ -695,10 +690,6 @@ Global
dev\TreeView\APITests\TreeView_APITests.projitems*{de885c66-929c-464e-bac4-3e076ec46483}*SharedItemsImports = 13
dev\Pivot\TestUI\Pivot_TestUI.projitems*{deb3fa60-e4a7-4735-89f2-363c7c56b428}*SharedItemsImports = 13
dev\CommonManaged\CommonManaged.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
dev\PagerControl\APITests\PagerControl_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
dev\PipsPager\APITests\PipsPager_APITests.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
test\TestAppUtils\TestAppUtils.projitems*{dedc1e4f-cfa5-4443-83eb-e79d425df7e7}*SharedItemsImports = 4
dev\SplitButton\InteractionTests\SplitButton_InteractionTests.projitems*{e1c861e2-c4d9-41e1-aed7-5e203451bd4d}*SharedItemsImports = 13
dev\DatePicker\TestUI\DatePicker_TestUI.projitems*{e20f725c-3a53-463b-ada9-ff2088aaca4d}*SharedItemsImports = 13
Expand All @@ -717,10 +708,6 @@ Global
dev\Materials\Acrylic\InteractionTests\AcrylicBrush_InteractionTests.projitems*{f601284a-00c1-49f9-99b3-70d45585f784}*SharedItemsImports = 13
dev\SplitButton\SplitButton.vcxitems*{faf114dd-af1f-4d9f-a511-354c19912aad}*SharedItemsImports = 9
dev\CommonManaged\CommonManaged.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
dev\PagerControl\APITests\PagerControl_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
dev\PagerControl\TestUI\PagerControl_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
dev\PipsPager\APITests\PipsPager_APITests.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
dev\PipsPager\TestUI\PipsPager_TestUI.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
test\TestAppUtils\TestAppUtils.projitems*{fbc396f5-26dd-4ca3-981e-c7bc9fea4546}*SharedItemsImports = 4
dev\Slider\Slider.vcxitems*{fc2178ca-7f72-40f0-916c-a2b3750bbb6c}*SharedItemsImports = 9
dev\LayoutPanel\LayoutPanel.vcxitems*{fd3c1a00-0d07-4849-a3b9-646f0ff21d7b}*SharedItemsImports = 9
Expand Down
5 changes: 5 additions & 0 deletions dev/NavigationView/NavigationView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,11 @@ winrt::ItemsRepeater NavigationView::GetParentRootItemsRepeaterForContainer(cons
while (!IsRootItemsRepeater(parentIR))
{
currentNvib = GetParentNavigationViewItemForContainer(currentNvib);
if (!currentNvib)
{
return nullptr;
}

parentIR = GetParentItemsRepeaterForContainer(currentNvib);
}
return parentIR;
Expand Down
18 changes: 18 additions & 0 deletions dev/NavigationView/NavigationView_InteractionTests/CommonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,11 +1690,19 @@ public void VerifyNavigationViewItemContentPresenterMargin()
var getChildContentPresenterMarginButton = FindElement.ById<Button>("GetChildNavViewItemContentPresenterMarginButton");
var contentPresenterMarginTextBlock = new TextBlock(FindElement.ByName("NavViewItemContentPresenterMarginTextBlock"));

var scrollItemIntoViewComboBox = new ComboBox(FindElement.ByName("ScrollItemIntoViewComboBox"));
var scrollItemIntoViewButton = FindElement.ById<Button>("ScrollItemIntoViewButton");

// Switch the NavigationView to closed compact mode
Log.Comment("Switch NavigationView to closed compact mode");
SetNavViewWidth(ControlWidth.Medium);
Wait.ForIdle();

Log.Comment("Ensure test menu item is in view");
scrollItemIntoViewComboBox.SelectItemByName("HasChildItem");
Wait.ForIdle();
scrollItemIntoViewButton.InvokeAndWait();

// Verify that top-level items use the correct content margin
getTopLevelContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,0,0", contentPresenterMarginTextBlock.DocumentText);
Expand All @@ -1703,16 +1711,26 @@ public void VerifyNavigationViewItemContentPresenterMargin()
Log.Comment("Expand item with children");
UIObject hasChildItem = FindElement.ByName("HasChildItem");
InputHelper.LeftClick(hasChildItem);
Wait.ForMilliseconds(100); // Give a little bit of time for the flyout to open, then wait for idle.
Wait.ForIdle();

getChildContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,20,0", contentPresenterMarginTextBlock.DocumentText);

// Close opened flyout
InputHelper.LeftClick(hasChildItem);
Wait.ForIdle();

// Switch the NavigationView to expanded mode
Log.Comment("Switch NavigationView to expanded mode");
SetNavViewWidth(ControlWidth.Wide);
Wait.ForIdle();

Log.Comment("Ensure test menu item is in view");
scrollItemIntoViewComboBox.SelectItemByName("HasChildItem");
Wait.ForIdle();
scrollItemIntoViewButton.InvokeAndWait();

// Verify that top-level items use the correct content margin
getTopLevelContentPresenterMarginButton.InvokeAndWait();
Verify.AreEqual("0,0,20,0", contentPresenterMarginTextBlock.DocumentText);
Expand Down
Loading