Commit Graph

470 Commits

Author SHA1 Message Date
zombiej
f791a50084 add forceRender support
fix #12503
2018-12-06 15:08:35 +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
二哲
ad347a98e2 Update manual.md
After destroying need to clear interval
2018-12-02 20:48:52 +08:00
afc163
83c192ea3e
💄 fix eslint problems 2018-11-28 15:11:02 +08:00
afc163
4abc2824e4
📝 upgrade ts comment 2018-11-26 19:32:33 +08:00
afc163
a616f89a1b 🔥 update less code style 2018-11-12 12:02:30 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
afc163
a264c6f345 Add less variable @modal-header-bg, close #12914 2018-11-01 14:57:10 +08:00
Pouya Sanooei
a70d64451b fix Modal docs typo 2018-11-01 12:05:24 +08:00
zombiej
9aa62d42c2 Modal.xxx support maskStyle
fix #12688
2018-10-27 18:54:52 +08:00
afc163
a27c8a2740 demo: update modal demo 2018-10-23 23:16:22 +08:00
黄文鉴
df9b20209c fix: change modal's default prefixCls to ant-modal and ant-modal-confirm (#12548) 2018-10-12 14:04:26 +08:00
comerc
3898c45c5d Typo (#12608) 2018-10-11 23:47:39 +08:00
RyanHui
c095cb4665 modal add mask colse (#12556) 2018-10-10 22:28:38 +08:00
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
Adam Burgess
9b01ec1ed2 Modal: Add the update function type definition 2018-09-23 13:20:38 +08:00
afc163
2952a8625b site: remove old version hint of API 2018-09-12 21:43:01 +08:00
HeskeyBaozi
c76a90b2b7 fix tweak icon 2018-09-07 14:14:23 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
afc163
32c78b2f8d update snapshot 2018-09-05 22:41:46 +08:00
zombiej
abd1d5efbb fix #12050. Table on modal should be the same behaivour as normal one 2018-09-04 14:35:46 +08:00
包子熊
67024893ce Hotfix/icon issue (#12016)
* fix progress icon

* remove IconDisplay fields.js

* update progress test snapshot

* fix form item circle filled

* update form-item test snapshot

* fix close icon in upload item list

* fix alert icon theme

* update alert test snapshot

* fix time picker clear icon

* fix test snapshot

* fix rotate icon in the header

* update test snapshot

* update new tree test snapshot

* fix icon position

* fix old icon and new icon both display

* fix card actions icon position
2018-09-03 19:29:27 +08:00
afc163
3cbb5da6c2 tweak icons size 2018-09-03 17:11:20 +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
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
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
afc163
0f472505db use const 2018-08-25 22:57:24 +08:00
afc163
325bff5324 update modal demo button text 2018-08-25 22:57:24 +08:00
afc163
9fdee487ce Add test case for modal update 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
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
afc163
ec6d88f407 Fix modal text being selected when open it with double click, close #11777 2018-08-17 19:13:42 +08:00
yoyo837
004d786cb4 补充中文文档 2018-08-16 23:00:52 +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
b2ab727c89 resolve conflicts 2018-08-06 15:06:06 +08:00
afc163
aa2b1a4352 Merge branch 'master' into feature-3.8.0 2018-08-03 23:16:08 +08:00
HeskeyBaozi
46cb1c8cde resolve conflict. 2018-08-02 18:02:43 +08:00
HeskeyBaozi
cc180e2605 resolve conflict. 2018-08-02 18:02:31 +08:00
Chandler Moisen
10f1c6ceaa Modal.confirm title overflow:hidden 2018-08-02 11:27:32 +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
45e9b2a937 fix prefixCls is missing in restProps 2018-07-31 21:14:48 +08:00
yoyo837
ef31697d26 Support centered settings 2018-07-31 21:14:48 +08:00
HeskeyBaozi
c28c30d124 use rc-dialog@3.2.0, use svg close icon in Modal component. 2018-07-31 16:19:10 +08:00
Ilan Hasanov
86398d910a 💬 misc typos and blank spaces fixes 2018-07-29 01:15:02 +08:00
afc163
fbf1a35249 Fix extra scrollbar style of Modal.confirm in Firefox, close #11432 2018-07-24 16:27:21 +08:00
Hanz Luo
11f0f14cb2 Remove scrollbar on confirm Modal title 2018-07-16 10:44:14 +08:00
陈帅
d2856392b6 fix site build error 2018-07-13 22:23:12 +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
Matt Lein
e63f9d4beb Pass data and aria props to the date picker input.
Pass data and aria props to the alert div.
add wrapProps to ModalProps
2018-06-25 16:53:04 +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
afc163
9f16d066af Fix lint problems from eslint-config-airbnb@17 2018-06-22 21:05:13 +08:00
Randy
a614a525c4 fix #10822 (#10955)
Add `okButtonProps` and `cancelButtonProps` props to ok button and cancel button
2018-06-22 19:56:41 +08:00
Oleg Kuzava
be7f540fba Fix breakpoint for mobile view 2018-05-29 14:05:40 +08:00
afc163
3a445f3e75 more test cases 2018-05-25 21:43:21 +08:00
Chenjia
5634881eda add docs for keyboard props on modal component #8818 (#10030) 2018-04-13 12:01:51 +08:00
Wei Zhu
921361313a Add explicit types for default props
Fix #8796
Close #8820
2018-04-10 10:50:59 +08:00
Hughen
53abf888cb fix: fixed modal content overflowed
- fixed modal content overflowed, when the very long english
  word fill in Modal title
2018-03-30 15:33:33 +08:00
afc163
f8f52b09be Fix Modal.confirm content layout
close #9374

created a BFC to resolve multiple lines of title render bug

https://www.smashingmagazine.com/2017/12/understanding-css-layout-block-formatting-context/
2018-03-21 17:35:31 +08:00
afc163
220d28d3e4 support keyboard for Modal.confirm, close #8818 2018-02-11 13:45:32 +08:00
afc163
6c46692160 Tweak confirm title style 2018-01-31 14:46:45 +08:00
keqingrong
32ac330ca2 docs: add className for Modal.method 2018-01-05 21:47:16 +08:00
Wei Zhu
999d6184ad docs: Sort api table 2017-12-29 20:22:58 +08:00
Wei Zhu
f89254537e Document destroyOnClose in Chinese 2017-12-28 16:26:03 +08:00
Rohan Malhotra
6f3f17bb06 removed unnecessary whitespace 2017-12-28 12:49:54 +05:30
Rohan Malhotra
c6a1861887 updated rc-dialog and docs for destroyOnClose 2017-12-28 12:49:33 +05:30
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
01f4b4e713 Merge branch 'master' into antd-3.0 2017-12-01 11:50:07 +08:00
Nathan Griffin
51b6e4904a Adding missing type properties (#8395) 2017-12-01 10:29:48 +08:00
Benjy Cui
57dcc78989 fix: should not override default footer, close: #8379 2017-11-30 17:24:51 +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
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
Benjy Cui
e5699aff68 fix: should not import moment while useless, close: #8013 2017-10-26 10:50: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
3f57d5f56d Merge branch 'master' into antd-3.0 2017-10-23 10:41:51 +08:00
Benjy Cui
ff5d05129f docs: translate 1599686 2017-10-23 10:37:31 +08:00
kossel
1599686fc2 docs: update docs for Modal, close #7840 (#7952) 2017-10-22 21:35:47 -05:00
Benjy Cui
7ea572bfc8 refactor: extract common locale logic (#7915) 2017-10-20 14:54:38 +08:00
偏右
ffffd0f4c5 Fix styles (#7924)
* update demo

* Fix styles

* fix snap

* Fix back-top ci
2017-10-18 17:16:14 +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
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
偏右
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
Benjy Cui
829b5f87bf feat: make default locale to enUS (#7553)
* feat: make default locale to enUS

* test: fix CI

* docs: update getting started
2017-09-26 23:12:47 +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
7a7b18032c use @screen-md 2017-09-25 11:18: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
Meow-z
e165b8a705 fix: model (#7675)
add confirmLoading in async model state.
2017-09-20 09:22:53 -05:00
afc163
ea2c113530 Fix zIndex types, ref #7624 2017-09-15 22:51:03 +08:00
afc163
11a6cd51a2 Fix zIndex types, close #7622 2017-09-15 21:41:32 +08:00
Khalifa Lame
b381f1f5ec docs: update Modal English doc (#7537)
Fixed several typos.
2017-09-11 11:08:18 +08:00
Benjy Cui
59193ef34a Revert "Patch 1 (#7471)"
This reverts commit 9667ec17bd.
2017-09-06 09:46:58 +08:00
kuang
9667ec17bd Patch 1 (#7471)
* default value error 

f10a2abbd8/src/Modal.tsx (L53)

* default value error
2017-09-05 19:07:57 +08:00
afc163
ef8beaffde Merge from master 2017-08-25 22:51:14 +08:00
afc163
61aac68028 doc: remove new key way 2017-08-24 09:44:17 +08:00
Benjy Cui
456cea652b docs: add zIndex to docs of Modal, ref: 2aa3437 2017-08-07 10:41:38 +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
fa0e90f577 remove cancel type 2017-08-07 10:40:34 +08:00
yociduo
528a7645ca remove cancel text 2017-08-07 10:40:33 +08:00
Eden Wang
a5a1458148 add missing trailing commna 2017-08-07 10:40:33 +08:00
Eden Wang
8f1dd9ccda add missing trailing comma 2017-08-07 10:40:33 +08:00
Eden Wang
ee176347ac fix ci compile error 2017-08-07 10:40:33 +08:00
Eden Wang
f7b918add3 update confirm demo 2017-08-07 10:40:33 +08:00
Eden Wang
c712d072eb update okType and cancelType for api docs 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
乐仪
1dd3e001c5 Update Modal doc, relevant:https://github.com/ant-design/ant-design/pull/7085 2017-08-06 12:44:15 +08:00
Ivan Radeljic
1651682020 Update modal documentation (#7085)
Add another way to destroy state on close modal
2017-08-06 00:04:25 +08:00
Wei Zhu
401519ec6f Fix types 2017-07-31 01:50:46 +08:00
Randy
99e4cd6aec add rc-util declaration to custom-typings (#6935) 2017-07-29 14:17:02 +08:00
LongYinan
bd5daa939a fix: missing maskClosable property in ModalFuncProps interface 2017-07-17 15:26:37 +08:00
paranoidjk
ba168b826f refactor: use spread operator replace object-assign (#6677) 2017-07-03 16:57:11 +08:00
Benjy Cui
8c632ef2cf fix: Modal.method should stop loading when promise throw err, close: #6183 2017-06-06 11:51:50 +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
Benjy Cui
977a5a1cc7 docs: add missing API docs for Modal, close: #6239 2017-05-24 10:00:59 +08:00
Benjy Cui
523ad8c802 docs: show demo for #6121 2017-05-16 15:09:10 +08:00
Benjy Cui
9ce3a1ea35 docs: update docs details for Modal, close: #6121 2017-05-16 10:43:12 +08:00
Benjy Cui
12a6060304 docs: fix code style 2017-05-15 14:37:22 +08:00
leadream
d783c26263 css: add background color variable for modal mask. (#5890) 2017-04-25 16:43:42 +08:00
afc163
b9ff7ed613 enlarge close area of Modal 2017-04-19 11:15:46 +08:00
Manjit Kumar
4e055ed5d0 use PropTypes from 'prop-types' mdoule instead of React
- as React.PropTypes is being deprecated
 - Warning: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
 - Solution: https://facebook.github.io/react/blog/2017/04/07/react-v15.5.0.html#migrating-from-react.proptypes
2017-04-12 02:22:05 +05:30
Benjy Cui
71495e71d2 test: fix warning, close: #5628 2017-04-05 16:21:21 +08:00
Wei Zhu
1a8e738142 Set snapshotSerializers 2017-04-02 18:09:23 +08:00
Benjy Cui
ce2fe2aa45 test: add test for Modal[footer=null] 2017-03-30 16:06:03 +08:00
Benjy Cui
af12ca7434 fix: Modal[footer] could be set to null to hide totally, close: #5462 2017-03-24 14:41:41 +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
afc163
6b2f6af85d use @info-color over @primary-color, close #5442 2017-03-23 13:57:30 +08:00
afc163
a42a507e2b percise modal document 2017-03-22 15:25:28 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361)
* Upgeade to jest 19

* Use jest.spyOn
2017-03-17 18:56:30 +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
0b62f77630 Tweak title color 2017-03-07 14:29:02 +08:00
3d32a86547 refactor: improve modal static methods type definition (#5090)
* refactor: improve modal static methods type definition

* chore: add exports.

* chore: remove unused import
2017-03-03 11:40:54 +08:00
ddcat1115
e07cdf5387 add left out event parameters for Modal[onOk] Popconfirm[onConfirm] Popconfirm[onCancel] (#5042) 2017-02-24 16:07:39 +08:00