td-stylekit - npm Package Compare versions

Comparing version 0.7.1 to 0.7.2

dist/es/Button/Button.js

@@ -34,3 +34,4 @@ var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
   var theme = _ref2.theme,
-      ignoreFocus = _ref2.ignoreFocus;
+      ignoreFocus = _ref2.ignoreFocus,
+      disabled = _ref2.disabled;
   return {
@@ -54,12 +55,6 @@ alignItems: 'center',
     whiteSpace: 'nowrap',
-    ':disabled, [disabled]': {
-      backgroundColor: theme.color.LightHover,
-      borderColor: theme.color.LightHover,
-      color: theme.color.LightDisabled,
-      cursor: 'default'
-    },
     ':focus:not(:active)': !ignoreFocus && {
       outline: 'thin dotted'
     },
-    ':focus:not(:disabled)': !ignoreFocus && {
+    ':focus': !ignoreFocus && !disabled && {
       /* Webkit */
@@ -75,3 +70,4 @@ outline: '4px auto -webkit-focus-ring-color',
       plain = _ref3.plain,
-      icon = _ref3.icon;
+      icon = _ref3.icon,
+      disabled = _ref3.disabled;
   return !plain && !icon && {
@@ -91,4 +87,4 @@ backgroundColor: theme.color.LightBackground,
     textTransform: 'uppercase',
-    ':hover:not(:disabled)': hoverStyles({ theme: theme }),
-    ':active:not(:disabled)': {
+    ':hover': !disabled && hoverStyles({ theme: theme }),
+    ':active': !disabled && {
       backgroundColor: theme.color.PrimaryLightFade,
@@ -103,3 +99,4 @@ borderColor: 'transparent',
   var theme = _ref4.theme,
-      primary = _ref4.primary;
+      primary = _ref4.primary,
+      disabled = _ref4.disabled;
   return primary && {
@@ -109,3 +106,3 @@ backgroundColor: theme.color.Primary,
     borderColor: 'transparent',
-    ':focus:not(:disabled)': {
+    ':focus': !disabled && {
       outlineColor: theme.color.PrimaryContrast
@@ -144,9 +141,9 @@ }
   var theme = _ref7.theme,
-      danger = _ref7.danger;
+      danger = _ref7.danger,
+      disabled = _ref7.disabled;
   return danger && {
-    backgroundColor: 'transparent',
     borderColor: theme.color.Error,
     color: theme.color.Error,
-    ':hover:not(:disabled)': hoverStyles({ theme: theme, danger: danger }),
-    ':active:not(:disabled)': {
+    ':hover': !disabled && hoverStyles({ theme: theme, danger: danger }),
+    ':active': !disabled && {
       backgroundColor: theme.color.ErrorFade,
@@ -165,6 +162,17 @@ borderColor: 'transparent',
 },
-// noFocus
+// disabled
 function (_ref9) {
   var theme = _ref9.theme,
-      ignoreFocus = _ref9.ignoreFocus;
+      disabled = _ref9.disabled;
+  return disabled && {
+    backgroundColor: theme.color.LightHover,
+    borderColor: theme.color.LightHover,
+    color: theme.color.LightDisabled,
+    cursor: 'default'
+  };
+},
+// noFocus
+function (_ref10) {
+  var theme = _ref10.theme,
+      ignoreFocus = _ref10.ignoreFocus;
   return ignoreFocus && {
@@ -183,3 +191,3 @@ outline: 'none',
   function UnstyledButton() {
-    var _ref10;
+    var _ref11;
 
@@ -194,3 +202,3 @@ var _temp, _this, _ret;
 
-    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref10 = UnstyledButton.__proto__ || Object.getPrototypeOf(UnstyledButton)).call.apply(_ref10, [this].concat(args))), _this), _this._onKeyPress = function (event) {
+    return _ret = (_temp = (_this = _possibleConstructorReturn(this, (_ref11 = UnstyledButton.__proto__ || Object.getPrototypeOf(UnstyledButton)).call.apply(_ref11, [this].concat(args))), _this), _this._onKeyPress = function (event) {
       var _this$props = _this.props,
@@ -275,5 +283,5 @@ disabled = _this$props.disabled,
      */
-    value: function getRel(_ref11) {
-      var target = _ref11.target,
-          rel = _ref11.rel;
+    value: function getRel(_ref12) {
+      var target = _ref12.target,
+          rel = _ref12.rel;
 
@@ -280,0 +288,0 @@ var relProp = [];

package.json

 {
   "name": "td-stylekit",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "main": "dist/es/index.js",
@@ -5,0 +5,0 @@ "module": "dist/es/index.js",

No alert changes

Improved metrics

Total package byte prevSize

422830

increased by0.04%

Lines of code

2318

increased by0.35%

No dependency changes