Merge branch 'master' into feat/localize

merge(master): Fix for fileImporter before iOS/macOS 27

apple/VniDrop/Platform/PlatformPickers.swift

@@ -31,20 +31,27 @@ struct SendPickers: ViewModifier {
 	@ObservedObject var model: SendModel
 
 	func body(content: Content) -> some View {
+		// A single .fileImporter, switched between files and folders. Stacking two
+		// .fileImporter modifiers on one view silently breaks on iOS/macOS < 27:
+		// the second shadows the first, so "Choose files" never presents.
 		content
 			.fileImporter(
-				isPresented: Binding(get: { model.pendingFilePick }, set: { model.pendingFilePick = $0 }),
+				isPresented: Binding(
-				allowedContentTypes: [.item],
+					get: { model.pendingFilePick || model.pendingFolderPick },
-				allowsMultipleSelection: true
+					set: { presented in
-			) { result in
+						if !presented {
-				handleShareSelection(result, isDirectory: false)
+							model.pendingFilePick = false
+							model.pendingFolderPick = false
 						}
-			.fileImporter(
+					}
-				isPresented: Binding(get: { model.pendingFolderPick }, set: { model.pendingFolderPick = $0 }),
+				),
-				allowedContentTypes: [.folder],
+				allowedContentTypes: model.pendingFolderPick ? [.folder] : [.item],
-				allowsMultipleSelection: false
+				allowsMultipleSelection: !model.pendingFolderPick
 			) { result in
-				handleShareSelection(result, isDirectory: true)
+				let isDirectory = model.pendingFolderPick
+				model.pendingFilePick = false
+				model.pendingFolderPick = false
+				handleShareSelection(result, isDirectory: isDirectory)
 			}
 	}