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

Grouped CollectionView enumeration #18554

Merged
merged 4 commits into from
Oct 24, 2024
Merged

Grouped CollectionView enumeration #18554

merged 4 commits into from
Oct 24, 2024

Conversation

MartinZikmund
Copy link
Member

@MartinZikmund MartinZikmund commented Oct 23, 2024 •
edited
Loading

GitHub Issue (If applicable): closes #

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

Grouped collection view does not enumerate correctly in some scenarios

What is the new behavior?

Enumeration works

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@MartinZikmund MartinZikmund linked an issue Oct 23, 2024 that may be closed by this pull request
DataGrid Grouping is not work same with Window and Android #18357
Closed
@MartinZikmund MartinZikmund self-assigned this Oct 23, 2024
@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@github-actions github-actions bot added the area/automation Categorizes an issue or PR as relevant to project automation label Oct 23, 2024
@MartinZikmund
Copy link
Member Author

@Mergifyio backport release/stable/5.5

@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 23, 2024 •
edited
Loading

backport release/stable/5.5

✅ Backports have been created

@unodevops
Copy link
Contributor

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

@nventive-devops
Copy link
Contributor

The build 144686 found UI Test snapshots differences: android-28-net8: 23, android-28-net8-Snap: 50, ios: 9, ios-Snap: 56, skia-gtk-screenshots: 63, skia-linux-screenshots: 68, skia-windows-screenshots: 69, wasm: 439, wasm-automated-net9.0-UWP-Default-automated: 25, 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: 23 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • FlyoutTest_DataBoundButton_CommandExecutes_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_ButtonInContent
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • Pivot_Non_PivotItem_Items_UITests_Shared_Windows_UI_Xaml_Controls_Pivot_Pivot_CustomContent_Automated
    • When_Clip_Is_Set_On_Child_Element_original
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_Parent_PointerMoved_After_drag_on_non-scrolling_ScrollViewer
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_Native_View_UITests_Shared_Windows_UI_Xaml_UIElementTests_UIElement_Native_Child
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • 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

  • android-28-net8-Snap: 50 changed over 1066

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrush_StreamSource_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrush_StreamSource
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • TextBox_Input_InputScope_Number_Uno_UI_Samples_Content_UITests_TextBoxControl_Input_InputScope_Number
    • TextBox_Input_InputScope_PersonalFullName_Uno_UI_Samples_Content_UITests_TextBoxControl_Input_InputScope_PersonalFullName
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • TextBox_Input_InputScope_Email_Uno_UI_Samples_Content_UITests_TextBoxControl_Input_InputScope_Email
    • RatingControl_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage
    • TabView_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage
    • TextBox_TextBox_BeforeTextChanging_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_BeforeTextChanging
    • TextBox_Uno_UI_Samples_UITests_TextBoxControl_TextBox_IsReadOnly_Uno_UI_Samples_UITests_TextBoxControl_TextBox_IsReadOnly
    • NavigationView_MUXControlsTestApp_NavigationViewCustomThemeResourcesPage_MUXControlsTestApp_NavigationViewCustomThemeResourcesPage
    • Scrolling_MUXControlsTestApp_ScrollViewWithScrollControllersPage_MUXControlsTestApp_ScrollViewWithScrollControllersPage
    • TextBlock_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_MeasureCache_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_MeasureCache
    • UIElement_TransformToVisual_Simple_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_Simple
    • UIElement_TransformToVisual_Transform_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_Transform
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Basic_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Basic

  • ios: 9 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220

  • ios-Snap: 56 changed over 1057

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_ImageBrushWithRotateTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithRotateTransform
    • Brushes_RectangleStretchFill_Uno_UI_Samples_UITests_ImageBrushTestControl_RectangleStretchFill
    • ListView_ListView_Image_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Image
    • Mapping_MapControl_Uno_UI_Samples_Content_UITests_MapControl_MapControl
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • Brushes_GenericApp_Views_Content_UITests_ImageBrushTestControl_BorderImageBrushRelativeTransform_GenericApp_Views_Content_UITests_ImageBrushTestControl_BorderImageBrushRelativeTransform
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList
    • GridView_GenericApp_Views_Samples_Shared_Content_UITests_GridViewGrouped_GenericApp_Views_Samples_Shared_Content_UITests_GridViewGrouped
    • 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_HorizontalListView_Padding_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Padding
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Brushes_ImageBrushStretch2_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch2
    • Brushes_PathImageBrushfill_Uno_UI_Samples_UITests_ImageBrushTestControl_PathImageBrushfill
    • Brushes_PanelImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_PanelImageBrush
    • ListView_ListView_Selection_Events_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Events
    • ListView_ListView_TextBox_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_TextBox
    • NavigationView_MUXControlsTestApp_NavigationViewMenuItemStretchPage_MUXControlsTestApp_NavigationViewMenuItemStretchPage
    • TextBlock_TextBlock_FixedWidth_With_DataBound_Run_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_FixedWidth_With_DataBound_Run
    • Brushes_ImageBrushLocalAsset_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushLocalAsset

  • skia-gtk-screenshots: 63 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ContentPresenter_NativeEmbedding.png
    • Gamepad_CurrentReading.png
    • TextBlock_IsTextSelectionEnabled.png-dark
    • SvgHighDPIBlur.png-dark
    • SvgHighDPIBlur.png
    • ImageIconPage.png-dark
    • DropDownButtonPage.png-dark
    • DropDownButtonPage.png
    • UIElement_Layout_Bug2879.png-dark
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • ExpanderColorValidationPage.png
    • Gamepad_CurrentReading.png-dark
    • ImageIconPage.png
    • Focus_FocusVisual_Properties.png-dark
    • ContentPresenter_NativeEmbedding.png-dark
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • SplitButtonTestsPage.png-dark
    • ExpanderColorValidationPage.png-dark

  • skia-linux-screenshots: 68 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrushRelativeTransform.png-dark
    • BorderImageBrushRelativeTransform.png
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • ButtonClippingTestsControl.png-dark
    • Gamepad_CurrentReading.png-dark
    • ImageBrushInList.png-dark
    • ImageBrushInList.png
    • Examples.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • ImageIconPage.png-dark
    • ImageIconPage.png
    • Buttons.png
    • Focus_FocusVisual_Properties.png-dark
    • Focus_FocusVisual_Properties.png
    • ClipboardTests.png
    • Image_Stretch_None.png-dark

  • skia-windows-screenshots: 69 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • AppWindowPositionAndSize.png-dark
    • CalendarView_Theming.png
    • ButtonClippingTestsControl.png-dark
    • ButtonClippingTestsControl.png
    • Buttons.png-dark
    • ClipboardTests.png-dark
    • Examples.png
    • AppWindowPositionAndSize.png
    • BorderImageBrush.png-dark
    • FlipView_Background.png-dark
    • FlipView_Background.png
    • BorderImageBrush.png
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • DropDownButtonPage.png
    • Gamepad_Enumeration.png-dark
    • Gamepad_Enumeration.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • DragDrop_TestPage.png-dark

  • wasm: 439 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Microsoft_UI_Xaml_Controls.WebView2Tests.WebView2ControlJavaScriptAlertConfirmPrompt
    • SamplesApp.Microsoft_UI_Xaml_Controls.WebView2Tests.WebView2_WithHeaders
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.Picker_Resizable
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Windows_UI_Xaml.Clipping.ButtonWithClippingAndOffset
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewChangeView
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewHeaderFooter_ImplicitlyBinded
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Changing_Text
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Expandable_Item
    • SamplesApp.Windows_UI_Xaml_Controls.ToggleSwitchControl.ToggleSwitch_Custom
    • SamplesApp.Windows_UI_Xaml_Shapes.PathTestsControl.PathIcon
    • SamplesApp.Windows_UI_Xaml_Shapes.PathTestsControl.PathinButton
    • UITests.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBox_ExpressionTest
    • UITests.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBox_Header
    • UITests.Shared.Windows_Graphics_Display.DisplayInformationTests
    • UITests.Shared.Windows_Security_Credentials.PasswordVaultTests.CredentialsPersistence
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListViewResizableText
    • UITests.Shared.Windows_UI_Xaml_Controls.TextBoxTests.TextBox_IsReadOnly_AcceptsReturn
    • UITests.Windows_UI_Composition.VisualTranslationSample
    • UITests.Windows_UI_Core.CloseRequestedTests

  • wasm-automated-net9.0-UWP-Default-automated: 25 changed over 1946

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • 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
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrush_StreamSource_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrush_StreamSource
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • Default_StrokeThickness_MyLine
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • Expander_WinUIExpanderPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_WinUIExpanderPage
    • Default_StrokeThickness_MyPolyline
    • Brushes_ImageBrushChangingCornerRadius_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushChangingCornerRadius
    • When_Theme_Changed_No_Crash_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Basic_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Basic
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • 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

ajpinedam
ajpinedam approved these changes Oct 24, 2024
View reviewed changes
Copy link
Contributor

@ajpinedam ajpinedam left a comment

Choose a reason for hiding this comment

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

Looks good!

@MartinZikmund MartinZikmund merged commit 450bfbe into master Oct 24, 2024
108 checks passed
@MartinZikmund MartinZikmund deleted the dev/mazi/collectionview-adjust branch October 24, 2024 03:07
@mergify mergify bot mentioned this pull request Oct 24, 2024
Merged
6 tasks
jeromelaban added a commit that referenced this pull request Oct 24, 2024
@jeromelaban
Merge pull request #18565 from unoplatform/mergify/bp/release/stable/…
1b98e79 
…5.5/pr-18554

Grouped `CollectionView` enumeration (backport #18554)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajpinedam ajpinedam ajpinedam approved these changes

@jeromelaban jeromelaban Awaiting requested review from jeromelaban

Assignees

@MartinZikmund MartinZikmund

Labels
area/automation Categorizes an issue or PR as relevant to project automation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DataGrid Grouping is not work same with Window and Android
4 participants
@MartinZikmund @unodevops @nventive-devops @ajpinedam