FIx null aware issues

2 years ago · 62cd9cbbf6
parent b844843c96
commit 62cd9cbbf6
2 changed files with 3 additions and 4 deletions
--- a/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart
+++ b/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart
@ -77,7 +77,8 @@ class QuillToolbarSelectTextAlignmentButtonState
  }

  QuillToolbarBaseButtonOptions get baseButtonExtraOptions {
-    return context.quillToolbarBaseButtonOptions!;
+    return context.quillToolbarBaseButtonOptions ??
+        const QuillToolbarBaseButtonOptions();
  }

  QuillSelectAlignmentValues<IconData> get _iconsData {
--- a/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart
+++ b/lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_dropdown_button.dart
@ -127,10 +127,8 @@ class _QuillToolbarSelectHeaderStyleDropdownButtonState
  Widget build(BuildContext context) {
    assert(_attrbuites.every((element) => _valueToText.keys.contains(element)));

-    final baseButtonConfigurations = context.quillToolbarBaseButtonOptions ??
-        const QuillToolbarBaseButtonOptions();
    final childBuilder =
-        options.childBuilder ?? baseButtonConfigurations.childBuilder;
+        options.childBuilder ?? baseButtonExtraOptions.childBuilder;
    if (childBuilder != null) {
      return childBuilder(
        options.copyWith(