Commit Graph

568 Commits

Author SHA1 Message Date
afc163
a51f7a0508 test unmount 2019-08-27 18:31:01 +08:00
+v
b2bc511163 docs: typo(version not exist) (#18378) 2019-08-21 11:21:56 +08:00
+v
7ce3a58d47 docs: typo(version not exist) (#18377) 2019-08-21 11:21:32 +08:00
jiang
ced96b954c fix: submenu popupClassName and className chaos (#18290)
* Update SubMenu.tsx

* add popupClassName to api

* fix typo
2019-08-17 22:38:11 +08:00
vagusX
149729e524
use ant design icons 4.0 (#18217)
* feat: use @ant-design/icons@4.0

* feat: use createFromIconfontCN to make site works

* feat: update doc for Icon

* feat: use icon in component Alert

* feat: use icon in component Avatar

* feat: use icon in component Breadcrumb

* feat: use icon in component Button

* feat: use icon in component Cascader

* feat: use icon in component Collapse

* feat: use icon in component Datepicker

* feat: use icon in component Dropdown

* feat: use icon in component Form

* feat: use icon in component Input

* feat: use icon in component InputNumber

* feat: use icon in component Layout

* feat: use icon in component Mention

* feat: use icon in component Message

* feat: use icon in component Modal

* feat: use icon in component Notification

* feat: use icon in component PageHeader

* feat: use icon in component Pagination

* feat: use icon in component Popconfirm

* feat: use icon in component Progress

* feat: use icon in component Rate

* feat: use icon in component Result

* feat: use icon in component Select

* feat: use icon in component Step

* feat: use icon in component Switch

* feat: use icon in component Table

* feat: use icon in component Tab

* feat: use icon in component Tag

* feat: handle rest component which using Icon

* fix: remove unused vars

* feat: use latest alpha ant design icons

* fix: failed test in uploadlist.test.js

* test: update snapshot for icons

* doc: add Icon for site

* doc: use @ant-design/icons in site

* chore: use latest icons

* fix: tslint issue

* fix: test cases

* fix: types for react

* fix: lint rules for import orders

* fix: use @ant-design/icons@4.0.0-alpha.5 to avoid insert css in server render

* fix: eslint error in demo/**.md

* inject antd icons

* update snapshot

* fix site

* doc: update docs

* fix: code snippets icon in site

* feat: use latest @ant-design/icons

* fix: icon props in message
2019-08-13 14:07:17 +08:00
zombiej
b30dc1c3bc merge master 2019-08-06 17:46:53 +08:00
orzyyyy
63b33d4020 fix: unexpected changes of snapshots 2019-08-06 15:36:12 +08:00
alxkosov
678f8a5c65 feat: menu component customization: create new variables for easy customization (#17273)
* new variable for customize margins and font-size on menu

* vars for icons size for menu items

* var for color of icon selected-item on dark menu

* menu selected item: vars for color text and icon

* var for background on hover item in dark menu

* rename variable

* deleted vars for icon size in menu

* change @menu-item-last-margin to @menu-item-boundary-margin
2019-08-02 22:51:34 +08:00
zombiej
514ee9bef9 Merge remote-tracking branch 'origin/master' into 4.0-prepare 2019-07-29 14:35:15 +08:00
zombieJ
bdea770670
Merge pull request #17804 from ant-design/master
chore: Merge master into feature
2019-07-23 10:23:55 +08:00
Hieu Pham
53ce81690e
Fix circular dependency in Menu
https://github.com/ant-design/ant-design/issues/17803

Co-authored-by: Hau Dao <hau.vdao@gmail.com>
2019-07-22 20:15:48 +07:00
偏右
1147ae6949
Merge pull request #17732 from ant-design/master
Merge master into feature
2019-07-19 12:20:08 +08:00
zombiej
ef66edd0c2 merge master 2019-07-19 11:54:08 +08:00
Alexander.Kosov
6428840c50 create variable for customize size of icon on menu 2019-07-17 13:54:31 +03:00
zombiej
735996ce35 merge master 2019-07-16 11:42:55 +08:00
afc163
67e027a41c 🐛 Fix Cannot update during an existing state transition
close #17147
2019-07-16 11:25:35 +08:00
偏右
e4e2641d6d
Merge pull request #17653 from ant-design/master
chore: merge master into feature
2019-07-15 22:22:41 +08:00
Ivan
9fdf41740d Extend MenuItemProps from HTMLAttributes<HTMLLIElement> (#17629) 2019-07-15 15:43:11 +08:00
诸岳
3f47b2cac0 Merge master branch and fix conflicts 2019-07-15 10:01:37 +08:00
Sanghyeon Lee
430117288d
docs: fix tag name in the API example 2019-07-11 18:09:00 +09:00
Sanghyeon Lee
559682df23
docs: fix tag name in the API example 2019-07-11 18:06:37 +09:00
MuYu
fb0b4f0fc9 docs: show version Number features were added (#17373)
* docs: add api first appearance

* docs: fix auto-complete doc

* docs: replace Version Added with Version

* docs: date picker common method

* docs: date picker common method

* docs: tree

* docs: remove meaningless 3.0.0
2019-07-11 14:14:33 +08:00
vagusX
eac30ec8e4 Feat/remove deprecated (#17510)
* feat: remove warnings for linkRender, nameRender in Breadcrumb

* feat: remove warnings for onOpen, onClose in Menu

* feat: remove warnings for overlay in Popover

* feat: remove warnings for columnsPageRange, columnsPageSize in Table

* feat: remove warnings for afterClose in Tag

* feat: remove warnings for notFoundContent, searchPlaceholder, body, onSearchChange in Transfer

* fix: types in Transfer

* feat: update test cases in Transfer

* feat: add additional test cases for removed deprecated apis
2019-07-09 11:46:21 +08:00
afc163
57c28def68
revert unknown to any 2019-06-24 11:29:58 +08:00
Ankit Babbar
0bb7f60708
Update SubMenu.tsx
popupOffset prop is missing in SubMenu
2019-06-22 12:23:51 +05:30
偏右
a4d7593ef2
Merge pull request #17120 from Zzzen/master
refactor: eliminate `any` type in exported interfaces.#14044
2019-06-21 17:38:56 +08:00
陈帅
82b85709be style: run lint-fix (#17172) 2019-06-19 19:09:08 +08:00
Zzzen
f1ee189bd2 eliminate any type in exported interfaces.#14044 2019-06-16 20:51:47 +08:00
afc163
20e6bed8a1
💄 Keep submenu selected style 2019-06-11 12:00:52 +08:00
afc163
14dc252b04
🆙 fix for typescript@3.5 2019-06-05 14:41:36 +08:00
偏右
c77b8ed817
Merge pull request #16828 from ant-design/improve-demo-code-style
chore: 💄 Optimize examples code style
2019-05-27 22:28:49 +08:00
afc163
13379aa0d8
💄 Optimize examples code style 2019-05-27 22:04:17 +08:00
picodoth
620755d893 typescript: adding forceSubmenuRender as MenuProps 2019-05-27 21:30:43 +08:00
zombieJ
93887e1380
chore: Add warning if use inlineCollapsed under Sider (#16826) 2019-05-27 20:53:43 +08:00
zombieJ
008136ece1
fix: Tooltip not hidden when menu is in control mode (#16812) 2019-05-27 15:22:26 +08:00
Xiaohan Li
2bfecc3ee9 📝 Update Menu docs (#16513)
add missing params in Menu's onClick, onSelect and onDeselect callback
2019-05-10 12:28:47 +08:00
afc163
b780070351
💄 prittier all files 2019-05-07 14:57:32 +08:00
陈帅
785c132262
meger feature to master (#16421)
* use ul in list

* update snapshot

* update comment

* feat: TreeSelect support `showSearch` in multiple mode (#15933)

* update rc-tree-select

* typo

* update desc & snapshot

* update desc & snapshot

* check default showSearch

* feat: table customizing variable (#15971)

* feat: added table selected row color variable

* fix: @table-selected-row-color default is inherit

* feat: Upload support customize previewFile (#15984)

* support preview file

* use promise

* dealy load

* use canvas of render

* use domHook of test

* update demo

* add snapshot

* update types

* update testcase

* feat: form customizing variables (#15954)

* fix: added styling form input background-color

* feat: added '@form-warning-input-bg' variable

* feat: added '@form-error-input-bg' variable

* use li wrap with comment

* feat: Support append theme less file with less-variable (#16118)

* add override

* add override support

* update doc

* feat: dropdown support set right icon

* docs: update doc of dropdown component

* style: format dropdown-button.md

* test: update updateSnapshot

* style: format dropdown-button.md

* test: update updateSnapshot

* test: update updateSnapshot

* style: change style of dropdown-button demo

* fix: fix document table order

* feat: Support SkeletonAvatarProps.size accept number (#16078) (#16128)

* chore:update style of demo

* feat: Notification functions accept top, bottom and getContainer as arguments

* drawer: add afterVisibleChange

* rm onVisibleChange

* update

* feat: 🇭🇷 hr_HR locale (#16258)

* Added Croatian locale

* fixed lint error

*  Add test cases for hr_HR

* 📝 update i18n documentation

* feat:  add `htmlFor` in Form.Item (#16278)

* add htmlFor in Form.Item

* update doc

* feat: Button support `link` type (#16289)

close #15892

* feat: Add Timeline.Item.position (#16148) (#16193)

* fix: Timeline.pendingDot interface documentation there is a small problem (#16177)

* feat: Add Timeline.Item.position (#16148)

* doc: add version infomation for Timeline.Item.position

* refactor: Update Tree & TreeSelect deps (#16330)

* use CSSMotion

* update snapshot

* feat: Collapse support `expandIconPosition` (#16365)

* update doc

* support expandIconPosition

* update snapshot

* feat: Breadcrumb  support DropDown (#16315)

* breadcrumbs support drop down menu

* update doc

* add require less

* fix test

* fix md doc

* less code

* fix  style warning

* update snap

* add children render test

* feat: TreeNode support checkable

* feat: add optional to support top and left slick dots (#16186) (#16225)

* add optional to support top and left slick dots

* update carousel snapshot

* Update doc, add placement demo

* update carousel placement demo snapshots

* rename dots placement to position

* update vertical as deprecated

* rename dotsPosition to dotPosition

* refine code

* add warning testcase for vertical

* remove unused warning

* update expression

* Additional test case for dotPosition

* refactor: Upgrade `rc-tree-select` to support pure React motion (#16402)

* upgrade `rc-tree-select`

* update snapshot

* 3.17.0 changelog

* fix warning

* fix review warning
2019-05-06 12:04:39 +08:00
陈帅
30508b0124 fix error types (#16043) 2019-04-28 11:47:22 +08:00
afc163
0a8f33385d
🆙 use @ant-design/create-react-context of MIT 2019-04-16 12:18:39 +08:00
afc163
a2a9831abb
💄 Fix less code style 2019-04-15 11:05:06 +08:00
zombieJ
41316e69e8
update snapshot (#16017) 2019-04-11 12:48:36 +08:00
jljsj33
278fcfdf41 menu openAnimation use object 2019-04-10 17:17:53 +08:00
jljsj33
1bc8ec5e0f recover openAnimation 2019-04-10 16:32:17 +08:00
jljsj33
c8a58396c5 update tween and scroll version, fix menu openTransitionName warning 2019-04-10 15:53:55 +08:00
zombieJ
bef491ecc9
fix: Menu defaultOpenKeys not work as expect (#15970)
* Remove animation on first render

* update test cas
2019-04-09 16:39:33 +08:00
zombiej
9f3c357053 add test case 2019-04-08 22:20:18 +08:00
zombiej
f7df66b97c fix tooltip not works 2019-04-08 21:03:25 +08:00
zombieJ
97d6f79ce4
fix: Menu arrow not display in old version of IE (#15932) 2019-04-08 18:26:31 +08:00
zombieJ
89dd827b7f
fix: Refactor Menu related components life cycle methods (#15868)
* use state instead

* rollback demo markdown

* clean test

* sider context should be clean

* update test case

* fix test

* update debug desc

* add siderCollapsed into omit

* rm useless code
2019-04-05 16:15:01 +08:00
zombiej
2c693ee95b merge feature 2019-04-01 10:22:43 +08:00
Benjamin Amelot
f55ccfe81e Remove underlines from focused links (#15759) 2019-03-31 13:46:38 +08:00
zombiej
b83a80c99c Merge branch 'master' into merge-master 2019-03-30 16:05:49 +08:00
偏右
25fb4a2353
Merge pull request #15705 from zy410419243/issue-15625
fix: MenuItem should not render Tooltip when inlineCollapsed is false
2019-03-30 13:08:08 +08:00
wangxing
1f60f37907 check SVGAnimatedString 2019-03-29 08:37:25 +08:00
wangxing
44ad6b0c07 fix-15699 2019-03-28 17:04:26 +08:00
zy410419243
ae8b52c290 fix: MenuItem should not render Tooltip when inlineCollapsed is false 2019-03-28 10:55:26 +08:00
偏右
e752ec3414
Merge pull request #15638 from ant-design/master
Merge master to feature
2019-03-26 14:34:17 +08:00
zy410419243
2aca6fc51a pref(Menu): instance() => simulate 2019-03-25 21:48:18 +08:00
zy410419243
5e1531e50d test: update cases for Menu 2019-03-25 21:48:17 +08:00
zy410419243
5362d57265 test: update case 2019-03-25 19:07:22 +08:00
zy410419243
9dec5ecedc chore: remove useless context from Menu.Item 2019-03-25 18:37:15 +08:00
zy410419243
ad54d23a44 fix(Menu): remove unexpected re-render, which causes flash and shake when collapsed 2019-03-25 13:58:57 +08:00
诸岳
6ae2ee4e31 Merge branch 'master' into feature 2019-03-24 08:41:22 +08:00
杨小事er
68c6982d89 feat(Menu): add overflowedIndicator prop (#15459) 2019-03-17 14:21:03 +08:00
偏右
1bb7d6c301
Merge pull request #15409 from zy410419243/issue-15321
fix: bad position of collapsible submenu in sider when collapsed
2019-03-15 19:01:49 +08:00
zy410419243
f9d01eeb99 test: update cases for using Menu with Layout.Sider 2019-03-14 21:04:13 +08:00
zy410419243
198c01d454 fix: bad position of collapsible submenu in sider when collapsed 2019-03-14 16:35:05 +08:00
偏右
1e028ec91e
Merge pull request #15406 from cemremengu/cemremengu-menu-us
Specify type for defaultOpenKeys
2019-03-14 16:21:54 +08:00
Cemre Mengu
946ef767e6
Specify type for defaultOpenKeys 2019-03-14 11:13:01 +03:00
偏右
f79b23805c
Merge pull request #15404 from cemremengu/cemremengu-submenu
Specify type for defaultOpenKeys
2019-03-14 16:09:46 +08:00
ztplz
97880a9b47 Formate (#15347) 2019-03-12 19:52:43 +08:00
Cemre Mengu
3f6f1c1f00
Specify type for defaultOpenKeys 2019-03-12 11:30:38 +03:00
zy410419243
7642cbf18d refactor: update lifecycle method for Menu 2019-03-07 16:58:53 +08:00
Frezc
c5b98c27c7 add export to MenuItemProps 2019-03-04 10:54:34 +08:00
zombieJ
4d1a998246
add component param in warning (#15078)
* add component param in warning

* update snapshot
2019-02-27 15:32:29 +08:00
afc163
447a8df724 🐛 Fix horizontal submenu wider then menu title in most case
https://codesandbox.io/s/qvpwm6mk66
2019-02-26 10:35:08 +08:00
Gabe Medrash
6dce9aff3a Add onTitleMouseEnter and onTitleMouseLeave to public interface 2019-02-15 14:50:58 +08:00
米老朱
6936599aef Enhance stylelint rules (#14803)
* rename .stylelintrc to .stylelintrc.json for explicit file type

* add new npm script lint-fix:style

* fix pseudo-element with double colon

* function name should be lower except ignored functions

* support stylelint declaration-block-no-ignored-properties rule

* support sorted CSS properties order for readability and consistency

* autofix order of all styles by lint-fix:style script

* remove double slash comments after selector

* replace .stylelintignore with ignoreFiles in .stylelintrc.json
2019-02-15 10:48:07 +08:00
Gabe Medrash
dfc9b24c98 Properly type onMouseEnter and onMouseLeave events 2019-02-06 12:23:07 +08:00
sylvanasGone
05df3aa552 fix: add missing typing for style prop 2019-01-31 17:42:35 +08:00
zombieJ
8838bd602d
update (#14591) 2019-01-28 13:29:20 +08:00
zombiej
b835110f79 merge master 2019-01-26 12:02:56 +08:00
iojichervo
e5a1e30055 Add MenuItem style type 2019-01-24 15:39:16 +08:00
MaoYiWei
5ec4383b3f Add definition for Menu.SubMenu (#14488)
Fix Menu.SubMenu props from any to real def
2019-01-23 10:32:35 +08:00
afc163
d3d5a3e18d
Merge branch 'master' into feature-for-resolve-conflict
* master: (45 commits)
  Add type definitions for Steps.Step (#14468)
  add select check to fix edge wave issue (#14469)
  Fix for Pagination ellipsis misalignment (#14473)
  change sentry id
   Add sentry in ant.design
  💄 New Sketch resources!
  fix transfer ref (#14441)
  Add onMouseEnter and onMouseLeave for Menu Item (#14454)
  update snapshot (#14467)
  📝 beautify code style in documentation (#14457)
  Updating type: TreeSelectProps.getPopupContainer (#14443)
  change error version
  3.12.4 changelog (#14436)
  Format
  Fix the bug that radio onchange will be ovrride by radioGroup onchange (#14364)
  docs: updated doc for create-react-app
  fix prefixCls of empty go to div (#14404)
  update snapshot (#14406)
  add radius on table-placeholder to fix table small size border clip (#14398)
  fix style of Input.Search with enterButton (#14397)
  ...
2019-01-22 17:34:10 +08:00
ztplz
8cce556309 Add onMouseEnter and onMouseLeave for Menu Item (#14454)
fix #14357
2019-01-22 11:25:20 +08:00
zombiej
0a67272ae4 add locale update 2019-01-10 21:55:21 +08:00
zombiej
12af9a9dca icon add aria-label support 2019-01-10 21:55:21 +08:00
afc163
879784c665
Merge branch "master" into "feature" 2018-12-20 17:43:00 +08:00
ztplz
1f730faf2d Set menu mode to vertical by default 2018-12-20 17:17:50 +08:00
陈帅
30d65ef46e Merge branch 'master' into feature 2018-12-13 22:48:08 +08:00
陈帅
daca08b6f1 merge master 2018-12-13 22:03:12 +08:00
ztplz
05cf557ee1 Format menu 2018-12-13 09:38:55 +08:00
afc163
56665144ae
💄 fix MenuItem code style 2018-12-07 20:07:17 +08:00
陈帅
8e11f0bdb9 merge support prettier 2018-12-07 20:02:01 +08:00
陈帅
df356a586c Merge branch 'master' into feature 2018-12-07 18:52:13 +08:00
陈帅
dca9715186 support prettier 2018-12-07 18:27:30 +08:00
sylvanasGone
210aab8d51 fix: add onClick prop 2018-12-07 17:51:17 +08:00
amedora
0aeb9a356b use color definitions insted of numbers 2018-12-05 19:45:22 +08:00
zombieJ
1a0a06fca9
ConfigProvider support prefixCls (#13389)
Basic support prefixCls.
2018-12-05 19:12:18 +08:00
Yury Kozyrev
c9fb5e6ea8 add missing classname prop 2018-12-03 00:37:31 +08:00
zombiej
9f5d421cd6 merge master 2018-11-30 14:48:37 +08:00
afc163
83c192ea3e
💄 fix eslint problems 2018-11-28 15:11:02 +08:00
zombieJ
9b49fb60d9
Config provider (#12991)
close #12985
2018-11-26 12:06:42 +08:00
zombieJ
d366886dcb add title support in menu item (#12952)
* add title support in menu item

* hide title when inlineCollapsed

* fix typo
2018-11-20 23:26:40 +08:00
afc163
67dc9b914c 🐛 Fixed bug of collapsed menu wrong mode responsively
close #13104
2018-11-14 15:25:17 +08:00
afc163
03d3b08315 🐛 Fix popup menu background transparent bug 2018-11-12 15:34:10 +08:00
afc163
a616f89a1b 🔥 update less code style 2018-11-12 12:02:30 +08:00
afc163
9b9c4c7dec fix typescript errors 2018-11-09 17:38:19 +08:00
afc163
85a758c7ec Fix inlineCollpased Menu remains inline mode instead of vertical
close ant-design/ant-design-pro#2783
close ant-design/ant-design-pro#2782
close ant-design/ant-design-pro#2786
2018-11-07 11:40:34 +08:00
afc163
00c65b046b site: update icon doc translation 2018-11-05 19:04:28 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
afc163
5e12b0a5ca Fix Menu Submenu animation when switch inlineCollapsed, close #12864 2018-10-30 15:09:40 +08:00
afc163
af653a8b69 revert f7fa8e0 2018-10-30 14:23:45 +08:00
afc163
f7fa8e0eb6 Fix menu submenu animation, close #12864 2018-10-30 12:00:27 +08:00
afc163
bd0ba8ce92 update menu snapshot 2018-10-25 10:42:11 +08:00
afc163
d4b51af29c docs: remove useless vertical-right mode 2018-10-23 19:55:18 +08:00
Wei Zhu
4ce3800de7 Merge branch 'master' into feature 2018-09-29 16:27:07 +08:00
Wei Zhu
79d3a926ef Update snapshot 2018-09-28 16:19:08 +08:00
zombiej
176a8dfcda update test snapshot 2018-09-25 19:45:41 +08:00
ycjcl868
4d1e46e03d Merge master into feature 2018-09-23 01:43:35 +08:00
tangjinzhou
9630dc48a0 fix: openKeys should have higher priority (#12361)
* fix: openKeys should have higher priority

* Update index.tsx
2018-09-22 13:32:21 +08:00
zombiej
2b22d6b19c bump rc-switch & update test case 2018-09-13 19:47:28 +08:00
afc163
298fc0f426 Fix extra scrollbar when popup menu, close #12152 2018-09-10 11:39:03 +08:00
afc163
bdcf4342fe tweak icon size and design 2018-09-08 15:46:26 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
picodoth
054d249f13 fix: #12019 2018-09-03 14:54:12 +08:00
afc163
4c1ca1b3cd tweak menu icon size 2018-09-03 13:15:22 +08:00
HeskeyBaozi
24568f61ff use the whole svg icons 2018-09-02 23:39:58 +08:00
HeskeyBaozi
2f8a56fa78 fix test case & update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
74798b8911 upgdate test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
picodoth
f0bedb2176 fix: tests 2018-09-02 19:21:03 +08:00
picodoth
6237511c04 feat: use menu with 7.4.0-beta, supporting menu overflow collapsing. Currently React >= 16.0 only 2018-09-02 19:21:03 +08:00
陈帅
c73ad8021d
Merge pull request #11894 from ant-design/feature/svg-icon
Hotfix(Icon) fix SVG element style
2018-08-29 18:40:04 +08:00
Chandler Moisen
ce4a4bacaa add @menu-item-active-border-width to Menu.Item (#11934) 2018-08-29 11:20:13 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
HeskeyBaozi
d9b38aee4b Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	package.json
2018-08-25 13:24:44 +08:00
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
HeskeyBaozi
9893fec5f1 fix rc-menu test case 2018-08-24 12:28:51 +08:00
afc163
e3aa2aaa84 fix submenu cannot hover 2018-08-23 21:14:16 +08:00
ohhoney1
a523706625 fix bug: If ItemGroup wraps the first menu, an error is displayed when the menu is collapsed 2018-08-22 11:26:07 +08:00
afc163
90b401e97b Fix submenu lap between menu, close #11725 2018-08-22 00:49:53 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
3baec95628 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-13 09:26:33 +08:00
Wei Zhu
064bfaf554 Add @types/prop-types 2018-08-07 21:09:05 +08:00
HeskeyBaozi
768af40c4c Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
#	components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
#	components/drawer/index.tsx
2018-07-25 12:03:00 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
2018-07-23 09:58:55 +08:00