fix：修改弹窗搜索框边距属性

.github/workflows/dart.yml

@@ -1,19 +1,20 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-name: Publish to pub.dev
+name: Publish plugin
 
 on:
   push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+*'
+    tags: 
+      - v*
 
 jobs:
   publish:
-    permissions:
-      id-token: write # Required for authentication using OIDC
-    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
-    # with:
-    #   working-directory: path/to/package/within/repository
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Publish
+        uses: sakebook/actions-flutter-pub-publisher@v1.2.1
+        with:
+          credential: ${{ secrets.CREDENTIALS }}
+          skip_test: true

CHANGELOG.md

@@ -1,13 +1,3 @@
-## 3.4.0 - August 19 2025
-- Fix China translation
-- Adding flag autofocus
-
-## 3.3.1 - August 19 2025
-- Fix French translation accent display issue
-- Correct French country name translations (Biélorussie, Koweït, Grenade, etc.)
-- Preserve accents in displayed names while maintaining search functionality
-- Update search logic to handle both accented and non-accented input
-
 ## 3.3.0 - March 26 2025
 - Fix localization, typo, and flag issue #51 thanks to @MrRoy121
 

lib/country_code_picker.dart

@@ -27,7 +27,6 @@ class CountryCodePicker extends StatefulWidget {
   final bool showCountryOnly;
   final InputDecoration searchDecoration;
   final TextStyle? searchStyle;
-  final bool? isFocused;
   final TextStyle? dialogTextStyle;
   final WidgetBuilder? emptySearchBuilder;
   final Function(CountryCode?)? builder;
@@ -126,7 +125,6 @@ class CountryCodePicker extends StatefulWidget {
     this.margin,
     this.showCountryOnly = false,
     this.searchDecoration = const InputDecoration(),
-    this.isFocused = false,
     this.searchStyle,
     this.dialogTextStyle,
     this.emptySearchBuilder,
@@ -332,7 +330,6 @@ class CountryCodePickerState extends State<CountryCodePicker> {
             emptySearchBuilder: widget.emptySearchBuilder,
             searchDecoration: widget.searchDecoration,
             searchStyle: widget.searchStyle,
-            isFocused: widget.isFocused,
             textStyle: widget.dialogTextStyle,
             boxDecoration: widget.boxDecoration,
             showFlag: widget.showFlagDialog ?? widget.showFlag,
@@ -389,6 +386,7 @@ class CountryCodePickerState extends State<CountryCodePicker> {
           hideSearch: widget.hideSearch,
           closeIcon: widget.closeIcon,
           flagDecoration: widget.flagDecoration,
+          searchPadding: widget.searchPadding,
         );
       },
     );

lib/src/bottom_sheet.dart

@@ -28,6 +28,8 @@ class SelectionBottomSheet extends StatefulWidget {
   /// elements passed as favorite
   final List<CountryCode> favoriteElements;
 
+  final EdgeInsetsGeometry searchPadding;
+
   SelectionBottomSheet(
     this.elements,
     this.favoriteElements, {
@@ -46,6 +48,7 @@ class SelectionBottomSheet extends StatefulWidget {
     this.barrierColor,
     this.hideSearch = false,
     this.closeIcon,
+    this.searchPadding = const EdgeInsets.symmetric(horizontal: 24),
   })  : searchDecoration = searchDecoration.prefixIcon == null
             ? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search))
             : searchDecoration,
@@ -93,7 +96,7 @@ class _SelectionBottomSheetState extends State<SelectionBottomSheet> {
               ),
               if (!widget.hideSearch)
                 Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  padding: widget.searchPadding,
                   child: TextField(
                     style: widget.searchStyle,
                     decoration: widget.searchDecoration,

lib/src/country_code.dart

@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart' show IterableExtension;
+import 'package:diacritic/diacritic.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart' show kDebugMode;
 
@@ -44,9 +45,7 @@ class CountryCode {
     try {
       return CountryCode.fromCountryCode(countryCode);
     } catch (e) {
-      if (kDebugMode) {
-        print('Failed to recognize country from countryCode: $countryCode');
-      }
+      if (kDebugMode) print('Failed to recognize country from countryCode: $countryCode');
       return null;
     }
   }
@@ -62,21 +61,20 @@ class CountryCode {
     try {
       return CountryCode.fromDialCode(dialCode);
     } catch (e) {
-      if (kDebugMode) {
-        print('Failed to recognize country from dialCode: $dialCode');
-      }
+      if (kDebugMode) print('Failed to recognize country from dialCode: $dialCode');
       return null;
     }
   }
 
   CountryCode localize(BuildContext context) {
     final nam = CountryLocalizations.of(context)?.translate(code) ?? name;
-    return this..name = nam ?? name;
+    return this
+      ..name = nam == null? name : removeDiacritics(nam);
   }
 
   factory CountryCode.fromJson(Map<String, dynamic> json) {
     return CountryCode(
-      name: json['name'],
+      name: removeDiacritics(json['name']),
       code: json['code'],
       dialCode: json['dial_code'],
       flagUri: 'flags/${json['code'].toLowerCase()}.png',

lib/src/country_codes.dart

@@ -83,7 +83,7 @@ const List<Map<String, String>> codes = [
   },
   {"name": "Tchad", "code": "TD", "iso3Code": "TCD", "dial_code": "+235"},
   {"name": "Chile", "code": "CL", "iso3Code": "CHL", "dial_code": "+56"},
-  {"name": "中国大陆", "code": "CN", "iso3Code": "CHN", "dial_code": "+86"},
+  {"name": "中国", "code": "CN", "iso3Code": "CHN", "dial_code": "+86"},
   {
     "name": "Christmas Island",
     "code": "CX",
@@ -216,7 +216,7 @@ const List<Map<String, String>> codes = [
   },
   {"name": "Vaticano", "code": "VA", "iso3Code": "VAT", "dial_code": "+379"},
   {"name": "Honduras", "code": "HN", "iso3Code": "HND", "dial_code": "+504"},
-  {"name": "中國香港", "code": "HK", "iso3Code": "HKG", "dial_code": "+852"},
+  {"name": "香港", "code": "HK", "iso3Code": "HKG", "dial_code": "+852"},
   {"name": "Magyarország", "code": "HU", "iso3Code": "HUN", "dial_code": "+36"},
   {"name": "Ísland", "code": "IS", "iso3Code": "ISL", "dial_code": "+354"},
   {"name": "भारत", "code": "IN", "iso3Code": "IND", "dial_code": "+91"},
@@ -258,7 +258,7 @@ const List<Map<String, String>> codes = [
   },
   {"name": "Lietuva", "code": "LT", "iso3Code": "LTU", "dial_code": "+370"},
   {"name": "Luxembourg", "code": "LU", "iso3Code": "LUX", "dial_code": "+352"},
-  {"name": "中國澳門", "code": "MO", "iso3Code": "MAC", "dial_code": "+853"},
+  {"name": "澳門", "code": "MO", "iso3Code": "MAC", "dial_code": "+853"},
   {"name": "Македонија", "code": "MK", "iso3Code": "MKD", "dial_code": "+389"},
   {
     "name": "Madagasikara",
@@ -456,7 +456,7 @@ const List<Map<String, String>> codes = [
   {"name": "Sverige", "code": "SE", "iso3Code": "SWE", "dial_code": "+46"},
   {"name": "Schweiz", "code": "CH", "iso3Code": "CHE", "dial_code": "+41"},
   {"name": "سوريا", "code": "SY", "iso3Code": "SYR", "dial_code": "+963"},
-  {"name": "中國臺灣", "code": "TW", "iso3Code": "TWN", "dial_code": "+886"},
+  {"name": "臺灣", "code": "TW", "iso3Code": "TWN", "dial_code": "+886"},
   {"name": "Тоҷикистон", "code": "TJ", "iso3Code": "TJK", "dial_code": "+992"},
   {"name": "Tanzania", "code": "TZ", "iso3Code": "TZA", "dial_code": "+255"},
   {"name": "ประเทศไทย", "code": "TH", "iso3Code": "THA", "dial_code": "+66"},

lib/src/i18n/en.json

@@ -42,7 +42,7 @@
     "CF": "Central African Republic",
     "TD": "Chad",
     "CL": "Chile",
-    "CN": "China's Mainland",
+    "CN": "China",
     "CX": "Christmas Island",
     "CC": "Cocos (Keeling) Islands",
     "CO": "Colombia",
@@ -94,7 +94,7 @@
     "HM": "Heard Island and McDonald Islands",
     "VA": "Holy See (Vatican City State)",
     "HN": "Honduras",
-    "HK": "Hong Kong China",
+    "HK": "Hong Kong",
     "HU": "Hungary",
     "IS": "Iceland",
     "IN": "India",
@@ -123,7 +123,7 @@
     "LI": "Liechtenstein",
     "LT": "Lithuania",
     "LU": "Luxembourg",
-    "MO": "Macao China",
+    "MO": "Macao",
     "MG": "Madagascar",
     "MW": "Malawi",
     "MY": "Malaysia",
@@ -210,7 +210,10 @@
     "SE": "Sweden",
     "CH": "Switzerland",
     "SY": "Syrian Arab Republic",
-    "TW": "Taiwan China",
+    "TW": [
+        "Taiwan, Province of China",
+        "Taiwan"
+    ],
     "TJ": "Tajikistan",
     "TZ": "Tanzania, United Republic of",
     "TH": "Thailand",

lib/src/i18n/fr.json

@@ -18,7 +18,7 @@
     "BH": "Bahrein",
     "BD": "Bangladesh",
     "BB": "Barbade",
-    "BY": "Biélorussie",
+    "BY": "Bielorussie",
     "BE": "Belgique",
     "BZ": "Belize",
     "BJ": "Bénin",
@@ -38,7 +38,7 @@
     "CM": "Cameroun",
     "CA": "Canada",
     "CV": "Cap-Vert",
-    "KY": "Îles Caïmans",
+    "KY": "Caïmanes",
     "CF": "Centrafricaine, République",
     "TD": "Tchad",
     "CL": "Chili",
@@ -83,7 +83,7 @@
     "GI": "Gibraltar",
     "GR": "Grèce",
     "GL": "Groenland",
-    "GD": "Grenade",
+    "GD": "Grenada",
     "GP": "Guadeloupe",
     "GU": "Guam",
     "GT": "Guatemala",
@@ -110,9 +110,9 @@
     "KZ": "Kazakhstan",
     "KE": "Kenya",
     "KI": "Kiribati",
-    "KP": "Corée du Nord",
-    "KR": "Corée du Sud",
-    "KW": "Koweït",
+    "KP": "Corée du Nord, République populaire démocratique",
+    "KR": "Corée du Sud, République",
+    "KW": "Koweit",
     "KG": "Kirghistan",
     "LA": "Laos",
     "LV": "Lettonie",
@@ -179,7 +179,7 @@
     "SH": "Sainte-Hélène",
     "KN": "Saint-Christophe-et-Niévès",
     "LC": "Sainte-Lucie",
-    "PM": "Saint-Pierre-et-Miquelon",
+    "PM": "Saint Pierre and Miquelon",
     "VC": "Saint-Vincent et les Grenadines",
     "WS": "Samoa",
     "SM": "Saint-Marin",
@@ -200,15 +200,15 @@
     "SD": "Soudan",
     "SR": "Suriname",
     "SJ": "Svalbard et Île Jan Mayen",
-    "SZ": "Eswatini",
+    "SZ": "Ngwane, Royaume d'Eswatini",
     "SE": "Suède",
     "CH": "Suisse",
     "SY": "Syrie",
     "TW": "Taïwan",
     "TJ": "Tadjikistan",
-    "TZ": "Tanzanie",
+    "TZ": "Tanzanie, République unie",
     "TH": "Thaïlande",
-    "TL": "Timor-Leste",
+    "TL": "Timor Leste",
     "TG": "Togo",
     "TK": "Tokelau",
     "TO": "Tonga",

lib/src/i18n/zh.json

@@ -46,7 +46,7 @@
     "CK": "库克群岛",
     "CL": "智利",
     "CM": "喀麦隆",
-    "CN": "中国大陆",
+    "CN": "中国",
     "CO": "哥伦比亚",
     "CR": "哥斯达黎加",
     "CU": "古巴",
@@ -226,7 +226,7 @@
     "TR": "土耳其",
     "TT": "特立尼达和多巴哥",
     "TV": "图瓦卢",
-    "TW": "中国台湾",
+    "TW": "中国台湾省",
     "TZ": "坦桑尼亚",
     "UA": "乌克兰",
     "UG": "乌干达",

lib/src/selection_dialog.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:diacritic/diacritic.dart';
 
 import 'country_code.dart';
 import 'country_localizations.dart';
@@ -10,7 +9,6 @@ class SelectionDialog extends StatefulWidget {
   final bool? showCountryOnly;
   final InputDecoration searchDecoration;
   final TextStyle? searchStyle;
-  final bool? isFocused;
   final TextStyle? textStyle;
   final TextStyle headerTextStyle;
   final BoxDecoration? boxDecoration;
@@ -51,9 +49,8 @@ class SelectionDialog extends StatefulWidget {
     required this.headerTextStyle,
     InputDecoration searchDecoration = const InputDecoration(),
     this.searchStyle,
-    this.isFocused,
     this.textStyle,
-    required this.topBarPadding,
+   required this.topBarPadding,
     this.headerText,
     this.boxDecoration,
     this.showFlag,
@@ -65,12 +62,9 @@ class SelectionDialog extends StatefulWidget {
     this.hideSearch = false,
     this.hideCloseIcon = false,
     this.closeIcon,
-    this.dialogItemPadding =
-        const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+    this.dialogItemPadding = const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
     this.searchPadding = const EdgeInsets.symmetric(horizontal: 24),
-  })  : searchDecoration = searchDecoration.prefixIcon == null
-            ? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search))
-            : searchDecoration,
+  })  : searchDecoration = searchDecoration.prefixIcon == null ? searchDecoration.copyWith(prefixIcon: const Icon(Icons.search)) : searchDecoration,
         super(key: key);
 
   @override
@@ -87,8 +81,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
         child: Container(
           clipBehavior: Clip.hardEdge,
           width: widget.size?.width ?? MediaQuery.of(context).size.width,
-          height:
-              widget.size?.height ?? MediaQuery.of(context).size.height * 0.85,
+          height: widget.size?.height ?? MediaQuery.of(context).size.height * 0.85,
           decoration: widget.boxDecoration ??
               BoxDecoration(
                 color: widget.backgroundColor ?? Colors.white,
@@ -107,9 +100,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
             crossAxisAlignment: CrossAxisAlignment.end,
             children: [
               Padding(
-                padding: !widget.hideHeaderText
-                    ? widget.topBarPadding
-                    : EdgeInsets.zero,
+                padding:!widget.hideHeaderText? widget.topBarPadding: EdgeInsets.zero,
                 child: Row(
                   mainAxisAlignment: widget.headerAlignment,
                   children: [
@@ -134,7 +125,6 @@ class _SelectionDialogState extends State<SelectionDialog> {
                 Padding(
                   padding: widget.searchPadding,
                   child: TextField(
-                    autofocus: widget.isFocused ?? false,
                     style: widget.searchStyle,
                     decoration: widget.searchDecoration,
                     onChanged: _filterElements,
@@ -187,14 +177,11 @@ class _SelectionDialogState extends State<SelectionDialog> {
           if (widget.showFlag!)
             Flexible(
               child: Container(
-                margin: Directionality.of(context) ==
-                        TextDirection
-                            .ltr // Here Adding padding depending on the locale language direction
+                margin: Directionality.of(context) == TextDirection.ltr    // Here Adding padding depending on the locale language direction
                     ? const EdgeInsets.only(right: 16.0)
                     : const EdgeInsets.only(left: 16.0),
                 decoration: widget.flagDecoration,
-                clipBehavior:
-                    widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
+                clipBehavior: widget.flagDecoration == null ? Clip.none : Clip.hardEdge,
                 child: Image.asset(
                   e.flagUri!,
                   package: 'country_code_picker',
@@ -205,9 +192,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
           Expanded(
             flex: 4,
             child: Text(
-              widget.showCountryOnly!
-                  ? e.toCountryStringOnly()
-                  : e.toLongString(),
+              widget.showCountryOnly! ? e.toCountryStringOnly() : e.toLongString(),
               overflow: TextOverflow.fade,
               style: widget.textStyle,
             ),
@@ -223,8 +208,7 @@ class _SelectionDialogState extends State<SelectionDialog> {
     }
 
     return Center(
-      child: Text(CountryLocalizations.of(context)?.translate('no_country') ??
-          'No country found'),
+      child: Text(CountryLocalizations.of(context)?.translate('no_country') ?? 'No country found'),
     );
   }
 
@@ -235,15 +219,9 @@ class _SelectionDialogState extends State<SelectionDialog> {
   }
 
   void _filterElements(String s) {
-    final normalizedSearch = removeDiacritics(s.toUpperCase());
+    s = s.toUpperCase();
     setState(() {
-      filteredElements = widget.elements
-          .where((e) =>
-              e.code!.contains(normalizedSearch) ||
-              e.dialCode!.contains(normalizedSearch) ||
-              removeDiacritics(e.name!.toUpperCase())
-                  .contains(normalizedSearch))
-          .toList();
+      filteredElements = widget.elements.where((e) => e.code!.contains(s) || e.dialCode!.contains(s) || e.name!.toUpperCase().contains(s)).toList();
     });
   }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: country_code_picker
 description: A flutter package for showing a country code selector. In addition it gives the possibility to select a list of favorites countries, as well as to search using a simple searchbox
-version: 3.4.0
+version: 3.3.0
 homepage: https://github.com/chandrabezzo/CountryCodePicker
 repository: https://github.com/chandrabezzo/CountryCodePicker
 issue_tracker: https://github.com/imtoori/CountryCodePicker/issues