From 62cd9cbbf662fc35a7ca0876b993658b96e22ae2 Mon Sep 17 00:00:00 2001
From: Aleksei <130981115+MacDeveloper1@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:27:16 +0100
Subject: [PATCH] FIx null aware issues

---
 .../buttons/alignment/select_alignment_button_original.dart   | 3 ++-
 .../hearder_style/select_header_style_dropdown_button.dart    | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart b/lib/src/widgets/toolbar/buttons/alignment/select_alignment_button_original.dart
index a3ee86e4..eb8778f9 100644
--- 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 {
diff --git 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
index 00e20fcc..691e1075 100644
--- 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(