[net10.0] Merge main to net10.0 #29753
Open
Conversation
This file contains hidden or 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
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…nges (#29424) * Added FeatureTests for CollectionView * changes updated * changes updated
* Fixed picker title's color * Update PickerExtensions.cs
* [iOS] Setting background color on the Searchbar (#23325) * Added a test category * Ui tests * Update SearchHandlerAppearanceTracker.cs * Update Issue23325Test.png
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ion - 18 (#28033) * Enabled CollectionViewUITests * Updated Issue Link * Addressed Feedbacks * Updated changes * Added images * Revert Changes * Changes updated * updated changes * Changes updated * Changes updated * Reverted Issue18896 * Changes updated * Reverted issue1583_1 * Reverted Issue18896
* Don't LoadUrl call when source is null * Add UI Test * remove space * Update UI Test
* [iOS] ScrollView content offset RTL fix * Added a UITest
…dding value for the label (#29163) * [Windows] Fix for 6387 ( Negative Padding values fail ). * [Windows] Fix for 6387 ( Negative Padding values fail ). * Have added Test case * Added a comment line explaining the assignment of zero when a padding value is negative * Have modified the test case
* Enhance debugging in ViewHandler.cs Added System.Diagnostics for debugging support. Introduced DebuggerDisplay attribute to ViewHandler class and added GetDebuggerDisplay method to improve object state visibility during debugging. * Update src/Core/src/Handlers/View/ViewHandler.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Gerald Versluis <gerald@verslu.is> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Fixed incorrect width and height * Updated test sample * Updated method name * Update shared test sample * Given width and height request for graphicsview in sample * Added snapshots
* Fixed the item template dynamic changes * Added a test case * Added test case and added snapshots * committed the image * committed the image
* re-enabled the test for android * modified test case * Update src/Controls/tests/TestCases.HostApp/Issues/CarouselViewLoopNoFreeze.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
) * [Windows] Fix for FlyoutBackgroundImage * [Windows] Fix for Flyout Background Image * Test case sample for FlyoutBackgroundImage * [Windows] Fix for FlyoutBackgroundImage * [Windows] Fix for FlyoutBackgroundImage * Updated Test sample * Changed test sample and added snapshots for android and iOS * BackgroundImage set Snapshot for windows and mac * BackgroundImage set Null Snapshot for windows and mac
… 2 (#29557) * [Android] clean up modalnavigationmanager * fix failing tests * Handle animation while poping * subscribe to event before showing dailog * change style's names * apply new styles * set result to tcs once dailog dismiss
…27575) * fixed shell items click issue * fix for shell items click issue * fix for flyoutitem in the overflow menu is not fully intractable * fix for flyoutitem in the overflow menu is not fully intractable * Update Issue6784.cs Removed test case fails on Windows * added new image * added new ci image
…ly - fix (#29561) * [Android] The number of SearchHandler toolbar item increases abnormally - fix * Added a UI test * Create NumberOfToolbarItemsShouldNotIncrease.png
…ge's Source to Local File Paths (#28405) * add extra condition * use _sourceCancellation
…o the Bottom Tab Icon (#29317) * Fixed the FontImageSource Icon color issues on the BottomNavigationView Tabs * Committed the test sample and case * Added comment over the fix * Remove unnecessary space
* Fixed Test case failure in PR 29469 - [2025/05/26] * Fixed Test case failure in PR 29469 - [2025/05/26]
* CollectionView drag changes on Mac * Mac drag changes
* fix CarouselViewHandler2 memory leak * enable cv2 memory tests * formatting
For more information about inflight process check https://github.com/dotnet/maui/wiki/Inflight-Branch-Process
# Conflicts: # src/Controls/tests/DeviceTests/Memory/MemoryTests.cs
There was a problem hiding this comment.
Pull Request Overview
This PR merges the latest changes from the main branch into the net10.0 branch, ensuring that platform-specific controls, toolbar handling, sample project configurations, and GitHub triage workflows/actions are up-to-date with main.
- In CarouselViewHandler.Windows.cs, an UpdateItemsSource() call is now invoked after setting the item template.
- In iOS and Android compatibility handlers, background color handling and toolbar item updates have been refined, including an explicit placeholder menu item ID for Android.
- Several new GitHub workflow and action files have been added to support issue triaging and label management.
Reviewed Changes
Copilot reviewed 144 out of 144 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Controls/src/Core/Handlers/Items/CarouselViewHandler.Windows.cs | Added call to UpdateItemsSource() after assigning ItemTemplate. |
| src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/SearchHandlerAppearanceTracker.cs | Updated background color assignment logic. |
| src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellToolbarTracker.cs | Refactored toolbar item update with explicit placeholder item ID and added a new method for tint colors. |
| src/Controls/samples/Controls.Sample/Properties/launchSettings.json | Changed commandName from MsixPackage to Project. |
| src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj | Updated WindowsPackageType and removed an ItemGroup. |
| .github/* | Added new workflows and GitHub Action definitions for triage and label management. |
Comment on lines
+90
to
92
| UpdateItemsSource(); | ||
| } | ||
|
|
There was a problem hiding this comment.
[nitpick] Ensure that the placement of UpdateItemsSource() immediately after setting the ItemTemplate is appropriate; verify that this call does not inadvertently trigger redundant data loading or inconsistent state changes.
Suggested change
| UpdateItemsSource(); | |
| } | |
| OnItemTemplateUpdated(); | |
| } | |
| private void OnItemTemplateUpdated() | |
| { | |
| if (Element == null || ListViewBase == null) | |
| return; | |
| // Ensure ItemTemplate is stable before updating items source | |
| if (ListViewBase.ItemTemplate == CarouselItemsViewTemplate) | |
| { | |
| UpdateItemsSource(); | |
| } | |
| } |
Copilot uses AI. Check for mistakes.
Positive FeedbackNegative Feedback
Comment on lines
+634
to
+635
| int _placeholderMenuItemId = 100; | ||
| if (menu.FindItem(_placeholderMenuItemId) is IMenuItem item) |
There was a problem hiding this comment.
Consider extracting the hardcoded placeholder menu item ID (100) into a named constant to clarify its purpose and simplify future maintenance.
Suggested change
| int _placeholderMenuItemId = 100; | |
| if (menu.FindItem(_placeholderMenuItemId) is IMenuItem item) | |
| const int PlaceholderMenuItemId = 100; | |
| if (menu.FindItem(PlaceholderMenuItemId) is IMenuItem item) |
Copilot uses AI. Check for mistakes.
Positive FeedbackNegative Feedback
| @@ -650,7 +662,7 @@ protected virtual void UpdateToolbarItems(AToolbar toolbar, Page page) | ||
| if (SearchHandler.SearchBoxVisibility == SearchBoxVisibility.Collapsible) | ||
| { | ||
| var placeholder = new Java.Lang.String(SearchHandler.Placeholder); | ||
| var item = menu.Add(placeholder); | ||
| var item = menu.Add(0, _placeholderMenuItemId, 0, placeholder); |
There was a problem hiding this comment.
[nitpick] Using the overload with an explicit menu item ID helps manage toolbar items better; please add a brief comment to explain the rationale behind choosing this specific ID.
Copilot uses AI. Check for mistakes.
Positive FeedbackNegative Feedback
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
#29776) * Added tolerance parameter to the VerifyScreenshot method * More changes * Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Controls/tests/TestCases.Shared.Tests/UITest.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Appium to the latest version * Removed deprecated logic * Update comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Bring latest changes from main to net10.0 branch