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

chore: Remove ContentTemplateSelector references from Styles #18125

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

morning4coffe-dev
Copy link
Member

GitHub Issue (If applicable): #18103 closes?

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

@morning4coffe-dev morning4coffe-dev added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 5, 2024
@morning4coffe-dev
Copy link
Member Author

CC @MartinZikmund

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18125/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-18125/index.html

@nventive-devops
Copy link
Contributor

The build 138797 found UI Test snapshots differences: android-28-net8: 16, android-28-net8-Snap: 63, ios: 8, ios-Snap: 47, skia-gtk-screenshots: 23, skia-linux-screenshots: 41, skia-windows-screenshots: 39, wasm: 387, wasm-automated-net8.0-UWP-Default-automated: 16, wasm-automated-net8.0-UWP-RuntimeTests-0: 0, wasm-automated-net8.0-UWP-RuntimeTests-1: 0, wasm-automated-net8.0-UWP-RuntimeTests-2: 0, wasm-automated-net8.0-WinUI-Benchmarks-automated: 0, wasm-automated-net8.0-WinUI-RuntimeTests-0: 0, wasm-automated-net8.0-WinUI-RuntimeTests-1: 0, wasm-automated-net8.0-WinUI-RuntimeTests-2: 0

Details
  • android-28-net8: 16 changed over 832

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • RadioButtons_Disable_Validation_Uno_UI_Samples_Content_UITests_ButtonTestsControl_RadioButton_IsEnabled_Automated
    • WebView_NavigateToAnchor_Initial
    • When_Parent_PointerMoved_After_drag_on_non-scrolling_ScrollViewer
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • When_MaxLines_Changed_On_Grid_Container_Uno_UI_Samples_Content_UITests_TextBlockControl_SimpleText_MaxLines_Multiple_Containers
    • When_MaxLines_Changed_On_Stack_Container_Uno_UI_Samples_Content_UITests_TextBlockControl_SimpleText_MaxLines_Multiple_Containers
    • When_Foreground_Is_Brush_Should_Take_Correct_Width_When_Foreground_Is_Brush_Should_Take_Correct_Width
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
  • android-28-net8-Snap: 63 changed over 1065

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Image_ImageSourceStream_Uno_UI_Samples_UITests_ImageTestsControl_ImageSourceStream
    • ListView_ListViewScrollBar_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewScrollBar
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_Ellipse_Uno_UI_Samples_UITests_ImageBrushTestControl_Ellipse
    • Buttons_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • Scrolling_UITests_Windows_UI_Xaml_Controls_ScrollViewerTests_ScrollViewer_Fluent_UITests_Windows_UI_Xaml_Controls_ScrollViewerTests_ScrollViewer_Fluent
    • Scrolling_UITests_Windows_UI_Xaml_Controls_ScrollViewerTests_ScrollViewer_Margin_UITests_Windows_UI_Xaml_Controls_ScrollViewerTests_ScrollViewer_Margin
    • Slider_Slider_Inside_ScrollViewer_Uno_UI_Samples_Content_UITests_Slider_Slider_Inside_ScrollViewer
    • TextBox_TextBox_Disabled_State_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_Disabled_State
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • ListView_HorizontalListView_Templates_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Templates
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Rectangle_Rounding_UITests_Windows_UI_Xaml_Shapes_Rectangle_Rounding
    • TextBlock_TextBlock_UpdatePerformance_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_UpdatePerformance
    • TextBlock_TextBlock_Visibility_Arrange_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Visibility_Arrange
    • TeachingTip_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage
    • Brushes_ImageBrushChangingCornerRadius_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushChangingCornerRadius
    • MUX_NumberBox_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • RatingControl_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage
  • ios: 8 changed over 268

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Check_ListView_Swallows_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
  • ios-Snap: 47 changed over 1056

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_ImageBrushWithCompositeTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithCompositeTransform
    • ListView_ListView_Image_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Image
    • Brushes_EllipsemaskingEllipseGrid_Uno_UI_Samples_UITests_ImageBrushTestControl_EllipsemaskingEllipseGrid
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Ellipse_StrokeThickness_UITests_Windows_UI_Xaml_Shapes_Ellipse_StrokeThickness
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • NavigationView_FluentStyle_NavigationViewSample_SamplesApp_Samples_Microsoft_UI_Xaml_Controls_NavigationViewTests_FluentStyle_FluentStyle_NavigationViewSample
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal
    • 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
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • Icons_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Foreground_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Foreground
    • ListView_ListView_TextBox_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_TextBox
    • TextBlock_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList
    • Image_ImageSourceStream_Uno_UI_Samples_UITests_ImageTestsControl_ImageSourceStream
    • ListView_ListViewGroupedChanging_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedChanging
    • ListView_ListView_WithScrollViewer_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_WithScrollViewer
  • skia-gtk-screenshots: 23 changed over 2216

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • RectanglemaskingRectangleGrid.png
    • ListView_IsSelected.png-dark
    • ListView_IsSelected.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • EllipsemaskingEllipseSuperpositionPanel.png
    • SelectorBarSamplePage.png-dark
    • SelectorBarSamplePage.png
    • ImageBrushAlignmentXY2.png
    • Ellipse.png-dark
    • Ellipse.png
    • Mini player.png-dark
    • Mini player.png
    • BorderImageBrush.png
    • Using .ogg.png-dark
    • Using .ogg.png
    • ImageOpened.png
    • Rectangle.png
    • PathImageBrushfill.png
    • Uniform100x100.png-dark
  • skia-linux-screenshots: 41 changed over 2216

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrush.png-dark
    • Ellipse.png-dark
    • Ellipse.png
    • EllipsemaskingEllipseSuperpositionPanel.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • BorderImageBrush.png
    • ImageWithLateSourceUniformToFill.png-dark
    • ImageWithLateSourceUniformToFill.png
    • LargeImageList.png-dark
    • LargeImageList.png
    • ImagesInlineInFlipView.png-dark
  • skia-windows-screenshots: 39 changed over 2216

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • AppWindowPositionAndSize.png-dark
    • ColorPickerSample.png-dark
    • ColorPickerSample.png
    • Ellipse.png-dark
    • Ellipse.png
    • ImageBrushInList.png-dark
    • ImageBrushInList.png
    • AppWindowPositionAndSize.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • Image_Stretch_None.png-dark
    • Image_Stretch_None.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • ImagesInlineInFlipView.png-dark
    • ImagesInlineInFlipView.png
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
  • wasm: 387 changed over 1043

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Benchmarks.Shared.Controls.BenchmarkDotNetTestsPage
    • GenericApp.Views.Content.UITests.ImageBrushTestControl.ImageBrush_UniformToFill
    • MUXControlsTestApp.InfoBarPage
    • MUXControlsTestApp.NavigationViewItemTemplatePage
    • MUXControlsTestApp.NavigationViewMinimalPage
    • MUXControlsTestApp.PersonPicturePage
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_Pane_Automated
    • SamplesApp.Wasm.Windows_UI_Xaml_Media.Transform.Border_With_RotateTransform
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewGroupedLarge
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewGroupedLargeLegacy
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Changing_Text
    • SamplesApp.Windows_UI_Xaml_Media.Geometry.ArcSegmentPage
    • SamplesApp.Windows_UI_Xaml_Media.Geometry.BezierSegmentPage
    • SamplesApp.Windows_UI_Xaml_Media.Geometry.ClosedFigurePage
    • UITests.Microsoft_UI_Xaml_Controls.ImageIconTests.ImageIconPage
    • UITests.Microsoft_UI_Xaml_Controls.InfoBadgeTests.InfoBadgePage
    • UITests.Microsoft_UI_Xaml_Controls.NavigationViewTests.NavigationViewBasicPage
    • UITests.Shared.Windows_UI_Xaml_Controls.ComboBox.ComboBox_ComboBoxItem_Selection
    • UITests.Shared.Windows_UI_Xaml_Controls.ComboBox.ComboBox_DropDownPlacement
  • wasm-automated-net8.0-UWP-Default-automated: 16 changed over 1952

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • 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
    • Windows_Media_MediaPlayer_UITests_Windows_Media_MediaPlayerTests
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
  • wasm-automated-net8.0-UWP-RuntimeTests-0: 0 changed over 1

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

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

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

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

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

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

@morning4coffe-dev
Copy link
Member Author

Waiting on #17645

@morning4coffe-dev
Copy link
Member Author

CC @MartinZikmund, @Xiaoy312 Can I continue with this change?

@MartinZikmund
Copy link
Member

@morning4coffe-dev I think it should now be ok to continue!

@morning4coffe-dev morning4coffe-dev marked this pull request as ready for review October 28, 2024 15:10
@morning4coffe-dev morning4coffe-dev removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 1, 2024
Copy link
Contributor

@Xiaoy312 Xiaoy312 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can see why they are getting removed, but im hesitant to greenlit this..?
could you go through the screenshot comparison tests and make sure that we didnt break anything?

@@ -204,8 +202,6 @@
Content="{TemplateBinding Content}"
ContentTransitions="{TemplateBinding ContentTransitions}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
CornerRadius="{TemplateBinding CornerRadius}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

radius too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can see why they are getting removed
but could you also go through the screenshot comparison tests and make sure that we didnt break anything?

@jeromelaban jeromelaban marked this pull request as draft November 8, 2024 19:16
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18125/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-18125/index.html

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.

5 participants