mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-26 12:10:06 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity
20,283 Commits 18 Branches 731 Tags 416 MiB
074f2228cb
Commit Graph

367 Commits

Author SHA1 Message Date
SoraYama
2b7fce3ce2 fix(Layout): disable hasSider when specifically declared 
In some situation `Sider` is deeply rendered in Children of `Layout`,
and if we don't want to judge whether `Layout` has sider, the attr `hasSider`
set to `false` should properly work. However `hasSider || this.state.siders.length > 0`
will ignore `hasSider` when it is `false`.
 2019-03-14 12:11:57 +08:00
ngolin
cb5fe6cbf8 Fix: TypeScript <Layout> requires a tagName property (#15181) 
* fix #15162

* force safe type casting

* get rid of non-null assertion

* get rid of non-null assertion
 2019-03-05 14:39:43 +08:00
zombiej
6f95995faa merge master 2019-02-27 19:57:48 +08:00
ztplz
b0ca03cba3 Update 2019-02-19 15:50:38 +08:00
ztplz
025bad6981 Update 2019-02-19 15:50:38 +08:00
ztplz
c24d737546 Fix incorrect collapse icon position when sider in the right 2019-02-19 15:50:38 +08:00
zombiej
271d201fbc merge master 2019-02-18 11:17:24 +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
偏右
2bacd0614c
⚡ Use semantic tag names in Layout (#14806) 
close #14801
 2019-02-14 17:51:52 +08:00
zy410419243
bf4560cf37 docs: fix wrong usage of comma 2019-02-07 13:59:32 +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
zombiej
b5fc19632b merge master 2018-12-26 14:23:40 +08:00
zombieJ
bf087e29bd
Add remark lint (#13906) 
support remark-lint check
 2018-12-26 14:14:00 +08:00
afc163
879784c665
Merge branch "master" into "feature" 2018-12-20 17:43:00 +08:00
Sam Lanning
8f830ec366 fix inconsistent component state updates 
React component state updates using setState may
asynchronously update this.props and this.state, thus it is
not safe to use either of the two when calculating the new
state passed to setState, and instead the callback-based
variant should be used instead.
 2018-12-20 17:29:02 +08:00
afc163
b1a67de35e
Merge branch 'master' into feature 
* master:
  📝 fix demo order
  Fixes #10576 (#13703)
  doc: update form & layout docs (#13701)
  update doc close #11802
  🐛 Fix Badge offset not working when count is ReactNode
 2018-12-19 12:09:12 +08:00
huishiyi
dd30678033 doc: update form & layout docs (#13701) 
* doc: remove duplicate setFields in form doc-US

* doc: fix layout doc collapsedWidth default
 2018-12-19 10:56:44 +08:00
陈帅
8e11f0bdb9 merge support prettier 2018-12-07 20:02:01 +08:00
陈帅
dca9715186 support prettier 2018-12-07 18:27:30 +08:00
zombieJ
1a0a06fca9
ConfigProvider support prefixCls (#13389) 
Basic support prefixCls.
 2018-12-05 19:12:18 +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
afc163
9b9c4c7dec fix typescript errors 2018-11-09 17:38:19 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
Charlie Guan
f4f0c34bc3 Update index.en-US.md 
Fix typos, and provide minor grammar improvements.
 2018-10-29 14:52:11 +08:00
Wei Zhu
9cfaf1750d fix: type error 2018-09-30 21:39:12 +08:00
Wei Zhu
40001d8220 Revert "fix: more types" 
This reverts commit e063e1916d.
 2018-09-30 21:29:14 +08:00
Wei Zhu
e063e1916d fix: more types 2018-09-30 16:39:51 +08:00
Wei Zhu
ee84f4ce0a fix: some type definitions 2018-09-30 16:07:01 +08:00
zombiej
176a8dfcda update test snapshot 2018-09-25 19:45:41 +08:00
Sepehr Mohammadi
e8c2e7ce72 fix firefox can't set height smaller than content on flex item (#12295) 
https://stackoverflow.com/questions/28636832/firefox-overflow-y-not-working-with-nested-flexbox/28639686#28639686
 2018-09-20 22:48:13 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +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
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
Cang Ta
044982ddb7 Remove duplicate theme property 2018-08-23 16:09:37 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +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
张聪
8a9fbcb5e4 Migrate lifecycle method: Upload, CheckboxGroup, Layout.Sider, Tooltip, Popconfirm (#11682) 
* Upload lifecycle method migrate

* CheckboxGroup lifecycle method migrate

* Layout.Sider lifecycle method migrate

* Tooltip lifecycle method migrate

* Popconfirm lifecycle method migrate

* test Spin as a controlled component
 2018-08-10 17:04:40 +08:00
Wei Zhu
064bfaf554 Add @types/prop-types 2018-08-07 21:09:05 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
Ilan Hasanov
8ee70e84b6 💬 update layout copyrights year and fix typos 2018-07-29 01:15:02 +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
jljsj33
881cef5abf update drawer 2018-07-22 11:55:46 +08:00
Fred-Shan
c045b79e62 Update index.zh-CN.md 
there are two "theme" in the table
 2018-07-20 17:38: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
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
陈帅
b3f4e5e3da bugfix: fixed #11152 silder trigger no white theme 2018-07-10 21:06:22 +08:00
Wei Zhu
435558b63e fix: Layout.Sider string width 
Close #11211
 2018-07-10 12:29:20 +08:00
afc163
56020cda39 Merge branch 'master' into feature-3.7.0 2018-06-27 16:14:14 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
b374297ca6 Merge branch 'master' into feature-3.7.0 2018-06-25 11:44:35 +08:00
Wei Zhu
aa580beb8b docs: sort api table 2018-06-24 17:09:18 +08:00
nuintun
ff24f1a978 Layout.Sider add onBreakpoint porp support (#10750) 
* Layout.Sider add onBreakpoint porp support

* Add onBreakpoint zh-CN doc

* Add onBreakpoint en-US doc

* Add demo test for Layout.Sider onBreakpoint

* Add Layout.Sider onBreakpoint test cases
 2018-06-03 13:03:20 +08:00
Junbin Huang
bbf5cb75c3
chore: update typescript@~2.9.1 (#10748) 2018-06-02 20:12:09 +08:00
picodoth
e25323882a Merge branch 'feature-3.6.0' 2018-06-02 13:36:05 +08:00
afc163
b5c5f0b5d4 update snapshot 2018-05-29 23:50:49 +08:00
Wu Haotian
4f91fe61bf add z-index for fixed header demo 
#10693
 2018-05-29 23:49:09 +08:00
Rongjian Zhang
f3869270ae Fix #10142: Add theme props to Layout.Sider (#10631) 
* Fix #10142: Add `theme` props to `Layout.Sider`

* Update documentation of Layout.Sider for new theme props

* Fix snapshot tests

* Add unit test for sider theme
 2018-05-23 23:46:28 +08:00
Oleg Kuzava
71abb96de7 Allow to use any CSS units for layout width (#10479) 
* Allow to use any CSS units for layout width

* Fix ts issues

* Fix parseFloat type check

* add tests for width in Sider

* clean up
 2018-05-12 02:30:33 +08:00
afc163
b5a52d26f2 fix snapshot 2018-05-02 14:28:16 +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
afc163
2078354bc5 Fix collapsedWidth string bug, close #10140 2018-04-22 13:56:23 +08:00
Zach Guo
280f907297 Fix Layout.Sider typos (#9885) 2018-04-01 01:15:42 +08:00
Scott Sturgeon
f2e60209c9 Changed zero-width layout trigger color to use layout-trigger-color var (#9851) 2018-03-29 10:50:58 +08:00
Angga
43e4622ef8 Fixed typo on Visualization rules (#9575) 
Style of a navigation should conform to the its level.

should be

Style of a navigation should conform to its level.
 2018-03-08 19:14:41 +08:00
Wei Zhu
518c424ca4 Improve Grid and Layout type definition 2018-03-06 15:51:06 +08:00
byuanama
98f938798d Update index.en-US.md (#9479) 2018-03-02 13:18:06 +08:00
MinJeong Kim
feaf238dfa fix: set -has-trigger class in sider when -trigger div exists (#9399) 
* fix: set `-has-trigger` class in sider when `-trigger` div exists

* fix: fix template expr lint error
 2018-02-24 10:35:04 +08:00
afc163
3a98fce47c Merge branch 'master' into feature-3.2 2018-01-19 15:06:09 +08:00
Reed Sun
a2b6d0a23e docs: 修改 Layout 组件文档中 breakpoint width 与代码不一致的问题 (#8995) 2018-01-17 21:54:54 +08:00
afc163
7aa665cc14 Add hasSider to avoid flickering in ssr 
close #8937
 2018-01-12 20:44:35 +08:00
afc163
bce66d6b3b fix code style 2017-12-19 16:32:20 +08:00
afc163
754d330bae Hide menu when collapsedWidth is 0, close #8587 2017-12-15 15:15:30 +08:00
afc163
7521348606 breakpoints of Layout.Sider should be same as Grid 
close #8620
 2017-12-15 14:37:36 +08:00
Wei Zhu
dc322a6a9c Fix implicit any error for Layout 2017-11-21 20:38:30 +08:00
Wei Zhu
b6c6ee8f3e Fix implicit any error for Modal and Menu 2017-11-21 17:38:51 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
afc163
a4faaad810 Merge branch 'master' into antd-3.0 2017-11-13 10:24:58 +08:00
afc163
cad769af91 No more __ANT_LAYOUT_SIDER in favor of #8077 2017-11-12 15:22:02 +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
afc163
b53e76cbd5 Merge branch 'master' into antd-3.0 2017-11-09 20:37:30 +08:00
afc163
ea185fe288 Fix code style 2017-11-09 20:14:51 +08:00
afc163
0eca38ba2f Add has sider test case, ref #8077 2017-11-09 20:13:59 +08:00
Yasin Uslu
b3e1192482 Detect Sider even if it's not first child of layout (#8077) 
* Fix typo in layout

* Detect Sider even if it's not first child of layout
 2017-11-09 20:04:34 +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
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
afc163
7286e6d0d0 Fix extra margin in sider Layout 
which is a margin collaspe problem

close #7967

ref: https://stackoverflow.com/a/33132624/3040605
 2017-10-21 15:12:56 +08:00
afc163
00bfa49031 Merge branch 'master' into antd-3.0 2017-10-16 20:45:25 +08:00
afc163
2a34866e83 update layout demo 2017-10-16 20:39:53 +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
afc163
054444f619 Merge branch 'master' into antd-3.0 2017-10-07 15:34:19 +08:00
Graeme Yeates
2e2acb5be9 Support customizing layout footer background (#7818) 2017-10-06 16:09:33 +08:00
nikogu
09addde73c Merge branch 'master' into antd-3.0 2017-09-28 17:56:36 +08:00
ddcat1115
3b6dc3f3c4 revert wrong code removing fd40643c2d 2017-09-28 17:28:49 +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
ChaXinyu
14e2a56b75 export components interface (#7654) 
* export components interface

* export specific props

* fix formItem missed import
 2017-09-25 22:14:49 +08:00
afc163
fd40643c2d Remove unused code 2017-09-25 11:12:59 +08:00
afc163
3eb4937fd4 Remove unused code 2017-09-25 11:12:38 +08:00
afc163
6507aefd8e Merge branch 'master' into antd-3.0 2017-09-25 10:54:49 +08:00
Zheeeng
d8c1bdb3ab Fix: setting 'heigh: 100%' on Sider and the wrapped element can't take the desired effects (#7716) 2017-09-23 18:33:26 +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
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
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
696b4252a8 tweak collpse animation easing 2017-09-06 13:46:45 +08:00
Khalifa Lame
112aaed5fb docs: update Layout English doc (#7461) 
Fixed typos.
 2017-09-05 16:48:23 +08:00
afc163
882ae31199 Fix menu inlineCollapsed under uncontrolled Sider, close #7409 2017-09-01 10:38:53 +08:00
afc163
9547fe5bc4 fix demo sanpshot 2017-08-30 14:21:20 +08:00
afc163
56b6fc38d7 fix sider layout min height 2017-08-29 23:58:27 +08:00
afc163
ea92bbf371 fix snap 2017-08-16 22:04:16 +08:00
afc163
f61f811432 Fix sider width transition in IE11 
close #6349
 2017-08-16 21:46:09 +08:00
afc163
70e10dee59 Fix transition width of sider trigger 2017-08-16 21:46:09 +08:00
afc163
f689ede0fa The collapse trigger of Sider should be fixed and upon menus 
close #7161
 2017-08-11 16:10:17 +08:00
afc163
500b222556 Fix stretched layout by content 
523b4360d2 (commitcomment-23527573)
 2017-08-08 13:38:10 +08:00
afc163
b3979885e4 fix demo snapshot 2017-08-04 21:29:30 +08:00
afc163
6a17efcbf1 upgrade some devDeps and fix stylelint 2017-08-04 18:01:40 +08:00
jiang
f1110f2bc5 sync menu and layout-sider animate time (#7047) 2017-08-01 17:36:53 +08:00
Bryan Berger
91400d54fa add less variables for layout-trigger background, color 2017-07-21 14:21:31 -04:00
Benjy Cui
6bdb84a011 docs: update docs, ref: 639e60a 2017-07-19 09:48:07 +08:00
Geoff Holden
639e60af45 docs: added reverseArrow documentation. (#6888) 2017-07-19 09:45:42 +08:00
afc163
f9193952ff Add breakpoint width documentation 2017-07-14 15:47:07 +08:00
afc163
91707b89d8 test: update snapshot 2017-07-13 15:24:53 +08:00
afc163
22e14970ec Improve fixed sider layout implementation, fix #6817 2017-07-13 15:23:34 +08:00
偏右
b653a2c055 Merge branch 'master' into feature-2.12 2017-07-07 19:41:37 +08:00
afc163
883f82172e Fix shadowed name ts errors 2017-07-06 15:37:28 +08:00
afc163
7d3bc4ebd4 update snapshots 2017-06-30 22:02:19 +08:00
afc163
89a37da77f Menu will get collapsed status from Layout.Sider 2017-06-30 21:36:23 +08:00
afc163
dd6d643519 update doc 2017-06-17 14:14:30 +08:00
afc163
a5cc8b33e3 fix menu border in demo 2017-06-15 15:39:55 +08:00
afc163
e62fa2a403 remove overflow:auto in Content 2017-06-15 15:37:24 +08:00
Panjie Setiawan Wicaksono
cc71ab957e better typings for layout components 2017-05-28 02:20:05 +07:00
Benjy Cui
0e5431d21b deps: upgrade antd-tools and code style 2017-05-25 16:54:15 +08:00
Benjy Cui
67c38fa3b4 fix: should hide collapsed children, close: #6131 2017-05-24 10:25:43 +08:00
ddcat1115
b236d73348 fix firefox Layout.Sider can't collapse to zero width (#5833) 2017-04-22 10:38:44 +08:00
乐仪
686cff965c undate 2017-04-10 14:02:00 +08:00