Skip to content
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.

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

fix: Popup.Child parent hierarchy, ResourceDictionary resolution #18942

Merged
merged 9 commits into from
Nov 28, 2024

Conversation

MartinZikmund
Copy link
Member

@MartinZikmund MartinZikmund commented Nov 27, 2024

GitHub Issue (If applicable): closes #18943

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

  • Popup.Child visual and logical parent hierarchy included PopupPanel, which is internal only
  • Logical Parent of Popup.Child was not the Popup itself
  • ResourceDictionary search for a popup in the visual tree did not include its actual parent

What is the new behavior?

  • Popup.Child parent hierarchy skips PopupPanel
  • Logical Parent of Popup.Child is Popup
  • We prefer logical parent for ResourceDictionary search when available

PR Checklist

Please check if your PR fulfills the following requirements:

@MartinZikmund MartinZikmund self-assigned this Nov 27, 2024
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18942/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18942/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18942/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18942/index.html

@unodevops
Copy link
Contributor

⚠️⚠️ The build 148746 has failed on Uno.UI - CI.

@MartinZikmund MartinZikmund force-pushed the dev/mazi/style-poup-visualtree branch from fda2167 to 0f10125 Compare November 28, 2024 13:49
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18942/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18942/index.html

@nventive-devops
Copy link
Contributor

The build 148801 found UI Test snapshots differences: android-28-net8: 30, android-28-net8-Snap: 38, ios: 7, ios-Snap: 41, skia-gtk-screenshots: 60, skia-linux-screenshots: 60, skia-windows-screenshots: 72, wasm: 449, wasm-automated-net9.0-UWP-Default-automated: 29, wasm-automated-net9.0-UWP-RuntimeTests-0: 0, wasm-automated-net9.0-UWP-RuntimeTests-1: 0, wasm-automated-net9.0-UWP-RuntimeTests-2: 0, wasm-automated-net9.0-WinUI-Benchmarks-automated: 0, wasm-automated-net9.0-WinUI-RuntimeTests-0: 0, wasm-automated-net9.0-WinUI-RuntimeTests-1: 0, wasm-automated-net9.0-WinUI-RuntimeTests-2: 0

Details
  • android-28-net8: 30 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Button_IsOpacity_Validation_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Button_Opacity_Automated
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_3_-_Orientation_Portrait
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_4_-_Orientation_Landscape
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • NativeCommandBar_Size_FirstOrientation
    • NativeCommandBar_Size_SecondOrientation
    • NativeCommandBar_Size_thirdOrientation
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • WebView_NavigateToAnchor_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • WebView_NavigateToAnchor_Initial
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ToggleCollapsedStateToVerifyClipping_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_ExpanderColorValidationPage
    • TestSimple_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_AutomationId
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_Clipped_Rounded_Corners_UITests_Windows_UI_Xaml_Clipping_Clipping4273
  • android-28-net8-Snap: 38 changed over 1067

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUX_NumberBox_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • Scrolling_MUXControlsTestApp_ScrollViewKeyboardAndGamepadNavigationPage_MUXControlsTestApp_ScrollViewKeyboardAndGamepadNavigationPage
    • Scrolling_MUXControlsTestApp_ScrollViewWithScrollControllersPage_MUXControlsTestApp_ScrollViewWithScrollControllersPage
    • TextBlock_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout
    • SwipeControl_MUXControlsTestApp_SwipeControlPage2_MUXControlsTestApp_SwipeControlPage2
    • Transform_Basics_UITests_Shared_Windows_UI_Xaml_Media_Transform_Basics
    • Transform_Border_With_CompositeTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_CompositeTransform
    • Transform_Border_With_Off_Centre_RotateTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_Off_Centre_RotateTransform
    • Transform_Border_With_Off_Centre_ScaleTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_Off_Centre_ScaleTransform
    • TabView_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • WebView_WebView_ChromeClient_Uno_UI_Samples_Content_UITests_WebView_WebView_ChromeClient
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
  • ios: 7 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings
  • ios-Snap: 41 changed over 1058

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • TabView_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewSelectionAndScrolling_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewSelectionAndScrolling
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • NavigationView_MUXControlsTestApp_NavigationViewMenuItemStretchPage_MUXControlsTestApp_NavigationViewMenuItemStretchPage
    • NavigationView_MUXControlsTestApp_NavigationViewMinimalPage_MUXControlsTestApp_NavigationViewMinimalPage
    • Brushes_PanelImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_PanelImageBrush
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Brushes_ImageBrushWithRotateTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithRotateTransform
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Uno_UI_Samples_UITests_Image_Image_Stretch
    • Windows_System_Display_DisplayRequest_UITests_Shared_Windows_System_Display_DisplayRequest
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl
    • TabView_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • ListView_ListView_TextBox_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_TextBox
    • NavigationView_MUXControlsTestApp_NavigationViewRS3Page_MUXControlsTestApp_NavigationViewRS3Page
    • NavigationView_MUXControlsTestApp_NavigationViewRS4Page_MUXControlsTestApp_NavigationViewRS4Page
    • Grid_CenteredGridinGridwiththreefixedsizechildren_Uno_UI_Samples_Content_UITests_GridTestsControl_CenteredGridinGridwiththreefixedsizechildren
  • skia-gtk-screenshots: 60 changed over 2232

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ButtonClippingTestsControl.png
    • ButtonClippingTestsControl.png-dark
    • ClipboardTests.png-dark
    • ClipboardTests.png
    • Gamepad_Enumeration.png-dark
    • ContentPresenter_NativeEmbedding.png
    • ImageSourceUrlMsAppDataScheme.png-dark
    • WinUIExpanderPage.png-dark
    • WinUIExpanderPage.png
    • WinUIProgressBarSimple.png-dark
    • WinUIProgressBarSimple.png
    • Buttons.png-dark
    • Buttons.png
    • DisplayInformation.png
    • ImageSourceUrlMsAppDataScheme.png
    • UIElement_MeasureDirtyPath.png-dark
    • UIElement_MeasureDirtyPath.png
    • BorderImageBrush.png-dark
    • BorderImageBrush.png
    • DisplayInformation.png-dark
  • skia-linux-screenshots: 60 changed over 2232

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrushRelativeTransform.png
    • Ellipse.png-dark
    • Ellipse.png
    • Focus_FocusVisual_Properties.png-dark
    • ImagesInlineInFlipView.png-dark
    • ImagesInlineInFlipView.png
    • ClipboardTests.png-dark
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • ClipboardTests.png
    • DropDownButtonPage.png-dark
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • BorderImageBrushRelativeTransform.png-dark
    • Gamepad_CurrentReading.png-dark
    • ContentPresenter_NativeEmbedding.png-dark
    • ContentPresenter_NativeEmbedding.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • Buttons.png-dark
  • skia-windows-screenshots: 72 changed over 2232

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ExpanderColorValidationPage.png-dark
    • ExpanderColorValidationPage.png
    • ColorPickerSample.png-dark
    • Buttons.png-dark
    • Buttons.png
    • ContentPresenter_NativeEmbedding.png-dark
    • ContentPresenter_NativeEmbedding.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • BorderImageBrushRelativeTransform.png-dark
    • BorderImageBrushRelativeTransform.png
    • Focus_FocusVisual_Properties.png-dark
    • ClipboardTests.png-dark
    • Examples.png
    • ButtonClippingTestsControl.png-dark
    • CalendarView_Theming.png-dark
    • ColorPickerSample.png
    • Gamepad_CurrentReading.png-dark
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
  • wasm: 449 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • GenericApp.Views.Samples.Shared.Content.UITests.GridViewGrouped
    • initial_state
    • SamplesApp.Microsoft_UI_Xaml_Controls.WebView2Tests.WebView2_WithHeaders
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_ItemsSource
    • SamplesApp.Windows_UI_Xaml_Controls.Canvas.Measure_Children_In_Canvas
    • SamplesApp.Windows_UI_Xaml_Controls.ContentControlNoTemplateNoContent
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewHeaderImage
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewHeaderUpdate
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_ItemContainerStyleSelector
    • SamplesApp.Windows_UI_Xaml_Shapes.ShapeControlsPage
    • UITests.Microsoft_UI_Xaml_Controls.RefreshContainerTests.RefreshContainerHorizontalScroll
    • UITests.Shared.Toolkit.Elevation
    • UITests.Shared.Windows_ApplicationModel.Calls.PhoneCallManagerTests
    • UITests.Shared.Windows_UI_Xaml.FrameworkElementTests.FrameworkElement_NativeLayout
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Ogg_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MenuFlyoutTests.MenuFlyoutItem_Hierarchy
    • UITests.Shared.Windows_UI_Xaml_Input.Pointers.DragCoordinates_Automated
    • UITests.Shared.Windows_UI_Xaml_Input.RoutedEvents.RoutedEvent_DoubleTapped
    • UITests.Windows_UI_Notifications.BadgeNotificationTests
    • UITests.Windows_UI_ViewManagement.ApplicationViewMode
  • wasm-automated-net9.0-UWP-Default-automated: 29 changed over 1947

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • Image_Image_Stretch_None_ScrollViewer_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None_Containers
    • Image_Image_Stretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • Default_StrokeThickness_MyRect
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Default_StrokeThickness_MyEllipse
    • NoToolTip_On_Open_opened-textonly-tooltip
    • NoToolTip_On_Open_opened-tooltip
    • Expander_WinUIExpanderPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_WinUIExpanderPage
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
  • wasm-automated-net9.0-UWP-RuntimeTests-0: 0 changed over 1

  • wasm-automated-net9.0-UWP-RuntimeTests-1: 0 changed over 1

  • wasm-automated-net9.0-UWP-RuntimeTests-2: 0 changed over 1

  • wasm-automated-net9.0-WinUI-Benchmarks-automated: 0 changed over 1

  • wasm-automated-net9.0-WinUI-RuntimeTests-0: 0 changed over 1

  • wasm-automated-net9.0-WinUI-RuntimeTests-1: 0 changed over 1

  • wasm-automated-net9.0-WinUI-RuntimeTests-2: 0 changed over 1

@MartinZikmund MartinZikmund merged commit b5a8d7a into master Nov 28, 2024
115 checks passed
@MartinZikmund MartinZikmund deleted the dev/mazi/style-poup-visualtree branch November 28, 2024 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resources do not correctly flow to Popup from parents
4 participants