diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index baa4107aaa..f1a673ee16 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -1,3 +1,3 @@ { - "sandboxes": ["wk04r016q8"] + "sandboxes": ["antd-reproduction-template-6e93z"] } diff --git a/AUTHORS.txt b/AUTHORS.txt index d06afae4d0..3f670e87a6 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -2,17 +2,26 @@ 17073025 <17073025@cnsuning.com> 282159468 <282159468@qq.com> 778758944 <778758944@qq.com> +Aaron Cawte Aaron Planell López Aditya Padhi Adrian Dimitrov +Ahmad Abdelaziz Ahmed AlSammany +Aidin +Aiello <770540123@qq.com> Alan Braithwaite Albert Zheng Albert 理斯特 +Alberto Marchetti Aleck Landgraf +Aleksandr Chernokondratenko +Alex Simons Alexander Alexander Anpleenko +Alexander Kachkaev Alexander Suevalov +Alexander.Kosov Alexandre Kirszenberg Alexey Yakovlev Alfred Qiu @@ -28,21 +37,32 @@ Andrew Shearer Andrey G Andrzej Dybionka André +Andrés +Ankit Babbar +Aobo Yang Ardo Kusuma Arnab Sen Arthur Denner Oliveira Santos +Artin Arvin Xu Ash Kumar +Ashot Mnatsakanyan +Aymen Bouchekoua BK Heleth Babajide Fowotade Barry Bartek +Ben Callaway Benedikt Franke +Benjamin Amelot Benjamin Kniffler Benjy Cui Benoît Latinier Bernie +Bestie +Bhavesh Chowdhury Bilal Sirazitdinov +Bill Searle Bill Sheikh Bo Chen Bolun Zhang @@ -61,9 +81,11 @@ Cam Song Camol Cang Ta Canwen Xu +Carlos Coves Prieto Carter Feldman Catalin Miron Cee Cirno +Cemre Mengu Chandler Moisen Chang Wang Charles Covey-Brandt @@ -75,8 +97,10 @@ Chris Kelly ChrisFan Christian Christian Vadalà +Christophe Hurpeau Christopher Deutsch Chuang Yu +Chuck Claudio Restifo Cody Chan Colton Pierson @@ -89,21 +113,32 @@ Daewoong Moon Damian Green Damian Green Dan Minshew +Dana Janoskova Dane David +Daniel Chang Daniel Gomez +Daniel Harrison Danny Hoower Antonio Viasus Avila +Daphne Won Daqi Song Darren Poon +David Broder-Rodgers David Hatten David Schneider +Dean van Niekerk DengYun +Denis +DiamondYuan <541832074@qq.com> +DiamondYuan Dimitri Mitropoulos +Dmitriy Dmitriy Mironov Dmitry Bolotin Dmitry Gladkikh Dmitry Guryev Dmitry Manannikov Dmitry Snegirev +Dmitry Tikhomirov Dorian DosLin Douglas Mason @@ -118,34 +153,43 @@ Eden Wang Eduardo Ludi Edward <7047924@qq.com> Egor Yurtaev +Eldar Mustafaiev Eli White Emerson Laurentino Emma +Ender Lee Eric <84263800@qq.com> Eric Celeste Eric Turriff Erwann Mest +Eusen <179530591@qq.com> Evgeny Kuznetsov Eward Song Federico Marcos +Ferdi Koomen Fergus Leung Fernando Giarritiello Florian Orpelière Flynn For177 +Frezc Gabe Medrash Gabriel Nunes +GalenWong Gao Jiangmiao Gautier Geoff Holden George Gray +Gin-X Go7hic +Goh Zhao Yang Graeme Yeates Graeme Yeates Grant Klinsing Gray Choi Guan Hao Guan Yu Pan (Jacky) +Guichi Zhao HJin.me Hai Phan Nguyen Haibin Yu @@ -155,12 +199,18 @@ Hanz Luo Harlan HarlanLuo Haroen Viaene +Harry.Hou Harshit Mehrotra +He Linming Heaven Henri Normak HeskeyBaozi +HiddenMan <1196089730@qq.com> Hieu Ho +Hieu Pham Higor Araújo dos Anjos +Hsuan Lee +Hsuan Lee Hubert Argasinski Hughen <446370503@163.com> Hugo LEHMANN @@ -168,12 +218,16 @@ Igor Igor G Ilan Ilan Hasanov +Ilya Bondarenko ImJoeHs <865439601@qq.com> Inclined.Z Infinity <305870677@qq.com> +Inian +Ivan Ivan Kravets Ivan Trofimov Ivo Stratev +Jack Jack Hsieh Jack Lo Jack Works @@ -182,19 +236,30 @@ Jacques Kvam JaePil Jung Jake Richards James +James Tsang JamesYin Jaroslav Bereza +Jarvis1010 +Jason Jason Chen +Jason Chung +Jason Yin Jean-Luc Sorak Jeffrey Carl Faden +Jelle de Jong +Jennie JeromeLin Jerry Bendy Jesper We Jiabin Peng Jialei +Jiawei Huang Jieraaa <842533841@qq.com> Jin ZHANG +JinXin Jing Ma +Jingsong Gao +Jinke Li <1359518268@qq.com> Jinxuan Zhu Joao Rabelo Joe @@ -202,90 +267,124 @@ Joe Hsu Johannes Loewe John Johnson III John Nguyen +Johnsen Jonatas Walker +Jonathan Lee <1150974628@qq.com> Jonny Buchanan Jordan Hornblow Josue Peralta Josué JribiBelhassen +JuFeng Zhang +Juan Carlos Lloret H Juan Rodrigo Venegas Boesch Julia Passynkova +Julien Confetti Junyu Zhan +Juraj Carnogursky Justin Reich Kaien Liao +Kamal Mahmudi Kasra Bigdeli +Kelvin Chu Kenaniah Cerny Kenneth Luján Rosas Kenneth Truong KentonYu <975853613@qq.com> Kevin Ivan Kevin Wang +Kevinaskin KgTong +Khaled Khalifa Lame Kian +Kieren Kiho · Cham +Kim, Harim +Kimmo Saari Kimmo Saari Kirill Alexander Khalitov Kirill Stiopin Knacktus +Kodai Nakamura Konrad Machlowski Kyle Kelley Kyle Rosenberg LLinFan- +LT246-VINHNPH\vinhnph Laith Larry Laski +LaySent LeeHarlan <709886167@qq.com> LeezQ Leo +Leon Koole Leon Shi Leon Shi Li Chao +LilyWakana <873435892@qq.com> +Liming Jin +Liu Ya Liu Yang LongYinan Lucien Lee Ludwig Bäcklund Lyndon001 +M Mitchell MG12 Ma Tianxiao Maciej Czekaj Madis Väin Maksym Mosyura +Malven Manjit Kumar Manweill MaoYiWei <137308365@qq.com> +Marcel Jackwerth Marcela Bomfim +Marcio Pamplona Marco Afonso Marcus Bransbury Marius Ileana Mars Wong Marshall Chen +Martin Cermak Martin Litvaj Martin Novák Mathew +Mathieu Anderson +Matias Orellana Matt Lein Max Maximilian Meyer Meck +Meck Zhu MeiLin Meow-z <372086270@qq.com> Miaow +Michael Adams Michael Krog Michael Salaverry +Michael Salaverry Michael Wang +Michal Pekar Michalis Macheras Michelle Zhang Mikasa33 Min MinJeong Kim +MinYuan Ming Hann Minqi Pan Minsung Ryu +Minwei Xu Mitchell Demler Mohamed Seada Mohammad Faisal Mohan Ban Mounish Sai Mr.Tone +MrHeer MuYu Mário Gonçalves Nathan Broadbent @@ -298,6 +397,8 @@ Nekron Neverland Nico Nidhi Agarwal +Nihal Saxena +Nikitenkova Niko Autio Nikolay Nikolay Solovyov @@ -306,8 +407,10 @@ Nimo Nishant Arora Nokecy OAwan +Olaniyi Philip Ojeyinka Oleg Kuzava Oleksandr Kovalchuk +Olivier Louvignes Ooi Yee Wei Open Next Oren Kosto @@ -320,16 +423,20 @@ Peter Peter Berg Phanupong Janthapoon Philip Oliver +Phyllis Pierre Pierre Neter +Piotr Monwid-Olechnowicz Piper Chester Pixy Yuan Pooya Parsa Pyiner Pyroboomka QC-L +Qhan W Qiaosen Huang Qingrong Ke +Radomir Skrzepij Rafael Cosman Rahul Gurung Rallets @@ -338,47 +445,70 @@ Ran Byron Randy RaoHai Raphael Chauveau +Ray Booysen +Ray Booysen +Rayron Victor Reed Sun +Regan Langford +Renovate Bot Rex Ricardo Raphael Joson Richard D. Worth Rick Zhou Robert Wilkinson +Rodrigo Ehlers Rohan Malhotra Rongjian Zhang Rrrandom RunningCoderLee +Rustin +Rustin-Liu RyanHui SHEN Lin +Sagar Jain Sakol Assawasagool +Salavat Gizatov <100ishundred@gmail.com> Sam Chen Sam Lanning Sam Maxwell Samuel Gaus +Sanghyeon Lee Sangle Sanjay Kumar Sanjay Kumar Scott Sturgeon Sean Lin Sean Sun +Sean Willis Sebastian Blade Sebastian Busch +Sebastian Busch Sebastian Busch +Sergey Levkovich Sergey Volynkin Sergio Crisostomo +Sevak Shawn Sit +ShiCheng ShiTengFei +ShuYu Wang Shuai Chen Shubham Kanodia Shun Shuvalov Anton SimaQ Simo Aleksandrov -Sivaraj S +Sivaraj +SoraYama Spencer +Stanley Thijssen +Stanley Thijssen Stephen Esser +Stevche Radevski Subroto Sven Efftinge +SylvanasGone <397009765@qq.com> +TTC <345866517@qq.com> Tao Tao Zhang Taylor Sabell @@ -387,18 +517,22 @@ Teng YANG Tengjiao Cai Terence The Rock +Theo Satloff <1golfball@gmail.com> Thibault Derousseaux Thiebaud Thomas Thomas +Thomas Ladd Tino D Tom Gao Tom Xu Tom Xu TomIsion Tomás Francisco +Tomáš Hylský Tomáš Szabo Trotyl Yu Troy Thompson +TsesamLi Tyler Ubaldo Quintana Vadim Macagon @@ -406,6 +540,8 @@ Valentin Vichnal Van Nguyen Vemund Santi Vic <709147950@qq.com> +Victor Repkow +Vijay Thirugnanam Vincent Zhang Vitaliy Mazurenko ViviaRui @@ -420,17 +556,23 @@ Warren Seymour Wei Zhu Wenchao Hu Wendell +Wensheng Xu +Will Will Chen +William Cai WingGao Wu Haotian XBTop1! +XTY <^@xty.dev> Xiaoming Xie Guanglei +Xinxing Li Xiping.wang <527409987@qq.com> XuMM_12 Yang <504021398@qq.com> Yang Bin Yangzhedi +Yann Normand Yasin Uslu Yevhen Hryhorevskyi Yiming @@ -445,27 +587,36 @@ Yusuke Ito Yuwei Ba Yuxuan Huo YuyingWu +ZYSzys Zack Craig Zap Zhang Zhi Zheeeng Zhiqiang Gong +Zhuo Chen Ziluo Zohaib Ijaz +Zzzen <843968788@qq.com> aashutoshrathi +adam afc163 agent-z <1607291079@qq.com> ahalimkara +alekslario alex <379118572@qq.com> +alex89lj <379118572@qq.com> alexchen amedora arifemrecelik ascoders <576625322@qq.com> ashishg-qburst +atomoo bLue +babycannotsay <335658202@qq.com> bang bang88 baozefeng <727751065@qq.com> +binyellow <571704908@qq.com> blankzust <450811238@qq.com> bukas byuanama @@ -477,14 +628,22 @@ cathayandy cc189 chaofeis <408067385@qq.com> chchen +chen shuai +chen wen jun <731028571@qq.com> chencheng (云谦) chencheng +chenlong +chenshuai2144 +chisus chunlea cjahv clinyong +cnjs <1269075501@qq.com> codesign corneyl +damon.chen david.lv +david.lv davidhatten ddcat1115 decade @@ -493,6 +652,7 @@ denzw dependabot[bot] detailyang devqin +dian.li digz6666 djorkaeff duzliang @@ -501,15 +661,21 @@ edgji eidonjoe <806488716@qq.com> elios elrrrrrrr +eruca ezpub feng zhi hao fengmk2 +fkysly flashback313 frezc <504021398@qq.com> genie gregahren guifu +gxvv gyh9457 +haianweifeng <1531297152@qq.com> +haimrait +handy handycode hank hanpei <75189218@qq.com> @@ -522,10 +688,13 @@ hengkx henryv0 hi-caicai hongxuWei +howard huangyan.py huishiyi huzzbuzz iamcastelli +iamkun +ikobe ilanus imhele imosapatryk @@ -539,6 +708,7 @@ jasonslyvia jasonxia23 jiajiangxu jiang <155259966@qq.com> +jiang.an jim jinouwuque jinyaqiao1102 <405782493@QQ.com> @@ -547,13 +717,20 @@ junjing.zhang kacjay <45483388@qq.com> kagawagao kaifei <150641329@qq.com> +kailunyao +kanweiwei <475801900@qq.com> +kanweiwei +kapiroska kasinooya +kavin kayw kdenz kdepp keng kenve keqingrong +kermolaev +klouskingsley ko konakona kossel @@ -565,13 +742,18 @@ leadream <857098475@qq.com> lehug leijingdao leon.shi +lewis liu <897473127@qq.com> lgmcolin lgmcolin +lhx +lhyt <515593899@qq.com> liangfei liekkas lihqi <455711093@qq.com> lilun littleLane <857183384@qq.com> +liuchuzhang +liuchuzhang lixiaochou077 lixiaoyang lixiaoyang1992 @@ -580,16 +762,21 @@ lizhen loganpowell luyiming lvren +lxnxbnq lyhper mArker <252133226@qq.com> maks +maximest-pierre +melchior voidwolf memoryza mgrdevport +mingyan.yu mitchell.demler mkermani144 mmmveggies mofelee monkindey +moonrailgun mraiguo <810158465@qq.com> mraiguo mushan0x0 @@ -597,21 +784,27 @@ muzea muzuiget natergj neekey +ngolin nick-ChenZe niko <644506165@qq.com> nikogu <644506165@qq.com> +nnecec nuintun ohhoney1 <1269075501@qq.com> +oldchicken orzorzorzorz +orzyyyy paranoidjk parlop pbrink231 pd4d10 peiming +pengtikui <949828390@qq.com> picodoth picodoth pinggod pizn +plainnany plandem popomore qiaojie <1454763497@qq.com> @@ -620,14 +813,18 @@ qliu <1403927509@qq.com> qubaoming ravirambles richardison +riho <873435892@qq.com> ryangun ryanhoho ryannz sadmark sallen450 +saxenanihal95 sdli <1669375803@qq.com> sfturing shangyuan.ning +shao +shaodahong shawtung shelwin shenlin192@gmail.com @@ -645,9 +842,11 @@ sosohime spideeee stevenyuysy stickmy +susiwen swindme sylvanasGone <397009765@qq.com> syssam +tangjinzhou <21251118@zju.edu.cn> tangjinzhou <415800467@qq.com> tangjinzhou taoweicn @@ -655,52 +854,76 @@ thegatheringstorm thilo-behnke tianli.zhao <275287902@qq.com> tom +tom +toshi1127 twobin u3u undefined +unknown ustccjw <317713370@qq.com> +vagusX valleykid +vaytsel +veveue vgeyi +wadezhan wangshantao <605682551@qq.com> wangshuai wangtao0101 wangxiaolei +wangxing wangxingkang <156148958@qq.com> wangxingkang wangxueliang wanli warmhug +wenhong +whinc whtang906 +willc001 wizawu +wleven <408493323@qq.com> wonyun +woodsand +wtzeng1 +wwwxy wwwxy80s wx1322 <289758716@qq.com> xiaofan2406 +xiaohuoni <448627663@qq.com> +xrkffgg +xuqiang y-take yangwukang yangxiaolin ycjcl868 <45808948@qq.com> +ye4241 yeliex yibu.wang yiminanci yiminghe +yinjs yociduo yoyo837 yubozhao yuche +yuezk z zack +zefeng zelongc zerob4wl zhangguanyu02 zhangpc zhangyangxue <383632607@qq.com> +zhangzh zhaocai zhaopeidong zhujun24 zhuyue zilong zinkey +zjf zlljqn zollero zombieJ @@ -708,22 +931,31 @@ zombiej zongzi531 ztplz zuiidea +zx6658 zy410419243 +zytjs °))))彡 邦 爱but的苍蝇 <354788473@qq.com> +Ștefan Filip 高力 <3071730@qq.com> 郑旭 <332171564@qq.com> 拷钉 <41830859@qq.com> +蒋璇 <645762213@qq.com> 苏秦 <646382806@qq.com> +陈杰 <810158465@qq.com> 竹尔 偏右 +黄斌 英布 朮厃 张聪 诸岳 +诸岳 逸达 诸岳 +啸生 +迷渡 二哲 廖星 刘红 @@ -736,6 +968,7 @@ zy410419243 松子 何乐 付引 +萧琚 可乐 山客 曾凯 @@ -743,6 +976,8 @@ zy410419243 信鑫-King <45808948@qq.com> 广彬-梁 <326741518@qq.com> 小哈husky <951565664@qq.com> +诸葛龙 <158362530@qq.com> +李环冀 <158757774@qq.com> 何志勇 <15988134176@163.com> 徐坤龙 <272992168@qq.com> 黄子毅 <576625322@qq.com> @@ -750,22 +985,27 @@ zy410419243 崔宏森 <948346354@qq.com> 黄文鉴 董天成 +龚方闻 方剑成 陈广亮 包子熊 闲耘™ 一喵呜 +王林涛 黄俊亮 吕立青 隋鑫磊 米老朱 +刘宏玺 乔奕轩 马斯特 +廖应龙 王集鹄 徐新航 杨哲迪 柚子男 愚指导 +只捱宅 郭延豪(708674) 愚指导-TZ 杨小事er @@ -773,5 +1013,8 @@ zy410419243 超能刚哥 马金花儿 रोहन मल्होत्रा +芝华塔尼欧 <1150974628@qq.com> 白羊座小葛 薛定谔的猫 +二货机器人 +骗你是小猫咪 diff --git a/components/spin/index.en-US.md b/components/spin/index.en-US.md index 27e7a4317a..7391c885b9 100644 --- a/components/spin/index.en-US.md +++ b/components/spin/index.en-US.md @@ -15,7 +15,7 @@ When part of the page is waiting for asynchronous data or during a rendering pro | Property | Description | Type | Default Value | Version | | --- | --- | --- | --- | --- | | delay | specifies a delay in milliseconds for loading state (prevent flush) | number (milliseconds) | - | | -| indicator | React node of the spinning indicator | ReactElement | - | | +| indicator | React node of the spinning indicator | ReactNode | - | | | size | size of Spin, options: `small`, `default` and `large` | string | `default` | | | spinning | whether Spin is spinning | boolean | true | | | tip | customize description content when Spin has children | string | - | | @@ -23,5 +23,6 @@ When part of the page is waiting for asynchronous data or during a rendering pro ### Static Method -- `Spin.setDefaultIndicator(indicator: ReactElement)` - As `indicator`, you can define the global default spin element +- `Spin.setDefaultIndicator(indicator: ReactNode)` + + You can define default spin element globally. diff --git a/components/spin/index.zh-CN.md b/components/spin/index.zh-CN.md index 5970857b9d..d71e003e55 100644 --- a/components/spin/index.zh-CN.md +++ b/components/spin/index.zh-CN.md @@ -16,7 +16,7 @@ subtitle: 加载中 | 参数 | 说明 | 类型 | 默认值 | 版本 | | --- | --- | --- | --- | --- | | delay | 延迟显示加载效果的时间（防止闪烁） | number (毫秒) | - | | -| indicator | 加载指示符 | ReactElement | - | | +| indicator | 加载指示符 | ReactNode | - | | | size | 组件大小，可选值为 `small` `default` `large` | string | 'default' | | | spinning | 是否为加载中状态 | boolean | true | | | tip | 当作为包裹元素时，可以自定义描述文案 | string | - | | @@ -24,5 +24,6 @@ subtitle: 加载中 ### 静态方法 -- `Spin.setDefaultIndicator(indicator: ReactElement)` - 同上 `indicator`，你可以自定义全局默认元素 +- `Spin.setDefaultIndicator(indicator: ReactNode)` + + 你可以自定义全局默认 Spin 的元素。 diff --git a/docs/react/customize-theme.en-US.md b/docs/react/customize-theme.en-US.md index cfaea39d64..5817231bc8 100644 --- a/docs/react/customize-theme.en-US.md +++ b/docs/react/customize-theme.en-US.md @@ -3,7 +3,7 @@ order: 5 title: Customize Theme --- -Ant Design allows you to customize our design tokens in order to meet the needs of UI diversity from business and brand, including primary color, border radius, border color, etc. +Ant Design allows you to customize our design tokens to satisfy UI diversity from business or brand requirements, including primary color, border radius, border color, etc. ![customized themes](https://zos.alipayobjects.com/rmsportal/zTFoszBtDODhXfLAazfSpYbSLSEeytoG.png) @@ -22,8 +22,8 @@ There are some major variables below, all less variables could be found in [Defa @font-size-base: 14px; // major text font size @heading-color: rgba(0, 0, 0, 0.85); // heading text color @text-color: rgba(0, 0, 0, 0.65); // major text color -@text-color-secondary : rgba(0, 0, 0, .45); // secondary text color -@disabled-color : rgba(0, 0, 0, .25); // disable state color +@text-color-secondary: rgba(0, 0, 0, 0.45); // secondary text color +@disabled-color: rgba(0, 0, 0, 0.25); // disable state color @border-radius-base: 4px; // major border radius @border-color-base: #d9d9d9; // major border color @box-shadow-base: 0 2px 8px rgba(0, 0, 0, 0.15); // major shadow for layers diff --git a/docs/react/faq.en-US.md b/docs/react/faq.en-US.md index 66a2f010b3..cc39f7b11a 100644 --- a/docs/react/faq.en-US.md +++ b/docs/react/faq.en-US.md @@ -9,7 +9,7 @@ Here are the frequently asked questions about Ant Design and antd that you shoul ### Are you going to provide Sass/Stylus(etc.) style file? -No, but you can convert Less to Sass/Stylus(etc.) with tools that you can find on Google. +No plan, but you can convert Less to Sass/Stylus(etc.) with tools that you can find on Google. ### `Select Dropdown DatePicker TimePicker Popover Popconfirm` disappears when I click another popup component inside it. How do I resolve this? diff --git a/docs/react/faq.zh-CN.md b/docs/react/faq.zh-CN.md index 96b7e8d8a2..81116c3eb1 100644 --- a/docs/react/faq.zh-CN.md +++ b/docs/react/faq.zh-CN.md @@ -9,7 +9,7 @@ title: FAQ ### 你们会提供 Sass/Stylus 等格式的样式文件吗？ -不。事实上你可以使用工具（请自行 Google）将 Less 转换成 Sass/Stylus 等。 +暂无计划。事实上你可以使用工具（请自行 Google）将 Less 转换成 Sass/Stylus 等。 ### 当我点击 `Select Dropdown DatePicker TimePicker Popover Popconfirm` 内的另一个 popup 组件时它会消失，如何解决？ diff --git a/docs/react/getting-started.en-US.md b/docs/react/getting-started.en-US.md index 97ab345970..e90adda85a 100755 --- a/docs/react/getting-started.en-US.md +++ b/docs/react/getting-started.en-US.md @@ -13,15 +13,20 @@ If you try in local environment, Please refer to [Install and Initialization](ht ## First Example -Here is a simple example to show usage of Ant Design React. +Here is a simple codesandbox example to show the usage of Ant Design React. - + +