Merge pull request #4 from Brainyoo/add-default-text-style-to-default-styles

Add default text style to default styles

Author: Brainyoo

lib/src/editor/config/editor_config.dart

@@ -293,7 +293,7 @@ class QuillEditorConfig {
   final double? maxContentWidth;
 
   /// Allows to override [DefaultStyles].
-  final DefaultStyles? customStyles;
+  final DefaultStylesOverride? customStyles;
 
   /// Whether this editor's height will be sized to fill its parent.
   ///
@@ -502,7 +502,7 @@ class QuillEditorConfig {
     double? minHeight,
     double? maxHeight,
     double? maxContentWidth,
-    DefaultStyles? customStyles,
+    DefaultStylesOverride? customStyles,
     bool? expands,
     TextCapitalization? textCapitalization,
     Brightness? keyboardAppearance,

lib/src/editor/raw_editor/builders/leading_block_builder.dart

@@ -23,6 +23,7 @@ class LeadingConfig {
     required this.value,
     required this.onCheckboxTap,
     required this.attrs,
+    this.listPointAlignment,
     this.withDot = true,
     this.index,
     this.lineSize,
@@ -40,6 +41,7 @@ class LeadingConfig {
   final TextStyle? style;
   final double? width;
   final double? padding;
+  final AlignmentDirectional? listPointAlignment;
 
   // these values are used if the leading is from a check list
   final QuillCheckboxBuilder? uiBuilder;

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

@@ -285,8 +285,8 @@ class QuillRawEditorConfig {
   /// horizontally centered. This is mostly useful on devices with wide screens.
   final double? maxContentWidth;
 
-  /// Allows to override [DefaultStyles].
-  final DefaultStyles? customStyles;
+  /// Allows to override [DefaultStylesOverride].
+  final DefaultStylesOverride? customStyles;
 
   /// Whether this widget's height will be sized to fill its parent.
   ///

lib/src/editor/raw_editor/raw_editor_state.dart

@@ -942,13 +942,15 @@ class QuillRawEditorState extends EditorState
   void didChangeDependencies() {
     super.didChangeDependencies();
     final parentStyles = QuillStyles.getStyles(context, true);
-    final defaultStyles = DefaultStyles.getInstance(context);
+    final stylesOverride = widget.config.customStyles;
+    final defaultStyles = DefaultStyles.getInstance(context,
+        baseStyleOverride: stylesOverride?.defaultTextStyle);
     _styles = (parentStyles != null)
         ? defaultStyles.merge(parentStyles)
         : defaultStyles;
 
     if (widget.config.customStyles != null) {
-      _styles = _styles!.merge(widget.config.customStyles!);
+      _styles = _styles!.applyOverrides(widget.config.customStyles!);
     }
 
     _requestAutoFocusIfShould();
@@ -1001,9 +1003,10 @@ class QuillRawEditorState extends EditorState
       }
     }
 
+    final stylesOverride = widget.config.customStyles;
     // in case customStyles changed in new widget
-    if (widget.config.customStyles != null) {
-      _styles = _styles!.merge(widget.config.customStyles!);
+    if (stylesOverride != null) {
+      _styles = _styles!.applyOverrides(stylesOverride);
     }
 
     if (widget.config.actionConfiguration !=

lib/src/editor/style_widgets/bullet_point.dart

@@ -7,19 +7,21 @@ class QuillBulletPoint extends StatelessWidget {
     this.padding = 0,
     this.backgroundColor,
     this.textAlign,
+    AlignmentDirectional? alignment,
     super.key,
-  });
+  }) : alignment = alignment ?? AlignmentDirectional.topEnd;
 
   final TextStyle style;
   final double width;
   final double padding;
   final Color? backgroundColor;
   final TextAlign? textAlign;
+  final AlignmentDirectional alignment;
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      alignment: AlignmentDirectional.topEnd,
+      alignment: alignment,
       width: width,
       padding: EdgeInsetsDirectional.only(end: padding),
       color: backgroundColor,

lib/src/editor/style_widgets/number_point.dart

@@ -12,9 +12,10 @@ class QuillNumberPoint extends StatelessWidget {
     this.textAlign,
     this.withDot = true,
     this.padding = 0.0,
-    super.key,
     this.backgroundColor,
-  });
+    AlignmentDirectional? alignment,
+    super.key,
+  }) : alignment = alignment ?? AlignmentDirectional.topEnd;
 
   final String index;
   final Map<int?, int> indentLevelCounts;
@@ -26,12 +27,13 @@ class QuillNumberPoint extends StatelessWidget {
   final double padding;
   final Color? backgroundColor;
   final TextAlign? textAlign;
+  final AlignmentDirectional alignment;
 
   @override
   Widget build(BuildContext context) {
     if (!attrs.containsKey(Attribute.indent.key) && indentLevelCounts.isEmpty) {
       return Container(
-        alignment: AlignmentDirectional.topEnd,
+        alignment: alignment,
         width: width,
         padding: EdgeInsetsDirectional.only(end: padding),
         color: backgroundColor,
@@ -43,7 +45,7 @@ class QuillNumberPoint extends StatelessWidget {
       );
     }
     return Container(
-      alignment: AlignmentDirectional.topEnd,
+      alignment: alignment,
       width: width,
       padding: EdgeInsetsDirectional.only(end: padding),
       color: backgroundColor,

lib/src/editor/widgets/default_leading_components/bullet_point_leading.dart

@@ -6,4 +6,5 @@ Widget bulletPointLeading(LeadingConfig config) => QuillBulletPoint(
       style: config.style!,
       width: config.width!,
       padding: config.padding!,
+      alignment: config.listPointAlignment,
     );

lib/src/editor/widgets/default_leading_components/number_point_leading.dart

@@ -10,4 +10,5 @@ Widget numberPointLeading(LeadingConfig config) => QuillNumberPoint(
       attrs: config.attrs,
       width: config.width!,
       padding: config.padding!,
+      alignment: config.listPointAlignment,
     );