Commit Graph

40 Commits

Author SHA1 Message Date
C.J. Winslow
b9a86b2ea1 Pass the ok and cancel button props in the confirm API (#12425)
This PR adds the `okButtonProps` and `cancelButtonProps` API to the `Modal.confirm` and associated methods.


* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for branch `feature`.
* [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:

*isNewFeature* **:**

  * [x] Update API docs for the component.
  * [x] Update/Add demo to demonstrate new feature.
  * [x] Update TypeScript definition for the component.
  * [x] Add unit tests for the feature.
2018-09-30 14:50:03 +08:00
Erwin Kort
2d8f9ccf63 Add button autofocus prop to confirm modal (#11756)
@picodoth
2018-09-29 17:00:01 +08:00
afc163
207bad7b47 Merge branch 'master' into feature-3.9.0 2018-09-01 13:22:06 +08:00
zombiej
fe2728cb20 fix #11969. Pass centered prop to popup modal 2018-08-30 22:27:32 +08:00
afc163
0f472505db use const 2018-08-25 22:57:24 +08:00
afc163
b8b9c02fb9 Add update function for Modal.method, close #11721 2018-08-25 22:57:24 +08:00
afc163
877f9fd7d6 Add getContainer to Modal.info etc, close #11377 2018-08-25 21:24:18 +08:00
yoyo837
eab74fa693 For #11537, Centered style should be applied to the wrap element. 2018-08-01 11:16:17 +08:00
yoyo837
f14e207912 Boolean 2018-07-31 21:14:48 +08:00
yoyo837
ef31697d26 Support centered settings 2018-07-31 21:14:48 +08:00
afc163
220d28d3e4 support keyboard for Modal.confirm, close #8818 2018-02-11 13:45:32 +08:00
Wei Zhu
45815d1148
Refactor confirm (#8409)
* Refactor confirm

* Add okCancel test

* Only test React 16

* Upgrade rc-dialog
2017-12-02 22:10:27 +08:00
Wei Zhu
d8f6c3bd8c Fix implicit any error for Modal and Message 2017-11-21 17:20:25 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
Alex Chao
3727ea2c33 feat: Modal.confirm supports zIndex prop #6722 (#6880)
* Modal.confirm supports zIndex prop #6722

* Fix filename

* Fix the zIndex missing in ModalFuncProps interface
2017-08-07 10:41:38 +08:00
yociduo
528a7645ca remove cancel text 2017-08-07 10:40:33 +08:00
Eden Wang
f2b987aaa9 update custom type for modal components 2017-08-07 10:40:32 +08:00
paranoidjk
ba168b826f refactor: use spread operator replace object-assign (#6677) 2017-07-03 16:57:11 +08:00
afc163
fd625ef1a0 upgrade and fix tslint problems 2017-05-31 15:48:35 +08:00
Benjy Cui
0e5431d21b deps: upgrade antd-tools and code style 2017-05-25 16:54:15 +08:00
ddcat1115
24e6fb4ba6 fix Modal.confirm error when onCancel not set (#5294)
* fix Modal.confirm error when onCancel not set

* add test case
2017-03-17 11:47:36 +08:00
elios
f3cc8dfe0d + call onCancel when pressing esc key (#5209)
* + call onCancel when pressing esc key

* + call onCancel when press esc corrections
2017-03-10 10:55:47 +08:00
afc163
0eb5c689a3 remove type="ghost" from demo 2017-02-04 22:35:33 +08:00
Pixy Yuan
a2bef2b87e feat: Modal.confirm add maskClosable option (#4488) (#4490)
* feat: Modal.confirm add maskClosable option (#4488)

* feat: Modal.confirm add maskClosable option (#4488)
2017-01-08 19:14:28 +08:00
Benjy Cui
4758302ad5 deps: upgrade antd-tools, close: #4208 2016-12-19 14:01:52 +08:00
afc163
3af1821bde remove whitespaces 2016-12-11 14:05:19 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055)
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
2016-11-30 10:20:23 +08:00
Benjy Cui
4878258f6c refactor: ref: #3490 2016-10-24 12:04:26 +08:00
afc163
2969f9d1e5 Improve confirm Modal style detail 2016-10-07 17:59:00 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
马金花儿
3d187d00a1 feat: 为Modal组件的confirm、success、error、warning、info 子组件增加快捷键,模仿原生体验。 (#3061)
* Add hotkey for Modal.confirm

* Optimize

* 重构快捷键逻辑

* 根据CR 进一步优化逻辑

* timeoutId 改为非强制

* Update confirm.tsx

* 使用 onCancel 回调代替 onClose,并修改 onCancel 注释。

* 修改注释
2016-09-20 08:58:20 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024)
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
2016-09-14 16:18:33 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
afc163
36293e2ccb fix tslint 2016-08-16 18:12:56 +08:00
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
ddcat1115
3bdd8212ec refactor: Ts rewrite patination notification modal menu (#2699) 2016-08-15 12:00:05 +08:00
Benjy Cui
8dd31d0bb2 fix: buttons of Modal.xxx should be disabled, close: #2684 (#2687) 2016-08-14 15:19:47 +08:00
afc163
d7defe458b blank line 2016-07-15 12:37:53 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00