fix: should not asideControlClickableOnDisabled if not disabled

iCHEF · Mar 30, 2022 · 673ad51 · 673ad51
1 parent 1587e69
commit 673ad51
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/packages/core/src/mixins/rowComp.js b/packages/core/src/mixins/rowComp.js
@@ -205,13 +205,14 @@ const rowComp = ({
             tag,
             bold,
             asideControlClickableOnDisabled,
+            disabled,
           } = this.props;
 
           const textLayoutProps = getTextLayoutProps(align, !!icon);
           const asideControlClickableProps = (
-            asideControlClickableOnDisabled
+            (asideControlClickableOnDisabled && disabled)
               ? {
-                onClick: (event) => { event.stopPropagation(); }
+                onClick: (event) => { event.stopPropagation(); },
               }
               : undefined
           );

diff --git a/packages/core/src/styles/RowComp.scss b/packages/core/src/styles/RowComp.scss
@@ -43,22 +43,22 @@
     &--aside-control-clickable {
         &.#{$prefix-state}-disabled {
           opacity: 1 !important;
-        }
-
-        .#{$prefix}-text__basic {
-          opacity: .3 !important;
-        }
-
-        .#{$prefix}-icon {
-          opacity: .3 !important;
-        }
-
-        .#{$prefix}-text__aside {
-          display: block;
 
-          a, button {
-            opacity: 1;
-            pointer-events: auto;
+          .#{$prefix}-text__basic {
+            opacity: .3 !important;
+          }
+
+          .#{$prefix}-icon {
+            opacity: .3 !important;
+          }
+
+          .#{$prefix}-text__aside {
+            display: block;
+
+            a, button {
+              opacity: 1;
+              pointer-events: auto;
+            }
           }
         }
     }