Commit Graph

344 Commits

Author SHA1 Message Date
afc163
e6bdd3d656 fix snapshot and defaultValue warning 2018-12-28 23:00:34 +08:00
afc163
879784c665
Merge branch "master" into "feature" 2018-12-20 17:43:00 +08:00
nick-ChenZe
bc20797a61 feat: update docs for switcherIcon 2018-12-20 17:16:44 +08:00
nick-ChenZe
d814c19356 feat: add switcherIcon prop to Tree 2018-12-20 17:16:44 +08:00
Sam Lanning
af8a025aeb [chore] remove additional unused variable 2018-12-20 17:16:00 +08:00
Sam Lanning
e56e1a71c3 [chore] fix useless assignments to local variables
This commit addresses all the instances of useless assignments to
local variables, as found by LGTM.com
2018-12-20 17:16:00 +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
afc163
83c192ea3e
💄 fix eslint problems 2018-11-28 15:11:02 +08:00
afc163
c0ba2eb456
💄 tweak tree switcher icon size 2018-11-26 13:42:49 +08:00
ztplz
f25757ef9d Add missing types for tree 2018-11-15 14:02:29 +08:00
ztplz
3130a9584d Delete extra blank line 2018-11-12 12:14:28 +08:00
afc163
a616f89a1b 🔥 update less code style 2018-11-12 12:02:30 +08:00
ztplz
6ad23c370e Fix CI 2018-11-10 22:09:29 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
zombiej
bc35582643 update tree draggable demo 2018-10-25 11:19:17 +08:00
zombiej
38fd268199 fix #12567
Use same expand logic in DirTree with switcher & selector
2018-10-10 11:51:34 +08:00
Wei Zhu
a3ce6678cb Update snapshot 2018-10-01 23:57:45 +08:00
zombiej
1c85bb3b62 fix #12396. Support expandedKeys when init 2018-09-25 15:29:07 +08:00
zombiej
e58273dccf fix #12269. Fix Tree onDrop ts type 2018-09-17 17:37:20 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
zombiej
425e477c7f update rc-tree & testcase 2018-09-03 15:11:40 +08:00
HeskeyBaozi
24568f61ff use the whole svg icons 2018-09-02 23:39:58 +08:00
HeskeyBaozi
d5e55e365d test 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
c7069b27fe fix icon theme code style 2018-09-02 20:59:37 +08:00
HeskeyBaozi
359191abeb update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
e91aa112bf remove svgClassName 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
HeskeyBaozi
7f22efbfae update test sanpshot 2018-08-25 16:09:10 +08:00
HeskeyBaozi
ec397fef5b update test snapshot 2018-08-25 15:52:14 +08:00
HeskeyBaozi
6fe79dff36 upgrade tree-select 2018-08-25 15:51:07 +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
43e6621fb7 use correct icon 2018-08-24 18:11:02 +08:00
zombiej
500ef62638 fix https://github.com/ant-design/ant-design/issues/11423. TreeNode can accept custom prop 2018-08-23 20:38:56 +08:00
HeskeyBaozi
96b38dd3ec use svg icon in introduce 2018-08-21 18:33:52 +08:00
HeskeyBaozi
ea6656f734 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-21 16:32:30 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
Alexey Yakovlev
3582f46347 Update TreeProps.onCheck callback signature. 2018-08-19 20:16:27 +08:00
HeskeyBaozi
33d270aaf2 tree dynamic icon 2018-08-17 16:36:33 +08:00
HeskeyBaozi
d185068c20 yarn upgrade rc-tree 2018-08-17 16:04:11 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
b9a9c308c9 [breaking] remove iconfont-font class helper 2018-08-14 15:31:20 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
Bartek
e107b03cc7 closing #11604, add selectable to AntTreeNodeProps (#11651) 2018-08-13 14:09:32 +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
afc163
56fa8629b5 Merge branch 'master' into feature-3.8.0 2018-07-30 17:58:21 +08:00
zombiej
6617f785fd fix #11458. Adjust treeNode draggable css 2018-07-30 13:56:49 +08:00
zombiej
17b82a251a update rc-tree 2018-07-30 12:05:29 +08:00
Ilan Hasanov
186496d840 💬 fix tree component typos 2018-07-29 01:15:02 +08:00
HeskeyBaozi
ee16585b6d update test cases 2018-07-25 11:51:19 +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
zombiej
ed7630053e fix #11366. action trigger expand also trigger the onExpand 2018-07-20 10:50:20 +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
Zhiqiang Gong
722b24b813 add disabled prop (#11188)
First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [x] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [x] Make sure that you add at least one unit test for the bug which you had fixed.

**elif** *isNewFeature* **:**

  * [ ] Update API docs for the component.
  * [ ] Update/Add demo to demonstrate new feature.
  * [ ] Update TypeScript definition for the component.
  * [ ] Add unit tests for the feature.

tslint检测时报错
类型“IntrinsicAttributes & IntrinsicClassAttributes<Tree> & Readonly<{ children?: ReactNode; }> & Read...”上不存在属性“disabled”。
2018-07-11 19:39:41 +08:00
afc163
0981ef06a4 fix demo lint 2018-06-27 16:14:47 +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
愚指导
d11d44e413
Bump 3.6.4 and fix some lint issue. 2018-06-23 16:35:42 +08:00
Wei Zhu
3fb478e743 Update Tree types 2018-06-21 14:38:44 +08:00
zombiej
ac9368298f miss ? for TreeNode className prop 2018-06-20 17:41:12 +08:00
zombiej
17da353575 close #10950. Add className in TreeNode prop 2018-06-20 09:47:24 +08:00
Wei Zhu
b7879e909f docs: use title instead of key
Address #10949
2018-06-19 17:30:06 +08:00
afc163
99d6e4c96c Merge branch 'master' into feature-3.7.0 2018-06-12 15:34:51 +08:00
Wei Zhu
99cad890ef Fix Tree types, TreeNode is a ComponentClass
Close #10868
2018-06-12 10:57:19 +08:00
zombiej
c488aca05e close #10666 #10821.Update tree support loadedKeys 2018-06-08 16:55:17 +08:00
afc163
89f3b253a4 Merge branch 'master' into feature-3.7.0 2018-06-08 16:22:15 +08:00
Kirill Alexander Khalitov
0ca1a990be Makes TreeNode component more type safe
Makes TreeNode component more type safe
2018-06-08 10:32:00 +08:00
Kirill Alexander Khalitov
74755fef99 Fix #10838
Fix [#10838](https://github.com/ant-design/ant-design/issues/10838)
2018-06-08 10:32:00 +08:00
zombieJ
a825ed4e66
Directory Tree (#10139)
Support DirTree. close #7749
2018-06-04 11:20:17 +08:00
zombiej
06ffd9ca04 Adjust Tree icon vertical-align, fix #10603 2018-05-21 21:24:16 +08:00
Wei Zhu
bf03d954d4 docs: Fix indent 2018-05-14 12:29:04 +08:00
Xiping.wang
413479a5b9 修改案例title值,原title值容易产生误导
修改案例title值,原title值容易产生误导
2018-05-14 12:08:50 +08:00
zombiej
0437d858f2 update testcase sync with Tree 1.8.12. Ref: https://github.com/ant-design/ant-design/issues/9899 2018-04-10 19:29:18 +08:00
jim
a5e2020908 add icon prop in .d.ts 2018-04-09 14:22:06 +08:00
zombieJ
49719b20d8
update tree doc for customize icon (#9893)
* update doc for customize icon
* add test case
2018-04-04 16:39:50 +08:00
zombiej
c135572730 Fix conduct logic on node disabled, update test snapshot 2018-03-29 19:46:01 +08:00
zombiej
08b6011ed7 update deps of rc-tree 2018-03-29 18:09:54 +08:00
valleykid
ae78a4bbec When treeNode is disabled, its switcher is highlight and clickabled (#9539)
* When treeNode is disabled, its switcher is highlight and clickabled

* rc-tree@1.7.11
2018-03-09 15:04:09 +08:00
偏右
8226ede38e
Fix test case for new jsdom (#9527)
* Fix test case for new jsdom

* use setTimeout as raf in jest jsdom

* Fix cancelAnimationFrame

* Add comment for facebook/jest#5147

* longer timeout

* fix snap

* upgrade antd-tools
2018-03-06 21:21:01 +08:00
Wei Zhu
5c00985fed Add children to AntTreeNodeProps 2018-01-30 16:50:49 +08:00
luyiming
e511c2ac33 fix tree demo drag&drop bug (#9131) 2018-01-26 13:30:44 +08:00
Wei Zhu
999d6184ad docs: Sort api table 2017-12-29 20:22:58 +08:00
Wei Zhu
01f4b4e713 Merge branch 'master' into antd-3.0 2017-12-01 11:50:07 +08:00
Wei Zhu
8e907cebde Fix tree draggable demo
Close #8246
2017-11-24 15:29:36 +08:00
Wei Zhu
6837aedf69 Imporve tree and tree-select type definitions 2017-11-20 17:11:13 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +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
翁润雨
58fe3277d8 add the 'selectable' attribute (#8048) 2017-10-31 13:57:45 +08:00
翁润雨
f64e24af8c add the 'selectable' attribute (#8048) 2017-10-28 19:39:33 +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