Refactored embed button implementation

example/lib/pages/home_page.dart

@@ -153,7 +153,7 @@ class _HomePageState extends State<HomePage> {
     }
     var toolbar = QuillToolbar.basic(
       controller: _controller!,
-      embedToolbar: QuillEmbedToolbar(
+      embedButtons: FlutterQuillEmbeds.buttons(
         // provide a callback to enable picking images from device.
         // if omit, "image" button only allows adding images from url.
         // same goes for videos.
@@ -169,7 +169,7 @@ class _HomePageState extends State<HomePage> {
     if (kIsWeb) {
       toolbar = QuillToolbar.basic(
         controller: _controller!,
-        embedToolbar: QuillEmbedToolbar(
+        embedButtons: FlutterQuillEmbeds.buttons(
           onImagePickCallback: _onImagePickCallback,
           webImagePickImpl: _webImagePickImpl,
         ),
@@ -179,7 +179,7 @@ class _HomePageState extends State<HomePage> {
     if (_isDesktop()) {
       toolbar = QuillToolbar.basic(
         controller: _controller!,
-        embedToolbar: QuillEmbedToolbar(
+        embedButtons: FlutterQuillEmbeds.buttons(
           onImagePickCallback: _onImagePickCallback,
           filePickImpl: openFileSystemPickerForDesktop,
         ),

example/lib/widgets/demo_scaffold.dart

@@ -92,13 +92,13 @@ class _DemoScaffoldState extends State<DemoScaffold> {
     final actions = widget.actions ?? <Widget>[];
     var toolbar = QuillToolbar.basic(
       controller: _controller!,
-      embedToolbar: QuillEmbedToolbar(),
+      embedButtons: FlutterQuillEmbeds.buttons(),
     );
     if (_isDesktop()) {
       toolbar = QuillToolbar.basic(
         controller: _controller!,
-        embedToolbar:
+        embedButtons: FlutterQuillEmbeds.buttons(
-            QuillEmbedToolbar(filePickImpl: openFileSystemPickerForDesktop),
+            filePickImpl: openFileSystemPickerForDesktop),
       );
     }
     return Scaffold(

flutter_quill_extensions/README.md

@@ -17,6 +17,6 @@ QuillEditor.basic(
 ```
 QuillToolbar.basic(
   controller: controller,
-  embedToolbar: QuillEmbedToolbar(),
+  embedButtons: FlutterQuillEmbeds.buttons(),
 );
 ```

flutter_quill_extensions/lib/embeds/toolbar.dart

@@ -1,108 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_quill/flutter_quill.dart';
-
-import 'embed_types.dart';
-import 'toolbar/camera_button.dart';
-import 'toolbar/formula_button.dart';
-import 'toolbar/image_button.dart';
-import 'toolbar/video_button.dart';
-
-export 'toolbar/image_button.dart';
-export 'toolbar/image_video_utils.dart';
-export 'toolbar/video_button.dart';
-export 'toolbar/formula_button.dart';
-export 'toolbar/camera_button.dart';
-
-class QuillEmbedToolbar implements EmbedToolbar {
-  QuillEmbedToolbar({
-    this.showImageButton = true,
-    this.showVideoButton = true,
-    this.showCameraButton = true,
-    this.showFormulaButton = false,
-    this.onImagePickCallback,
-    this.onVideoPickCallback,
-    this.mediaPickSettingSelector,
-    this.cameraPickSettingSelector,
-    this.filePickImpl,
-    this.webImagePickImpl,
-    this.webVideoPickImpl,
-  });
-
-  final bool showImageButton;
-  final bool showVideoButton;
-  final bool showCameraButton;
-  final bool showFormulaButton;
-
-  final OnImagePickCallback? onImagePickCallback;
-  final OnVideoPickCallback? onVideoPickCallback;
-  final MediaPickSettingSelector? mediaPickSettingSelector;
-  final MediaPickSettingSelector? cameraPickSettingSelector;
-  final FilePickImpl? filePickImpl;
-  final WebImagePickImpl? webImagePickImpl;
-  final WebVideoPickImpl? webVideoPickImpl;
-
-  @override
-  bool get notEmpty =>
-      showImageButton ||
-      showVideoButton ||
-      (showCameraButton &&
-          (onImagePickCallback != null || onVideoPickCallback != null)) ||
-      showFormulaButton;
-
-  @override
-  Iterable<Widget> build(QuillController controller, double toolbarIconSize,
-      QuillIconTheme? iconTheme, QuillDialogTheme? dialogTheme) {
-    return [
-      if (showImageButton)
-        ImageButton(
-          icon: Icons.image,
-          iconSize: toolbarIconSize,
-          controller: controller,
-          onImagePickCallback: onImagePickCallback,
-          filePickImpl: filePickImpl,
-          webImagePickImpl: webImagePickImpl,
-          mediaPickSettingSelector: mediaPickSettingSelector,
-          iconTheme: iconTheme,
-          dialogTheme: dialogTheme,
-        ),
-      if (showVideoButton)
-        VideoButton(
-          icon: Icons.movie_creation,
-          iconSize: toolbarIconSize,
-          controller: controller,
-          onVideoPickCallback: onVideoPickCallback,
-          filePickImpl: filePickImpl,
-          webVideoPickImpl: webImagePickImpl,
-          mediaPickSettingSelector: mediaPickSettingSelector,
-          iconTheme: iconTheme,
-          dialogTheme: dialogTheme,
-        ),
-      if ((onImagePickCallback != null || onVideoPickCallback != null) &&
-          showCameraButton)
-        CameraButton(
-          icon: Icons.photo_camera,
-          iconSize: toolbarIconSize,
-          controller: controller,
-          onImagePickCallback: onImagePickCallback,
-          onVideoPickCallback: onVideoPickCallback,
-          filePickImpl: filePickImpl,
-          webImagePickImpl: webImagePickImpl,
-          webVideoPickImpl: webVideoPickImpl,
-          cameraPickSettingSelector: cameraPickSettingSelector,
-          iconTheme: iconTheme,
-        ),
-      if (showFormulaButton)
-        FormulaButton(
-          icon: Icons.functions,
-          iconSize: toolbarIconSize,
-          controller: controller,
-          onImagePickCallback: onImagePickCallback,
-          filePickImpl: filePickImpl,
-          webImagePickImpl: webImagePickImpl,
-          mediaPickSettingSelector: mediaPickSettingSelector,
-          iconTheme: iconTheme,
-          dialogTheme: dialogTheme,
-        )
-    ];
-  }
-}

flutter_quill_extensions/lib/flutter_quill_extensions.dart

@@ -1,12 +1,21 @@
 library flutter_quill_extensions;
 
+import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 
 import 'embeds/builders.dart';
+import 'embeds/embed_types.dart';
+import 'embeds/toolbar/camera_button.dart';
+import 'embeds/toolbar/formula_button.dart';
+import 'embeds/toolbar/image_button.dart';
+import 'embeds/toolbar/video_button.dart';
 
-export 'embeds/toolbar.dart';
-export 'embeds/builders.dart';
 export 'embeds/embed_types.dart';
+export 'embeds/toolbar/camera_button.dart';
+export 'embeds/toolbar/formula_button.dart';
+export 'embeds/toolbar/image_button.dart';
+export 'embeds/toolbar/image_video_utils.dart';
+export 'embeds/toolbar/video_button.dart';
 export 'embeds/utils.dart';
 
 class FlutterQuillEmbeds {
@@ -15,4 +24,71 @@ class FlutterQuillEmbeds {
         VideoEmbedBuilder(),
         FormulaEmbedBuilder(),
       ];
+
+  static List<EmbedButtonBuilder> buttons({
+    bool showImageButton = true,
+    bool showVideoButton = true,
+    bool showCameraButton = true,
+    bool showFormulaButton = false,
+    OnImagePickCallback? onImagePickCallback,
+    OnVideoPickCallback? onVideoPickCallback,
+    MediaPickSettingSelector? mediaPickSettingSelector,
+    MediaPickSettingSelector? cameraPickSettingSelector,
+    FilePickImpl? filePickImpl,
+    WebImagePickImpl? webImagePickImpl,
+    WebVideoPickImpl? webVideoPickImpl,
+  }) {
+    return [
+      if (showImageButton)
+        (controller, toolbarIconSize, iconTheme, dialogTheme) => ImageButton(
+              icon: Icons.image,
+              iconSize: toolbarIconSize,
+              controller: controller,
+              onImagePickCallback: onImagePickCallback,
+              filePickImpl: filePickImpl,
+              webImagePickImpl: webImagePickImpl,
+              mediaPickSettingSelector: mediaPickSettingSelector,
+              iconTheme: iconTheme,
+              dialogTheme: dialogTheme,
+            ),
+      if (showVideoButton)
+        (controller, toolbarIconSize, iconTheme, dialogTheme) => VideoButton(
+              icon: Icons.movie_creation,
+              iconSize: toolbarIconSize,
+              controller: controller,
+              onVideoPickCallback: onVideoPickCallback,
+              filePickImpl: filePickImpl,
+              webVideoPickImpl: webImagePickImpl,
+              mediaPickSettingSelector: mediaPickSettingSelector,
+              iconTheme: iconTheme,
+              dialogTheme: dialogTheme,
+            ),
+      if ((onImagePickCallback != null || onVideoPickCallback != null) &&
+          showCameraButton)
+        (controller, toolbarIconSize, iconTheme, dialogTheme) => CameraButton(
+              icon: Icons.photo_camera,
+              iconSize: toolbarIconSize,
+              controller: controller,
+              onImagePickCallback: onImagePickCallback,
+              onVideoPickCallback: onVideoPickCallback,
+              filePickImpl: filePickImpl,
+              webImagePickImpl: webImagePickImpl,
+              webVideoPickImpl: webVideoPickImpl,
+              cameraPickSettingSelector: cameraPickSettingSelector,
+              iconTheme: iconTheme,
+            ),
+      if (showFormulaButton)
+        (controller, toolbarIconSize, iconTheme, dialogTheme) => FormulaButton(
+              icon: Icons.functions,
+              iconSize: toolbarIconSize,
+              controller: controller,
+              onImagePickCallback: onImagePickCallback,
+              filePickImpl: filePickImpl,
+              webImagePickImpl: webImagePickImpl,
+              mediaPickSettingSelector: mediaPickSettingSelector,
+              iconTheme: iconTheme,
+              dialogTheme: dialogTheme,
+            )
+    ];
+  }
 }

lib/src/widgets/embeds.dart

@@ -17,9 +17,8 @@ abstract class EmbedBuilder {
   );
 }
 
-abstract class EmbedToolbar {
+typedef EmbedButtonBuilder = Widget Function(
-  Iterable<Widget> build(QuillController controller, double toolbarIconSize,
+    QuillController controller,
-      QuillIconTheme? iconTheme, QuillDialogTheme? dialogTheme);
+    double toolbarIconSize,
-
+    QuillIconTheme? iconTheme,
-  bool get notEmpty;
+    QuillDialogTheme? dialogTheme);
-}

lib/src/widgets/toolbar.dart

@@ -99,7 +99,7 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
     Map<String, String>? fontFamilyValues,
 
     /// Toolbar items to display for controls of embed blocks
-    EmbedToolbar? embedToolbar,
+    List<EmbedButtonBuilder>? embedButtons,
 
     ///The theme to use for the icons in the toolbar, uses type [QuillIconTheme]
     QuillIconTheme? iconTheme,
@@ -125,7 +125,7 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
           showColorButton ||
           showBackgroundColorButton ||
           showClearFormat ||
-          embedToolbar?.notEmpty == true,
+          embedButtons?.isNotEmpty == true,
       showAlignmentButtons || showDirection,
       showLeftAlignment,
       showCenterAlignment,
@@ -301,8 +301,9 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
             controller: controller,
             iconTheme: iconTheme,
           ),
-        ...?embedToolbar?.build(
+        if (embedButtons != null)
-            controller, toolbarIconSize, iconTheme, dialogTheme),
+          for (final builder in embedButtons)
+            builder(controller, toolbarIconSize, iconTheme, dialogTheme),
         if (showDividers &&
             isButtonGroupShown[0] &&
             (isButtonGroupShown[1] ||