Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: Buttons native disabled support (#3320)

Ivan Starkov6b5edcdb54cb
diff --git a/packages/design-system/src/components/button.stories.tsx b/packages/design-system/src/components/button.stories.tsx
index bc444aec62..71e6396644 100644
--- a/packages/design-system/src/components/button.stories.tsx
+++ b/packages/design-system/src/components/button.stories.tsx
@@ -83,6 +83,11 @@ export const Button = ({
<ButtonComponent prefix={<TrashIcon />} color={color} disabled>
{color} disabled
</ButtonComponent>
+ <fieldset style={{ display: "contents" }} disabled>
+ <ButtonComponent prefix={<TrashIcon />} color={color}>
+ {color} disabled by fieldset
+ </ButtonComponent>
+ </fieldset>
</StoryGrid>
))}
</StoryGrid>
diff --git a/packages/design-system/src/components/button.tsx b/packages/design-system/src/components/button.tsx
index 401dc2b096..c86d4be415 100644
--- a/packages/design-system/src/components/button.tsx
+++ b/packages/design-system/src/components/button.tsx
@@ -96,7 +96,7 @@ const perColorStyle = (variant: ButtonColor) => ({
),
},
- "&[data-state=disabled]": {
+ "&:disabled:not([data-state=pending]), &[data-state=disabled]": {
background: theme.colors.backgroundButtonDisabled,
color: theme.colors.foregroundDisabled,
},