Skip to content

Commit

Permalink
added props.show
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Jorgensen committed Jul 29, 2017
1 parent 6734e76 commit 53d54e6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 5 deletions.
12 changes: 7 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ Changes in version 4.0
-----

* Added `prop-types` as peer dependency
* Added props.showConfirm to allow hiding the confirm button
* Added `props.showConfirm` to allow hiding the confirm button
* Added `props.show` to allow hiding the confirm button

Changes in version 3.0
-----

* You no longer need to inlcude lib/css/animations.css in your app.
* Removed props.content (use props.children)
* Removed props.inputPlaceHolder (use props.placeholder)
* Removed props.inputValidationMsg (use props.validationMsg)
* You no longer need to inlcude `lib/css/animations.css` in your app.
* Removed `props.content` (use `props.children`)
* Removed `props.inputPlaceHolder` (use `props.placeholder`)
* Removed `props.inputValidationMsg` (use `props.validationMsg`)

Examples
--------
Expand Down Expand Up @@ -170,6 +171,7 @@ Configuration
| confirmBtnBsStyle | no | string | 'primary' | Bootstrap style of confirm button. Allowed values: 'default', 'primary', 'link', 'info', 'success', 'warning', 'danger' |
| customIcon | no | string, node | undefined | Either a string url for an image to use as the icon, or JSX/ReactNode. |
| placeholder | no | string | undefined | If type is input, this is the placeholder for the input field. |
| show | no | bool | true | If false, the alert will not be rendered. |
| required | no | bool | true | If true, requires the input field to have a value. |
| validationMsg | no | string | 'Please enter a response!' | If type is input, this is the message to diplay when the user clicks confirm without entering a value. |
| defaultValue | no | string | undefined | If type is input, this is the default value for the input field. |
Expand Down
5 changes: 5 additions & 0 deletions lib/components/SweetAlert.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export default class SweetAlert extends React.Component {
cancelBtnBsStyle : PropTypes.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
confirmBtnBsStyle : PropTypes.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
customIcon : PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
show : PropTypes.bool,
required : PropTypes.bool,
placeholder : PropTypes.string,
validationMsg : PropTypes.string,
Expand All @@ -65,6 +66,7 @@ export default class SweetAlert extends React.Component {
inputType : 'text',
customClass : '',
hideOverlay : false,
show : true,
required : true,
disabled : false,
beforeMount : () => {},
Expand Down Expand Up @@ -229,6 +231,9 @@ export default class SweetAlert extends React.Component {
};

render() {
if (!this.props.show) {
return false;
}
return (
<div>

Expand Down
5 changes: 5 additions & 0 deletions lib/demo/dist/demo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22633,6 +22633,9 @@
}, {
key: 'render',
value: function render() {
if (!this.props.show) {
return false;
}
return _react2.default.createElement('div', null, _react2.default.createElement('style', { type: 'text/css', scoped: true }, '@-webkit-keyframes showSweetAlert {\n 0% {\n transform: scale(0.7);\n -webkit-transform: scale(0.7);\n }\n 45% {\n transform: scale(1.05);\n -webkit-transform: scale(1.05);\n }\n 80% {\n transform: scale(0.95);\n -webkit-tranform: scale(0.95);\n }\n 100% {\n transform: scale(1);\n -webkit-transform: scale(1);\n }\n }\n @keyframes showSweetAlert {\n 0% {\n transform: scale(0.7);\n -webkit-transform: scale(0.7);\n }\n 45% {\n transform: scale(1.05);\n -webkit-transform: scale(1.05);\n }\n 80% {\n transform: scale(0.95);\n -webkit-tranform: scale(0.95);\n }\n 100% {\n transform: scale(1);\n -webkit-transform: scale(1);\n }\n }\n @-webkit-keyframes hideSweetAlert {\n 0% {\n transform: scale(1);\n -webkit-transform: scale(1);\n }\n 100% {\n transform: scale(0.5);\n -webkit-transform: scale(0.5);\n }\n }\n @keyframes hideSweetAlert {\n 0% {\n transform: scale(1);\n -webkit-transform: scale(1);\n }\n 100% {\n transform: scale(0.5);\n -webkit-transform: scale(0.5);\n }\n }\n @-webkit-keyframes animateSuccessTip {\n 0% {\n width: 0;\n left: 1px;\n top: 19px;\n }\n 54% {\n width: 0;\n left: 1px;\n top: 19px;\n }\n 70% {\n width: 50px;\n left: -8px;\n top: 37px;\n }\n 84% {\n width: 17px;\n left: 21px;\n top: 48px;\n }\n 100% {\n width: 25px;\n left: 14px;\n top: 45px;\n }\n }\n @keyframes animateSuccessTip {\n 0% {\n width: 0;\n left: 1px;\n top: 19px;\n }\n 54% {\n width: 0;\n left: 1px;\n top: 19px;\n }\n 70% {\n width: 50px;\n left: -8px;\n top: 37px;\n }\n 84% {\n width: 17px;\n left: 21px;\n top: 48px;\n }\n 100% {\n width: 25px;\n left: 14px;\n top: 45px;\n }\n }\n @-webkit-keyframes animateSuccessLong {\n 0% {\n width: 0;\n right: 46px;\n top: 54px;\n }\n 65% {\n width: 0;\n right: 46px;\n top: 54px;\n }\n 84% {\n width: 55px;\n right: 0px;\n top: 35px;\n }\n 100% {\n width: 47px;\n right: 8px;\n top: 38px;\n }\n }\n @keyframes animateSuccessLong {\n 0% {\n width: 0;\n right: 46px;\n top: 54px;\n }\n 65% {\n width: 0;\n right: 46px;\n top: 54px;\n }\n 84% {\n width: 55px;\n right: 0px;\n top: 35px;\n }\n 100% {\n width: 47px;\n right: 8px;\n top: 38px;\n }\n }\n @-webkit-keyframes rotatePlaceholder {\n 0% {\n transform: rotate(-45deg);\n -webkit-transform: rotate(-45deg);\n }\n 5% {\n transform: rotate(-45deg);\n -webkit-transform: rotate(-45deg);\n }\n 12% {\n transform: rotate(-405deg);\n -webkit-transform: rotate(-405deg);\n }\n 100% {\n transform: rotate(-405deg);\n -webkit-transform: rotate(-405deg);\n }\n }\n @keyframes rotatePlaceholder {\n 0% {\n transform: rotate(-45deg);\n -webkit-transform: rotate(-45deg);\n }\n 5% {\n transform: rotate(-45deg);\n -webkit-transform: rotate(-45deg);\n }\n 12% {\n transform: rotate(-405deg);\n -webkit-transform: rotate(-405deg);\n }\n 100% {\n transform: rotate(-405deg);\n -webkit-transform: rotate(-405deg);\n }\n }\n @-webkit-keyframes animateErrorIcon {\n 0% {\n transform: rotateX(100deg);\n -webkit-transform: rotateX(100deg);\n opacity: 0;\n }\n 100% {\n transform: rotateX(0deg);\n -webkit-transform: rotateX(0deg);\n opacity: 1;\n }\n }\n @keyframes animateErrorIcon {\n 0% {\n transform: rotateX(100deg);\n -webkit-transform: rotateX(100deg);\n opacity: 0;\n }\n 100% {\n transform: rotateX(0deg);\n -webkit-transform: rotateX(0deg);\n opacity: 1;\n }\n }\n @-webkit-keyframes animateXMark {\n 0% {\n transform: scale(0.4);\n -webkit-transform: scale(0.4);\n margin-top: 26px;\n opacity: 0;\n }\n 50% {\n transform: scale(0.4);\n -webkit-transform: scale(0.4);\n margin-top: 26px;\n opacity: 0;\n }\n 80% {\n transform: scale(1.15);\n -webkit-transform: scale(1.15);\n margin-top: -6px;\n }\n 100% {\n transform: scale(1);\n -webkit-transform: scale(1);\n margin-top: 0;\n opacity: 1;\n }\n }\n @keyframes animateXMark {\n 0% {\n transform: scale(0.4);\n -webkit-transform: scale(0.4);\n margin-top: 26px;\n opacity: 0;\n }\n 50% {\n transform: scale(0.4);\n -webkit-transform: scale(0.4);\n margin-top: 26px;\n opacity: 0;\n }\n 80% {\n transform: scale(1.15);\n -webkit-transform: scale(1.15);\n margin-top: -6px;\n }\n 100% {\n transform: scale(1);\n -webkit-transform: scale(1);\n margin-top: 0;\n opacity: 1;\n }\n }\n @-webkit-keyframes pulseWarning {\n 0% {\n border-color: #F8D486;\n }\n 100% {\n border-color: #F8BB86;\n }\n }\n @keyframes pulseWarning {\n 0% {\n border-color: #F8D486;\n }\n 100% {\n border-color: #F8BB86;\n }\n }\n @-webkit-keyframes pulseWarningIns {\n 0% {\n background-color: #F8D486;\n }\n 100% {\n background-color: #F8BB86;\n }\n }\n @keyframes pulseWarningIns {\n 0% {\n background-color: #F8D486;\n }\n 100% {\n background-color: #F8BB86;\n }\n }'), !this.props.hideOverlay && _react2.default.createElement('div', { style: _SweetAlertStyles2.default.overlay }), _react2.default.createElement('div', {
style: (0, _objectAssign2.default)({}, style, this.props.style),
tabIndex: '0',
Expand Down Expand Up @@ -22663,6 +22666,7 @@
cancelBtnBsStyle: _propTypes2.default.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
confirmBtnBsStyle: _propTypes2.default.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
customIcon: _propTypes2.default.oneOfType([_propTypes2.default.node, _propTypes2.default.string]),
show: _propTypes2.default.bool,
required: _propTypes2.default.bool,
placeholder: _propTypes2.default.string,
validationMsg: _propTypes2.default.string,
Expand All @@ -22687,6 +22691,7 @@
inputType: 'text',
customClass: '',
hideOverlay: false,
show: true,
required: true,
disabled: false,
beforeMount: function beforeMount() {},
Expand Down
5 changes: 5 additions & 0 deletions lib/dist/SweetAlert.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ var SweetAlert = function (_React$Component) {
}, {
key: 'render',
value: function render() {
if (!this.props.show) {
return false;
}
return _react2.default.createElement(
'div',
null,
Expand Down Expand Up @@ -294,6 +297,7 @@ SweetAlert.propTypes = {
cancelBtnBsStyle: _propTypes2.default.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
confirmBtnBsStyle: _propTypes2.default.oneOf(['default', 'primary', 'link', 'info', 'success', 'warning', 'danger']),
customIcon: _propTypes2.default.oneOfType([_propTypes2.default.node, _propTypes2.default.string]),
show: _propTypes2.default.bool,
required: _propTypes2.default.bool,
placeholder: _propTypes2.default.string,
validationMsg: _propTypes2.default.string,
Expand All @@ -318,6 +322,7 @@ SweetAlert.defaultProps = {
inputType: 'text',
customClass: '',
hideOverlay: false,
show: true,
required: true,
disabled: false,
beforeMount: function beforeMount() {},
Expand Down

0 comments on commit 53d54e6

Please sign in to comment.