refactor: restructure project into modular architecture for flutter_quill (#2032)

* refactor: restructure project into modular architecture for flutter_quill

* refactor: move LineHeightAttribute class to custom_attributes.dart

* chore: remove nullable controller extension

README.md

@@ -107,7 +107,7 @@ dependencies:
 
 ## 🛠 Platform Specific Configurations
 
-Before using the package, we must inform you the package uses the following plugins:
+The `flutter_quill` package uses the following plugins:
 
 1. [`url_launcher`](https://pub.dev/packages/url_launcher) to open links.
 2. [`device_info_plus`](https://pub.dev/packages/device_info_plus) to view info about the current device.

analysis_options.yaml

@@ -12,7 +12,6 @@ linter:
     avoid_empty_else: true
     avoid_escaping_inner_quotes: true
     avoid_print: true
-    avoid_redundant_argument_values: true
     avoid_types_on_closure_parameters: true
     avoid_void_async: true
     cascade_invocations: true

flutter_quill_extensions/lib/flutter_quill_extensions.dart

@@ -1,7 +1,7 @@
 library flutter_quill_extensions;
 
 // ignore: implementation_imports
-import 'package:flutter_quill/src/services/clipboard/clipboard_service_provider.dart';
+import 'package:flutter_quill/src/editor_toolbar_controller_shared/clipboard/clipboard_service_provider.dart';
 import 'package:meta/meta.dart' show immutable;
 
 import 'services/clipboard/super_clipboard_service.dart';
@@ -38,6 +38,9 @@ export 'models/config/video/editor/video_web_configurations.dart';
 export 'models/config/video/toolbar/video_configurations.dart';
 export 'utils/utils.dart';
 
+// TODO: Refactor flutter_quill_extensions to match the structure of flutter_quill
+//  Also avoid exposing all APIs as public. Use `src` as directory name
+
 @immutable
 class FlutterQuillExtensions {
   const FlutterQuillExtensions._();

flutter_quill_extensions/lib/services/clipboard/super_clipboard_service.dart

@@ -3,7 +3,8 @@ import 'dart:convert' show utf8;
 
 import 'package:flutter/foundation.dart';
 // ignore: implementation_imports
-import 'package:flutter_quill/src/services/clipboard/clipboard_service.dart';
+import 'package:flutter_quill/src/editor_toolbar_controller_shared/clipboard/clipboard_service.dart';
+
 import 'package:super_clipboard/super_clipboard.dart';
 
 /// Implementation based on https://pub.dev/packages/super_clipboard

lib/extensions.dart

@@ -1,7 +1,7 @@
 library flutter_quill.extensions;
 
-export 'src/models/documents/nodes/leaf.dart';
+export 'src/common/utils/platform.dart';
-export 'src/models/rules/insert.dart';
+export 'src/common/utils/string.dart';
-export 'src/utils/platform.dart';
+export 'src/common/utils/widgets.dart';
-export 'src/utils/string.dart';
+export 'src/document/nodes/leaf.dart';
-export 'src/utils/widgets.dart';
+export 'src/rules/insert.dart';

lib/flutter_quill.dart

@@ -1,38 +1,42 @@
 library flutter_quill;
 
-export '/src/widgets/raw_editor/quill_single_child_scroll_view.dart';
+export 'src/common/structs/image_url.dart';
-export 'src/extensions/quill_configurations_ext.dart';
+export 'src/common/structs/offset_value.dart';
-export 'src/models/config/quill_configurations.dart';
+export 'src/common/structs/optional_size.dart';
-export 'src/models/config/raw_editor/raw_editor_configurations.dart';
+export 'src/common/structs/vertical_spacing.dart';
-export 'src/models/config/toolbar/toolbar_configurations.dart';
+export 'src/common/utils/embeds.dart';
-export 'src/models/documents/attribute.dart';
+export 'src/controller/provider.dart';
-export 'src/models/documents/document.dart';
+export 'src/controller/quill_controller.dart';
-export 'src/models/documents/nodes/block.dart';
+export 'src/document/attribute.dart';
-export 'src/models/documents/nodes/embeddable.dart';
+export 'src/document/document.dart';
-export 'src/models/documents/nodes/leaf.dart';
+export 'src/document/nodes/block.dart';
-export 'src/models/documents/nodes/line.dart';
+export 'src/document/nodes/embeddable.dart';
-export 'src/models/documents/nodes/node.dart';
+export 'src/document/nodes/leaf.dart';
-export 'src/models/documents/style.dart';
+export 'src/document/nodes/line.dart';
-export 'src/models/structs/doc_change.dart';
+export 'src/document/nodes/node.dart';
-export 'src/models/structs/image_url.dart';
+export 'src/document/structs/doc_change.dart';
-export 'src/models/structs/link_dialog_action.dart';
+export 'src/document/style.dart';
-export 'src/models/structs/offset_value.dart';
+export 'src/editor/editor.dart';
-export 'src/models/structs/optional_size.dart';
+export 'src/editor/embed/embed_editor_builder.dart';
-export 'src/models/structs/vertical_spacing.dart';
+export 'src/editor/provider.dart';
-export 'src/models/themes/quill_dialog_theme.dart';
+export 'src/editor/raw_editor/config/raw_editor_configurations.dart';
-export 'src/models/themes/quill_icon_theme.dart';
+export 'src/editor/raw_editor/quill_single_child_scroll_view.dart';
-export 'src/utils/embeds.dart';
+export 'src/editor/raw_editor/raw_editor.dart';
-export 'src/widgets/editor/editor.dart';
+export 'src/editor/raw_editor/raw_editor_state.dart';
-export 'src/widgets/others/cursor.dart';
+export 'src/editor/style_widgets/style_widgets.dart';
-export 'src/widgets/others/default_styles.dart';
+export 'src/editor/widgets/cursor.dart';
-export 'src/widgets/others/link.dart';
+export 'src/editor/widgets/default_styles.dart';
-export 'src/widgets/quill/embeds.dart';
+export 'src/editor/widgets/link.dart';
-export 'src/widgets/quill/quill_controller.dart';
+export 'src/editor_toolbar_controller_shared/quill_configurations.dart';
-export 'src/widgets/raw_editor/raw_editor.dart';
+export 'src/editor_toolbar_shared/quill_configurations_ext.dart';
-export 'src/widgets/raw_editor/raw_editor_state.dart';
+export 'src/toolbar/base_toolbar.dart';
-export 'src/widgets/style_widgets/style_widgets.dart';
+export 'src/toolbar/buttons/alignment/select_alignment_button.dart';
-export 'src/widgets/toolbar/base_toolbar.dart';
+export 'src/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart';
-export 'src/widgets/toolbar/buttons/alignment/select_alignment_button.dart';
+export 'src/toolbar/config/toolbar_configurations.dart';
-export 'src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart';
+export 'src/toolbar/embed/embed_button_builder.dart';
-export 'src/widgets/toolbar/simple_toolbar.dart';
+export 'src/toolbar/provider.dart';
-export 'src/widgets/utils/provider.dart';
+export 'src/toolbar/simple_toolbar.dart';
+export 'src/toolbar/simple_toolbar_provider.dart';
+export 'src/toolbar/structs/link_dialog_action.dart';
+export 'src/toolbar/theme/quill_dialog_theme.dart';
+export 'src/toolbar/theme/quill_icon_theme.dart';

lib/markdown_quill.dart

@@ -1,5 +1,7 @@
 library quill_markdown;
 
+// TODO: Might avoid exposing the quill_markdown package
+
 export 'src/packages/quill_markdown/delta_to_markdown.dart';
 export 'src/packages/quill_markdown/embeddable_table_syntax.dart';
 export 'src/packages/quill_markdown/markdown_to_delta.dart';

lib/src/common/structs/segment_leaf_node.dart

@@ -1,7 +1,7 @@
 import 'package:meta/meta.dart' show immutable;
 
-import '../documents/nodes/leaf.dart';
+import '../../document/nodes/leaf.dart';
-import '../documents/nodes/line.dart';
+import '../../document/nodes/line.dart';
 
 @immutable
 class SegmentLeafNode {

lib/src/common/utils/embeds.dart

@@ -1,8 +1,8 @@
 import 'dart:math';
 
-import '../models/documents/nodes/leaf.dart';
+import '../../controller/quill_controller.dart';
-import '../models/structs/offset_value.dart';
+import '../../document/nodes/leaf.dart';
-import '../widgets/quill/quill_controller.dart';
+import '../structs/offset_value.dart';
 
 OffsetValue<Embed> getEmbedNode(QuillController controller, int offset) {
   var offset = controller.selection.start;

lib/src/common/utils/font.dart

@@ -1,4 +1,4 @@
-import '../../flutter_quill.dart';
+import '../../../flutter_quill.dart';
 
 dynamic getFontSize(dynamic sizeValue) {
   if (sizeValue is String &&

lib/src/controller/provider.dart

@@ -0,0 +1,19 @@
+import 'package:flutter/widgets.dart' show BuildContext;
+
+import '../editor/provider.dart';
+import '../toolbar/simple_toolbar_provider.dart';
+import 'quill_controller.dart';
+
+extension QuillControllerExt on BuildContext {
+  QuillController? get quilController {
+    return quillSimpleToolbarConfigurations?.controller ??
+        quillEditorConfigurations?.controller;
+  }
+
+  QuillController get requireQuillController {
+    return quillSimpleToolbarConfigurations?.controller ??
+        quillEditorConfigurations?.controller ??
+        (throw ArgumentError(
+            'The quill provider is required, you must only call requireQuillController inside the QuillToolbar and QuillEditor'));
+  }
+}

lib/src/controller/quill_controller.dart

@@ -5,11 +5,19 @@ import 'package:flutter/widgets.dart';
 import 'package:html/parser.dart' as html_parser;
 import 'package:meta/meta.dart';
 
-import '../../../flutter_quill.dart';
+import '../../quill_delta.dart';
-import '../../../quill_delta.dart';
+import '../common/structs/image_url.dart';
-import '../../models/documents/delta_x.dart';
+import '../common/structs/offset_value.dart';
-import '../../services/clipboard/clipboard_service_provider.dart';
+import '../delta/delta_diff.dart';
-import '../../utils/delta.dart';
+import '../delta/delta_x.dart';
+import '../document/attribute.dart';
+import '../document/document.dart';
+import '../document/nodes/embeddable.dart';
+import '../document/nodes/leaf.dart';
+import '../document/structs/doc_change.dart';
+import '../document/style.dart';
+import '../editor_toolbar_controller_shared/clipboard/clipboard_service_provider.dart';
+import 'quill_controller_configurations.dart';
 
 typedef ReplaceTextCallback = bool Function(int index, int len, Object? data);
 typedef DeleteCallback = void Function(int cursorPosition, bool forward);

lib/src/delta/delta_diff.dart

@@ -1,11 +1,11 @@
 import 'dart:math' as math;
-import 'dart:ui';
+import 'dart:ui' show TextDirection;
 
 import 'package:meta/meta.dart' show immutable;
 
 import '../../quill_delta.dart';
-import '../models/documents/attribute.dart';
+import '../document/attribute.dart';
-import '../models/documents/nodes/node.dart';
+import '../document/nodes/node.dart';
 
 // Diff between two texts - old text and new text
 @immutable

lib/src/delta/delta_x.dart

@@ -1,8 +1,8 @@
 import 'package:flutter_quill_delta_from_html/flutter_quill_delta_from_html.dart';
 import 'package:markdown/markdown.dart' as md;
 import 'package:meta/meta.dart';
-import '../../../markdown_quill.dart';
+import '../../markdown_quill.dart';
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
 
 @immutable
 @experimental

lib/src/document/attribute.dart

@@ -4,6 +4,9 @@ import 'package:equatable/equatable.dart';
 import 'package:meta/meta.dart' show immutable;
 import 'package:quiver/core.dart';
 
+import 'custom_attributes.dart';
+export 'custom_attributes.dart';
+
 enum AttributeScope {
   inline, // refer to https://quilljs.com/docs/formats/#inline
   block, // refer to https://quilljs.com/docs/formats/#block
@@ -354,27 +357,6 @@ class HeaderAttribute extends Attribute<int?> {
       : super('header', AttributeScope.block, level);
 }
 
-/// This attribute represents the space between text lines. The line height can be
-/// adjusted using predefined constants or custom values
-///
-/// The attribute at the json looks like: "attributes":{"line-height": 1.5 }
-class LineHeightAttribute extends Attribute<double?> {
-  const LineHeightAttribute({double? lineHeight})
-      : super('line-height', AttributeScope.block, lineHeight);
-
-  static const Attribute<double?> lineHeightNormal =
-      LineHeightAttribute(lineHeight: 1);
-
-  static const Attribute<double?> lineHeightTight =
-      LineHeightAttribute(lineHeight: 1.15);
-
-  static const Attribute<double?> lineHeightOneAndHalf =
-      LineHeightAttribute(lineHeight: 1.5);
-
-  static const Attribute<double?> lineHeightDouble =
-      LineHeightAttribute(lineHeight: 2);
-}
-
 class IndentAttribute extends Attribute<int?> {
   const IndentAttribute({int? level})
       : super('indent', AttributeScope.block, level);

lib/src/document/custom_attributes.dart

@@ -0,0 +1,25 @@
+import 'attribute.dart';
+
+// Attributes that don't conform to standard Quill Delta
+// and are not compatible with https://quilljs.com/docs/delta/
+
+/// This attribute represents the space between text lines. The line height can be
+/// adjusted using predefined constants or custom values
+///
+/// The attribute at the json looks like: "attributes":{"line-height": 1.5 }
+class LineHeightAttribute extends Attribute<double?> {
+  const LineHeightAttribute({double? lineHeight})
+      : super('line-height', AttributeScope.block, lineHeight);
+
+  static const Attribute<double?> lineHeightNormal =
+      LineHeightAttribute(lineHeight: 1);
+
+  static const Attribute<double?> lineHeightTight =
+      LineHeightAttribute(lineHeight: 1.15);
+
+  static const Attribute<double?> lineHeightOneAndHalf =
+      LineHeightAttribute(lineHeight: 1.5);
+
+  static const Attribute<double?> lineHeightDouble =
+      LineHeightAttribute(lineHeight: 2);
+}

lib/src/document/document.dart

@@ -1,16 +1,14 @@
 import 'dart:async' show StreamController;
 
-import 'package:meta/meta.dart';
+import 'package:meta/meta.dart' show experimental;
 
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../../widgets/quill/embeds.dart';
+import '../common/structs/offset_value.dart';
+import '../common/structs/segment_leaf_node.dart';
+import '../delta/delta_x.dart';
+import '../editor/embed/embed_editor_builder.dart';
 import '../rules/rule.dart';
-import '../structs/doc_change.dart';
-import '../structs/history_changed.dart';
-import '../structs/offset_value.dart';
-import '../structs/segment_leaf_node.dart';
 import 'attribute.dart';
-import 'delta_x.dart';
 import 'history.dart';
 import 'nodes/block.dart';
 import 'nodes/container.dart';
@@ -18,6 +16,8 @@ import 'nodes/embeddable.dart';
 import 'nodes/leaf.dart';
 import 'nodes/line.dart';
 import 'nodes/node.dart';
+import 'structs/doc_change.dart';
+import 'structs/history_changed.dart';
 import 'style.dart';
 
 /// The rich text document
@@ -251,7 +251,8 @@ class Document {
     if (res.node is Line) {
       return res;
     }
-    final block = res.node as Block; // TODO: Can be nullable, handle this case
+    final block = res.node
+        as Block; // TODO: Can be nullable, handle this case to avoid cast exception
     return block.queryChild(res.offset, true);
   }
 

lib/src/document/history.dart

@@ -1,7 +1,7 @@
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../structs/doc_change.dart';
-import '../structs/history_changed.dart';
 import 'document.dart';
+import 'structs/doc_change.dart';
+import 'structs/history_changed.dart';
 
 class History {
   History({

lib/src/document/nodes/container.dart

@@ -1,6 +1,6 @@
-import 'dart:collection';
+import 'dart:collection' show LinkedList;
 
-import '../../../widgets/quill/embeds.dart';
+import '../../editor/embed/embed_editor_builder.dart';
 import '../style.dart';
 import 'leaf.dart';
 import 'line.dart';

lib/src/document/nodes/leaf.dart

@@ -1,7 +1,7 @@
 import 'dart:math' as math;
 
 import '../../../../quill_delta.dart';
-import '../../../widgets/quill/embeds.dart';
+import '../../editor/embed/embed_editor_builder.dart';
 import '../style.dart';
 import 'embeddable.dart';
 import 'line.dart';
@@ -154,7 +154,8 @@ abstract base class Leaf extends Node {
   }
 
   /// Splits this leaf node at [index] and returns new node.
-  ///
+  ///import '../style.dart';
+
   /// If this is the last node in its list and [index] equals this node's
   /// length then this method returns `null` as there is nothing left to split.
   /// If there is another leaf node after this one and [index] equals this

lib/src/document/nodes/line.dart

@@ -3,8 +3,8 @@ import 'dart:math' as math;
 import 'package:collection/collection.dart';
 
 import '../../../../quill_delta.dart';
-import '../../../widgets/quill/embeds.dart';
+import '../../common/structs/offset_value.dart';
-import '../../structs/offset_value.dart';
+import '../../editor/embed/embed_editor_builder.dart';
 import '../attribute.dart';
 import '../style.dart';
 import 'block.dart';

lib/src/document/nodes/node.dart

@@ -1,7 +1,7 @@
 import 'dart:collection';
 
 import '../../../../quill_delta.dart';
-import '../../../widgets/quill/embeds.dart';
+import '../../editor/embed/embed_editor_builder.dart';
 import '../attribute.dart';
 import '../style.dart';
 import 'container.dart';

lib/src/document/structs/doc_change.dart

@@ -1,7 +1,7 @@
 import 'package:meta/meta.dart' show immutable;
 
 import '../../../quill_delta.dart';
-import '../documents/document.dart';
+import '../document.dart';
 
 @immutable
 class DocChange {

lib/src/editor/config/editor_configurations.dart

@@ -6,15 +6,15 @@ import 'package:flutter/material.dart'
 import 'package:flutter/widgets.dart';
 import 'package:meta/meta.dart' show experimental;
 
-import '../../../widgets/editor/editor_builder.dart';
+import '../../controller/quill_controller.dart';
-import '../../../widgets/others/default_styles.dart';
+import '../../editor_toolbar_shared/config/quill_shared_configurations.dart';
-import '../../../widgets/others/delegate.dart';
+import '../../toolbar/theme/quill_dialog_theme.dart';
-import '../../../widgets/others/link.dart';
+import '../editor_builder.dart';
-import '../../../widgets/quill/embeds.dart';
+import '../embed/embed_editor_builder.dart';
-import '../../../widgets/quill/quill_controller.dart';
+import '../raw_editor/raw_editor.dart';
-import '../../../widgets/raw_editor/raw_editor.dart';
+import '../widgets/default_styles.dart';
-import '../../themes/quill_dialog_theme.dart';
+import '../widgets/delegate.dart';
-import '../quill_shared_configurations.dart';
+import '../widgets/link.dart';
 import 'element_options.dart';
 
 export 'element_options.dart';

lib/src/editor/editor.dart

@@ -9,22 +9,22 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 
-import '../../l10n/widgets/localizations.dart';
+import '../common/utils/platform.dart';
-import '../../models/config/editor/editor_configurations.dart';
+import '../document/document.dart';
-import '../../models/config/raw_editor/raw_editor_configurations.dart';
+import '../document/nodes/container.dart' as container_node;
-import '../../models/documents/document.dart';
+import '../document/nodes/leaf.dart';
-import '../../models/documents/nodes/container.dart' as container_node;
+import '../l10n/widgets/localizations.dart';
-import '../../models/documents/nodes/leaf.dart';
+import 'config/editor_configurations.dart';
-import '../../utils/platform.dart';
-import '../others/box.dart';
-import '../others/cursor.dart';
-import '../others/delegate.dart';
-import '../others/float_cursor.dart';
-import '../others/text_selection.dart';
-import '../quill/embeds.dart';
-import '../raw_editor/raw_editor.dart';
-import '../utils/provider.dart';
 import 'editor_builder.dart';
+import 'embed/embed_editor_builder.dart';
+import 'provider.dart';
+import 'raw_editor/config/raw_editor_configurations.dart';
+import 'raw_editor/raw_editor.dart';
+import 'widgets/box.dart';
+import 'widgets/cursor.dart';
+import 'widgets/delegate.dart';
+import 'widgets/float_cursor.dart';
+import 'widgets/text/text_selection.dart';
 
 /// Base interface for editable render objects.
 abstract class RenderAbstractEditor implements TextLayoutMetrics {

lib/src/editor/editor_builder.dart

@@ -1,6 +1,6 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
-import '../raw_editor/raw_editor.dart';
+import 'raw_editor/raw_editor.dart';
 
 typedef QuillEditorBuilder = Widget Function(
   BuildContext context,

lib/src/editor/embed/embed_editor_builder.dart

@@ -1,10 +1,8 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 import '../../../extensions.dart';
-import '../../models/documents/nodes/leaf.dart' as leaf;
+import '../../controller/quill_controller.dart';
-import '../../models/themes/quill_dialog_theme.dart';
+import '../../document/nodes/leaf.dart' as leaf;
-import '../../models/themes/quill_icon_theme.dart';
-import 'quill_controller.dart';
 
 abstract class EmbedBuilder {
   const EmbedBuilder();
@@ -28,9 +26,4 @@ abstract class EmbedBuilder {
   );
 }
 
-typedef EmbedButtonBuilder = Widget Function(
+typedef EmbedsBuilder = EmbedBuilder Function(Embed node);
-  QuillController controller,
-  double toolbarIconSize,
-  QuillIconTheme? iconTheme,
-  QuillDialogTheme? dialogTheme,
-);

lib/src/editor/provider.dart

@@ -0,0 +1,78 @@
+import 'package:flutter/foundation.dart' show debugPrint, kDebugMode;
+import 'package:flutter/widgets.dart'
+    show BuildContext, InheritedWidget, Widget;
+
+import 'config/editor_configurations.dart';
+
+class QuillEditorProvider extends InheritedWidget {
+  const QuillEditorProvider({
+    required super.child,
+    required this.editorConfigurations,
+    super.key,
+  });
+
+  final QuillEditorConfigurations editorConfigurations;
+
+  @override
+  bool updateShouldNotify(covariant QuillEditorProvider oldWidget) {
+    return oldWidget.editorConfigurations != editorConfigurations;
+  }
+
+  static QuillEditorProvider? maybeOf(BuildContext context) {
+    return context.dependOnInheritedWidgetOfExactType<QuillEditorProvider>();
+  }
+
+  static QuillEditorProvider of(BuildContext context) {
+    final provider = maybeOf(context);
+    if (provider == null) {
+      if (kDebugMode) {
+        debugPrint(
+          'The quill editor provider must be provided in the widget tree.',
+        );
+      }
+      throw ArgumentError.checkNotNull(
+        'You are using a widget in the Flutter quill library that require '
+            'The Quill editor provider widget to be in the parent widget tree '
+            'because '
+            'The provider is $provider. Please make sure to wrap this widget'
+            ' with'
+            ' QuillEditorProvider widget. '
+            'You might using QuillEditor so make sure to'
+            ' wrap them with the quill provider widget and setup the required '
+            'configurations',
+        'QuillEditorProvider',
+      );
+    }
+    return provider;
+  }
+
+  /// To pass the [QuillEditorProvider] instance as value instead of creating
+  /// new widget
+  static QuillEditorProvider value({
+    required QuillEditorProvider value,
+    required Widget child,
+  }) {
+    return QuillEditorProvider(
+      editorConfigurations: value.editorConfigurations,
+      child: child,
+    );
+  }
+}
+
+extension QuillEditorExt on BuildContext {
+  QuillEditorConfigurations get requireQuillEditorConfigurations {
+    return QuillEditorProvider.of(this).editorConfigurations;
+  }
+
+  QuillEditorConfigurations? get quillEditorConfigurations {
+    return QuillEditorProvider.maybeOf(this)?.editorConfigurations;
+  }
+
+  QuillEditorElementOptions? get quillEditorElementOptions {
+    return quillEditorConfigurations?.elementOptions;
+  }
+
+  QuillEditorElementOptions get requireQuillEditorElementOptions {
+    return requireQuillEditorConfigurations.elementOptions;
+  }
+}

lib/src/editor/raw_editor/config/raw_editor_configurations.dart

@@ -28,14 +28,15 @@ import 'package:flutter/widgets.dart'
         SystemMouseCursors;
 import 'package:meta/meta.dart' show immutable;
 
-import '../../../widgets/others/cursor.dart';
+import '../../../controller/quill_controller.dart';
-import '../../../widgets/others/default_styles.dart';
+import '../../../editor/embed/embed_editor_builder.dart';
-import '../../../widgets/others/delegate.dart';
+import '../../../editor/raw_editor/raw_editor.dart';
-import '../../../widgets/others/link.dart';
+import '../../../editor/raw_editor/raw_editor_state.dart';
-import '../../../widgets/quill/quill_controller.dart';
+import '../../../editor/widgets/cursor.dart';
-import '../../../widgets/raw_editor/raw_editor.dart';
+import '../../../editor/widgets/default_styles.dart';
-import '../../../widgets/raw_editor/raw_editor_state.dart';
+import '../../../editor/widgets/delegate.dart';
-import '../../themes/quill_dialog_theme.dart';
+import '../../../editor/widgets/link.dart';
+import '../../../toolbar/theme/quill_dialog_theme.dart';
 
 @immutable
 class QuillRawEditorConfigurations extends Equatable {

lib/src/editor/raw_editor/raw_editor.dart

@@ -1,4 +1,4 @@
-import 'dart:ui';
+import 'dart:ui' show Offset;
 
 import 'package:flutter/widgets.dart'
     show
@@ -11,10 +11,10 @@ import 'package:flutter/widgets.dart'
         Widget;
 import 'package:meta/meta.dart' show immutable;
 
-import '../../models/config/raw_editor/raw_editor_configurations.dart';
+import '../../common/structs/offset_value.dart';
-import '../../models/structs/offset_value.dart';
+import '../editor.dart';
-import '../editor/editor.dart';
+import '../widgets/text/text_selection.dart';
-import '../others/text_selection.dart';
+import 'config/raw_editor_configurations.dart';
 import 'raw_editor_state.dart';
 
 class QuillRawEditor extends StatefulWidget {

lib/src/editor/raw_editor/raw_editor_actions.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
 import '../../../translations.dart';
-import '../../models/documents/attribute.dart';
+import '../../document/attribute.dart';
-import '../editor/editor.dart';
+import '../../toolbar/buttons/link_style2_button.dart';
-import '../others/link.dart';
+import '../../toolbar/buttons/search/search_dialog.dart';
-import '../toolbar/buttons/link_style2_button.dart';
+import '../editor.dart';
-import '../toolbar/buttons/search/search_dialog.dart';
+import '../widgets/link.dart';
 import 'raw_editor_state.dart';
 import 'raw_editor_text_boundaries.dart';
 

lib/src/editor/raw_editor/raw_editor_render_object.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart' show ViewportOffset;
 
-import '../../models/documents/document.dart';
+import '../../document/document.dart';
-import '../editor/editor.dart';
+import '../editor.dart';
-import '../others/cursor.dart';
+import '../widgets/cursor.dart';
 
 class QuillRawEditorMultiChildRenderObject
     extends MultiChildRenderObjectWidget {

lib/src/editor/raw_editor/raw_editor_state.dart

@@ -20,30 +20,30 @@ import 'package:flutter/services.dart'
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'
     show KeyboardVisibilityController;
 
-import '../../models/documents/attribute.dart';
+import '../../common/structs/offset_value.dart';
-import '../../models/documents/document.dart';
+import '../../common/structs/vertical_spacing.dart';
-import '../../models/documents/nodes/block.dart';
+import '../../common/utils/cast.dart';
-import '../../models/documents/nodes/embeddable.dart';
+import '../../common/utils/embeds.dart';
-import '../../models/documents/nodes/leaf.dart' as leaf;
+import '../../common/utils/platform.dart';
-import '../../models/documents/nodes/line.dart';
+import '../../controller/quill_controller.dart';
-import '../../models/documents/nodes/node.dart';
+import '../../delta/delta_diff.dart';
-import '../../models/structs/offset_value.dart';
+import '../../document/attribute.dart';
-import '../../models/structs/vertical_spacing.dart';
+import '../../document/document.dart';
-import '../../services/clipboard/clipboard_service_provider.dart';
+import '../../document/nodes/block.dart';
-import '../../utils/cast.dart';
+import '../../document/nodes/embeddable.dart';
-import '../../utils/delta.dart';
+import '../../document/nodes/leaf.dart' as leaf;
-import '../../utils/embeds.dart';
+import '../../document/nodes/line.dart';
-import '../../utils/platform.dart';
+import '../../document/nodes/node.dart';
-import '../editor/editor.dart';
+import '../../editor_toolbar_controller_shared/clipboard/clipboard_service_provider.dart';
-import '../others/cursor.dart';
+import '../editor.dart';
-import '../others/default_styles.dart';
+import '../widgets/cursor.dart';
-import '../others/keyboard_listener.dart';
+import '../widgets/default_styles.dart';
-import '../others/link.dart';
+import '../widgets/keyboard_listener.dart';
-import '../others/proxy.dart';
+import '../widgets/link.dart';
-import '../others/text_selection.dart';
+import '../widgets/proxy.dart';
-import '../quill/quill_controller.dart';
+import '../widgets/text/text_block.dart';
-import '../quill/text_block.dart';
+import '../widgets/text/text_line.dart';
-import '../quill/text_line.dart';
+import '../widgets/text/text_selection.dart';
 import 'quill_single_child_scroll_view.dart';
 import 'raw_editor.dart';
 import 'raw_editor_actions.dart';
@@ -1774,8 +1774,6 @@ class QuillRawEditorState extends EditorState
     }
   }
 
-  // TODO: Review those
-
   @override
   bool get liveTextInputEnabled => false;
 

lib/src/editor/raw_editor/raw_editor_state_selection_delegate_mixin.dart

@@ -3,8 +3,8 @@ import 'dart:math' as math;
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 
-import '../../models/documents/document.dart';
+import '../../delta/delta_diff.dart';
-import '../../utils/delta.dart';
+import '../../document/document.dart';
 import 'raw_editor.dart';
 
 mixin RawEditorStateSelectionDelegateMixin on EditorState

lib/src/editor/raw_editor/raw_editor_state_text_input_client_mixin.dart

@@ -7,9 +7,9 @@ import 'package:flutter/material.dart' show Theme;
 import 'package:flutter/scheduler.dart' show SchedulerBinding;
 import 'package:flutter/services.dart';
 
-import '../../models/documents/document.dart';
+import '../../delta/delta_diff.dart';
-import '../../utils/delta.dart';
+import '../../document/document.dart';
-import '../editor/editor.dart';
+import '../editor.dart';
 import 'raw_editor.dart';
 
 mixin RawEditorStateTextInputClientMixin on EditorState

lib/src/editor/raw_editor/raw_editor_text_boundaries.dart

@@ -135,8 +135,7 @@ class QuillEditorWordBoundary extends QuillEditorTextBoundary {
     return TextPosition(
       offset: textLayout.getWordBoundary(position).start,
       // Word boundary seems to always report downstream on many platforms.
-      affinity:
+      affinity: TextAffinity.downstream,
-          TextAffinity.downstream, // ignore: avoid_redundant_argument_values
     );
   }
 
@@ -145,8 +144,7 @@ class QuillEditorWordBoundary extends QuillEditorTextBoundary {
     return TextPosition(
       offset: textLayout.getWordBoundary(position).end,
       // Word boundary seems to always report downstream on many platforms.
-      affinity:
+      affinity: TextAffinity.downstream,
-          TextAffinity.downstream, // ignore: avoid_redundant_argument_values
     );
   }
 }

lib/src/editor/style_widgets/bullet_point.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';
 
-import '../../extensions/quill_configurations_ext.dart';
+import '../provider.dart';
 
 class QuillEditorBulletPoint extends StatelessWidget {
   const QuillEditorBulletPoint({

lib/src/editor/style_widgets/number_point.dart

@@ -1,7 +1,7 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 import '../../../flutter_quill.dart';
-import '../quill/text_block.dart';
+import '../widgets/text/text_block.dart';
 
 class QuillEditorNumberPoint extends StatelessWidget {
   const QuillEditorNumberPoint({

lib/src/editor/widgets/box.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/rendering.dart';
 
-import '../../models/documents/nodes/container.dart';
+import '../../document/nodes/container.dart';
 
 /// A common interface to render boxes which represent a piece of rich text
 /// content.

lib/src/editor/widgets/cursor.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/widgets.dart';
 
-import '../../utils/platform.dart';
+import '../../common/utils/platform.dart';
 import 'box.dart';
 
 /// Style properties of editing cursor.

lib/src/editor/widgets/default_styles.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 
-import '../../models/documents/attribute.dart';
+import '../../common/structs/vertical_spacing.dart';
-import '../../models/documents/style.dart';
+import '../../common/utils/platform.dart';
-import '../../models/structs/vertical_spacing.dart';
+import '../../document/attribute.dart';
-import '../../utils/platform.dart';
+import '../../document/style.dart';
 import '../style_widgets/checkbox_point.dart';
 
 class QuillStyles extends InheritedWidget {

lib/src/editor/widgets/delegate.dart

@@ -3,15 +3,12 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
-import '../../models/documents/attribute.dart';
+import '../../common/utils/platform.dart';
-import '../../models/documents/nodes/leaf.dart';
+import '../../document/attribute.dart';
-import '../../utils/platform.dart';
+import '../../document/nodes/leaf.dart';
-import '../editor/editor.dart';
+import '../editor.dart';
-import '../quill/embeds.dart';
 import '../raw_editor/raw_editor.dart';
-import 'text_selection.dart';
+import 'text/text_selection.dart';
-
-typedef EmbedsBuilder = EmbedBuilder Function(Embed node);
 
 typedef CustomStyleBuilder = TextStyle Function(Attribute attribute);
 

lib/src/editor/widgets/link.dart

@@ -2,10 +2,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import '../../l10n/extensions/localizations.dart';
+import '../../controller/quill_controller.dart';
-import '../../models/documents/attribute.dart';
+import '../../document/attribute.dart';
-import '../../models/documents/nodes/node.dart';
+import '../../document/nodes/node.dart';
-import '../../widgets/quill/quill_controller.dart';
+import '../../l10n/extensions/localizations_ext.dart';
 
 const linkPrefixes = [
   'mailto:', // email

lib/src/editor/widgets/text/text_block.dart

@@ -1,26 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
-import '../../extensions/quill_configurations_ext.dart';
+import '../../../common/structs/vertical_spacing.dart';
-import '../../models/documents/attribute.dart';
+import '../../../common/utils/font.dart';
-import '../../models/documents/nodes/block.dart';
+import '../../../controller/quill_controller.dart';
-import '../../models/documents/nodes/line.dart';
+import '../../../delta/delta_diff.dart';
-import '../../models/structs/vertical_spacing.dart';
+import '../../../document/attribute.dart';
-import '../../utils/delta.dart';
+import '../../../document/nodes/block.dart';
-import '../../utils/font.dart';
+import '../../../document/nodes/line.dart';
-import '../editor/editor.dart';
+import '../../../toolbar/base_toolbar.dart';
-import '../others/box.dart';
+import '../../editor.dart';
-import '../others/cursor.dart';
+import '../../embed/embed_editor_builder.dart';
-import '../others/default_styles.dart';
+import '../../provider.dart';
-import '../others/delegate.dart';
+import '../../style_widgets/bullet_point.dart';
-import '../others/link.dart';
+import '../../style_widgets/checkbox_point.dart';
-import '../others/text_selection.dart';
+import '../../style_widgets/number_point.dart';
-import '../style_widgets/bullet_point.dart';
+import '../box.dart';
-import '../style_widgets/checkbox_point.dart';
+import '../cursor.dart';
-import '../style_widgets/number_point.dart';
+import '../default_styles.dart';
-import '../toolbar/base_toolbar.dart';
+import '../delegate.dart';
-import 'quill_controller.dart';
+import '../link.dart';
 import 'text_line.dart';
+import 'text_selection.dart';
 
 const List<int> arabianRomanNumbers = [
   1000,

lib/src/editor/widgets/text/text_line.dart

@@ -1,24 +1,26 @@
 import 'dart:collection';
 import 'dart:math' as math;
 
-import 'package:flutter/foundation.dart';
+import 'package:flutter/foundation.dart' show kIsWeb;
-import 'package:flutter/gestures.dart';
+import 'package:flutter/gestures.dart'
+    show GestureRecognizer, LongPressGestureRecognizer, TapGestureRecognizer;
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
+import 'package:flutter/rendering.dart'
-import 'package:flutter/services.dart';
+    show BoxParentData, PipelineOwner, BoxHitTestResult, RenderObjectVisitor;
-import 'package:url_launcher/url_launcher.dart';
+import 'package:flutter/services.dart' show ClipboardData, Clipboard;
-
+import 'package:url_launcher/url_launcher_string.dart' show launchUrlString;
-import '../../../flutter_quill.dart';
+
-import '../../models/documents/nodes/container.dart' as container_node;
+import '../../../../flutter_quill.dart';
-import '../../models/documents/nodes/leaf.dart' as leaf;
+import '../../../common/utils/color.dart';
-import '../../utils/color.dart';
+import '../../../common/utils/font.dart';
-import '../../utils/font.dart';
+import '../../../common/utils/platform.dart';
-import '../../utils/platform.dart';
+import '../../../document/nodes/container.dart' as container_node;
-import '../others/box.dart';
+import '../../../document/nodes/leaf.dart' as leaf;
-import '../others/delegate.dart';
+import '../box.dart';
-import '../others/keyboard_listener.dart';
+import '../delegate.dart';
-import '../others/proxy.dart';
+import '../keyboard_listener.dart';
-import '../others/text_selection.dart';
+import '../proxy.dart';
+import 'text_selection.dart';
 
 class TextLine extends StatefulWidget {
   const TextLine({
@@ -536,7 +538,7 @@ class _TextLineState extends State<TextLine> {
   }
 
   Future<void> _launchUrl(String url) async {
-    await launchUrl(Uri.parse(url));
+    await launchUrlString(url);
   }
 
   void _tapNodeLink(Node node) {

lib/src/editor/widgets/text/text_selection.dart

@@ -6,8 +6,8 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
-import '../../models/documents/nodes/node.dart';
+import '../../../document/nodes/node.dart';
-import '../editor/editor.dart';
+import '../../editor.dart';
 
 TextSelection localSelection(Node node, TextSelection selection, fromParent) {
   final base = fromParent ? node.offset : node.documentOffset;

lib/src/editor_toolbar_controller_shared/quill_configurations.dart

@@ -0,0 +1,5 @@
+export '../controller/quill_controller_configurations.dart';
+export '../editor/config/editor_configurations.dart';
+export '../editor_toolbar_shared/config/quill_shared_configurations.dart';
+export '../toolbar/config/simple_toolbar_configurations.dart';
+export '../toolbar/config/toolbar_configurations.dart';

lib/src/editor_toolbar_shared/config/quill_shared_configurations.dart

@@ -1,12 +1,11 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart' show Color, Colors, Locale;
 
-import '../themes/quill_dialog_theme.dart';
+import '../../editor/config/editor_configurations.dart'
-import 'editor/editor_configurations.dart' show QuillEditorConfigurations;
+    show QuillEditorConfigurations;
-import 'toolbar/simple_toolbar_configurations.dart'
+import '../../toolbar/config/simple_toolbar_configurations.dart'
     show QuillSimpleToolbarConfigurations;
-
+import '../../toolbar/theme/quill_dialog_theme.dart';
-export './others/animations.dart';
 
 /// The shared configurations between [QuillEditorConfigurations] and
 /// [QuillSimpleToolbarConfigurations] so we don't duplicate things
@@ -34,7 +33,8 @@ class QuillSharedConfigurations extends Equatable {
   /// `MaterialApp` or `WidgetsApp`
   final Locale? locale;
 
-  /// Store custom configurations in here and use it in the widget tree
+  /// Store custom configurations in here and use it in the widget tree.
+  /// Useful for `flutter_quill_extensions` to store additional configurations.
   final Map<String, Object?> extraConfigurations;
 
   @override

lib/src/editor_toolbar_shared/quill_configurations_ext.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/widgets.dart' show BuildContext;
+
+import '../editor/provider.dart';
+import '../toolbar/simple_toolbar_provider.dart';
+import 'config/quill_shared_configurations.dart';
+
+extension QuillSharedExt on BuildContext {
+  /// return nullable [QuillSharedConfigurations]
+  QuillSharedConfigurations? get quillSharedConfigurations {
+    return quillSimpleToolbarConfigurations?.sharedConfigurations ??
+        quillEditorConfigurations?.sharedConfigurations;
+  }
+}

lib/src/extensions/quill_configurations_ext.dart

@@ -1,84 +0,0 @@
-import 'package:flutter/widgets.dart' show BuildContext;
-
-import '../../flutter_quill.dart';
-
-extension QuillControllerExt on BuildContext {
-  /// return nullable [QuillController]
-  QuillController? get quilController {
-    return quillSimpleToolbarConfigurations?.controller ??
-        quillEditorConfigurations?.controller;
-  }
-
-  /// return [QuillController] as not null
-  QuillController get requireQuillController {
-    return quillSimpleToolbarConfigurations?.controller ??
-        quillEditorConfigurations?.controller ??
-        (throw ArgumentError(
-            'The quill provider is required, you must only call requireQuillController inside the QuillToolbar and QuillEditor'));
-  }
-}
-
-extension QuillSharedExt on BuildContext {
-  /// return nullable [QuillSharedConfigurations]
-  QuillSharedConfigurations? get quillSharedConfigurations {
-    return quillSimpleToolbarConfigurations?.sharedConfigurations ??
-        quillEditorConfigurations?.sharedConfigurations;
-  }
-}
-
-extension QuillEditorExt on BuildContext {
-  /// return [QuillEditorConfigurations] as not null
-  QuillEditorConfigurations get requireQuillEditorConfigurations {
-    return QuillEditorProvider.of(this).editorConfigurations;
-  }
-
-  /// return nullable [QuillEditorConfigurations]
-  QuillEditorConfigurations? get quillEditorConfigurations {
-    return QuillEditorProvider.maybeOf(this)?.editorConfigurations;
-  }
-
-  /// return nullable [QuillToolbarBaseButtonOptions]. Since the quill
-  /// quill editor block options is in the [QuillEditorProvider] then we need to
-  /// get the provider widget first and then we will return block options
-  /// throw exception if [QuillEditorProvider] is not in the widget tree
-  QuillEditorElementOptions? get quillEditorElementOptions {
-    return quillEditorConfigurations?.elementOptions;
-  }
-
-  /// return [QuillToolbarBaseButtonOptions] as not null. Since the quill
-  /// quill editor block options is in the [QuillEditorProvider] then we need to
-  /// get the provider widget first and then we will return block options
-  /// don't throw exception if [QuillEditorProvider] is not in the widget tree
-  QuillEditorElementOptions get requireQuillEditorElementOptions {
-    return requireQuillEditorConfigurations.elementOptions;
-  }
-}
-
-extension QuillSimpleToolbarExt on BuildContext {
-  /// return [QuillSimpleToolbarConfigurations] as not null
-  QuillSimpleToolbarConfigurations get requireQuillSimpleToolbarConfigurations {
-    return QuillSimpleToolbarProvider.of(this).toolbarConfigurations;
-  }
-
-  /// return nullable [QuillSimpleToolbarConfigurations]
-  QuillSimpleToolbarConfigurations? get quillSimpleToolbarConfigurations {
-    return QuillSimpleToolbarProvider.maybeOf(this)?.toolbarConfigurations;
-  }
-
-  /// return nullable [QuillToolbarBaseButtonOptions].
-  QuillToolbarBaseButtonOptions? get quillToolbarBaseButtonOptions {
-    return quillSimpleToolbarConfigurations?.buttonOptions.base;
-  }
-}
-
-extension QuillToolbarExt on BuildContext {
-  /// return [QuillToolbarConfigurations] as not null
-  QuillToolbarConfigurations get requireQuillToolbarConfigurations {
-    return QuillToolbarProvider.of(this).toolbarConfigurations;
-  }
-
-  /// return nullable [QuillToolbarConfigurations].
-  QuillToolbarConfigurations? get quillToolbarConfigurations {
-    return QuillToolbarProvider.maybeOf(this)?.toolbarConfigurations;
-  }
-}

lib/src/extensions/quill_controller_ext.dart

@@ -1,17 +0,0 @@
-import 'package:flutter/widgets.dart' show BuildContext;
-
-import '../../flutter_quill.dart' show QuillController;
-import 'quill_configurations_ext.dart';
-
-extension QuillControllerNullableExt on QuillController? {
-  /// Simple logic to use the current passed controller if not null
-  /// if null then we will have to use the default one
-  /// using the [context]
-  QuillController notNull(BuildContext context) {
-    final controller = this;
-    if (controller != null) {
-      return controller;
-    }
-    return context.requireQuillController;
-  }
-}

lib/src/l10n/widgets/localizations.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../extensions/quill_configurations_ext.dart';
+import '../../editor_toolbar_shared/quill_configurations_ext.dart';
-import '../extensions/localizations.dart';
+import '../extensions/localizations_ext.dart';
 
 /// A widget that check if [FlutterQuillLocalizations.delegate] is provided
 /// in the widgets app (e.g, [MaterialApp] or [WidgetsApp]).

lib/src/models/config/others/animations.dart

@@ -1,28 +0,0 @@
-// import 'package:equatable/equatable.dart';
-// import 'package:meta/meta.dart' show experimental, immutable;
-
-// @immutable
-// @experimental
-// class QuillAnimationConfigurations extends Equatable {
-//   const QuillAnimationConfigurations({
-//     required this.checkBoxPointItem,
-//   });
-
-//   factory QuillAnimationConfigurations.disableAll() =>
-//       const QuillAnimationConfigurations(
-//         checkBoxPointItem: false,
-//       );
-
-//   factory QuillAnimationConfigurations.enableAll() =>
-//       const QuillAnimationConfigurations(
-//         checkBoxPointItem: true,
-//       );
-
-//   /// This currently has issue which the whole checkbox list will rebuilt
-//   /// and the animation will replay when some value changes
-//   /// which is why disabled by default
-//   final bool checkBoxPointItem;
-
-//   @override
-//   List<Object?> get props => [];
-// }

lib/src/models/config/quill_configurations.dart

@@ -1,4 +0,0 @@
-export 'editor/editor_configurations.dart';
-export 'quill_controller_configurations.dart';
-export 'quill_shared_configurations.dart';
-export 'toolbar/simple_toolbar_configurations.dart';

lib/src/packages/quill_markdown/custom_quill_attributes.dart

@@ -1,4 +1,4 @@
-import '../../../flutter_quill.dart';
+import '../../document/attribute.dart';
 
 /// Custom attribute to save the language of codeblock
 class CodeBlockLanguageAttribute extends Attribute<String?> {

lib/src/packages/quill_markdown/delta_to_markdown.dart

@@ -1,9 +1,16 @@
 import 'dart:convert';
 import 'dart:ui';
 
-import 'package:collection/collection.dart';
+import 'package:collection/collection.dart' show IterableExtension;
-import '../../../flutter_quill.dart';
+
 import '../../../quill_delta.dart';
+import '../../document/attribute.dart';
+import '../../document/document.dart';
+import '../../document/nodes/block.dart';
+import '../../document/nodes/embeddable.dart';
+import '../../document/nodes/leaf.dart';
+import '../../document/nodes/line.dart';
+import '../../document/nodes/node.dart';
 import './custom_quill_attributes.dart';
 import './utils.dart';
 

lib/src/rules/delete.dart

@@ -1,9 +1,9 @@
 import 'package:meta/meta.dart' show immutable;
 
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../../models/documents/document.dart';
+import '../document/attribute.dart';
-import '../documents/attribute.dart';
+import '../document/document.dart';
-import '../documents/nodes/embeddable.dart';
+import '../document/nodes/embeddable.dart';
 import 'rule.dart';
 
 /// A heuristic rule for delete operations.

lib/src/rules/format.dart

@@ -1,8 +1,8 @@
 import 'package:meta/meta.dart' show immutable;
 
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../../models/documents/document.dart';
+import '../document/attribute.dart';
-import '../documents/attribute.dart';
+import '../document/document.dart';
 import 'rule.dart';
 
 /// A heuristic rule for format (retain) operations.

lib/src/rules/insert.dart

@@ -1,11 +1,11 @@
 import 'package:meta/meta.dart' show immutable;
 
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../../extensions/uri_ext.dart';
+import '../common/extensions/uri_ext.dart';
-import '../../models/documents/document.dart';
+import '../document/attribute.dart';
-import '../documents/attribute.dart';
+import '../document/document.dart';
-import '../documents/nodes/embeddable.dart';
+import '../document/nodes/embeddable.dart';
-import '../documents/style.dart';
+import '../document/style.dart';
 import 'rule.dart';
 
 /// A heuristic rule for insert operations.

lib/src/rules/rule.dart

@@ -1,8 +1,8 @@
 import 'package:meta/meta.dart' show immutable;
 
-import '../../../quill_delta.dart';
+import '../../quill_delta.dart';
-import '../documents/attribute.dart';
+import '../document/attribute.dart';
-import '../documents/document.dart';
+import '../document/document.dart';
 import 'delete.dart';
 import 'format.dart';
 import 'insert.dart';

lib/src/toolbar/base_button/base_value_button.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../../../flutter_quill.dart';
+import '../../../flutter_quill.dart';
 
 /// The [T] is the options for the button
 /// The [E] is the extra options for the button

lib/src/toolbar/base_button/stateless_base_button.dart

@@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 
-import '../../../extensions/quill_configurations_ext.dart';
+import '../../controller/quill_controller.dart';
-import '../../../models/themes/quill_icon_theme.dart';
+import '../config/simple_toolbar_configurations.dart';
-import '../../quill/quill_controller.dart';
+import '../simple_toolbar_provider.dart';
-import '../base_toolbar.dart';
+import '../theme/quill_icon_theme.dart';
+
+// TODO: Use this later or remove it
 
 /// The [T] is the options for the button, usually should refresnce itself
 /// it's used in [childBuilder] so the developer can custmize this when using it

lib/src/toolbar/base_toolbar.dart

@@ -1,14 +1,12 @@
 import 'package:flutter/material.dart';
 
-import '../../../flutter_quill.dart'
+import '../../flutter_quill.dart'
     show QuillToolbarProvider, kDefaultToolbarSize;
-import '../../l10n/widgets/localizations.dart';
+import '../l10n/widgets/localizations.dart';
-import '../../models/config/toolbar/simple_toolbar_configurations.dart';
+import 'config/simple_toolbar_configurations.dart';
-import '../../models/config/toolbar/toolbar_configurations.dart';
+import 'config/toolbar_configurations.dart';
 import 'simple_toolbar.dart';
 
-export '../../models/config/toolbar/base_button_configurations.dart';
-export '../../models/config/toolbar/simple_toolbar_configurations.dart';
 export 'buttons/clear_format_button.dart';
 export 'buttons/clipboard_button.dart';
 export 'buttons/color/color_button.dart';
@@ -27,6 +25,8 @@ export 'buttons/search/search_button.dart';
 export 'buttons/select_line_height_dropdown_button.dart';
 export 'buttons/toggle_check_list_button.dart';
 export 'buttons/toggle_style_button.dart';
+export 'config/base_button_configurations.dart';
+export 'config/simple_toolbar_configurations.dart';
 
 typedef QuillBaseToolbarChildrenBuilder = List<Widget> Function(
   BuildContext context,

lib/src/toolbar/buttons/alignment/select_alignment_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../../../models/documents/attribute.dart';
+import '../../../controller/quill_controller.dart';
-import '../../../quill/quill_controller.dart';
+import '../../../document/attribute.dart';
 
 enum _AlignmentOptions {
   left(attribute: Attribute.leftAlignment),

lib/src/toolbar/buttons/alignment/select_alignment_buttons.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../../../models/documents/attribute.dart';
+import '../../../controller/quill_controller.dart';
-import '../../../quill/quill_controller.dart';
+import '../../../document/attribute.dart';
 import '../../base_toolbar.dart';
 
 class QuillToolbarSelectAlignmentButtons extends StatelessWidget {

lib/src/toolbar/buttons/clear_format_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
-import '../../../l10n/extensions/localizations.dart';
+import '../../document/attribute.dart';
-import '../../../models/documents/attribute.dart';
+import '../../l10n/extensions/localizations_ext.dart';
 import '../base_button/stateless_base_button.dart';
 import '../base_toolbar.dart';
 

lib/src/toolbar/buttons/clipboard_button.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-import '../../../../extensions.dart';
+import '../../../extensions.dart';
-import '../../../../flutter_quill.dart';
+import '../../../flutter_quill.dart';
-import '../../../l10n/extensions/localizations.dart';
+import '../../editor_toolbar_controller_shared/clipboard/clipboard_service_provider.dart';
-import '../../../services/clipboard/clipboard_service_provider.dart';
+import '../../l10n/extensions/localizations_ext.dart';
 import '../base_button/base_value_button.dart';
 
 enum ClipboardAction { cut, copy, paste }

lib/src/toolbar/buttons/color/color_button.dart

@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 
-import '../../../../extensions/quill_configurations_ext.dart';
+import '../../../common/utils/color.dart';
-import '../../../../l10n/extensions/localizations.dart';
+import '../../../document/attribute.dart';
-import '../../../../l10n/widgets/localizations.dart';
+import '../../../document/style.dart';
-import '../../../../models/documents/attribute.dart';
+import '../../../editor_toolbar_shared/quill_configurations_ext.dart';
-import '../../../../models/documents/style.dart';
+import '../../../l10n/extensions/localizations_ext.dart';
-import '../../../../utils/color.dart';
+import '../../../l10n/widgets/localizations.dart';
 import '../../base_button/base_value_button.dart';
-import '../../base_toolbar.dart';
+import '../../config/buttons/color_configurations.dart';
+import '../quill_icon_button.dart';
 import 'color_dialog.dart';
 
 typedef QuillToolbarColorBaseButton = QuillToolbarBaseButton<

lib/src/toolbar/buttons/color/color_dialog.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_colorpicker/flutter_colorpicker.dart'
     show ColorPicker, MaterialPicker, colorToHex;
 
-import '../../../../../translations.dart';
+import '../../../../translations.dart';
-import '../../../../models/documents/style.dart';
+import '../../../document/style.dart';
 import 'color_button.dart' show hexToColor;
 
 enum _PickerType {