Completely updated React, fixed #11, (hopefully)

goTorrentWebUI/node_modules/react-toastify/lib/Toast.js

@@ -24,9 +24,9 @@ var _ProgressBar2 = _interopRequireDefault(_ProgressBar);
 
 var _constant = require('./constant');
 
-var _style = require('./style');
+var _defaultStyle = require('./defaultStyle');
 
-var _style2 = _interopRequireDefault(_style);
+var _defaultStyle2 = _interopRequireDefault(_defaultStyle);
 
 var _propValidator = require('./util/propValidator');
 
@@ -40,31 +40,32 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var toast = function toast(type) {
-  return (0, _glamor.css)(_extends({
-    position: 'relative',
-    minHeight: '48px',
-    marginBottom: '1rem',
-    padding: '8px',
-    borderRadius: '1px',
-    boxShadow: '0 1px 10px 0 rgba(0, 0, 0, .1), 0 2px 15px 0 rgba(0, 0, 0, .05)',
-    display: 'flex',
-    justifyContent: 'space-between',
-    maxHeight: '800px',
-    overflow: 'hidden',
-    fontFamily: _style2.default.fontFamily,
-    cursor: 'pointer',
-    background: _style2.default['color' + type.charAt(0).toUpperCase() + type.slice(1)]
-  }, type === 'default' ? { color: '#aaa' } : {}, _defineProperty({}, '@media ' + _style2.default.mobile, {
-    marginBottom: 0
-  })));
+var styles = {
+  container: function container(type) {
+    return (0, _glamor.css)(_extends({
+      position: 'relative',
+      minHeight: '48px',
+      marginBottom: '1rem',
+      padding: '8px',
+      borderRadius: '1px',
+      boxShadow: '0 1px 10px 0 rgba(0, 0, 0, .1), 0 2px 15px 0 rgba(0, 0, 0, .05)',
+      display: 'flex',
+      justifyContent: 'space-between',
+      maxHeight: '800px',
+      overflow: 'hidden',
+      fontFamily: _defaultStyle2.default.fontFamily,
+      cursor: 'pointer',
+      background: _defaultStyle2.default['color' + type.charAt(0).toUpperCase() + type.slice(1)]
+    }, type === 'default' ? { color: '#aaa' } : {}, _defineProperty({}, '@media ' + _defaultStyle2.default.mobile, {
+      marginBottom: 0
+    })));
+  },
+  body: (0, _glamor.css)({
+    margin: 'auto 0',
+    flex: 1
+  })
 };
 
-var body = (0, _glamor.css)({
-  margin: 'auto 0',
-  flex: 1
-});
-
 var Toast = function (_Component) {
   _inherits(Toast, _Component);
 
@@ -142,7 +143,8 @@ var Toast = function (_Component) {
           className = _props.className,
           bodyClassName = _props.bodyClassName,
           progressClassName = _props.progressClassName,
-          updateId = _props.updateId;
+          updateId = _props.updateId,
+          role = _props.role;
 
 
       return _react2.default.createElement(
@@ -156,10 +158,10 @@ var Toast = function (_Component) {
         },
         _react2.default.createElement(
           'div',
-          _extends({}, typeof className !== 'string' ? (0, _glamor.css)(toast(type), className) : toast(type), this.getToastProps()),
+          _extends({}, typeof className !== 'string' ? (0, _glamor.css)(styles.container(type), className) : styles.container(type), this.getToastProps()),
           _react2.default.createElement(
             'div',
-            _extends({}, typeof bodyClassName !== 'string' ? (0, _glamor.css)(body, bodyClassName) : body, typeof bodyClassName === 'string' && {
+            _extends({}, this.props.in && { role: role }, typeof bodyClassName !== 'string' ? (0, _glamor.css)(styles.body, bodyClassName) : styles.body, typeof bodyClassName === 'string' && {
               className: bodyClassName
             }),
             children
@@ -201,7 +203,8 @@ Toast.propTypes = {
   className: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object]),
   bodyClassName: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object]),
   progressClassName: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.object]),
-  updateId: _propTypes2.default.number
+  updateId: _propTypes2.default.number,
+  ariaLabel: _propTypes2.default.string
 };
 Toast.defaultProps = {
   type: _constant.TYPE.DEFAULT,
@@ -212,6 +215,7 @@ Toast.defaultProps = {
   className: '',
   bodyClassName: '',
   progressClassName: '',
-  updateId: null
+  updateId: null,
+  role: 'alert'
 };
 exports.default = Toast;