From 2c50a817470af1d360702849a296d9cfa35ca198 Mon Sep 17 00:00:00 2001
From: nearimba <yu.mei@sunmi.com>
Date: Tue, 16 Sep 2025 18:06:13 +0800
Subject: [PATCH 1/2] feat:  when filterSort function is provided, scroll to
 first option during searching

---
 docs/examples/filterSort.tsx | 996 +++++++++++++++++++++++++++++++++++
 src/OptionList.tsx           |  11 +-
 src/Select.tsx               |   2 +
 src/SelectContext.ts         |   1 +
 4 files changed, 1007 insertions(+), 3 deletions(-)

diff --git a/docs/examples/filterSort.tsx b/docs/examples/filterSort.tsx
index 358b40280..caa17b478 100644
--- a/docs/examples/filterSort.tsx
+++ b/docs/examples/filterSort.tsx
@@ -11,8 +11,996 @@ const incidencesStateResource = [
   { value: 5, label: 'Cancelled' },
 ];
 
+const countries = [
+  {
+    id: 'AF',
+    en: 'Afghanistan',
+  },
+  {
+    id: 'AX',
+    en: 'Åland Islands',
+  },
+  {
+    id: 'AL',
+    en: 'Albania',
+  },
+  {
+    id: 'DZ',
+    en: 'Algeria',
+  },
+  {
+    id: 'AS',
+    en: 'American Samoa',
+  },
+  {
+    id: 'AD',
+    en: 'Andorra',
+  },
+  {
+    id: 'AO',
+    en: 'Angola',
+  },
+  {
+    id: 'AI',
+    en: 'Anguilla',
+  },
+  {
+    id: 'AG',
+    en: 'Antigua & Barbuda',
+  },
+  {
+    id: 'AR',
+    en: 'Argentina',
+  },
+  {
+    id: 'AM',
+    en: 'Armenia',
+  },
+  {
+    id: 'AW',
+    en: 'Aruba',
+  },
+  {
+    id: 'AU',
+    en: 'Australia',
+  },
+  {
+    id: 'AT',
+    en: 'Austria',
+  },
+  {
+    id: 'AZ',
+    en: 'Azerbaijan',
+  },
+  {
+    id: 'BS',
+    en: 'Bahamas',
+  },
+  {
+    id: 'BH',
+    en: 'Bahrain',
+  },
+  {
+    id: 'BD',
+    en: 'Bangladesh',
+  },
+  {
+    id: 'BB',
+    en: 'Barbados',
+  },
+  {
+    id: 'BY',
+    en: 'Belarus',
+  },
+  {
+    id: 'BE',
+    en: 'Belgium',
+  },
+  {
+    id: 'BZ',
+    en: 'Belize',
+  },
+  {
+    id: 'BJ',
+    en: 'Benin',
+  },
+  {
+    id: 'BM',
+    en: 'Bermuda',
+  },
+  {
+    id: 'BT',
+    en: 'Bhutan',
+  },
+  {
+    id: 'BO',
+    en: 'Bolivia',
+  },
+  {
+    id: 'BA',
+    en: 'Bosnia & Herzegovina',
+  },
+  {
+    id: 'BW',
+    en: 'Botswana',
+  },
+  {
+    id: 'BR',
+    en: 'Brazil',
+  },
+  {
+    id: 'IO',
+    en: 'British Indian Ocean Territory',
+  },
+  {
+    id: 'VG',
+    en: 'British Virgin Islands',
+  },
+  {
+    id: 'BN',
+    en: 'Brunei',
+  },
+  {
+    id: 'BG',
+    en: 'Bulgaria',
+  },
+  {
+    id: 'BF',
+    en: 'Burkina Faso',
+  },
+  {
+    id: 'BI',
+    en: 'Burundi',
+  },
+  {
+    id: 'KH',
+    en: 'Cambodia',
+  },
+  {
+    id: 'CM',
+    en: 'Cameroon',
+  },
+  {
+    id: 'CA',
+    en: 'Canada',
+  },
+  {
+    id: 'CV',
+    en: 'Cape Verde',
+  },
+  {
+    id: 'KY',
+    en: 'Cayman Islands',
+  },
+  {
+    id: 'CF',
+    en: 'Central African Republic',
+  },
+  {
+    id: 'TD',
+    en: 'Chad',
+  },
+  {
+    id: 'CL',
+    en: 'Chile',
+  },
+  {
+    id: 'CX',
+    en: 'Christmas Island',
+  },
+  {
+    id: 'CC',
+    en: 'Cocos (Keeling) Islands',
+  },
+  {
+    id: 'CO',
+    en: 'Colombia',
+  },
+  {
+    id: 'KM',
+    en: 'Comoros',
+  },
+  {
+    id: 'CG',
+    en: 'Congo - Brazzaville',
+  },
+  {
+    id: 'CD',
+    en: 'Congo - Kinshasa',
+  },
+  {
+    id: 'CK',
+    en: 'Cook Islands',
+  },
+  {
+    id: 'CR',
+    en: 'Costa Rica',
+  },
+  {
+    id: 'CI',
+    en: 'Côte d’Ivoire',
+  },
+  {
+    id: 'HR',
+    en: 'Croatia',
+  },
+  {
+    id: 'CU',
+    en: 'Cuba',
+  },
+  {
+    id: 'CW',
+    en: 'Curaçao',
+  },
+  {
+    id: 'CY',
+    en: 'Cyprus',
+  },
+  {
+    id: 'CZ',
+    en: 'Czech Republic',
+  },
+  {
+    id: 'DK',
+    en: 'Denmark',
+  },
+  {
+    id: 'DJ',
+    en: 'Djibouti',
+  },
+  {
+    id: 'DM',
+    en: 'Dominica',
+  },
+  {
+    id: 'DO',
+    en: 'Dominican Republic',
+  },
+  {
+    id: 'EC',
+    en: 'Ecuador',
+  },
+  {
+    id: 'EG',
+    en: 'Egypt',
+  },
+  {
+    id: 'SV',
+    en: 'El Salvador',
+  },
+  {
+    id: 'GQ',
+    en: 'Equatorial Guinea',
+  },
+  {
+    id: 'ER',
+    en: 'Eritrea',
+  },
+  {
+    id: 'EE',
+    en: 'Estonia',
+  },
+  {
+    id: 'ET',
+    en: 'Ethiopia',
+  },
+  {
+    id: 'FK',
+    en: 'Falkland Islands',
+  },
+  {
+    id: 'FO',
+    en: 'Faroe Islands',
+  },
+  {
+    id: 'FJ',
+    en: 'Fiji',
+  },
+  {
+    id: 'FI',
+    en: 'Finland',
+  },
+  {
+    id: 'FR',
+    en: 'France',
+  },
+  {
+    id: 'GF',
+    en: 'French Guiana',
+  },
+  {
+    id: 'PF',
+    en: 'French Polynesia',
+  },
+  {
+    id: 'GA',
+    en: 'Gabon',
+  },
+  {
+    id: 'GM',
+    en: 'Gambia',
+  },
+  {
+    id: 'GE',
+    en: 'Georgia',
+  },
+  {
+    id: 'DE',
+    en: 'Germany',
+  },
+  {
+    id: 'GH',
+    en: 'Ghana',
+  },
+  {
+    id: 'GI',
+    en: 'Gibraltar',
+  },
+  {
+    id: 'GR',
+    en: 'Greece',
+  },
+  {
+    id: 'GL',
+    en: 'Greenland',
+  },
+  {
+    id: 'GD',
+    en: 'Grenada',
+  },
+  {
+    id: 'GP',
+    en: 'Guadeloupe',
+  },
+  {
+    id: 'GU',
+    en: 'Guam',
+  },
+  {
+    id: 'GT',
+    en: 'Guatemala',
+  },
+  {
+    id: 'GG',
+    en: 'Guernsey',
+  },
+  {
+    id: 'GN',
+    en: 'Guinea',
+  },
+  {
+    id: 'GW',
+    en: 'Guinea-Bissau',
+  },
+  {
+    id: 'GY',
+    en: 'Guyana',
+  },
+  {
+    id: 'HT',
+    en: 'Haiti',
+  },
+  {
+    id: 'HN',
+    en: 'Honduras',
+  },
+  {
+    id: 'HU',
+    en: 'Hungary',
+  },
+  {
+    id: 'IS',
+    en: 'Iceland',
+  },
+  {
+    id: 'IN',
+    en: 'India',
+  },
+  {
+    id: 'ID',
+    en: 'Indonesia',
+  },
+  {
+    id: 'IR',
+    en: 'Iran',
+  },
+  {
+    id: 'IQ',
+    en: 'Iraq',
+  },
+  {
+    id: 'IE',
+    en: 'Ireland',
+  },
+  {
+    id: 'IM',
+    en: 'Isle of Man',
+  },
+  {
+    id: 'IL',
+    en: 'Israel',
+  },
+  {
+    id: 'IT',
+    en: 'Italy',
+  },
+  {
+    id: 'JM',
+    en: 'Jamaica',
+  },
+  {
+    id: 'JP',
+    en: 'Japan',
+  },
+  {
+    id: 'JE',
+    en: 'Jersey',
+  },
+  {
+    id: 'JO',
+    en: 'Jordan',
+  },
+  {
+    id: 'KZ',
+    en: 'Kazakhstan',
+  },
+  {
+    id: 'KE',
+    en: 'Kenya',
+  },
+  {
+    id: 'KI',
+    en: 'Kiribati',
+  },
+  {
+    id: 'XK',
+    en: 'Kosovo',
+  },
+  {
+    id: 'KW',
+    en: 'Kuwait',
+  },
+  {
+    id: 'KG',
+    en: 'Kyrgyzstan',
+  },
+  {
+    id: 'LA',
+    en: 'Laos',
+  },
+  {
+    id: 'LV',
+    en: 'Latvia',
+  },
+  {
+    id: 'LB',
+    en: 'Lebanon',
+  },
+  {
+    id: 'LS',
+    en: 'Lesotho',
+  },
+  {
+    id: 'LR',
+    en: 'Liberia',
+  },
+  {
+    id: 'LY',
+    en: 'Libya',
+  },
+  {
+    id: 'LI',
+    en: 'Liechtenstein',
+  },
+  {
+    id: 'LT',
+    en: 'Lithuania',
+  },
+  {
+    id: 'LU',
+    en: 'Luxembourg',
+  },
+  {
+    id: 'MK',
+    en: 'Macedonia',
+  },
+  {
+    id: 'MG',
+    en: 'Madagascar',
+  },
+  {
+    id: 'MW',
+    en: 'Malawi',
+  },
+  {
+    id: 'MY',
+    en: 'Malaysia',
+  },
+  {
+    id: 'MV',
+    en: 'Maldives',
+  },
+  {
+    id: 'ML',
+    en: 'Mali',
+  },
+  {
+    id: 'MT',
+    en: 'Malta',
+  },
+  {
+    id: 'MH',
+    en: 'Marshall Islands',
+  },
+  {
+    id: 'MQ',
+    en: 'Martinique',
+  },
+  {
+    id: 'MR',
+    en: 'Mauritania',
+  },
+  {
+    id: 'MU',
+    en: 'Mauritius',
+  },
+  {
+    id: 'YT',
+    en: 'Mayotte',
+  },
+  {
+    id: 'MX',
+    en: 'Mexico',
+  },
+  {
+    id: 'FM',
+    en: 'Micronesia',
+  },
+  {
+    id: 'MD',
+    en: 'Moldova',
+  },
+  {
+    id: 'MC',
+    en: 'Monaco',
+  },
+  {
+    id: 'MN',
+    en: 'Mongolia',
+  },
+  {
+    id: 'ME',
+    en: 'Montenegro',
+  },
+  {
+    id: 'MS',
+    en: 'Montserrat',
+  },
+  {
+    id: 'MA',
+    en: 'Morocco',
+  },
+  {
+    id: 'MZ',
+    en: 'Mozambique',
+  },
+  {
+    id: 'MM',
+    en: 'Myanmar (Burma)',
+  },
+  {
+    id: 'NA',
+    en: 'Namibia',
+  },
+  {
+    id: 'NR',
+    en: 'Nauru',
+  },
+  {
+    id: 'NP',
+    en: 'Nepal',
+  },
+  {
+    id: 'NL',
+    en: 'Netherlands',
+  },
+  {
+    id: 'NC',
+    en: 'New Caledonia',
+  },
+  {
+    id: 'NZ',
+    en: 'New Zealand',
+  },
+  {
+    id: 'NI',
+    en: 'Nicaragua',
+  },
+  {
+    id: 'NE',
+    en: 'Niger',
+  },
+  {
+    id: 'NG',
+    en: 'Nigeria',
+  },
+  {
+    id: 'NU',
+    en: 'Niue',
+  },
+  {
+    id: 'NF',
+    en: 'Norfolk Island',
+  },
+  {
+    id: 'KP',
+    en: 'North Korea',
+  },
+  {
+    id: 'MP',
+    en: 'Northern Mariana Islands',
+  },
+  {
+    id: 'NO',
+    en: 'Norway',
+  },
+  {
+    id: 'OM',
+    en: 'Oman',
+  },
+  {
+    id: 'PK',
+    en: 'Pakistan',
+  },
+  {
+    id: 'PW',
+    en: 'Palau',
+  },
+  {
+    id: 'PS',
+    en: 'Palestinian Territories',
+  },
+  {
+    id: 'PA',
+    en: 'Panama',
+  },
+  {
+    id: 'PG',
+    en: 'Papua New Guinea',
+  },
+  {
+    id: 'PY',
+    en: 'Paraguay',
+  },
+  {
+    id: 'PE',
+    en: 'Peru',
+  },
+  {
+    id: 'PH',
+    en: 'Philippines',
+  },
+  {
+    id: 'PN',
+    en: 'Pitcairn Islands',
+  },
+  {
+    id: 'PL',
+    en: 'Poland',
+  },
+  {
+    id: 'PT',
+    en: 'Portugal',
+  },
+  {
+    id: 'PR',
+    en: 'Puerto Rico',
+  },
+  {
+    id: 'QA',
+    en: 'Qatar',
+  },
+  {
+    id: 'RE',
+    en: 'Réunion',
+  },
+  {
+    id: 'RO',
+    en: 'Romania',
+  },
+  {
+    id: 'RU',
+    en: 'Russia',
+  },
+  {
+    id: 'RW',
+    en: 'Rwanda',
+  },
+  {
+    id: 'WS',
+    en: 'Samoa',
+  },
+  {
+    id: 'SM',
+    en: 'San Marino',
+  },
+  {
+    id: 'ST',
+    en: 'São Tomé & Príncipe',
+  },
+  {
+    id: 'SA',
+    en: 'Saudi Arabia',
+  },
+  {
+    id: 'SN',
+    en: 'Senegal',
+  },
+  {
+    id: 'RS',
+    en: 'Serbia',
+  },
+  {
+    id: 'SC',
+    en: 'Seychelles',
+  },
+  {
+    id: 'SL',
+    en: 'Sierra Leone',
+  },
+  {
+    id: 'SG',
+    en: 'Singapore',
+  },
+  {
+    id: 'SX',
+    en: 'Sint Maarten',
+  },
+  {
+    id: 'SK',
+    en: 'Slovakia',
+  },
+  {
+    id: 'SI',
+    en: 'Slovenia',
+  },
+  {
+    id: 'SB',
+    en: 'Solomon Islands',
+  },
+  {
+    id: 'SO',
+    en: 'Somalia',
+  },
+  {
+    id: 'ZA',
+    en: 'South Africa',
+  },
+  {
+    id: 'GS',
+    en: 'South Georgia & South Sandwich I',
+  },
+  {
+    id: 'KR',
+    en: 'South Korea',
+  },
+  {
+    id: 'SS',
+    en: 'South Sudan',
+  },
+  {
+    id: 'ES',
+    en: 'Spain',
+  },
+  {
+    id: 'LK',
+    en: 'Sri Lanka',
+  },
+  {
+    id: 'BL',
+    en: 'St. Barthélemy',
+  },
+  {
+    id: 'KN',
+    en: 'St. Kitts & Nevis',
+  },
+  {
+    id: 'LC',
+    en: 'St. Lucia',
+  },
+  {
+    id: 'MF',
+    en: 'St. Martin',
+  },
+  {
+    id: 'PM',
+    en: 'St. Pierre & Miquelon',
+  },
+  {
+    id: 'VC',
+    en: 'St. Vincent & Grenadines',
+  },
+  {
+    id: 'SD',
+    en: 'Sudan',
+  },
+  {
+    id: 'SR',
+    en: 'Suriname',
+  },
+  {
+    id: 'SJ',
+    en: 'Svalbard & Jan Mayen',
+  },
+  {
+    id: 'SZ',
+    en: 'Swaziland',
+  },
+  {
+    id: 'SE',
+    en: 'Sweden',
+  },
+  {
+    id: 'CH',
+    en: 'Switzerland',
+  },
+  {
+    id: 'SY',
+    en: 'Syria',
+  },
+  {
+    id: 'TJ',
+    en: 'Tajikistan',
+  },
+  {
+    id: 'TZ',
+    en: 'Tanzania',
+  },
+  {
+    id: 'TH',
+    en: 'Thailand',
+  },
+  {
+    id: 'TL',
+    en: 'Timor-Leste',
+  },
+  {
+    id: 'TG',
+    en: 'Togo',
+  },
+  {
+    id: 'TK',
+    en: 'Tokelau',
+  },
+  {
+    id: 'TO',
+    en: 'Tonga',
+  },
+  {
+    id: 'TT',
+    en: 'Trinidad & Tobago',
+  },
+  {
+    id: 'TN',
+    en: 'Tunisia',
+  },
+  {
+    id: 'TR',
+    en: 'Turkey',
+  },
+  {
+    id: 'TM',
+    en: 'Turkmenistan',
+  },
+  {
+    id: 'TC',
+    en: 'Turks & Caicos Islands',
+  },
+  {
+    id: 'TV',
+    en: 'Tuvalu',
+  },
+  {
+    id: 'VI',
+    en: 'U.S. Virgin Islands',
+  },
+  {
+    id: 'UG',
+    en: 'Uganda',
+  },
+  {
+    id: 'UA',
+    en: 'Ukraine',
+  },
+  {
+    id: 'AE',
+    en: 'United Arab Emirates',
+  },
+  {
+    id: 'GB',
+    en: 'United Kingdom',
+  },
+  {
+    id: 'US',
+    en: 'United States',
+  },
+  {
+    id: 'UY',
+    en: 'Uruguay',
+  },
+  {
+    id: 'UZ',
+    en: 'Uzbekistan',
+  },
+  {
+    id: 'VU',
+    en: 'Vanuatu',
+  },
+  {
+    id: 'VA',
+    en: 'Vatican City',
+  },
+  {
+    id: 'VE',
+    en: 'Venezuela',
+  },
+  {
+    id: 'VN',
+    en: 'Vietnam',
+  },
+  {
+    id: 'WF',
+    en: 'Wallis & Futuna',
+  },
+  {
+    id: 'EH',
+    en: 'Western Sahara',
+  },
+  {
+    id: 'YE',
+    en: 'Yemen',
+  },
+  {
+    id: 'ZM',
+    en: 'Zambia',
+  },
+  {
+    id: 'ZW',
+    en: 'Zimbabwe',
+  },
+  {
+    id: 'CN',
+    en: 'China',
+  },
+  {
+    id: 'HK',
+    en: 'Hong Kong SAR China',
+  },
+  {
+    id: 'MO',
+    en: 'Macau SAR China',
+  },
+  {
+    id: 'TW',
+    en: 'Taiwan',
+  },
+].map((item) => {
+  return {
+    value: item.id,
+    label: item.en,
+  };
+});
+
 const sorterByLabel = (optionA, optionB) => optionA.label.localeCompare(optionB.label);
 
+const sorterBySearchValue = (oa, ob, info) =>
+  info.searchValue
+    ? oa.label.toLowerCase().indexOf(info.searchValue) >
+      ob.label.toLowerCase().indexOf(info.searchValue)
+      ? 1
+      : -1
+    : oa.label.localeCompare(ob.label);
+
 const Test = () => (
   <div>
     <h3> with filter sort </h3>
@@ -30,6 +1018,14 @@ const Test = () => (
       optionFilterProp="label"
       options={incidencesStateResource}
     />
+    <h3> huge data with filter sort and search value </h3>
+    <Select
+      showSearch
+      style={{ width: 500 }}
+      filterSort={sorterBySearchValue}
+      optionFilterProp="label"
+      options={countries}
+    />
   </div>
 );
 
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 056c714c7..2fa97eb11 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -62,6 +62,7 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
     optionRender,
     classNames: contextClassNames,
     styles: contextStyles,
+    filterSort,
   } = React.useContext(SelectContext);
 
   const itemPrefixCls = `${prefixCls}-item`;
@@ -158,10 +159,14 @@ const OptionList: React.ForwardRefRenderFunction<RefOptionListProps, {}> = (_, r
 
     if (!multiple && open && rawValues.size === 1) {
       const value: RawValueType = Array.from(rawValues)[0];
+      // When filterSort is provided, we need to scroll to the first option if searching.
       // Scroll to the option closest to the searchValue if searching.
-      const index = memoFlattenOptions.findIndex(({ data }) =>
-        searchValue ? String(data.value).startsWith(searchValue) : data.value === value,
-      );
+      const index =
+        filterSort && searchValue
+          ? 0
+          : memoFlattenOptions.findIndex(({ data }) =>
+              searchValue ? String(data.value).startsWith(searchValue) : data.value === value,
+            );
 
       if (index !== -1) {
         setActive(index);
diff --git a/src/Select.tsx b/src/Select.tsx
index b9e2e557c..e457b432a 100644
--- a/src/Select.tsx
+++ b/src/Select.tsx
@@ -673,6 +673,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
         childrenAsData,
         maxCount,
         optionRender,
+        filterSort,
         classNames,
         styles,
       };
@@ -693,6 +694,7 @@ const Select = React.forwardRef<BaseSelectRef, SelectProps<any, DefaultOptionTyp
       listItemHeight,
       childrenAsData,
       optionRender,
+      filterSort,
       classNames,
       styles,
     ]);
diff --git a/src/SelectContext.ts b/src/SelectContext.ts
index 9a78d1c54..8475c448b 100644
--- a/src/SelectContext.ts
+++ b/src/SelectContext.ts
@@ -37,6 +37,7 @@ export interface SelectContextProps {
   listItemHeight?: number;
   childrenAsData?: boolean;
   maxCount?: number;
+  filterSort?: SelectProps['filterSort'];
 }
 
 const SelectContext = React.createContext<SelectContextProps>(null);

From 65b5ce565caf1e86aecaee10d4723bef7b43b8c8 Mon Sep 17 00:00:00 2001
From: nearimba <yu.mei@sunmi.com>
Date: Mon, 22 Sep 2025 18:18:43 +0800
Subject: [PATCH 2/2] fix: fixed codecov

---
 tests/OptionList.test.tsx | 173 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)

diff --git a/tests/OptionList.test.tsx b/tests/OptionList.test.tsx
index b73b370d0..5721b4b5d 100644
--- a/tests/OptionList.test.tsx
+++ b/tests/OptionList.test.tsx
@@ -510,6 +510,179 @@ describe('OptionList', () => {
     expect(onSelect).toHaveBeenCalledTimes(1);
   });
 
+  describe('filterSort scroll behavior', () => {
+    beforeEach(() => {
+      jest.useFakeTimers();
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it('should scroll to index 0 when filterSort is provided and searchValue exists', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+      const filterSort = jest.fn((a, b) => 0); // Mock filterSort function
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['2']), // Pre-select option '2'
+          searchValue: 'Option', // Has search value
+          filterSort, // Has filterSort
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // Verify that when filterSort and searchValue are both present,
+      // the index should be 0 (first option)
+      expect(onActiveValue).toHaveBeenCalledWith('1', 0, expect.anything());
+    });
+
+    it('should scroll to matching option when filterSort is provided but no searchValue', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+      const filterSort = jest.fn((a, b) => 0); // Mock filterSort function
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['2']), // Pre-select option '2'
+          searchValue: '', // No search value
+          filterSort, // Has filterSort
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // Verify that when filterSort is provided but no searchValue,
+      // it should find the index of the selected value (option '2' at index 1)
+      expect(onActiveValue).toHaveBeenCalledWith('2', 1, expect.anything());
+    });
+
+    it('should scroll to matching option when no filterSort but searchValue exists', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['2']), // Pre-select option '2'
+          searchValue: '2', // Search value that matches option '2'
+          filterSort: undefined, // No filterSort
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // Verify that when no filterSort but searchValue exists,
+      // it should find the index of the option that starts with searchValue
+      expect(onActiveValue).toHaveBeenCalledWith('2', 1, expect.anything());
+    });
+
+    it('should scroll to selected value when no filterSort and no searchValue', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['2']), // Pre-select option '2'
+          searchValue: '', // No search value
+          filterSort: undefined, // No filterSort
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // Verify that when no filterSort and no searchValue,
+      // it should find the index of the selected value (option '2' at index 1)
+      expect(onActiveValue).toHaveBeenCalledWith('2', 1, expect.anything());
+    });
+
+    it('should call scrollIntoView with correct index when filterSort is used', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+      const filterSort = jest.fn((a, b) => 0); // Mock filterSort function
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['2']), // Pre-select option '2'
+          searchValue: 'test', // Has search value
+          filterSort, // Has filterSort
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // Fast-forward timers to trigger the setTimeout for scrollIntoView
+      act(() => {
+        jest.runAllTimers();
+      });
+
+      // Verify that scrollIntoView was called with index 0 when filterSort and searchValue are present
+      expect(global.scrollToArgs).toEqual({ index: 0 });
+    });
+
+    it('should not scroll when selected value is not found in options', () => {
+      const onActiveValue = jest.fn();
+      const listRef = React.createRef<RefOptionListProps>();
+
+      render(
+        generateList({
+          options: [
+            { value: '1', label: 'Option 1' },
+            { value: '2', label: 'Option 2' },
+            { value: '3', label: 'Option 3' },
+          ],
+          values: new Set(['4']), // Pre-select option '4' which doesn't exist
+          searchValue: '',
+          filterSort: undefined,
+          open: true,
+          multiple: false, // Single mode
+          onActiveValue,
+          ref: listRef,
+        }),
+      );
+
+      // When the selected value is not found, the component will still activate the first available option
+      // This is the expected behavior based on the current implementation
+      expect(onActiveValue).toHaveBeenCalledWith('1', 0, expect.anything());
+    });
+  });
+
   describe('List.ScrollBar', () => {
     let mockElement;
     let boundingRect = {