@hexure/ui 1.13.68 → 1.13.69

package/dist/esm/index.js

@@ -2801,7 +2801,19 @@ const StyledButton = styled.button `
     return '0px';
 }};
   outline: none;
-  background: ${props => props.$bg_color || props.theme.PRIMARY_COLOR.Hex};
+  background: ${props => {
+    if (props.$disabled) {
+        if (props.$format === 'secondary') {
+            return '#66666626';
+        }
+        else {
+            return '#e7e6e6';
+        }
+    }
+    else {
+        return props.$bg_color || props.theme.PRIMARY_COLOR.Hex;
+    }
+}};
   width: ${props => {
     if (props.$hasChildren) {
         return 'auto';
@@ -2820,7 +2832,19 @@ const StyledButton = styled.button `
   opacity: ${props => (props.$disabled ? 0.6 : 0.9)};
   border-width: 1px;
   border-style: solid;
-  border-color: ${props => props.$border_color || props.theme.PRIMARY_COLOR.Hex};
+  border-color: ${props => {
+    if (props.$disabled) {
+        if (props.$format === 'secondary') {
+            return '#66666680';
+        }
+        else {
+            return '#e7e6e6';
+        }
+    }
+    else {
+        return props.$border_color || props.theme.PRIMARY_COLOR.Hex;
+    }
+}};
   box-sizing: border-box;
 
   &:active,
@@ -2896,10 +2920,15 @@ const Button = (_a) => {
     };
     const format_styles = button_type_mapping[format];
     const baseId = dataItemid || 'button';
-    const button_view = (React.createElement(StyledButton, Object.assign({ "$bg_color": format_styles.background_color, "$border_color": format_styles.border_color, "$disabled": disabled || loading, "$hasChildren": !!has_children, "$iconPosition": iconPosition, "$margin": margin, "$small": small, disabled: disabled || loading, onClick: disabled || loading ? undefined : onClick, title: title, type: type || (isForm ? 'submit' : undefined) }, accessibleProps, { "data-itemid": `${baseId}-styled-button` }),
-        children ? (React.createElement(Label$5, { "$content_color": format_styles.content_color, "$small": small, "data-itemid": `${baseId}-label` }, children)) : null,
+    const button_view = (React.createElement(StyledButton, Object.assign({ "$bg_color": format_styles.background_color, "$border_color": format_styles.border_color, "$disabled": disabled || loading, "$format": format, "$hasChildren": !!has_children, "$iconPosition": iconPosition, "$margin": margin, "$small": small, disabled: disabled || loading, onClick: disabled || loading ? undefined : onClick, title: title, type: type || (isForm ? 'submit' : undefined) }, accessibleProps, { "data-itemid": `${baseId}-styled-button` }),
+        children ? (React.createElement(Label$5, { "$content_color": disabled || loading ? '#666666' : format_styles.content_color, "$small": small, "data-itemid": `${baseId}-label` }, children)) : null,
         icon && !badge ? (React.createElement(StyledIcon$5, { "$hasChildren": !!has_children, "data-itemid": `${baseId}-icon` },
-            React.createElement(Icon, { color: format ? format_styles === null || format_styles === void 0 ? void 0 : format_styles.content_color : '#fff', "data-itemid": `${baseId}-icon-svg`, path: loading ? mdiLoading : icon, size: small ? '20px' : '24px', spin: loading }))) : null,
+            React.createElement(Icon, { color: (() => {
+                    if (disabled || loading) {
+                        return '#666666';
+                    }
+                    return format ? format_styles.content_color : '#fff';
+                })(), "data-itemid": `${baseId}-icon-svg`, path: loading ? mdiLoading : icon, size: small ? '20px' : '24px', spin: loading }))) : null,
         badge && !icon ? (React.createElement(Badge$1, { "$bg_color": format_styles.badge_bg_color, "$content_color": format_styles.badge_content_color, "$small": small, "data-itemid": `${baseId}-badge` }, badge)) : null));
     if (toolTip && Object.keys(toolTip).length) {
         return (React.createElement(Tooltip, Object.assign({}, toolTip, { trigger: (toolTip === null || toolTip === void 0 ? void 0 : toolTip.trigger) || button_view }), toolTip === null || toolTip === void 0 ? void 0 : toolTip.children));