[Windows] Fix CollectionView.RemainingItemsThresholdReached #14391
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fixed an issue where the `CollectionView.RemainingItemsThresholdReached` event wasn't firing on Windows. * Added a DeviceTest for the event
Foda
added
platform/windows 🪟
area-controls-collectionview
mandel-macaque
approved these changes
Apr 4, 2023
Comment on lines
431
to
432
| case 0: | ||
| if (itemsViewScrolledEventArgs.LastVisibleItemIndex == ItemCount - 1) |
There was a problem hiding this comment.
Can this two statements be merged in a single switch expression?
There was a problem hiding this comment.
Yup yup, actually I think the switch can be completely removed.
Comment on lines
435
to
436
| default: | ||
| if (ItemCount - 1 - itemsViewScrolledEventArgs.LastVisibleItemIndex <= Element.RemainingItemsThreshold) |
rmarinho
reviewed
Apr 28, 2023
| @@ -423,6 +423,12 @@ internal void HandleScroll(ScrollViewer scrollViewer) | |||
| itemsViewScrolledEventArgs = ComputeVisibleIndexes(itemsViewScrolledEventArgs, layoutOrientaton, advancing); | |||
|
|
|||
| Element.SendScrolled(itemsViewScrolledEventArgs); | |||
|
|
|||
| if (Element.RemainingItemsThreshold > -1 && | |||
There was a problem hiding this comment.
we should grab this value and use so we don't hit the BP twice
rmarinho
reviewed
May 4, 2023
src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: Rui Marinho <me@ruimarinho.net>
rmarinho
approved these changes
May 5, 2023
rmarinho
added
the
backport/suggested
rmarinho
added a commit
that referenced
this pull request
May 30, 2023
* fix(bug): Fix `RemainingItemsThresholdReached` on Windows * Fixed an issue where the `CollectionView.RemainingItemsThresholdReached` event wasn't firing on Windows. * Added a DeviceTest for the event * Remove switch statement * Update src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs Co-authored-by: Rui Marinho <me@ruimarinho.net> --------- Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
hartez
added
the
backport/approved
|
/backport to net7.0 |
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/5138919704 |
|
@hartez backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: fix(bug): Fix `RemainingItemsThresholdReached` on Windows
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
M src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
CONFLICT (content): Merge conflict in src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
Auto-merging src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix(bug): Fix `RemainingItemsThresholdReached` on Windows
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@hartez an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
hartez
added a commit
that referenced
this pull request
Jun 2, 2023
* fix(bug): Fix `RemainingItemsThresholdReached` on Windows * Fixed an issue where the `CollectionView.RemainingItemsThresholdReached` event wasn't firing on Windows. * Added a DeviceTest for the event * Remove switch statement * Update src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs Co-authored-by: Rui Marinho <me@ruimarinho.net> --------- Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
This was referenced Jun 14, 2023
samhouts
added
the
fixed-in-8.0.0-preview.5.8529
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
CollectionView.RemainingItemsThresholdReachedevent wasn't firing on Windows. This issue was caused by missing code inItemsViewHandler.Windowsto fire the event.Issues Fixed
Fixes #8338
Fixes #9935 (dupe)
Fixes #12066 (dupe)