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.

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

Jump to bottom

fix: Ensure proper check for template root #19582

Merged
merged 2 commits into from
Feb 27, 2025
Merged

fix: Ensure proper check for template root #19582

merged 2 commits into from
Feb 27, 2025

Conversation

MartinZikmund
Copy link
Member

@MartinZikmund MartinZikmund commented Feb 24, 2025 •
edited
Loading

GitHub Issue (If applicable): closes #16648

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@nventive-devops
Copy link
Contributor

The build 156108 found UI Test snapshots differences: android-28-net8: 29, android-28-net8-Snap: 42, ios: 4, ios-Snap: 42, skia-gtk-screenshots: 64, skia-linux-screenshots: 79, skia-windows-screenshots: 65, wasm: 94, wasm-automated-net9.0-UWP-Default-automated: 1, 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: 29 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • WebView_NavigateToAnchor_Initial
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • WebView_NavigateToAnchor_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • When_Bound_To_GlobalThemedResources_UITests_Shared_Windows_UI_Xaml_ThemeResources_AppXamlDefinedResources
    • When_Clipped_Rounded_Corners_UITests_Windows_UI_Xaml_Clipping_Clipping4273
    • When_Clip_Is_Set_On_Child_Element_original
    • When_Clip_Is_Set_On_Child_Element_UITests_Windows_UI_Xaml_UIElementTests_UIElement_Clipping
    • When_Clip_Is_Set_On_Child_Element_validation
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • LoadEmptyContentControl_CContentControl
    • NativeCommandBar_Size_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Dynamic
    • NavigateBackAndForthBetweenMenuItemsAndSettings_Fluent_SamplesApp_Samples_Microsoft_UI_Xaml_Controls_NavigationViewTests_FluentStyle_FluentStyle_NavigationViewSample

  • android-28-net8-Snap: 42 changed over 1067

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • ListView_ListView_FirstLastCacheIndex_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_FirstLastCacheIndex
    • Scrolling_MUXControlsTestApp_ScrollViewKeyboardAndGamepadNavigationPage_MUXControlsTestApp_ScrollViewKeyboardAndGamepadNavigationPage
    • TextBox_TextBox_TextProperty_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_TextProperty
    • TextBox_TextBox_WithPadding_Focus_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_WithPadding_Focus
    • TextBox_UITests_Shared_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBoxPage_UITests_Shared_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBoxPage
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • TextBlock_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • MUX_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage
    • Scrolling_MUXControlsTestApp_ScrollViewWithScrollControllersPage_MUXControlsTestApp_ScrollViewWithScrollControllersPage
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties
    • TextBox_UITests_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBox_AutoFill_UITests_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBox_AutoFill
    • TextBox_UITests_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBox_iOS_DuplicatingText_UITests_Windows_UI_Xaml_Controls_PasswordBoxTests_PasswordBox_iOS_DuplicatingText
    • 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
    • TeachingTip_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage

  • ios: 4 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings

  • ios-Snap: 42 changed over 967

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_HorizontalListView_Padding_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Padding
    • Brushes_GenericApp_Views_Content_UITests_ImageBrushTestControl_BorderImageBrushRelativeTransform_GenericApp_Views_Content_UITests_ImageBrushTestControl_BorderImageBrushRelativeTransform
    • Default_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_ObservableCollection_Unused_Space_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_ObservableCollection_Unused_Space
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • UIElement_TransformToVisual_Simple_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_Simple
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_ExecuteScriptAsync_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_ExecuteScriptAsync
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebViewTests_WebView_InvokeScriptAsync_UITests_Microsoft_UI_Xaml_Controls_WebViewTests_WebView_InvokeScriptAsync
    • Brushes_EllipsemaskingEllipseGrid_Uno_UI_Samples_UITests_ImageBrushTestControl_EllipsemaskingEllipseGrid
    • Default_Uno_UI_Samples_UITests_Image_Image_UseTargetSize_Uno_UI_Samples_UITests_Image_Image_UseTargetSize
    • ListView_ListView_Image_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Image
    • Scrolling_MUXControlsTestApp_ScrollViewDynamicPage_MUXControlsTestApp_ScrollViewDynamicPage
    • Viewbox_UITests_Shared_Windows_UI_Xaml_Controls_ViewBoxTests_ViewBox_Alignment_UITests_Shared_Windows_UI_Xaml_Controls_ViewBoxTests_ViewBox_Alignment
    • WebView_WebView_Mailto_Uno_UI_Samples_Content_UITests_WebView_WebView_Mailto
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats
    • NavigationView_MUXControlsTestApp_NavigationViewMenuItemStretchPage_MUXControlsTestApp_NavigationViewMenuItemStretchPage
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • WebView_WebView2_WithHeaders_SamplesApp_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_WithHeaders
    • Brushes_PanelImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_PanelImageBrush
    • Brushes_RectangleStretchFill_Uno_UI_Samples_UITests_ImageBrushTestControl_RectangleStretchFill

  • skia-gtk-screenshots: 64 changed over 2238

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Gamepad_Enumeration.png-dark
    • Gamepad_Enumeration.png
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • ToggleButton_IsEnabled_Automated.png
    • CompositionPath.png
    • Ellipse.png-dark
    • Ellipse.png
    • BorderImageBrushRelativeTransform.png-dark
    • BorderImageBrushRelativeTransform.png
    • Gamepad_CurrentReading.png-dark
    • Gamepad_CurrentReading.png
    • TextBlock_IsTextSelectionEnabled.png-dark
    • Examples.png-dark
    • Examples.png
    • UIElement_Layout_Bug2879.png-dark
    • DropDownButtonPage.png-dark
    • DropDownButtonPage.png

  • skia-linux-screenshots: 79 changed over 2238

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ContentPresenter_NativeEmbedding.png-dark
    • ContentPresenter_NativeEmbedding.png
    • BorderImageBrush.png-dark
    • DropDownButtonPage.png-dark
    • DropDownButtonPage.png
    • Gamepad_CurrentReading.png-dark
    • Gamepad_CurrentReading.png
    • Gamepad_Enumeration.png-dark
    • Gamepad_Enumeration.png
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • ClipboardTests.png
    • Image_Stretch_None.png-dark
    • Image_Stretch_None.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • BorderImageBrush.png
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • ImageIconPage.png-dark

  • skia-windows-screenshots: 65 changed over 2238

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ButtonClippingTestsControl.png-dark
    • ButtonClippingTestsControl.png
    • Buttons.png-dark
    • DropDownButtonPage.png-dark
    • ClipboardTests.png-dark
    • CalendarView_Theming.png
    • ImageBrushInList.png-dark
    • ImageBrushInList.png
    • CompositionPath.png-dark
    • CompositionPath.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • Gamepad_CurrentReading.png-dark
    • Gamepad_Enumeration.png-dark
    • Gamepad_Enumeration.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • Focus_FocusVisual_Properties.png-dark

  • wasm: 94 changed over 1043

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUXControlsTestApp.PipsPagerPage
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_IsSelected
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_ItemsSource
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewGrouped_ItemContainerStyleSelector
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewWithinScollViewer
    • UITests.Shared.Windows_UI_Xaml_Controls.ComboBox.ComboBox_VisibleBounds
    • UITests.Shared.Windows_UI_Xaml_Controls.CommandBar.CommandBar_Xaml_Automated
    • UITests.Shared.Windows_UI_Xaml_Controls.ContentDialogTests.ContentDialog_Closing
    • UITests.Windows_UI_Xaml_Controls.ListView.ListViewItem_Click_Focus
    • UITests.Windows_UI_Xaml_Controls.ListView.ListViewTemplateRootIsContainer
    • GenericApp.Views.Samples.Shared.Content.UITests.GridViewMultipleSelectionMode
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_CornerRadius
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewLegacy
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Padding_Unconstrained
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_SelectedItem
    • UITests.Shared.Microsoft_UI_Xaml_Controls.ExpanderTests.WinUIExpanderPage
    • UITests.Windows_UI_Xaml.FocusTests.Focus_FocusVisual_Properties
    • UITests.Windows_UI_Xaml.FrameworkElementTests.FrameworkElement_Opacity
    • Uno.UI.Samples.Content.UITests.ButtonTestsControl.AppBar_KeyBoard
    • Uno.UI.Samples.Content.UITests.ButtonTestsControl.CheckBox_Button

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

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features

  • 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
Copy link
Member Author

@Mergifyio backport release/stable/5.6

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 27, 2025 •
edited
Loading

backport release/stable/5.6

✅ Backports have been created

@MartinZikmund MartinZikmund merged commit 1418556 into master Feb 27, 2025
115 checks passed
@MartinZikmund MartinZikmund deleted the dev/mazi/scrollbar-check branch February 27, 2025 12:36
@mergify mergify bot mentioned this pull request Feb 27, 2025
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morning4coffe-dev morning4coffe-dev morning4coffe-dev approved these changes

@jeromelaban jeromelaban Awaiting requested review from jeromelaban

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Skia] Update ScrollBar to WinUI 3 styles
5 participants
@MartinZikmund @unodevops @nventive-devops @jeromelaban @morning4coffe-dev