diff --git a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap index 144a17df3..552d8ff58 100644 --- a/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap +++ b/components/auto-complete/__tests__/__snapshots__/demo.test.js.snap @@ -4,7 +4,7 @@ exports[`renders ./components/auto-complete/demo/basic.vue correctly 1`] = `
-
+
input here
@@ -42,7 +42,7 @@ exports[`renders ./components/auto-complete/demo/non-case-sensitive.vue correctl
-
+
input here
@@ -54,7 +54,7 @@ exports[`renders ./components/auto-complete/demo/options.vue correctly 1`] = `
-
+
input here
diff --git a/components/calendar/__tests__/__snapshots__/demo.test.js.snap b/components/calendar/__tests__/__snapshots__/demo.test.js.snap index 74bf08cb9..313becf76 100644 --- a/components/calendar/__tests__/__snapshots__/demo.test.js.snap +++ b/components/calendar/__tests__/__snapshots__/demo.test.js.snap @@ -6,7 +6,7 @@ exports[`renders ./components/calendar/demo/basic.vue correctly 1`] = `
-
2016 +
2016
@@ -14,7 +14,7 @@ exports[`renders ./components/calendar/demo/basic.vue correctly 1`] = `
-
Nov +
Nov
@@ -402,7 +402,7 @@ exports[`renders ./components/calendar/demo/card.vue correctly 1`] = `
-
2016 +
2016
@@ -410,7 +410,7 @@ exports[`renders ./components/calendar/demo/card.vue correctly 1`] = `
-
Nov +
Nov
@@ -805,7 +805,7 @@ exports[`renders ./components/calendar/demo/customize-header.vue correctly 1`] =
-
2016 +
2016
@@ -815,7 +815,7 @@ exports[`renders ./components/calendar/demo/customize-header.vue correctly 1`] =
-
Nov +
Nov
@@ -1204,7 +1204,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.vue correctly 1`] =
-
2016 +
2016
@@ -1212,7 +1212,7 @@ exports[`renders ./components/calendar/demo/notice-calendar.vue correctly 1`] =
-
Nov +
Nov
@@ -1628,7 +1628,7 @@ exports[`renders ./components/calendar/demo/select.vue correctly 1`] = `
-
2017 +
2017
@@ -1636,7 +1636,7 @@ exports[`renders ./components/calendar/demo/select.vue correctly 1`] = `
-
Jan +
Jan
diff --git a/components/calendar/__tests__/__snapshots__/index.test.js.snap b/components/calendar/__tests__/__snapshots__/index.test.js.snap index 9fa9e5ab0..03a4dbfb2 100644 --- a/components/calendar/__tests__/__snapshots__/index.test.js.snap +++ b/components/calendar/__tests__/__snapshots__/index.test.js.snap @@ -6,7 +6,7 @@ exports[`Calendar Calendar should support locale 1`] = `
-
2018年 +
2018年
@@ -14,7 +14,7 @@ exports[`Calendar Calendar should support locale 1`] = `
-
Oct +
Oct
diff --git a/components/cascader/__tests__/__snapshots__/demo.test.js.snap b/components/cascader/__tests__/__snapshots__/demo.test.js.snap index 1f52f3c2e..82725d951 100644 --- a/components/cascader/__tests__/__snapshots__/demo.test.js.snap +++ b/components/cascader/__tests__/__snapshots__/demo.test.js.snap @@ -4,7 +4,7 @@ exports[`renders ./components/cascader/demo/basic.vue correctly 1`] = `
-
+
Please select
@@ -15,7 +15,7 @@ exports[`renders ./components/cascader/demo/change-on-select.vue correctly 1`] =
-
+
Please select
@@ -26,7 +26,7 @@ exports[`renders ./components/cascader/demo/custom-render.vue correctly 1`] = `
-
Zhejiang /Hangzhou /West Lake ( 752100 ) +
Zhejiang /Hangzhou /West Lake ( 752100 )
@@ -38,7 +38,7 @@ exports[`renders ./components/cascader/demo/disabled-option.vue correctly 1`] =
-
+
Please select
@@ -49,7 +49,7 @@ exports[`renders ./components/cascader/demo/fields-name.vue correctly 1`] = `
-
+
Please select
@@ -60,7 +60,7 @@ exports[`renders ./components/cascader/demo/hover.vue correctly 1`] = `
-
+
Please select
@@ -71,7 +71,7 @@ exports[`renders ./components/cascader/demo/lazy.vue correctly 1`] = `
-
+
Please select
@@ -86,7 +86,7 @@ exports[`renders ./components/cascader/demo/multiple.vue correctly 1`] = `
-
+
Please select
@@ -99,7 +99,7 @@ exports[`renders ./components/cascader/demo/search.vue correctly 1`] = `
-
+
Please select
@@ -110,7 +110,7 @@ exports[`renders ./components/cascader/demo/size.vue correctly 1`] = `
-
+
Please select
@@ -120,7 +120,7 @@ exports[`renders ./components/cascader/demo/size.vue correctly 1`] = `
-
+
Please select
@@ -130,7 +130,7 @@ exports[`renders ./components/cascader/demo/size.vue correctly 1`] = `
-
+
Please select
@@ -145,7 +145,7 @@ exports[`renders ./components/cascader/demo/suffix.vue correctly 1`] = `
-
+
Please select
@@ -156,7 +156,7 @@ exports[`renders ./components/cascader/demo/suffix.vue correctly 1`] = `
-
+
Please select
diff --git a/components/collapse/__tests__/__snapshots__/demo.test.js.snap b/components/collapse/__tests__/__snapshots__/demo.test.js.snap index 4c2df6a60..b07633ada 100644 --- a/components/collapse/__tests__/__snapshots__/demo.test.js.snap +++ b/components/collapse/__tests__/__snapshots__/demo.test.js.snap @@ -146,7 +146,7 @@ exports[`renders ./components/collapse/demo/extra.vue correctly 1`] = `
-
left +
left
diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap index 6f54d3941..f1e1e3fe9 100644 --- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap @@ -640,7 +640,7 @@ exports[`renders ./components/date-picker/demo/switchable.vue correctly 1`] = `
-
Time +
Time
diff --git a/components/empty/__tests__/__snapshots__/demo.test.js.snap b/components/empty/__tests__/__snapshots__/demo.test.js.snap index bf63f119a..9a019f818 100644 --- a/components/empty/__tests__/__snapshots__/demo.test.js.snap +++ b/components/empty/__tests__/__snapshots__/demo.test.js.snap @@ -37,7 +37,7 @@ exports[`renders ./components/empty/demo/config-provider.vue correctly 1`] = `
-
+
@@ -46,7 +46,7 @@ exports[`renders ./components/empty/demo/config-provider.vue correctly 1`] = `
-
+
@@ -55,7 +55,7 @@ exports[`renders ./components/empty/demo/config-provider.vue correctly 1`] = `
-
+
diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index d13d0bcda..042253d3f 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -294,7 +294,7 @@ exports[`renders ./components/form/demo/customized-form-controls.vue correctly 1
-
RMB +
RMB
@@ -398,7 +398,7 @@ exports[`renders ./components/form/demo/dynamic-form-items-complex.vue correctly
-
+
@@ -1086,7 +1086,7 @@ exports[`renders ./components/form/demo/useForm-basic.vue correctly 1`] = `
-
+
please select your zone
@@ -1156,7 +1156,7 @@ exports[`renders ./components/form/demo/useForm-merge.vue correctly 1`] = `
-
+
please select your zone
@@ -1272,7 +1272,7 @@ exports[`renders ./components/form/demo/useForm-trigger.vue correctly 1`] = `
-
+
please select your zone
@@ -1327,7 +1327,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = `
-
+
Please select a country
@@ -1353,7 +1353,7 @@ exports[`renders ./components/form/demo/validate-other.vue correctly 1`] = `
-
+
Please select favourite colors
@@ -1602,7 +1602,7 @@ exports[`renders ./components/form/demo/validation.vue correctly 1`] = `
-
+
please select your zone
diff --git a/components/input-number/__tests__/__snapshots__/demo.test.js.snap b/components/input-number/__tests__/__snapshots__/demo.test.js.snap index 7e65862c9..eee67f296 100644 --- a/components/input-number/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input-number/__tests__/__snapshots__/demo.test.js.snap @@ -22,7 +22,7 @@ exports[`renders ./components/input-number/demo/addon.vue correctly 1`] = `
-
+ +
+
@@ -36,7 +36,7 @@ exports[`renders ./components/input-number/demo/addon.vue correctly 1`] = `
-
$ +
$
@@ -71,7 +71,7 @@ exports[`renders ./components/input-number/demo/addon.vue correctly 1`] = `
-
+
cascader
diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap index be5000a96..a65d213eb 100644 --- a/components/input/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input/__tests__/__snapshots__/demo.test.js.snap @@ -4,11 +4,11 @@ exports[`renders ./components/input/demo/addon.vue correctly 1`] = `
Http://.com
-
Http:// +
Http://
-
.com +
.com
@@ -16,7 +16,7 @@ exports[`renders ./components/input/demo/addon.vue correctly 1`] = `
-
+
cascader
@@ -43,11 +43,11 @@ exports[`renders ./components/input/demo/basic.vue correctly 1`] = ``; exports[`renders ./components/input/demo/group.vue correctly 1`] = ` -


Zhejiang +


Zhejiang
-

Option1 +

Option1
@@ -55,7 +55,7 @@ exports[`renders ./components/input/demo/group.vue correctly 1`] = `
-

Option1-1 +

Option1-1
@@ -63,15 +63,15 @@ exports[`renders ./components/input/demo/group.vue correctly 1`] = `
-
Option2-2 +
Option2-2
-

Between +

Between
-

Sign Up +

Sign Up
@@ -79,12 +79,12 @@ exports[`renders ./components/input/demo/group.vue correctly 1`] = `
-
+
Email
-

Home +

Home
@@ -92,7 +92,7 @@ exports[`renders ./components/input/demo/group.vue correctly 1`] = `
-
+
Select Address
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index 5aa249d40..daf0404a0 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -15,7 +15,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
-
10 / الصفحة +
10 / الصفحة
@@ -26,7 +26,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
-
+
@@ -118,7 +118,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
-
2017 +
2017
@@ -126,7 +126,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
-
Sep +
Sep
@@ -581,7 +581,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
-
10 / страница +
10 / страница
@@ -592,7 +592,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
-
+
@@ -684,7 +684,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
-
2017 +
2017
@@ -692,7 +692,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
-
Sep +
Sep
@@ -1147,7 +1147,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
-
10 / pàgina +
10 / pàgina
@@ -1158,7 +1158,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
-
+
@@ -1250,7 +1250,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
-
2017 +
2017
@@ -1258,7 +1258,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
-
Sep +
Sep
@@ -1713,7 +1713,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
-
10 / strana +
10 / strana
@@ -1724,7 +1724,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
-
+
@@ -1816,7 +1816,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
-
2017 +
2017
@@ -1824,7 +1824,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
-
Sep +
Sep
@@ -2279,7 +2279,7 @@ exports[`Locale Provider should display the text as da 1`] = `
-
10 / side +
10 / side
@@ -2290,7 +2290,7 @@ exports[`Locale Provider should display the text as da 1`] = `
-
+
@@ -2382,7 +2382,7 @@ exports[`Locale Provider should display the text as da 1`] = `
-
2017 +
2017
@@ -2390,7 +2390,7 @@ exports[`Locale Provider should display the text as da 1`] = `
-
Sep +
Sep
@@ -2845,7 +2845,7 @@ exports[`Locale Provider should display the text as de 1`] = `
-
10 / Seite +
10 / Seite
@@ -2856,7 +2856,7 @@ exports[`Locale Provider should display the text as de 1`] = `
-
+
@@ -2948,7 +2948,7 @@ exports[`Locale Provider should display the text as de 1`] = `
-
2017 +
2017
@@ -2956,7 +2956,7 @@ exports[`Locale Provider should display the text as de 1`] = `
-
Sep +
Sep
@@ -3411,7 +3411,7 @@ exports[`Locale Provider should display the text as el 1`] = `
-
10 / σελίδα +
10 / σελίδα
@@ -3422,7 +3422,7 @@ exports[`Locale Provider should display the text as el 1`] = `
-
+
@@ -3514,7 +3514,7 @@ exports[`Locale Provider should display the text as el 1`] = `
-
2017 +
2017
@@ -3522,7 +3522,7 @@ exports[`Locale Provider should display the text as el 1`] = `
-
Sep +
Sep
@@ -3977,7 +3977,7 @@ exports[`Locale Provider should display the text as en 1`] = `
-
10 / page +
10 / page
@@ -3988,7 +3988,7 @@ exports[`Locale Provider should display the text as en 1`] = `
-
+
@@ -4080,7 +4080,7 @@ exports[`Locale Provider should display the text as en 1`] = `
-
2017 +
2017
@@ -4088,7 +4088,7 @@ exports[`Locale Provider should display the text as en 1`] = `
-
Sep +
Sep
@@ -4543,7 +4543,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
-
10 / page +
10 / page
@@ -4554,7 +4554,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
-
+
@@ -4646,7 +4646,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
-
2017 +
2017
@@ -4654,7 +4654,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
-
Sep +
Sep
@@ -5109,7 +5109,7 @@ exports[`Locale Provider should display the text as es 1`] = `
-
10 / página +
10 / página
@@ -5120,7 +5120,7 @@ exports[`Locale Provider should display the text as es 1`] = `
-
+
@@ -5212,7 +5212,7 @@ exports[`Locale Provider should display the text as es 1`] = `
-
2017 +
2017
@@ -5220,7 +5220,7 @@ exports[`Locale Provider should display the text as es 1`] = `
-
Sep +
Sep
@@ -5675,7 +5675,7 @@ exports[`Locale Provider should display the text as et 1`] = `
-
10 / leheküljel +
10 / leheküljel
@@ -5686,7 +5686,7 @@ exports[`Locale Provider should display the text as et 1`] = `
-
+
@@ -5778,7 +5778,7 @@ exports[`Locale Provider should display the text as et 1`] = `
-
2017 +
2017
@@ -5786,7 +5786,7 @@ exports[`Locale Provider should display the text as et 1`] = `
-
Sep +
Sep
@@ -6241,7 +6241,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
-
10 / صفحه +
10 / صفحه
@@ -6252,7 +6252,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
-
+
@@ -6344,7 +6344,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
-
2017 +
2017
@@ -6352,7 +6352,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
-
Sep +
Sep
@@ -6807,7 +6807,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
-
10 / sivu +
10 / sivu
@@ -6818,7 +6818,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
-
+
@@ -6910,7 +6910,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
-
2017 +
2017
@@ -6918,7 +6918,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
-
Sep +
Sep
@@ -7373,7 +7373,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
-
10 / page +
10 / page
@@ -7384,7 +7384,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
-
+
@@ -7476,7 +7476,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
-
2017 +
2017
@@ -7484,7 +7484,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
-
Sep +
Sep
@@ -7939,7 +7939,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
-
10 / page +
10 / page
@@ -7950,7 +7950,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
-
+
@@ -8042,7 +8042,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
-
2017 +
2017
@@ -8050,7 +8050,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
-
Sep +
Sep
@@ -8505,7 +8505,7 @@ exports[`Locale Provider should display the text as he 1`] = `
-
10 / עמוד +
10 / עמוד
@@ -8516,7 +8516,7 @@ exports[`Locale Provider should display the text as he 1`] = `
-
+
@@ -8608,7 +8608,7 @@ exports[`Locale Provider should display the text as he 1`] = `
-
2017 +
2017
@@ -8616,7 +8616,7 @@ exports[`Locale Provider should display the text as he 1`] = `
-
Sep +
Sep
@@ -9071,7 +9071,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
-
10 / पृष्ठ +
10 / पृष्ठ
@@ -9082,7 +9082,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
-
+
@@ -9174,7 +9174,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
-
2017 +
2017
@@ -9182,7 +9182,7 @@ exports[`Locale Provider should display the text as hi 1`] = `
-
Sep +
Sep
@@ -9637,7 +9637,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
-
10 / str +
10 / str
@@ -9648,7 +9648,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
-
+
@@ -9740,7 +9740,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
-
2017 +
2017
@@ -9748,7 +9748,7 @@ exports[`Locale Provider should display the text as hr 1`] = `
-
Sep +
Sep
@@ -10203,7 +10203,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
-
10 / oldal +
10 / oldal
@@ -10214,7 +10214,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
-
+
@@ -10306,7 +10306,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
-
2017 +
2017
@@ -10314,7 +10314,7 @@ exports[`Locale Provider should display the text as hu 1`] = `
-
Sep +
Sep
@@ -10769,7 +10769,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = `
-
10 / էջ +
10 / էջ
@@ -10780,7 +10780,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = `
-
+
@@ -10872,7 +10872,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = `
-
2017 +
2017
@@ -10880,7 +10880,7 @@ exports[`Locale Provider should display the text as hy-am 1`] = `
-
Sep +
Sep
@@ -11335,7 +11335,7 @@ exports[`Locale Provider should display the text as id 1`] = `
-
10 / halaman +
10 / halaman
@@ -11346,7 +11346,7 @@ exports[`Locale Provider should display the text as id 1`] = `
-
+
@@ -11438,7 +11438,7 @@ exports[`Locale Provider should display the text as id 1`] = `
-
2017 +
2017
@@ -11446,7 +11446,7 @@ exports[`Locale Provider should display the text as id 1`] = `
-
Sep +
Sep
@@ -11901,7 +11901,7 @@ exports[`Locale Provider should display the text as is 1`] = `
-
10 / síðu +
10 / síðu
@@ -11912,7 +11912,7 @@ exports[`Locale Provider should display the text as is 1`] = `
-
+
@@ -12004,7 +12004,7 @@ exports[`Locale Provider should display the text as is 1`] = `
-
2017 +
2017
@@ -12012,7 +12012,7 @@ exports[`Locale Provider should display the text as is 1`] = `
-
Sep +
Sep
@@ -12467,7 +12467,7 @@ exports[`Locale Provider should display the text as it 1`] = `
-
10 / pagina +
10 / pagina
@@ -12478,7 +12478,7 @@ exports[`Locale Provider should display the text as it 1`] = `
-
+
@@ -12570,7 +12570,7 @@ exports[`Locale Provider should display the text as it 1`] = `
-
2017 +
2017
@@ -12578,7 +12578,7 @@ exports[`Locale Provider should display the text as it 1`] = `
-
Sep +
Sep
@@ -13033,7 +13033,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
-
10 件 / ページ +
10 件 / ページ
@@ -13044,7 +13044,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
-
+
@@ -13136,7 +13136,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
-
2017年 +
2017年
@@ -13144,7 +13144,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
-
Sep +
Sep
@@ -13599,7 +13599,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
-
10 / ಪುಟ +
10 / ಪುಟ
@@ -13610,7 +13610,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
-
+
@@ -13702,7 +13702,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
-
2017 +
2017
@@ -13710,7 +13710,7 @@ exports[`Locale Provider should display the text as kn 1`] = `
-
Sep +
Sep
@@ -14165,7 +14165,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
-
10 / 쪽 +
10 / 쪽
@@ -14176,7 +14176,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
-
+
@@ -14268,7 +14268,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
-
2017 +
2017
@@ -14276,7 +14276,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
-
Sep +
Sep
@@ -14731,7 +14731,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
-
10 / rûpel +
10 / rûpel
@@ -14742,7 +14742,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
-
+
@@ -14834,7 +14834,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
-
2017 +
2017
@@ -14842,7 +14842,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
-
Sep +
Sep
@@ -15297,7 +15297,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
-
10 / lappuse +
10 / lappuse
@@ -15308,7 +15308,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
-
+
@@ -15400,7 +15400,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
-
2017 +
2017
@@ -15408,7 +15408,7 @@ exports[`Locale Provider should display the text as lv 1`] = `
-
Sep +
Sep
@@ -15863,7 +15863,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
-
10 / стр +
10 / стр
@@ -15874,7 +15874,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
-
+
@@ -15966,7 +15966,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
-
2017 +
2017
@@ -15974,7 +15974,7 @@ exports[`Locale Provider should display the text as mk 1`] = `
-
Sep +
Sep
@@ -16429,7 +16429,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
-
10 / хуудас +
10 / хуудас
@@ -16440,7 +16440,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
-
+
@@ -16532,7 +16532,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
-
2017 +
2017
@@ -16540,7 +16540,7 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
-
Sep +
Sep
@@ -16995,7 +16995,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
-
10 / halaman +
10 / halaman
@@ -17006,7 +17006,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
-
+
@@ -17098,7 +17098,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
-
2017 +
2017
@@ -17106,7 +17106,7 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
-
Sep +
Sep
@@ -17561,7 +17561,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
-
10 / side +
10 / side
@@ -17572,7 +17572,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
-
+
@@ -17664,7 +17664,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
-
2017 +
2017
@@ -17672,7 +17672,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
-
Sep +
Sep
@@ -18127,7 +18127,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
-
10 / page +
10 / page
@@ -18138,7 +18138,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
-
+
@@ -18230,7 +18230,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
-
2017 +
2017
@@ -18238,7 +18238,7 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
-
Sep +
Sep
@@ -18693,7 +18693,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
-
10 / pagina +
10 / pagina
@@ -18704,7 +18704,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
-
+
@@ -18796,7 +18796,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
-
2017 +
2017
@@ -18804,7 +18804,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
-
Sep +
Sep
@@ -19259,7 +19259,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
-
10 / pagina +
10 / pagina
@@ -19270,7 +19270,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
-
+
@@ -19362,7 +19362,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
-
2017 +
2017
@@ -19370,7 +19370,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
-
Sep +
Sep
@@ -19825,7 +19825,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
-
10 na stronę +
10 na stronę
@@ -19836,7 +19836,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
-
+
@@ -19928,7 +19928,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
-
2017 +
2017
@@ -19936,7 +19936,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
-
Sep +
Sep
@@ -20391,7 +20391,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
-
10 / página +
10 / página
@@ -20402,7 +20402,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
-
+
@@ -20494,7 +20494,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
-
2017 +
2017
@@ -20502,7 +20502,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
-
Set +
Set
@@ -20957,7 +20957,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
-
10 / página +
10 / página
@@ -20968,7 +20968,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
-
+
@@ -21060,7 +21060,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
-
2017 +
2017
@@ -21068,7 +21068,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
-
Set +
Set
@@ -21523,7 +21523,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
-
10 / pagină +
10 / pagină
@@ -21534,7 +21534,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
-
+
@@ -21626,7 +21626,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
-
2017 +
2017
@@ -21634,7 +21634,7 @@ exports[`Locale Provider should display the text as ro 1`] = `
-
Sep +
Sep
@@ -22089,7 +22089,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
-
10 / стр. +
10 / стр.
@@ -22100,7 +22100,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
-
+
@@ -22192,7 +22192,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
-
2017 +
2017
@@ -22200,7 +22200,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
-
Sep +
Sep
@@ -22655,7 +22655,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
-
10 / strana +
10 / strana
@@ -22666,7 +22666,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
-
+
@@ -22758,7 +22758,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
-
2017 +
2017
@@ -22766,7 +22766,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
-
Sep +
Sep
@@ -23221,7 +23221,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
-
10 / strani +
10 / strani
@@ -23232,7 +23232,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
-
+
@@ -23324,7 +23324,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
-
2017 +
2017
@@ -23332,7 +23332,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
-
Sep +
Sep
@@ -23787,7 +23787,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
-
10 / strani +
10 / strani
@@ -23798,7 +23798,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
-
+
@@ -23890,7 +23890,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
-
2017 +
2017
@@ -23898,7 +23898,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
-
Sep +
Sep
@@ -24353,7 +24353,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
-
10 / sida +
10 / sida
@@ -24364,7 +24364,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
-
+
@@ -24456,7 +24456,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
-
2017 +
2017
@@ -24464,7 +24464,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
-
Sep +
Sep
@@ -24919,7 +24919,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
-
10 / பக்கம் +
10 / பக்கம்
@@ -24930,7 +24930,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
-
+
@@ -25022,7 +25022,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
-
2017 +
2017
@@ -25030,7 +25030,7 @@ exports[`Locale Provider should display the text as ta 1`] = `
-
Sep +
Sep
@@ -25485,7 +25485,7 @@ exports[`Locale Provider should display the text as th 1`] = `
-
10 / หน้า +
10 / หน้า
@@ -25496,7 +25496,7 @@ exports[`Locale Provider should display the text as th 1`] = `
-
+
@@ -25588,7 +25588,7 @@ exports[`Locale Provider should display the text as th 1`] = `
-
2017 +
2017
@@ -25596,7 +25596,7 @@ exports[`Locale Provider should display the text as th 1`] = `
-
Sep +
Sep
@@ -26051,7 +26051,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
-
10 / sayfa +
10 / sayfa
@@ -26062,7 +26062,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
-
+
@@ -26154,7 +26154,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
-
2017 +
2017
@@ -26162,7 +26162,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
-
Sep +
Sep
@@ -26617,7 +26617,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
-
10 / сторінці +
10 / сторінці
@@ -26628,7 +26628,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
-
+
@@ -26720,7 +26720,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
-
2017 +
2017
@@ -26728,7 +26728,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
-
Sep +
Sep
@@ -27183,7 +27183,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
10 / trang +
10 / trang
@@ -27194,7 +27194,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
+
@@ -27286,7 +27286,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
2017 +
2017
@@ -27294,7 +27294,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
Sep +
Sep
@@ -27749,7 +27749,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
-
10 条/页 +
10 条/页
@@ -27760,7 +27760,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
-
+
@@ -27852,7 +27852,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
-
2017年 +
2017年
@@ -27860,7 +27860,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
-
Sep +
Sep
@@ -28315,7 +28315,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
-
10 條/頁 +
10 條/頁
@@ -28326,7 +28326,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
-
+
@@ -28418,7 +28418,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
-
2017年 +
2017年
@@ -28426,7 +28426,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
-
Sep +
Sep
diff --git a/components/pagination/__tests__/__snapshots__/demo.test.js.snap b/components/pagination/__tests__/__snapshots__/demo.test.js.snap index e69f8088e..cba1d57e3 100644 --- a/components/pagination/__tests__/__snapshots__/demo.test.js.snap +++ b/components/pagination/__tests__/__snapshots__/demo.test.js.snap @@ -33,7 +33,7 @@ exports[`renders ./components/pagination/demo/changer.vue correctly 1`] = `
-
20 / page +
20 / page
@@ -59,7 +59,7 @@ exports[`renders ./components/pagination/demo/changer.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -84,7 +84,7 @@ exports[`renders ./components/pagination/demo/custom-changer.vue correctly 1`] =
-
10条/页 +
10条/页
@@ -112,7 +112,7 @@ exports[`renders ./components/pagination/demo/itemRender.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -141,7 +141,7 @@ exports[`renders ./components/pagination/demo/jump.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -166,7 +166,7 @@ exports[`renders ./components/pagination/demo/jump.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -205,7 +205,7 @@ exports[`renders ./components/pagination/demo/mini.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -251,7 +251,7 @@ exports[`renders ./components/pagination/demo/more.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -285,7 +285,7 @@ exports[`renders ./components/pagination/demo/total.vue correctly 1`] = `
-
20 / page +
20 / page
@@ -306,7 +306,7 @@ exports[`renders ./components/pagination/demo/total.vue correctly 1`] = `
-
20 / page +
20 / page
diff --git a/components/select/__tests__/__snapshots__/demo.test.js.snap b/components/select/__tests__/__snapshots__/demo.test.js.snap index d10e50aa1..d862b95a9 100644 --- a/components/select/__tests__/__snapshots__/demo.test.js.snap +++ b/components/select/__tests__/__snapshots__/demo.test.js.snap @@ -8,7 +8,7 @@ exports[`renders ./components/select/demo/automatic-tokenization.vue correctly 1
-
+
Automatic tokenization
@@ -24,7 +24,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -35,7 +35,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -46,7 +46,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -60,7 +60,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -71,7 +71,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -82,7 +82,7 @@ exports[`renders ./components/select/demo/basic.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -105,7 +105,7 @@ exports[`renders ./components/select/demo/big-data.vue correctly 1`] = `
c12
-
+
@@ -121,7 +121,7 @@ exports[`renders ./components/select/demo/coordinate.vue correctly 1`] = `
-
Zhejiang +
Zhejiang
@@ -132,7 +132,7 @@ exports[`renders ./components/select/demo/coordinate.vue correctly 1`] = `
-
Hangzhou +
Hangzhou
@@ -146,7 +146,7 @@ exports[`renders ./components/select/demo/custom-dropdown-menu.vue correctly 1`]
-
lucy +
lucy
@@ -157,7 +157,7 @@ exports[`renders ./components/select/demo/field-names.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -172,7 +172,7 @@ exports[`renders ./components/select/demo/hide-selected.vue correctly 1`] = `
-
+
Inserted are removed
@@ -185,7 +185,7 @@ exports[`renders ./components/select/demo/label-in-value.vue correctly 1`] = `
-
Lucy (101) +
Lucy (101)
@@ -202,7 +202,7 @@ exports[`renders ./components/select/demo/multiple.vue correctly 1`] = `
b2
-
+
@@ -218,7 +218,7 @@ exports[`renders ./components/select/demo/optgroup.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -229,7 +229,7 @@ exports[`renders ./components/select/demo/optgroup.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -250,7 +250,7 @@ exports[`renders ./components/select/demo/option-label-prop.vue correctly 1`] =
🇨🇳   China (中国)
-
+
@@ -269,7 +269,7 @@ exports[`renders ./components/select/demo/option-label-prop.vue correctly 1`] =
China (中国)
-
+
@@ -294,7 +294,7 @@ exports[`renders ./components/select/demo/option-label-prop.vue correctly 1`] =
China (中国)   🇨🇳
-
+
@@ -340,7 +340,7 @@ exports[`renders ./components/select/demo/responsive.vue correctly 1`] = `
-
+
@@ -364,7 +364,7 @@ exports[`renders ./components/select/demo/responsive.vue correctly 1`] = `
-
+
@@ -404,7 +404,7 @@ exports[`renders ./components/select/demo/responsive.vue correctly 1`] = `
Long Label...
-
+
@@ -421,7 +421,7 @@ exports[`renders ./components/select/demo/search.vue correctly 1`] = `
-
+
Select a person
@@ -432,7 +432,7 @@ exports[`renders ./components/select/demo/search-box.vue correctly 1`] = `
-
+
input search text
@@ -448,7 +448,7 @@ exports[`renders ./components/select/demo/select-users.vue correctly 1`] = `
-
+
Select users
@@ -466,7 +466,7 @@ exports[`renders ./components/select/demo/size.vue correctly 1`] = `
-
a1 +
a1
@@ -483,7 +483,7 @@ exports[`renders ./components/select/demo/size.vue correctly 1`] = `
b2
-
+
@@ -503,7 +503,7 @@ exports[`renders ./components/select/demo/size.vue correctly 1`] = `
b2
-
+
@@ -522,7 +522,7 @@ exports[`renders ./components/select/demo/suffix.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -533,7 +533,7 @@ exports[`renders ./components/select/demo/suffix.vue correctly 1`] = `
-
Lucy +
Lucy
@@ -551,7 +551,7 @@ exports[`renders ./components/select/demo/tags.vue correctly 1`] = `
-
+
Tags Mode
diff --git a/components/select/__tests__/__snapshots__/index.test.js.snap b/components/select/__tests__/__snapshots__/index.test.js.snap index 921166e70..7a38dd788 100644 --- a/components/select/__tests__/__snapshots__/index.test.js.snap +++ b/components/select/__tests__/__snapshots__/index.test.js.snap @@ -4,7 +4,7 @@ exports[`Select Select Custom Icons should support customized icons 1`] = `
-
+
diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index 021e339b9..f5d882d7c 100644 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -884,7 +884,7 @@ exports[`renders ./components/table/demo/edit-row.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -2253,7 +2253,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.vue correctly 1`]
-
10 / page +
10 / page
@@ -3083,7 +3083,7 @@ exports[`renders ./components/table/demo/fixed-header.vue correctly 1`] = `
-
50 / page +
50 / page
@@ -3588,7 +3588,7 @@ exports[`renders ./components/table/demo/grouping-columns.vue correctly 1`] = `
-
10 / page +
10 / page
@@ -6011,7 +6011,7 @@ exports[`renders ./components/table/demo/sticky.vue correctly 1`] = `
-
10 / page +
10 / page
diff --git a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap index 1c8696430..5df412ac6 100644 --- a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap @@ -4,7 +4,7 @@ exports[`renders ./components/tree-select/demo/async.vue correctly 1`] = `
-
+
Please select
@@ -15,7 +15,7 @@ exports[`renders ./components/tree-select/demo/basic.vue correctly 1`] = `
-
+
Please select
@@ -31,7 +31,7 @@ exports[`renders ./components/tree-select/demo/checkable.vue correctly 1`] = `
Node1
-
+
@@ -51,7 +51,7 @@ exports[`renders ./components/tree-select/demo/custom-tag-render.vue correctly 1
my leaf  
-
+
@@ -64,7 +64,7 @@ exports[`renders ./components/tree-select/demo/highlight.vue correctly 1`] = `
-
+
Please select
@@ -79,7 +79,7 @@ exports[`renders ./components/tree-select/demo/multiple.vue correctly 1`] = `
-
+
Please select
@@ -92,7 +92,7 @@ exports[`renders ./components/tree-select/demo/replaceFields.vue correctly 1`] =
-
+
Please select
@@ -105,7 +105,7 @@ exports[`renders ./components/tree-select/demo/suffix.vue correctly 1`] = `
-
+
Please select
@@ -120,7 +120,7 @@ exports[`renders ./components/tree-select/demo/suffix.vue correctly 1`] = `
-
+
Please select
@@ -149,7 +149,7 @@ exports[`renders ./components/tree-select/demo/tree-line.vue correctly 1`] = `
-
+
Please select
@@ -169,7 +169,7 @@ exports[`renders ./components/tree-select/demo/virtual-scroll.vue correctly 1`]
0-0-1
-
+
diff --git a/components/vc-select/BaseSelect.tsx b/components/vc-select/BaseSelect.tsx index 836996b28..7cd8954a8 100644 --- a/components/vc-select/BaseSelect.tsx +++ b/components/vc-select/BaseSelect.tsx @@ -15,7 +15,7 @@ import type { KeyboardEventHandler, MouseEventHandler, } from '../_util/EventInterface'; -import type { ScrollTo } from '../vc-virtual-list/List'; +import type { ScrollConfig, ScrollTo } from '../vc-virtual-list/List'; import { computed, defineComponent, @@ -39,6 +39,7 @@ import createRef from '../_util/createRef'; import type { BaseOptionType } from './Select'; import useInjectLegacySelectContext from '../vc-tree-select/LegacyContext'; import { cloneElement } from '../_util/vnode'; +import type { AlignType } from '../vc-trigger/interface'; const DEFAULT_OMIT_PROPS = [ 'value', @@ -70,7 +71,7 @@ export type RawValueType = string | number; export interface RefOptionListProps { onKeydown: KeyboardEventHandler; onKeyup: KeyboardEventHandler; - scrollTo?: (index: number) => void; + scrollTo?: (index: number | ScrollConfig) => void; } export type CustomTagProps = { @@ -214,7 +215,7 @@ export const baseSelectPropsWithoutPrivate = () => { default: undefined, }, dropdownRender: { type: Function as PropType }, - dropdownAlign: PropTypes.any, + dropdownAlign: Object as PropType, placement: { type: String as PropType, }, diff --git a/components/vc-select/OptionList.tsx b/components/vc-select/OptionList.tsx index 66b4b8f93..dc3ef0828 100644 --- a/components/vc-select/OptionList.tsx +++ b/components/vc-select/OptionList.tsx @@ -10,17 +10,22 @@ import List from '../vc-virtual-list'; import useMemo from '../_util/hooks/useMemo'; import { isPlatformMac } from './utils/platformUtil'; -export interface RefOptionListProps { - onKeydown: (e?: KeyboardEvent) => void; - onKeyup: (e?: KeyboardEvent) => void; - scrollTo?: (index: number) => void; -} - import type { EventHandler } from '../_util/EventInterface'; import omit from '../_util/omit'; import useBaseProps from './hooks/useBaseProps'; import type { RawValueType } from './Select'; import useSelectProps from './SelectContext'; +import type { ScrollConfig } from '../vc-virtual-list/List'; + +export interface RefOptionListProps { + onKeydown: (e?: KeyboardEvent) => void; + onKeyup: (e?: KeyboardEvent) => void; + scrollTo?: (index: number | ScrollConfig) => void; +} +function isTitleType(content: any) { + return typeof content === 'string' || typeof content === 'number'; +} + // export interface OptionListProps { export type OptionListProps = Record; @@ -50,9 +55,9 @@ const OptionList = defineComponent({ event.preventDefault(); }; - const scrollIntoView = (index: number) => { + const scrollIntoView = (args: number | ScrollConfig) => { if (listRef.current) { - listRef.current.scrollTo({ index }); + listRef.current.scrollTo(typeof args === 'number' ? { index: args } : args); } }; @@ -86,7 +91,7 @@ const OptionList = defineComponent({ return; } - props.onActiveValue(flattenItem.data.value, index, info); + props.onActiveValue(flattenItem.value, index, info); }; // Auto active first item when list length or searchValue changed @@ -98,8 +103,12 @@ const OptionList = defineComponent({ }, { immediate: true }, ); - // Auto scroll to item position in single mode + // https://github.com/ant-design/ant-design/issues/34975 + const isSelected = (value: RawValueType) => + props.rawValues.has(value) && baseProps.mode !== 'combobox'; + + // Auto scroll to item position in single mode watch( [() => baseProps.open, () => baseProps.searchValue], () => { @@ -154,7 +163,7 @@ const OptionList = defineComponent({ key={index} role={group ? 'presentation' : 'option'} id={`${baseProps.id}_list_${index}`} - aria-selected={props.rawValues.has(value)} + aria-selected={isSelected(value)} > {value}
@@ -195,7 +204,7 @@ const OptionList = defineComponent({ // value const item = memoFlattenOptions.value[state.activeIndex]; if (item && !item.data.disabled) { - onSelectValue(item.data.value); + onSelectValue(item.value); } else { onSelectValue(undefined); } @@ -238,8 +247,7 @@ const OptionList = defineComponent({ // $slots, // } = this as any; const { id, notFoundContent, onPopupScroll } = baseProps; - const { menuItemSelectedIcon, rawValues, fieldNames, virtual, listHeight, listItemHeight } = - props; + const { menuItemSelectedIcon, fieldNames, virtual, listHeight, listItemHeight } = props; const renderOption = slots.option; const { activeIndex } = state; @@ -281,8 +289,12 @@ const OptionList = defineComponent({ const label = typeof item.label === 'function' ? item.label() : item.label; // Group if (group) { + const groupTitle = data.title ?? (isTitleType(label) && label); return ( -
+
{renderOption ? renderOption(data) : label !== undefined ? label : key}
); @@ -299,7 +311,7 @@ const OptionList = defineComponent({ } = data; const passedProps = omit(otherProps, omitFieldNameList); // Option - const selected = rawValues.has(value); + const selected = isSelected(value); const optionPrefixCls = `${itemPrefixCls.value}-option`; const optionClassName = classNames( @@ -320,12 +332,11 @@ const OptionList = defineComponent({ const iconVisible = !menuItemSelectedIcon || typeof menuItemSelectedIcon === 'function' || selected; - const content = mergedLabel || value; + // https://github.com/ant-design/ant-design/issues/34145 + const content = + typeof mergedLabel === 'number' ? mergedLabel : mergedLabel || value; // https://github.com/ant-design/ant-design/issues/26717 - let optionTitle = - typeof content === 'string' || typeof content === 'number' - ? content.toString() - : undefined; + let optionTitle = isTitleType(content) ? content.toString() : undefined; if (title !== undefined) { optionTitle = title; } diff --git a/components/vc-select/Select.tsx b/components/vc-select/Select.tsx index b0f1908aa..ffc11b7ce 100644 --- a/components/vc-select/Select.tsx +++ b/components/vc-select/Select.tsx @@ -53,6 +53,7 @@ import omit from '../_util/omit'; const OMIT_DOM_PROPS = ['inputValue']; +type ArrayElementType = T extends (infer E)[] ? E : T; export type OnActiveValue = ( active: RawValueType, index: number, @@ -121,8 +122,8 @@ export function selectProps< autoClearSearchValue: { type: Boolean, default: undefined }, // >>> Select - onSelect: Function as PropType>, - onDeselect: Function as PropType>, + onSelect: Function as PropType, OptionType>>, + onDeselect: Function as PropType, OptionType>>, // >>> Options /** @@ -169,6 +170,7 @@ export default defineComponent({ autoClearSearchValue: true, listHeight: 200, listItemHeight: 20, + dropdownMatchSelectWidth: true, }), setup(props, { expose, attrs, slots }) { const mergedId = useId(toRef(props, 'id')); @@ -442,7 +444,7 @@ export default defineComponent({ label: typeof originLabel === 'function' ? originLabel() : originLabel, originLabel, value: val, - key: option.key ?? val, + key: option?.key ?? val, } : val, injectPropsWithOption(option), diff --git a/components/vc-select/SelectTrigger.tsx b/components/vc-select/SelectTrigger.tsx index 64adb6d26..36f8e2748 100644 --- a/components/vc-select/SelectTrigger.tsx +++ b/components/vc-select/SelectTrigger.tsx @@ -5,6 +5,7 @@ import type { CSSProperties, PropType } from 'vue'; import { computed, ref, defineComponent } from 'vue'; import type { VueNode } from '../_util/type'; import type { DropdownRender, Placement, RenderDOMFunc } from './BaseSelect'; +import type { AlignType } from '../vc-trigger/interface'; const getBuiltInPlacements = (dropdownMatchSelectWidth: number | boolean) => { // Enable horizontal overflow auto-adjustment when a custom dropdown width is provided @@ -64,7 +65,7 @@ export interface SelectTriggerProps { dropdownMatchSelectWidth?: boolean | number; dropdownRender?: DropdownRender; getPopupContainer?: RenderDOMFunc; - dropdownAlign: object; + dropdownAlign: AlignType; empty: boolean; getTriggerDOMNode: () => any; onPopupVisibleChange?: (visible: boolean) => void; @@ -76,7 +77,7 @@ const SelectTrigger = defineComponent({ name: 'SelectTrigger', inheritAttrs: false, props: { - dropdownAlign: PropTypes.object, + dropdownAlign: Object as PropType, visible: { type: Boolean, default: undefined }, disabled: { type: Boolean, default: undefined }, dropdownClassName: String, diff --git a/components/vc-select/Selector/Input.tsx b/components/vc-select/Selector/Input.tsx index 47f7447e9..16bc6eacb 100644 --- a/components/vc-select/Selector/Input.tsx +++ b/components/vc-select/Selector/Input.tsx @@ -101,6 +101,8 @@ const Input = defineComponent({ inputNode, Object.assign( { + type: 'search', + ...inputProps, id, ref: inputRef, disabled, @@ -108,7 +110,7 @@ const Input = defineComponent({ autocomplete: autocomplete || 'off', autofocus, class: classNames(`${prefixCls}-selection-search-input`, inputNode?.props?.class), - style: { ...style, opacity: editable ? null : 0 }, + role: 'combobox', 'aria-expanded': open, 'aria-haspopup': 'listbox', @@ -120,6 +122,7 @@ const Input = defineComponent({ value: editable ? value : '', readonly: !editable, unselectable: !editable ? 'on' : null, + style: { ...style, opacity: editable ? null : 0 }, onKeydown: (event: KeyboardEvent) => { onKeydown(event); if (onOriginKeyDown) { diff --git a/components/vc-select/index.ts b/components/vc-select/index.ts index 685603662..879766b6c 100644 --- a/components/vc-select/index.ts +++ b/components/vc-select/index.ts @@ -1,3 +1,4 @@ +// base rc-select 14.1.1 import type { SelectProps } from './Select'; import Select, { selectProps } from './Select'; import Option from './Option';