clean name

CHANGELOG.md

@@ -4,6 +4,7 @@
 - use modal_bottom_sheet 2.0.0
 - nullable integration
 - switch to dialog on desktop app support
+- added flagDecoration
 
 ## 1.7.0
 

lib/country_code.dart

@@ -69,6 +69,10 @@ class CountryCode {
   String toLongString() => "$dialCode ${toCountryStringOnly()}";
 
   String toCountryStringOnly() {
-    return '$name';
+    return '$_cleanName';
+  }
+
+  String? get _cleanName {
+    return name?.replaceAll(RegExp(r'[[\]]'), '').split(',').first;
   }
 }

lib/country_code_picker.dart

@@ -87,7 +87,7 @@ class CountryCodePicker extends StatefulWidget {
     this.initialSelection,
     this.favorite = const [],
     this.textStyle,
-    this.padding = const EdgeInsets.all(0.0),
+    this.padding = const EdgeInsets.all(8.0),
     this.showCountryOnly = false,
     this.searchDecoration = const InputDecoration(),
     this.searchStyle,
@@ -160,9 +160,10 @@ class CountryCodePickerState extends State<CountryCodePicker> {
         child: widget.builder!(selectedItem),
       );
     else {
-      _widget = FlatButton(
+      _widget = TextButton(
-        padding: widget.padding,
         onPressed: widget.enabled ? showCountryCodePickerDialog : null,
+        child: Padding(
+          padding: widget.padding,
           child: Flex(
             direction: Axis.horizontal,
             mainAxisSize: MainAxisSize.min,
@@ -174,8 +175,9 @@ class CountryCodePickerState extends State<CountryCodePicker> {
                   flex: widget.alignLeft ? 0 : 1,
                   fit: widget.alignLeft ? FlexFit.tight : FlexFit.loose,
                   child: Container(
-                  clipBehavior:
+                    clipBehavior: widget.flagDecoration == null
-                      widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
+                        ? Clip.none
+                        : Clip.hardEdge,
                     decoration: widget.flagDecoration,
                     margin: widget.alignLeft
                         ? const EdgeInsets.only(right: 16.0, left: 8.0)
@@ -194,7 +196,8 @@ class CountryCodePickerState extends State<CountryCodePicker> {
                     widget.showOnlyCountryWhenClosed
                         ? selectedItem!.toCountryStringOnly()
                         : selectedItem.toString(),
-                  style: widget.textStyle ?? Theme.of(context).textTheme.button,
+                    style:
+                        widget.textStyle ?? Theme.of(context).textTheme.button,
                     overflow: widget.textOverflow,
                   ),
                 ),
@@ -214,6 +217,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
                 ),
             ],
           ),
+        ),
       );
     }
     return _widget;