Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/src/editor/config/editor_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -502,7 +502,7 @@ class QuillEditorConfig {
double? minHeight,
double? maxHeight,
double? maxContentWidth,
DefaultStyles? customStyles,
DefaultStylesOverride? customStyles,
bool? expands,
TextCapitalization? textCapitalization,
Brightness? keyboardAppearance,
Expand Down
2 changes: 2 additions & 0 deletions lib/src/editor/raw_editor/builders/leading_block_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class LeadingConfig {
required this.value,
required this.onCheckboxTap,
required this.attrs,
this.listPointAlignment,
this.withDot = true,
this.index,
this.lineSize,
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/src/editor/raw_editor/config/raw_editor_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
11 changes: 7 additions & 4 deletions lib/src/editor/raw_editor/raw_editor_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -892,13 +892,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();
Expand Down Expand Up @@ -951,9 +953,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 !=
Expand Down
6 changes: 4 additions & 2 deletions lib/src/editor/style_widgets/bullet_point.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 6 additions & 4 deletions lib/src/editor/style_widgets/number_point.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -43,7 +45,7 @@ class QuillNumberPoint extends StatelessWidget {
);
}
return Container(
alignment: AlignmentDirectional.topEnd,
alignment: alignment,
width: width,
padding: EdgeInsetsDirectional.only(end: padding),
color: backgroundColor,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ Widget bulletPointLeading(LeadingConfig config) => QuillBulletPoint(
style: config.style!,
width: config.width!,
padding: config.padding!,
alignment: config.listPointAlignment,
);
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ Widget numberPointLeading(LeadingConfig config) => QuillNumberPoint(
attrs: config.attrs,
width: config.width!,
padding: config.padding!,
alignment: config.listPointAlignment,
);
Loading