master #81

Closed
malo wants to merge 322 commits from master into feat/bloc_layout/new-package
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 6537945946 - Show all commits

View File

@ -23,7 +23,7 @@ class RichTextStyleParameter {
this.styleName, this.styleName,
); );
final TextStyle defaultStyle; final TextStyle? defaultStyle;
final Map<String, TextStyle> definedStyle; final Map<String, TextStyle> definedStyle;
final String? styleName; final String? styleName;
@ -31,7 +31,7 @@ class RichTextStyleParameter {
if (definedStyle.containsKey(styleName)) { if (definedStyle.containsKey(styleName)) {
return definedStyle[styleName]!; return definedStyle[styleName]!;
} }
return defaultStyle; return defaultStyle ?? const TextStyle();
} }
RichTextStyleParameter copyWith({ RichTextStyleParameter copyWith({

View File

@ -59,7 +59,7 @@ class RichTextBuilder extends RichTextBuilderComponent
text ?? '', text ?? '',
regex, regex,
RichTextStyleParameter( RichTextStyleParameter(
style.defaultStyle!, style.defaultStyle,
style.styles ?? {}, style.styles ?? {},
null, null,
), ),