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
hongxuWei
f796618a15
Fix the style of horizontal menu on dark theme
2018-07-22 11:58:33 +08:00
HeskeyBaozi
4a553a2006
upgrade test cases
2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022
update test cases
2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c
update test cases
2018-07-18 10:33:54 +08:00
Wei Zhu
c696757793
Revert "fix test"
...
This reverts commit f1570c01ea
.
Follow f1570c01ea
2018-07-17 22:22:16 +08:00
Wei Zhu
e6c4c6667d
Revert rc-menu upgrade
...
Revert "use default hover trigger for horizontal menu demo"
This reverts commit 159b09342d
.
Revert "upgrade menu@7.2.0"
This reverts commit d4c9a1deea
.
Revert "feat: prevent horizontal menu items wrapping"
This reverts commit 5c7f9feecb
.
2018-07-17 21:59:16 +08:00
afc163
57c072d1b8
Fix dark menu small style issue, close #11299
2018-07-17 15:29:23 +08:00
picodoth
159b09342d
use default hover trigger for horizontal menu demo
2018-07-15 08:41:06 +08:00
picodoth
f1570c01ea
fix test
2018-07-14 13:05:36 +08:00
picodoth
5c7f9feecb
feat: prevent horizontal menu items wrapping
2018-07-14 13:05:36 +08:00
afc163
009ed08580
upgrade eslint-config-airbnb
2018-06-27 16:09:58 +08:00
zombiej
b524e1fe7e
adjust defaultProps def
2018-06-07 00:33:52 +08:00
hank
5be1b9c33c
Fix issue #8666 ( #10739 )
...
* fix issue #8666
* add issue #8666 test
2018-06-01 18:09:11 +08:00
afc163
09d5e36cfa
style: fix hightlight link color in menu item
2018-05-17 21:17:20 +08:00
afc163
6e6b1ccdec
chore: code style
2018-05-10 10:59:33 +08:00
Wei Zhu
56e3384c6b
Revert "MenuItem: avoid rendering Tooltip unless necessary ( #9636 )"
...
This reverts commit 0754845aff
.
Conditional rendering will break the transition animation,
since React will create new DOM node when inlineCollapsed changges.
Fix https://github.com/react-component/menu/issues/139
2018-05-02 14:49:20 +08:00
afc163
b5a52d26f2
fix snapshot
2018-05-02 14:28:16 +08:00
afc163
726f0466bc
menu should be unfocusable defaultly
2018-05-01 18:53:44 +08:00
Junbin Huang
3a3d550b54
chore: upgrade menu ( #10305 )
...
* chore: upgrade menu and select
* Add test case for coverage percent
2018-04-29 23:01:58 +08:00
Jiabin Peng
bb720aaab9
Fix menu item's clickable region in dark theme ( #10187 )
...
* remove redundant style for submenu
* Fix menu item's clickable region in dark theme
2018-04-23 00:31:36 +08:00
Dmitry Gladkikh
0d0632b2f3
Add getPopupContainer method decl to MenuProps interface ( #10158 )
...
* add getPopupContainer to MenuProps
see https://github.com/ant-design/ant-design/issues/10145
* Update getPopupContainer signature of MenuProps
* getPopupContainer prop is optional
2018-04-19 20:33:12 +08:00
afc163
649d733048
fix snapshot ci
2018-04-19 11:54:44 +08:00
afc163
f0660836b7
fix snapshot ci
2018-04-19 11:34:19 +08:00
afc163
04b3aad451
Fix menu arrow style of disabled, close #10113
2018-04-18 13:47:40 +08:00
Wei Zhu
2a5479a524
Fix type errors
...
Close #9988
2018-04-11 12:01:28 +08:00
Wei Zhu
921361313a
Add explicit types for default props
...
Fix #8796
Close #8820
2018-04-10 10:50:59 +08:00
Zach Guo
280f907297
Fix Layout.Sider typos ( #9885 )
2018-04-01 01:15:42 +08:00
Jiabin Peng
6c77d336d9
Fix menu item clickable region ( #9666 )
2018-03-22 15:14:53 +08:00
Wu Haotian
0754845aff
MenuItem: avoid rendering Tooltip unless necessary ( #9636 )
...
* MenuItem: avoid rendering Tooltip unless necessary
* MenuItem: remove extra check for tooltip.title
2018-03-14 11:13:06 +08:00
George Gray
d19fa740c7
use highlight var on vertical menu ( #9169 )
2018-01-29 20:18:54 +08:00
George Gray
7d9a93e7ed
vars to theme Menu ( #9115 )
2018-01-25 10:59:49 +08:00
afc163
8c442cfaf0
Fix submenu title padding
2018-01-23 21:00:11 +08:00
रोहन मल्होत्रा
ec16d97086
added subMenuCloseDelay & subMenuOpenDelay props to menu interface ( #9049 )
2018-01-21 01:13:23 +08:00
Wei Zhu
999d6184ad
docs: Sort api table
2017-12-29 20:22:58 +08:00
afc163
6afb853161
Fix menu collapse animation broken by #8475
...
change another way to fix #8475
2017-12-27 16:46:00 +08:00
afc163
7d082c1dc5
Fix submenu popup issue when specified unexisted defaultOpenKeys
...
close #8475
2017-12-17 19:11:56 +08:00
afc163
754d330bae
Hide menu when collapsedWidth is 0, close #8587
2017-12-15 15:15:30 +08:00
wangxiaolei
d7475f47cb
Fix menu doc in english version. ( #8503 )
2017-12-07 21:39:27 +08:00
afc163
927853a1f1
seperate dark style of menu
2017-11-29 21:08:44 +08:00
偏右
b531de3fee
Upgrade dev deps and fix lints ( #8358 )
...
* upgrade devDeps and fix lint
* Fix stylelint problems
2017-11-29 21:00:16 +08:00
afc163
dada590d2d
Fix dark menu popup animation
2017-11-22 17:29:58 +08:00
Wei Zhu
b6c6ee8f3e
Fix implicit any error for Modal and Menu
2017-11-21 17:38:51 +08:00
afc163
3406c6598a
Fix submenu z-index
2017-11-20 14:58:03 +08:00
afc163
7049a45d8e
Fix submenu width, close #8236
2017-11-20 14:37:14 +08:00
afc163
8e6e91b932
Fix menu active style
...
close ant-design/ant-design-pro#222
2017-11-20 10:56:56 +08:00
Benjy Cui
09fd564af9
feat: upgrade rc-menu ( #8235 )
2017-11-20 10:33:34 +08:00
afc163
0627d9a3a0
Fix MenuItem margin
2017-11-18 17:49:33 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports ( #8218 )
2017-11-17 14:38:54 +08:00
afc163
1e1c6d1c72
Merge branch 'master' into antd-3.0
2017-11-16 19:58:20 +08:00
afc163
46d1296045
Fix async test cases
2017-11-16 17:12:36 +08:00
Benjy Cui
06a1b6ed23
fix: should not throw error when keydown in menu, close : #8089 ( #8211 )
2017-11-16 16:08:30 +08:00
Wei Zhu
55c85f77a1
Update dependendies ( #8150 )
...
* deps: upgrade rc-menu, and close : #2837
* test: update snapshots
* Update rc-calendar
* Update rc-cascader
* Update rc-dialog
* Update dropdown
* Update rc-select@7.1.0
* Update rc-slider
* Update rc-time-picker
* Update rc-tooltip
* Update rc-tree-select
* Mock rc-trigger and Portal
* Fix animation warning when inlineCollapsed changes
* fix: should use SubMenu[popupClassName]
* Fix typescript error
* Fix lint
* fix: style for menu
* Mock rc-trigger for React 15
* Remvoe allow_failures
2017-11-11 00:07:03 +08:00
偏右
bdceb5f083
Review fix ( #8125 )
...
* Fix style
* Fix style
* fix lint
* Fix more styles
* Fix more styles
* update snap
2017-11-06 21:28:51 +08:00
afc163
d96284c798
Merge branch 'master' into antd-3.0
2017-10-27 20:22:17 +08:00
vgeyi
8bde0c0fee
Rewrite the MenuItem to handle ref for react 16 ( #8037 )
...
* ReWrite MenuItem to remove ref warning for react 16
* unified coding style
* add removing semicolon
2017-10-27 07:21:34 -05:00
nikogu
9696739a36
update Menu snapshots
2017-10-27 18:24:07 +08:00
nikogu
c664d843fb
fixed: https://github.com/ant-design/ant-design/issues/8040
2017-10-27 17:40:31 +08:00
afc163
cbcc073aca
Fix menu style
2017-10-26 13:38:18 +08:00
afc163
0e5155567c
Fix menu active border
2017-10-26 11:59:18 +08:00
Wei Zhu
bbb1a3a828
Merge branch 'master' into antd-3.0
2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db
docs: sort api table
2017-10-25 10:25:44 +08:00
afc163
89a3b22791
Fix menu style
2017-10-24 15:56:28 +08:00
afc163
9ddbad1088
Unify menu item height
2017-10-12 18:14:23 +08:00
偏右
9053192ae9
Fix component style ( #7848 )
...
* fix components style
* fix snapshot
* update travis node version
* change upload action in ci
2017-10-11 12:01:27 +08:00
Wei Zhu
c5487ad1eb
React 16 + Enzyme 3
2017-10-09 19:18:04 +08:00
afc163
4eb9d5ef56
Merge branch 'master' into antd-3.0
2017-10-09 13:33:59 +08:00
afc163
475e4ff23d
upgrade eslint-config-airbnb
2017-10-09 13:27:35 +08:00
nikogu
901ceb2507
Merge branch 'master' into antd-3.0
2017-09-28 09:54:29 +08:00
偏右
2bced36f0c
New component styles ( #7731 )
...
* Tweak button padding
* upgrade input and button size
* update form controls size
* update components size
* Add lemon color and update rate color
* Add new icons
* update layout style
* breadcrumb and dropdown
* update menu arrow width
* update layout and menu
* update steps
* fix var name
* update cascasder style
* Update DatePicker
* update InputNumber and Mention
* radio and switch
* select and transfer
* TimePicker & Upload
* more components
* calendar and list
* Tree Timeline Popover Tag
* divider modal popover
* update search input
* update card style
* update switch disabled opacity
* update shoadow and mask
* Add v2-compatible-reset.less
* Fix undefined className
* update snahshotssssssssssssssssss 👻
2017-09-27 22:32:49 +08:00
Amorites
e17c8e093e
Update index.zh-CN.md ( #7755 )
2017-09-27 21:15:05 +08:00
偏右
759b0bb821
seperate reset styles ( #7682 )
...
* seperate reset styles
* not reset ul/ol/p/heading
* revert reset.less idea
* move label style into ant-form-item, #5851
* revert reset.less idea
* update base.less
* Better typography from bootstrap@4
use reboot replace normalize
ref:
b4d84b9cdf/scss/_reboot.scss
close #6162
2017-09-22 18:33:29 +08:00
afc163
df69320fc2
Fix arrow position
2017-09-21 20:43:13 +08:00
afc163
823e07bc75
Merge branch 'master' into antd-3.0
2017-09-15 21:44:39 +08:00
afc163
641f1ddeeb
Add link
2017-09-15 21:37:17 +08:00
afc163
6236641c74
Fix broken collapsed MenuGroup, close #7109
2017-09-15 20:37:11 +08:00
Wei Zhu
250c7a9c68
Revert "Mock rc-trigger"
...
This reverts commit 9d2c91598b
.
2017-09-15 16:42:25 +08:00
Wei Zhu
9d2c91598b
Mock rc-trigger
...
Ref #5522
2017-09-15 16:14:26 +08:00
jljsj
aea18c3627
add padding !important, restore menu retraction animate
...
Conflicts:
components/menu/style/index.less
2017-09-12 16:51:17 +08:00
jiang
2570ba8fe6
Menu anim ( #7567 )
...
* update menu icon animate
* add padding !important, restore menu retraction animate
* update dropdown arrow
2017-09-12 16:46:33 +08:00
afc163
b24483545c
Merge branch 'master' into antd-3.0
2017-09-12 09:41:51 +08:00
afc163
35fc427630
Fix inlineCollapsed menu when submenu is opened
...
close #7524
close #7514
ref #7063
2017-09-09 00:58:15 +08:00
afc163
7bee69a9df
Merge from master
2017-09-08 16:49:58 +08:00
Benjy Cui
070b2696ba
chore: remove hacks for IE8-, close : #7447 ( #7512 )
2017-09-08 13:08:46 +08:00
Benjy Cui
30745da52e
docs: update typo, close : #7427
2017-09-08 10:12:34 +08:00
Khalifa Lame
fa1547df84
docs: update Menu English doc ( #7465 )
...
* Update Menu English doc
Fixed typos.
* Update Menu English doc
Accidentally replaced noop with none in previous commit. Now reverted.
2017-09-08 09:45:01 +08:00
afc163
78f2b0aa5d
update snapshot
2017-09-06 14:29:10 +08:00
afc163
121898001d
update snapshot
2017-09-06 14:28:20 +08:00
afc163
e9a592a9c8
Fix inlineCollpasd and openKeys issue
2017-09-06 14:14:34 +08:00
afc163
786f5cd7e0
improve side current menu demo
2017-09-06 13:59:44 +08:00
afc163
696b4252a8
tweak collpse animation easing
2017-09-06 13:46:45 +08:00
afc163
6654a4220d
Fix submenu hover style
2017-09-05 11:31:00 +08:00
afc163
3ceda311b6
menu cannot be selectable in dropdown defaultly
2017-08-29 19:55:09 +08:00
afc163
7fed87f835
doc: fix undocumented selectable prop of Menu
2017-08-29 19:45:13 +08:00
John Nguyen
6c509f9712
adds selectable prop to typescript file ( #7384 )
2017-08-29 19:42:55 +08:00
afc163
a51a37cbd8
tweak detail of inline collapse menu
2017-08-22 18:37:08 +08:00
lvren
a93cb09e15
将sider收起时的宽度变量放到themes中控制 ( #7238 )
2017-08-17 16:09:04 +08:00
afc163
53640c3f18
update menu API doc
2017-08-16 14:27:22 +08:00
afc163
b3979885e4
fix demo snapshot
2017-08-04 21:29:30 +08:00
Tom Gao
9e54bebf33
fix: when menuitem is seleted, but submenu is not seleted ( #7042 )
2017-08-04 21:24:59 +08:00
afc163
5da1403bc0
Fix inlineCollapsed in controlled mode
...
ref #7063
2017-08-04 16:23:52 +08:00
jiang
1a93536a26
fix #7048 ( #7050 )
2017-08-01 17:41:03 +08:00
jiang
24f58c20e1
fix menu-anim ( #6955 )
...
* fix menu-anim
* fix menu-anim
* update
* remove space
* fix test
* Improve code style
* submeu-title use color transition
* sync motion-collapse time
* snyc padding
2017-07-27 19:43:45 +08:00
afc163
d90e1b2a9e
Fix extra ... in firefox
2017-07-25 14:15:13 +08:00
afc163
4f85be834c
Tweak menu text align again
2017-07-25 10:31:05 +08:00
afc163
3d71d980a7
Adjust menu icon and text vertical align
2017-07-19 17:44:02 +08:00
Benjy Cui
119d498935
chore: replace http with https, close : #6893
2017-07-19 14:00:11 +08:00
afc163
44b3dad12f
tweak style
2017-07-14 12:18:02 +08:00
afc163
2b2e962738
tweak menu style
2017-07-13 20:28:23 +08:00
afc163
46ffda9c93
fix vertical menu item border radius
2017-07-12 16:43:53 +08:00
afc163
6c5a11a363
Fix inlineCollapsed Menu styledetails
2017-07-08 16:15:00 +08:00
afc163
fda881cc7a
trailing spaces
2017-07-07 19:45:59 +08:00
偏右
b653a2c055
Merge branch 'master' into feature-2.12
2017-07-07 19:41:37 +08:00
afc163
f2268c2877
Fix test case for menu
2017-07-07 17:15:29 +08:00
afc163
8945bb5da6
Add test case for menu
2017-07-07 16:51:06 +08:00
afc163
b6011d7a39
typo
2017-07-01 14:04:26 +08:00
afc163
50e37796b8
Add test case
2017-06-30 23:08:11 +08:00
afc163
0b67dc4e12
update warning message
2017-06-30 22:05:53 +08:00
afc163
7d3bc4ebd4
update snapshots
2017-06-30 22:02:19 +08:00
afc163
82afb368c0
Fix context change logic
2017-06-30 22:00:04 +08:00
afc163
89a37da77f
Menu will get collapsed status from Layout.Sider
2017-06-30 21:36:23 +08:00
afc163
97fbb20fa8
improve menu doc
2017-06-30 21:10:47 +08:00
afc163
2eb3d55743
Add documentation for inlineCollapsed
2017-06-30 21:09:34 +08:00
afc163
6e145bfad3
Add tooltip for collapsed menu item
2017-06-30 21:07:01 +08:00
afc163
115749e06f
inline menu should not trigger handleClick
2017-06-30 20:27:39 +08:00
afc163
63daf8d0a3
Add Menu[inlineCollapsed] prop
2017-06-30 18:08:30 +08:00
afc163
0ed75caeac
fix dark menu style
2017-06-21 16:44:13 +08:00
afc163
3a2f6bea18
update menu demo
2017-06-19 16:07:48 +08:00
afc163
fa88477886
tweak vertical menu selected style
2017-06-19 16:07:47 +08:00
afc163
9969a3b598
Improve doc
2017-06-16 16:56:03 +08:00
Nico
cfccd84f62
Fix(Documentation): Fix Menu documentation
2017-06-15 18:08:01 +02:00
Benjy Cui
aab3daa1ea
fix: broken style of SubMenu[disabled], close : #6062
2017-05-15 18:24:27 +08:00
Graeme Yeates
d8d17a6401
Seperate @active-item-bg into 2 variables
2017-05-03 10:57:14 -04:00
Graeme Yeates
4eb2855871
Add @active-item-bg to control hover and active states
2017-05-02 11:05:28 -04:00
Brook Shi
286fc964e6
fix: support inlineIndent property of Menu for TypeScript ( #5903 )
2017-04-26 10:11:03 +08:00
pinggod
01f0e07835
fix issue 5707: override the default a:focus style when it nested in the menu component
2017-04-12 14:42:07 +08:00
Kenneth Truong
31ec5b7ad3
Add selectable option into Menu documentation
...
I had to read the source code to figure out that there was a property called selectable. So hopefully this will help save someone time. (Though this is an option in the rc-menu I made a PR there to add it in the doc also https://github.com/react-component/menu/pull/79 )
(I was trying to make a contextmenu out of this menu component which is why I needed to turn selectable off)
2017-04-02 23:42:28 -07:00
afc163
6864fea0cb
Improve inline menu active style
2017-04-02 14:43:34 +08:00
Wei Zhu
675e037e7a
Remove only...
2017-03-28 17:16:15 +08:00
afc163
0cb3259570
tweak menu style code
2017-03-25 20:31:53 +08:00
afc163
85a32c79f4
Fix menu icon transition delay in Chrome, close #5495
2017-03-25 20:30:35 +08:00
偏右
674255bd14
[WIP] upgrade deps ( #5455 )
...
* upgrade deps
* autofix some tslint problems
* Fix tslint problems manually
2017-03-23 21:15:49 +08:00
Wei Zhu
f6b1e942e3
Jest 19 ( #5361 )
...
* Upgeade to jest 19
* Use jest.spyOn
2017-03-17 18:56:30 +08:00
afc163
c1cb365eca
Fix missing API document of Menu[multiple]
2017-03-02 17:48:11 +08:00
afc163
1c4407b60c
fix popup menu z-index problem
2017-02-22 18:30:50 +08:00
afc163
fbeccb7be5
fix inline submenu open style
2017-02-22 14:47:01 +08:00
afc163
176b9f9083
fix typo
2017-02-20 22:11:39 +08:00
afc163
c440a4d2b2
rewrite Menu demos to es6 component, #4878
2017-02-20 21:51:23 +08:00
afc163
989792ed9b
simplify less code
2017-02-16 21:24:17 +08:00
afc163
74028f6e48
Fix pop menu padding
2017-02-16 17:56:27 +08:00