File picker and bookmarks API

native/Avalonia.Native/src/OSX/Avalonia.Native.OSX.xcodeproj/project.pbxproj

@@ -49,6 +49,7 @@
 		AB8F7D6B21482D7F0057DBA5 /* platformthreading.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */; };
 		BC11A5BE2608D58F0017BAD0 /* automation.h in Headers */ = {isa = PBXBuildFile; fileRef = BC11A5BC2608D58F0017BAD0 /* automation.h */; };
 		BC11A5BF2608D58F0017BAD0 /* automation.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC11A5BD2608D58F0017BAD0 /* automation.mm */; };
+		ED3791C42862E1F40080BD62 /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -101,13 +102,15 @@
 		AB8F7D6A21482D7F0057DBA5 /* platformthreading.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platformthreading.mm; sourceTree = "<group>"; };
 		BC11A5BC2608D58F0017BAD0 /* automation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = automation.h; sourceTree = "<group>"; };
 		BC11A5BD2608D58F0017BAD0 /* automation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = automation.mm; sourceTree = "<group>"; };
+		ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		AB7A61EC2147C814003C5833 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				ED3791C42862E1F40080BD62 /* UniformTypeIdentifiers.framework in Frameworks */,
 				1A3E5EB023E9FE8300EDE661 /* QuartzCore.framework in Frameworks */,
 				1A3E5EAA23E9F26C00EDE661 /* IOSurface.framework in Frameworks */,
 				AB1E522C217613570091CD71 /* OpenGL.framework in Frameworks */,
@@ -122,6 +125,7 @@
 		AB661C1C2148230E00291242 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				ED3791C32862E1F40080BD62 /* UniformTypeIdentifiers.framework */,
 				522D5958258159C1006F7F7A /* Carbon.framework */,
 				1A3E5EAF23E9FE8300EDE661 /* QuartzCore.framework */,
 				1A3E5EA923E9F26C00EDE661 /* IOSurface.framework */,

native/Avalonia.Native/src/OSX/SystemDialogs.mm

@@ -1,19 +1,22 @@
 #include "common.h"
 #include "INSWindowHolder.h"
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 class SystemDialogs : public ComSingleObject<IAvnSystemDialogs, &IID_IAvnSystemDialogs>
 {
 public:
     FORWARD_IUNKNOWN()
     virtual void SelectFolderDialog (IAvnWindow* parentWindowHandle,
                                      IAvnSystemDialogEvents* events,
+                                     bool allowMultiple,
                                      const char* title,
                                      const char* initialDirectory) override
     {
         @autoreleasepool
         {
             auto panel = [NSOpenPanel openPanel];
 
+            panel.allowsMultipleSelection = allowMultiple;
             panel.canChooseDirectories = true;
             panel.canCreateDirectories = true;
             panel.canChooseFiles = false;
@@ -118,7 +121,15 @@ virtual void OpenFileDialog (IAvnWindow* parentWindowHandle,
                 {
                     auto allowedTypes = [filtersString componentsSeparatedByString:@";"];
 
-                    panel.allowedFileTypes = allowedTypes;
+                    // Prefer allowedContentTypes if available
+                    if (@available(macOS 11.0, *))
+                    {
+                        panel.allowedContentTypes = ConvertToUTType(allowedTypes);
+                    }
+                    else
+                    {
+                        panel.allowedFileTypes = allowedTypes;
+                    }
                 }
             }
 
@@ -207,7 +218,18 @@ virtual void SaveFileDialog (IAvnWindow* parentWindowHandle,
                 {
                     auto allowedTypes = [filtersString componentsSeparatedByString:@";"];
 
-                    panel.allowedFileTypes = allowedTypes;
+                    // Prefer allowedContentTypes if available
+                    if (@available(macOS 11.0, *))
+                    {
+                        panel.allowedContentTypes = ConvertToUTType(allowedTypes);
+                    }
+                    else
+                    {
+                        panel.allowedFileTypes = allowedTypes;
+                    }
+
+                    panel.allowsOtherFileTypes = false;
+                    panel.extensionHidden = false;
                 }
             }
 
@@ -250,6 +272,32 @@ virtual void SaveFileDialog (IAvnWindow* parentWindowHandle,
             }
         }
     }
+
+private:
+    NSMutableArray* ConvertToUTType(NSArray<NSString*>* allowedTypes)
+    {
+        auto originalCount = [allowedTypes count];
+        auto mapped = [[NSMutableArray alloc] init];
+
+        if (@available(macOS 11.0, *))
+        {
+            for (int i = 0; i < originalCount; i++)
+            {
+                auto utTypeStr = allowedTypes[i];
+                auto utType = [UTType typeWithIdentifier:utTypeStr];
+                if (utType == nil)
+                {
+                    utType = [UTType typeWithMIMEType:utTypeStr];
+                }
+                if (utType != nil)
+                {
+                    [mapped addObject:utType];
+                }
+            }
+        }
+
+        return mapped;
+    }
 
 };
 

samples/ControlCatalog/ControlCatalog.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>    
   </PropertyGroup>

samples/ControlCatalog/MainView.xaml

@@ -69,6 +69,9 @@
       <TabItem Header="CalendarDatePicker">
         <pages:CalendarDatePickerPage />
       </TabItem>
+      <TabItem Header="Dialogs">
+        <pages:DialogsPage />
+      </TabItem>
       <TabItem Header="Drag+Drop">
         <pages:DragAndDropPage />
       </TabItem>

samples/ControlCatalog/MainView.xaml.cs

@@ -24,11 +24,6 @@ public MainView()
             {
                 IList tabItems = ((IList)sideBar.Items);
                 tabItems.Add(new TabItem()
-                {
-                    Header = "Dialogs",
-                    Content = new DialogsPage()
-                });
-                tabItems.Add(new TabItem()
                 {
                     Header = "Screens",
                     Content = new ScreenPage()

samples/ControlCatalog/Pages/DialogsPage.xaml

@@ -1,29 +1,57 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.DialogsPage">
-  <StackPanel Orientation="Vertical" Spacing="4" Margin="4">
-      <CheckBox Name="UseFilters">Use filters</CheckBox>
-      <Button Name="OpenFile">_Open File</Button>
-      <Button Name="OpenMultipleFiles">Open _Multiple File</Button>
-      <Button Name="SaveFile">_Save File</Button>
-      <Button Name="SelectFolder">Select Fo_lder</Button>
-      <Button Name="OpenBoth">Select _Both</Button>
+<UserControl x:Class="ControlCatalog.Pages.DialogsPage"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <StackPanel Margin="4"
+              Orientation="Vertical"
+              Spacing="4">
 
-      <TextBlock x:Name="PickerLastResultsVisible"
-                 Classes="h2"
-                 IsVisible="False"
-                 Text="Last picker results:" />
-      <ItemsPresenter x:Name="PickerLastResults" />
+    <TextBlock Text="Windows:" />
 
-      <TextBlock Margin="0, 8, 0, 0"
-                 Classes="h1"
-                 Text="Window dialogs" />
-      <Button Name="DecoratedWindow">Decorated _window</Button>
-      <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button>
-      <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button>
-      <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button>
-      <Button Name="OwnedWindow">Own_ed window</Button>
-      <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button>
+    <Expander Header="Window dialogs">
+      <StackPanel Spacing="4">
+        <Button Name="DecoratedWindow">Decorated _window</Button>
+        <Button Name="DecoratedWindowDialog">Decorated w_indow (dialog)</Button>
+        <Button Name="Dialog" ToolTip.Tip="Shows a dialog">_Dialog</Button>
+        <Button Name="DialogNoTaskbar">Dialog (_No taskbar icon)</Button>
+        <Button Name="OwnedWindow">Own_ed window</Button>
+        <Button Name="OwnedWindowNoTaskbar">Owned window (No tas_kbar icon)</Button>
+      </StackPanel>
+    </Expander>
+
+    <TextBlock Margin="0,20,0,0" Text="Pickers:" />
+
+    <CheckBox Name="UseFilters">Use filters</CheckBox>
+    <Expander Header="FilePicker API">
+      <StackPanel Spacing="4">
+        <CheckBox Name="ForceManaged">Force managed dialog</CheckBox>
+        <CheckBox Name="OpenMultiple">Open multiple</CheckBox>
+        <Button Name="OpenFolderPicker">Select Fo_lder</Button>
+        <Button Name="OpenFilePicker">_Open File</Button>
+        <Button Name="SaveFilePicker">_Save File</Button>
+        <Button Name="OpenFileFromBookmark">Open File Bookmark</Button>
+        <Button Name="OpenFolderFromBookmark">Open Folder Bookmark</Button>
+      </StackPanel>
+    </Expander>
+    <Expander Header="Legacy OpenFileDialog">
+      <StackPanel Spacing="4">
+        <Button Name="OpenFile">_Open File</Button>
+        <Button Name="OpenMultipleFiles">Open _Multiple File</Button>
+        <Button Name="SaveFile">_Save File</Button>
+        <Button Name="SelectFolder">Select Fo_lder</Button>
+        <Button Name="OpenBoth">Select _Both</Button>
+      </StackPanel>
+    </Expander>
+
+    <TextBlock x:Name="PickerLastResultsVisible"
+               Classes="h2"
+               IsVisible="False"
+               Text="Last picker results:" />
+    <ItemsPresenter x:Name="PickerLastResults" />
+
+    <TextBox Name="BookmarkContainer" Watermark="Bookmark" />
+    <TextBox Name="OpenedFileContent"
+             MaxLines="10"
+             Watermark="Picked file content" />
 
   </StackPanel>
 </UserControl>