diginet-core-ui 1.4.6 → 1.4.7

package/components/button/icon.js

@@ -98,10 +98,9 @@ const ButtonIcon = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       css: [_ButtonRootCSS, _ButtonSizeCSS],
       ref: ref,
       id: id,
-      disabled: disabled,
       style: style,
       onClick: _onClick,
-      className: classNames('DGN-UI-ButtonIcon', viewType, size, className)
+      className: classNames('DGN-UI-ButtonIcon', disabled && 'disabled', viewType, size, className)
     }, loading && IconLoadingView(iconSize), !loading && jsx("span", {
       className: 'DGN-UI-ButtonIcon-Icon',
       css: _ButtonIconCSS
@@ -181,7 +180,7 @@ const ButtonRootCSS = (circular, colorHover, color, name, isColorDefault, viewTy
                         }
                     `)}// &:hover | &:focus | &:active
         `}
-        :disabled {
+        &.disabled {
             ${borderColor('system/disabled')};
             ${bgColor('transparent')};
         }
@@ -210,9 +209,8 @@ const ButtonRootCSS = (circular, colorHover, color, name, isColorDefault, viewTy
                 ${bgColor(colorHover)};
             }
         `}
-        :disabled {
+        &.disabled {
             ${bgColor('fill/disabled')};
-            filter: brightness(1);
         }
     `}
     ${viewType === 'text' && css`
@@ -238,7 +236,7 @@ const ButtonRootCSS = (circular, colorHover, color, name, isColorDefault, viewTy
                         }
                     `)}
         `}
-        :disabled {
+        &.disabled {
             ${bgColor('transparent')};
         }
     `}
@@ -265,9 +263,10 @@ const ButtonRootCSS = (circular, colorHover, color, name, isColorDefault, viewTy
             }
         `}
     `}
-    :disabled {
+    &.disabled {
         ${cursorNotAllowed};
         ${textColor('system/disabled')};
+        filter: brightness(1);
     }
 `;
 ButtonIcon.defaultProps = {

package/components/button/index.js

@@ -193,8 +193,7 @@ const Button = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(({
       onClick: _onClick,
       id: id,
       type: type,
-      disabled: disabled,
-      className: classNames('DGN-UI-Button', viewType, size, className),
+      className: classNames('DGN-UI-Button', disabled && 'disabled', viewType, size, className),
       href: urlState || null,
       ...props
     }, start, jsx(Typography, {
@@ -282,7 +281,7 @@ const ButtonRootCSS = (color, isColorDefault, viewType, loading) => css`
                         }
                     `)} // &:hover | &:focus | &:active
         `}
-        :disabled {
+        &.disabled {
             ${borderColor('system/disabled')};
             ${bgColor('transparent')};
         }
@@ -311,9 +310,8 @@ const ButtonRootCSS = (color, isColorDefault, viewType, loading) => css`
                 ${bgColor('system/active')};
             }
         `}
-        :disabled {
+        &.disabled {
             ${bgColor('fill/disabled')};
-            filter: brightness(1);
         }
     `}
     ${viewType === 'text' && css`
@@ -339,7 +337,7 @@ const ButtonRootCSS = (color, isColorDefault, viewType, loading) => css`
                         }
                     `)}
         `}
-        :disabled {
+        &.disabled {
             ${bgColor('transparent')};
         }
     `}
@@ -357,13 +355,11 @@ const ButtonRootCSS = (color, isColorDefault, viewType, loading) => css`
         &:active {
             filter: brightness(0.7);
         }
-        :disabled {
-            filter: brightness(1);
-        }
     `}
-    :disabled {
+    &.disabled {
         ${cursorNotAllowed};
         ${textColor('system/disabled')};
+        filter: brightness(1);
     }
 `;
 Button.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "The DigiNet core ui",
   "homepage": "https://diginet.com.vn",
   "main": "index.js",

package/readme.md

@@ -38,6 +38,9 @@ npm test
 ```
 
 ## Changelog
+## 1.4.7
+- \[Changed\]: Button – Remove attribute disabled in button tag
+
 ## 1.4.6
 - \[Added\]: Icon – Add MoneyHand
 - \[Changed\]: DatePicker – Add default placeholder