Support padding around the selector button.

natintosh · Mar 4, 2023 · c43b7e6 · c43b7e6
1 parent 75fdfb5
commit c43b7e6
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 64 deletions.
diff --git a/lib/src/utils/selector_config.dart b/lib/src/utils/selector_config.dart
@@ -27,19 +27,19 @@ class SelectorConfig {
   /// [setSelectorButtonAsPrefixIcon], this sets/places the selector button inside the [TextField] as a prefixIcon.
   final bool setSelectorButtonAsPrefixIcon;
 
-  /// Space before the flag icon
-  final double? leadingPadding;
-
   /// Add white space for short dial code
   final bool trailingSpace;
 
+  /// The padding around the selector.
+  final EdgeInsets? padding;
+
   const SelectorConfig({
     this.selectorType = PhoneInputSelectorType.DROPDOWN,
     this.showFlags = true,
     this.useEmoji = false,
     this.countryComparator,
     this.setSelectorButtonAsPrefixIcon = false,
-    this.leadingPadding,
     this.trailingSpace = true,
+    this.padding,
   });
 }
diff --git a/lib/src/widgets/input_widget.dart b/lib/src/widgets/input_widget.dart
@@ -291,8 +291,7 @@ class _InputWidgetState extends State<InternationalPhoneNumberInput> {
         );
 
     if (widget.selectorConfig.setSelectorButtonAsPrefixIcon) {
-      return value.copyWith(
-          prefixIcon: SelectorButton(
+      return value.copyWith(prefixIcon: SelectorButton(
         country: country,
         countries: countries,
         onCountryChanged: onCountryChanged,

diff --git a/lib/src/widgets/item.dart b/lib/src/widgets/item.dart
@@ -9,7 +9,6 @@ class Item extends StatelessWidget {
   final bool? useEmoji;
   final TextStyle? textStyle;
   final bool withCountryNames;
-  final double? leadingPadding;
   final bool trailingSpace;
 
   const Item({
@@ -19,7 +18,6 @@ class Item extends StatelessWidget {
     this.useEmoji,
     this.textStyle,
     this.withCountryNames = false,
-    this.leadingPadding = 12,
     this.trailingSpace = true,
   }) : super(key: key);
 
@@ -34,7 +32,6 @@ class Item extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
-          SizedBox(width: leadingPadding),
           _Flag(
             country: country,
             showFlag: showFlag,

diff --git a/lib/src/widgets/selector_button.dart b/lib/src/widgets/selector_button.dart
@@ -36,65 +36,66 @@ class SelectorButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return selectorConfig.selectorType == PhoneInputSelectorType.DROPDOWN
-        ? countries.isNotEmpty && countries.length > 1
-            ? DropdownButtonHideUnderline(
-                child: DropdownButton<Country>(
-                  key: Key(TestHelper.DropdownButtonKeyValue),
-                  hint: Item(
-                    country: country,
-                    showFlag: selectorConfig.showFlags,
-                    useEmoji: selectorConfig.useEmoji,
-                    leadingPadding: selectorConfig.leadingPadding,
-                    trailingSpace: selectorConfig.trailingSpace,
-                    textStyle: selectorTextStyle,
-                  ),
-                  value: country,
-                  items: mapCountryToDropdownItem(countries),
-                  onChanged: isEnabled ? onCountryChanged : null,
+    Widget button = selectorConfig.selectorType == PhoneInputSelectorType.DROPDOWN
+      ? countries.isNotEmpty && countries.length > 1
+          ? DropdownButtonHideUnderline(
+              child: DropdownButton<Country>(
+                key: Key(TestHelper.DropdownButtonKeyValue),
+                hint: Item(
+                  country: country,
+                  showFlag: selectorConfig.showFlags,
+                  useEmoji: selectorConfig.useEmoji,
+                  trailingSpace: selectorConfig.trailingSpace,
+                  textStyle: selectorTextStyle,
                 ),
-              )
-            : Item(
-                country: country,
-                showFlag: selectorConfig.showFlags,
-                useEmoji: selectorConfig.useEmoji,
-                leadingPadding: selectorConfig.leadingPadding,
-                trailingSpace: selectorConfig.trailingSpace,
-                textStyle: selectorTextStyle,
-              )
-        : MaterialButton(
-            key: Key(TestHelper.DropdownButtonKeyValue),
-            padding: EdgeInsets.zero,
-            minWidth: 0,
-            onPressed: countries.isNotEmpty && countries.length > 1 && isEnabled
-                ? () async {
-                    Country? selected;
-                    if (selectorConfig.selectorType ==
-                        PhoneInputSelectorType.BOTTOM_SHEET) {
-                      selected = await showCountrySelectorBottomSheet(
-                          context, countries);
-                    } else {
-                      selected =
-                          await showCountrySelectorDialog(context, countries);
-                    }
+                value: country,
+                items: mapCountryToDropdownItem(countries),
+                onChanged: isEnabled ? onCountryChanged : null,
+              ),
+            )
+          : Item(
+              country: country,
+              showFlag: selectorConfig.showFlags,
+              useEmoji: selectorConfig.useEmoji,
+              trailingSpace: selectorConfig.trailingSpace,
+              textStyle: selectorTextStyle,
+            )
+      : MaterialButton(
+          key: Key(TestHelper.DropdownButtonKeyValue),
+          padding: EdgeInsets.zero,
+          minWidth: 0,
+          onPressed: countries.isNotEmpty && countries.length > 1 && isEnabled
+              ? () async {
+                  Country? selected;
+                  if (selectorConfig.selectorType ==
+                      PhoneInputSelectorType.BOTTOM_SHEET) {
+                    selected = await showCountrySelectorBottomSheet(
+                        context, countries);
+                  } else {
+                    selected =
+                        await showCountrySelectorDialog(context, countries);
+                  }
 
-                    if (selected != null) {
-                      onCountryChanged(selected);
-                    }
+                  if (selected != null) {
+                    onCountryChanged(selected);
                   }
-                : null,
-            child: Padding(
-              padding: const EdgeInsets.only(right: 8.0),
-              child: Item(
-                country: country,
-                showFlag: selectorConfig.showFlags,
-                useEmoji: selectorConfig.useEmoji,
-                leadingPadding: selectorConfig.leadingPadding,
-                trailingSpace: selectorConfig.trailingSpace,
-                textStyle: selectorTextStyle,
-              ),
+                }
+              : null,
+          child: Padding(
+            padding: const EdgeInsets.only(right: 8.0),
+            child: Item(
+              country: country,
+              showFlag: selectorConfig.showFlags,
+              useEmoji: selectorConfig.useEmoji,
+              trailingSpace: selectorConfig.trailingSpace,
+              textStyle: selectorTextStyle,
             ),
-          );
+          ),
+        );
+    if (selectorConfig.padding != null) {
+      button = Padding(padding: selectorConfig.padding!, child: button);
+    }
+    return button;
   }
 
   /// Converts the list [countries] to `DropdownMenuItem`