New merge from dev branch (#1602)

* Prepare to release 9.0.2

Author: EchoEllet

.github/workflows/main.yml

@@ -25,6 +25,9 @@ jobs:
 
       - name: Install dependencies
         run: flutter pub get
+
+      - name: Install dart_quill_delta dependencies
+        run: flutter pub get -C dart_quill_delta
 
       - name: Install flutter_quill_extensions dependencies
         run: flutter pub get -C flutter_quill_extensions

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.0.2
+* Release instead of pre-release
+
+## 9.0.2-dev.3
+* Export `QuillSingleChildScrollView`
+
+## 9.0.2-dev.2
+* Add the new translations for ru, uk arb files by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Add a new dropdown button by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Update the default style values by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Fix bug [#1562](https://github.com/singerdmx/flutter-quill/issues/1562)
+* Fix the second bug of [#1480](https://github.com/singerdmx/flutter-quill/issues/1480)
+
+## 9.0.2-dev.1
+* Add configurations for the new dropdown `QuillToolbarSelectHeaderStyleButton`, you can use the orignal one or this
+* Fix the [issue](https://github.com/singerdmx/flutter-quill/issues/1119) when enter is pressed, all font settings is lost
+
+## 9.0.2-dev
+* **Breaking change** Remove the spacer widget, removed the controller option for each button
+* Add `toolbarRunSpacing` property to the simple toolbar
+
+## 9.0.1
+* Fix default icon size
+
 ## 9.0.0
 * This version is quite stable but it's not how we wanted to be, because the lack of time and there are not too many maintainers active, we decided to publish it, we might make a new breaking changes verion
 

README.md

@@ -127,7 +127,6 @@ QuillController _controller = QuillController.basic();
 
 And then use the `QuillEditor`, `QuillToolbar` widgets,
 connect the `QuillController` to them
-using `QuillProvider` inherited widget
 
 ```dart
 QuillToolbar.simple(

example/lib/main.dart

@@ -47,8 +47,22 @@ class MyApp extends StatelessWidget {
         builder: (context, state) {
           return MaterialApp(
             title: 'Flutter Quill Demo',
-            theme: ThemeData.light(useMaterial3: true),
-            darkTheme: ThemeData.dark(useMaterial3: true),
+            theme: ThemeData(
+              useMaterial3: true,
+              visualDensity: VisualDensity.adaptivePlatformDensity,
+              colorScheme: ColorScheme.fromSeed(
+                brightness: Brightness.light,
+                seedColor: Colors.red,
+              ),
+            ),
+            darkTheme: ThemeData(
+              useMaterial3: true,
+              visualDensity: VisualDensity.adaptivePlatformDensity,
+              colorScheme: ColorScheme.fromSeed(
+                brightness: Brightness.dark,
+                seedColor: Colors.red,
+              ),
+            ),
             themeMode: state.themeMode,
             debugShowCheckedModeBanner: false,
             localizationsDelegates: const [

example/lib/presentation/quill/my_quill_editor.dart

@@ -33,6 +33,22 @@ class MyQuillEditor extends StatelessWidget {
       scrollController: scrollController,
       focusNode: focusNode,
       configurations: configurations.copyWith(
+        elementOptions: const QuillEditorElementOptions(
+          codeBlock: QuillEditorCodeBlockElementOptions(
+            enableLineNumbers: true,
+          ),
+          // orderedList: QuillEditorOrderedListElementOptions(
+          //   backgroundColor: Colors.amber,
+          //   fontColor: Colors.black,
+          // ),
+          // unorderedList: QuillEditorUnOrderedListElementOptions(
+          //   backgroundColor: Colors.green,
+          //   fontColor: Colors.red,
+          // ),
+          unorderedList: QuillEditorUnOrderedListElementOptions(
+            useTextColorForDot: false,
+          ),
+        ),
         customStyles: const DefaultStyles(
           h1: DefaultTextBlockStyle(
             TextStyle(

example/lib/presentation/quill/my_quill_toolbar.dart

@@ -100,17 +100,10 @@ class MyQuillToolbar extends StatelessWidget {
           // For more info
           // https://github.com/singerdmx/flutter-quill/blob/master/doc/custom_toolbar.md
           return QuillToolbar(
-            configurations: const QuillToolbarConfigurations(
-              buttonOptions: QuillToolbarButtonOptions(
-                base: QuillToolbarBaseButtonOptions(
-                  globalIconSize: 20,
-                  globalIconButtonFactor: 1.4,
-                ),
-              ),
-            ),
+            configurations: const QuillToolbarConfigurations(),
             child: SingleChildScrollView(
               scrollDirection: Axis.horizontal,
-              child: Row(
+              child: Wrap(
                 children: [
                   IconButton(
                     onPressed: () => context
@@ -166,7 +159,7 @@ class MyQuillToolbar extends StatelessWidget {
                     isBackground: true,
                   ),
                   const VerticalDivider(),
-                  QuillToolbarSelectHeaderStyleButton(
+                  QuillToolbarSelectHeaderStyleDropdownButton(
                     controller: controller,
                   ),
                   const VerticalDivider(),
@@ -204,14 +197,24 @@ class MyQuillToolbar extends StatelessWidget {
             ),
           );
         }
-        return QuillSimpleToolbar(
+        return QuillToolbar.simple(
           configurations: QuillSimpleToolbarConfigurations(
             controller: controller,
             showAlignmentButtons: true,
-            buttonOptions: QuillToolbarButtonOptions(
+            buttonOptions: QuillSimpleToolbarButtonOptions(
               base: QuillToolbarBaseButtonOptions(
                 // Request editor focus when any button is pressed
                 afterButtonPressed: focusNode.requestFocus,
+                globalIconSize: 18,
+              ),
+              selectHeaderStyleDropdownButton:
+                  const QuillToolbarSelectHeaderStyleDropdownButtonOptions(
+                textStyle: TextStyle(
+                  fontSize: 20,
+                ),
+                iconTheme: QuillIconTheme(
+                  iconSelectedColor: Colors.red,
+                ),
               ),
             ),
             customButtons: [

example/lib/presentation/quill/quill_screen.dart

@@ -76,7 +76,7 @@ class _QuillScreenState extends State<QuillScreen> {
             onPressed: () {
               final html = _controller.document.toDelta().toHtml();
               _controller.document =
-                  Document.fromDelta(QuillController.fromHtml(html));
+                  Document.fromDelta(Document.fromHtml(html));
             },
             icon: const Icon(Icons.html),
           ),
@@ -126,20 +126,6 @@ class _QuillScreenState extends State<QuillScreen> {
                     sharedConfigurations: _sharedConfigurations,
                     controller: _controller,
                     readOnly: _isReadOnly,
-                    customStyles: const DefaultStyles(),
-                    elementOptions: const QuillEditorElementOptions(
-                      codeBlock: QuillEditorCodeBlockElementOptions(
-                        enableLineNumbers: true,
-                      ),
-                      // orderedList: QuillEditorOrderedListElementOptions(
-                      //   backgroundColor: Colors.amber,
-                      //   fontColor: Colors.black,
-                      // ),
-                      // unorderedList: QuillEditorUnOrderedListElementOptions(
-                      //   backgroundColor: Colors.green,
-                      //   fontColor: Colors.red,
-                      // ),
-                    ),
                   ),
                   scrollController: _editorScrollController,
                   focusNode: _editorFocusNode,

flutter_quill_extensions/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
+## 9.0.2
+* Release instead of pre-release
+
+## 9.0.2-dev.3
+* Export `QuillSingleChildScrollView`
+
+## 9.0.2-dev.2
+* Add the new translations for ru, uk arb files by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Add a new dropdown button by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Update the default style values by [#1575](https://github.com/singerdmx/flutter-quill/pull/1575)
+* Fix bug [#1562](https://github.com/singerdmx/flutter-quill/issues/1562)
+* Fix the second bug of [#1480](https://github.com/singerdmx/flutter-quill/issues/1480)
+
+## 9.0.2-dev.1
+* Add configurations for the new dropdown `QuillToolbarSelectHeaderStyleButton`, you can use the orignal one or this
+* Fix the [issue](https://github.com/singerdmx/flutter-quill/issues/1119) when enter is pressed, all font settings is lost
+
+## 9.0.2-dev
+* **Breaking change** Remove the spacer widget, removed the controller option for each button
+* Add `toolbarRunSpacing` property to the simple toolbar
+
+## 9.0.1
+* Fix default icon size
+
 ## 9.0.0
 * This version is quite stable but it's not how we wanted to be, because the lack of time and there are not too many maintainers active, we decided to publish it, we might make a new breaking changes verion
 

flutter_quill_extensions/README.md

@@ -93,37 +93,6 @@ Expanded(
 )
 ```
 
-They both should have a parent `QuillProvider` in the widget tree and set properly <br>
-Example:
-
-```dart
-QuillProvider(
-  configurations: QuillConfigurations(
-    controller: _controller,
-    sharedConfigurations: const QuillSharedConfigurations(),
-  ),
-  child: Column(
-    children: [
-      QuillToolbar(
-        configurations: QuillToolbarConfigurations(
-          embedButtons: FlutterQuillEmbeds.toolbarButtons(
-            imageButtonOptions: QuillToolbarImageButtonOptions(),
-          ),
-        ),
-      ),
-      Expanded(
-        child: QuillEditor.basic(
-          configurations: QuillEditorConfigurations(
-            padding: const EdgeInsets.all(16),
-            embedBuilders: kIsWeb ? FlutterQuillEmbeds.editorWebBuilders() : FlutterQuillEmbeds.editorBuilders(),
-          ),
-        ),
-      )
-    ],
-  ),
-)
-```
-
 ## Embed Blocks
 
 As of version [flutter_quill](https://pub.dev/packages/flutter_quill) 6.0, embed blocks are not provided by default as part of Flutter quill. Instead, it provides an interface for all the users to provide their implementations for embed blocks. Implementations for image, video, and formula embed blocks are proved in this package

flutter_quill_extensions/lib/flutter_quill_extensions.dart

@@ -180,19 +180,19 @@ class FlutterQuillEmbeds {
         if (imageButtonOptions != null)
           (controller, toolbarIconSize, iconTheme, dialogTheme) =>
               QuillToolbarImageButton(
-                controller: imageButtonOptions.controller ?? controller,
+                controller: controller,
                 options: imageButtonOptions,
               ),
         if (videoButtonOptions != null)
           (controller, toolbarIconSize, iconTheme, dialogTheme) =>
               QuillToolbarVideoButton(
-                controller: videoButtonOptions.controller ?? controller,
+                controller: controller,
                 options: videoButtonOptions,
               ),
         if (cameraButtonOptions != null)
           (controller, toolbarIconSize, iconTheme, dialogTheme) =>
               QuillToolbarCameraButton(
-                controller: cameraButtonOptions.controller ?? controller,
+                controller: controller,
                 options: cameraButtonOptions,
               ),
         // TODO: We will return the support for this later