Fix clipboard image pasting (#2384)

singerdmx · Nov 17, 2024 · c804c08 · c804c08
1 parent 278e15d
commit c804c08
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/lib/src/controller/quill_controller.dart b/lib/src/controller/quill_controller.dart
@@ -582,18 +582,6 @@ class QuillController extends ChangeNotifier {
       }
     }
 
-    // Snapshot the input before using `await`.
-    // See https://github.com/flutter/flutter/issues/11427
-    final plainText = (await Clipboard.getData(Clipboard.kTextPlain))?.text;
-    if (plainText != null) {
-      final plainTextToPaste = await getTextToPaste(plainText);
-      if (pastePlainTextOrDelta(plainTextToPaste,
-          pastePlainText: _pastePlainText, pasteDelta: _pasteDelta)) {
-        updateEditor?.call();
-        return true;
-      }
-    }
-
     final clipboardService = ClipboardServiceProvider.instance;
 
     final onImagePaste = clipboardConfig?.onImagePaste;
@@ -609,6 +597,8 @@ class QuillController extends ChangeNotifier {
             BlockEmbed.image(imageUrl),
             null,
           );
+          updateEditor?.call();
+          return true;
         }
       }
     }
@@ -625,10 +615,26 @@ class QuillController extends ChangeNotifier {
             BlockEmbed.image(gifUrl),
             null,
           );
+          updateEditor?.call();
+          return true;
         }
       }
     }
 
+    // Only process plain text if no image/gif was pasted.
+    // Snapshot the input before using `await`.
+    // See https://github.com/flutter/flutter/issues/11427
+    final plainText = (await Clipboard.getData(Clipboard.kTextPlain))?.text;
+
+    if (plainText != null) {
+      final plainTextToPaste = await getTextToPaste(plainText);
+      if (pastePlainTextOrDelta(plainTextToPaste,
+          pastePlainText: _pastePlainText, pasteDelta: _pasteDelta)) {
+        updateEditor?.call();
+        return true;
+      }
+    }
+
     final onUnprocessedPaste = clipboardConfig?.onUnprocessedPaste;
     if (onUnprocessedPaste != null) {
       if (await onUnprocessedPaste()) {