[CP to 1.8] Cherry-pick Fix FileTypeChoices in Storage Pickers to preserve insertion order #6018
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
…ion order (#5948) **Description** This is a fix for issue: - #5827 The existing FileTypeChoices property was built on an unordered map, which does not preserve the user-defined order. However, in the FileOpenPicker and FileSavePicker, the FileTypeChoices need to be displayed in the order they were inserted, rather than in a random order. This is important for developers' and end-users' experience because: - Developers expect to see their file type options in the logical order they added them - The first added option is usually the default selection - Maintaining consistent ordering helps end users quickly locate the desired file type Additionaly, the insertion order is respected in the legacy UWP FileSavePicker. **Fix** This is a backward-compatible fix. The goal of this fix is to maintain the existing Map type API contract and its good performance while ensuring that the display order of FileTypeChoices meets expectations. This pull request refactors the implementation of the `FileTypeChoicesMap` to ensure that the insertion order of keys is preserved and provides efficient key lookups. It replaces the previous unordered map-based implementation with the implementation backed by a vector. The update also introduces custom iterator and view classes to support this ordered behavior and modifies related tests to verify the new insertion order.
DinahK-2SO force-pushed the user/DinahK-2SO/cherry-pick-ordered-filetypechoices branch from e0613c2 to c7be002 Compare DinahK-2SO force-pushed the user/DinahK-2SO/cherry-pick-ordered-filetypechoices branch from 3dc103a to 5c3bab8 Compare DinahK-2SO changed the title 
Contributor Author
| Thanks @codendone for sharing the example! I updated the containment. |
Contributor Author
| /azp run |
| Azure Pipelines successfully started running 1 pipeline(s). |
codendone approved these changes Nov 21, 2025
…dered-filetypechoices
Contributor Author
| /azp run |
| Azure Pipelines successfully started running 1 pipeline(s). |
DinahK-2SO added area-File access DinahK-2SO deleted the user/DinahK-2SO/cherry-pick-ordered-filetypechoices branch 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
This is a cherry-pick of PR
For issue
The existing FileTypeChoices property was built on an unordered map, which does not preserve the user-defined order.
However, in the FileOpenPicker and FileSavePicker, the FileTypeChoices need to be displayed in the order they were inserted, rather than in a random order.
This is important for developers' and end-users' experience because:
Additionaly, the insertion order is respected in the legacy UWP FileSavePicker.
Fix
This is a backward-compatible fix. The goal of this fix is to maintain the existing Map type API contract and its good performance while ensuring that the display order of FileTypeChoices meets expectations.
This pull request refactors the implementation of the
FileTypeChoicesMapto ensure that the insertion order of keys is preserved and provides efficient key lookups. It replaces the previous unordered map-based implementation with the implementation backed by a vector. The update also introduces custom iterator and view classes to support this ordered behavior and modifies related tests to verify the new insertion order.Containment
This PR introduces the following changes for containment:
FileTypeChoicesMaphas been renamed toFileTypeChoicesMapUnordered.FileTypeChoicesMapwith the fix applied has been added.Feature_StoragePickersChoicesInsertionOrdervelocity flag:FileSavePickeruses the updatedFileTypeChoicesMapwith the fix.FileSavePickeruses the originalFileTypeChoicesMapUnordered.