fix(share_plus): Show NSSharingServicePicker asynchronously on main t…

…hread (#1223)
fluttercommunity · Oct 12, 2022 · e403cfa · e403cfa
1 parent 405c400
commit e403cfa
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 29 deletions.
diff --git a/packages/share_plus/share_plus/example/lib/main.dart b/packages/share_plus/share_plus/example/lib/main.dart
@@ -5,13 +5,12 @@
 // ignore_for_file: public_member_api_docs
 
 import 'dart:io';
+import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:image_picker/image_picker.dart';
 
 import 'image_previews.dart';
-import 'utils/file_picker_win.dart'
-    if (dart.library.html) 'utils/file_picker_web.dart';
 
 void main() {
   runApp(const DemoApp());
@@ -71,13 +70,20 @@ class DemoAppState extends State<DemoApp> {
                     title: const Text('Add image'),
                     onTap: () async {
                       // Using `package:image_picker` to get image from gallery.
-                      if (Platform.isWindows) {
-                        // Using `package:filepicker_windows` on Windows, since `package:image_picker` is not supported.
-                        final path = await pickFile();
-                        if (path != null) {
+                      if (Platform.isMacOS ||
+                          Platform.isLinux ||
+                          Platform.isWindows) {
+                        // Using `package:file_selector` on windows, macos & Linux, since `package:image_picker` is not supported.
+                        const XTypeGroup typeGroup = XTypeGroup(
+                          label: 'images',
+                          extensions: <String>['jpg', 'jpeg', 'png', 'gif'],
+                        );
+                        final file = await openFile(
+                            acceptedTypeGroups: <XTypeGroup>[typeGroup]);
+                        if (file != null) {
                           setState(() {
-                            imagePaths.add(path);
-                            imageNames.add(path.split('\\').last);
+                            imagePaths.add(file.path);
+                            imageNames.add(file.name);
                           });
                         }
                       } else {

diff --git a/packages/share_plus/share_plus/example/lib/utils/file_picker_web.dart b/packages/share_plus/share_plus/example/lib/utils/file_picker_web.dart
diff --git a/packages/share_plus/share_plus/example/lib/utils/file_picker_win.dart b/packages/share_plus/share_plus/example/lib/utils/file_picker_win.dart
diff --git a/packages/share_plus/share_plus/example/macos/Runner/DebugProfile.entitlements b/packages/share_plus/share_plus/example/macos/Runner/DebugProfile.entitlements
@@ -8,5 +8,7 @@
 	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+  <true/>
 </dict>
 </plist>
diff --git a/packages/share_plus/share_plus/example/macos/Runner/Release.entitlements b/packages/share_plus/share_plus/example/macos/Runner/Release.entitlements
@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<false/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+  	<true/>
 </dict>
 </plist>
diff --git a/packages/share_plus/share_plus/example/pubspec.yaml b/packages/share_plus/share_plus/example/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
   share_plus:
     path: ../
   image_picker: ^0.8.4
-  filepicker_windows: ^2.0.2
+  file_selector: ^0.9.2+1
 
 dependency_overrides:
   share_plus_linux:

diff --git a/packages/share_plus/share_plus_macos/macos/Classes/SharePlusMacosPlugin.swift b/packages/share_plus/share_plus_macos/macos/Classes/SharePlusMacosPlugin.swift
@@ -49,14 +49,16 @@ public class SharePlusMacosPlugin: NSObject, FlutterPlugin, NSSharingServicePick
   }
 
   private func shareItems(_ items: [Any], subject: String? = nil, origin: NSRect, view: NSView, callback: FlutterResult? = nil) {
-    let picker = NSSharingServicePicker(items: items)
-    if callback != nil {
-      picker.delegate = SharePlusMacosSuccessDelegate(subject: subject, callback: callback!).keep()
-    } else {
-      picker.delegate = self
-      self.subject = subject
+    DispatchQueue.main.async {
+      let picker = NSSharingServicePicker(items: items)
+      if callback != nil {
+        picker.delegate = SharePlusMacosSuccessDelegate(subject: subject, callback: callback!).keep()
+      } else {
+        picker.delegate = self
+        self.subject = subject
+      }
+      picker.show(relativeTo: origin, of: view, preferredEdge: NSRectEdge.maxY)
     }
-    picker.show(relativeTo: origin, of: view, preferredEdge: NSRectEdge.maxY)
   }
 
   private func originRect(_ args: [String: Any]) -> NSRect {