Skip to content

Mabel/add button disabled dark mode #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 30, 2025
Merged

Mabel/add button disabled dark mode #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9dac9b
add button varant for disabled dark mode
mabela416 May 29, 2025
6fcd213
add changeset
mabela416 May 29, 2025
1a573d1
Merge branch 'main' into mabel/add-button-disabled-dark-mode
mabela416 May 29, 2025
eb30a03
fix button styles
mabela416 May 30, 2025
9984451
fix failing accessibility test
mabela416 May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/clean-carrots-trade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@cypress-design/constants-button': minor
'@cypress-design/react-button': minor
'@cypress-design/vue-button': minor
---

Add disabled-dark-mode variant
2 changes: 2 additions & 0 deletions components/Button/constants/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export const CssVariantClassesTable = {
white:
'text-indigo-500 bg-white border-gray-100 hover:border-gray-200 disabled:hocus:shadow-none hocus:shadow-gray-50 disabled:text-gray-500 focus:ring-gray-200',
disabled: 'text-gray-500 bg-gray-100 border-gray-100 hover:shadow-none',
'disabled-dark-mode':
'text-gray-800 bg-gray-1000 border-none hocus:shadow-none mix-blend-screen',
// outline variants
'outline-indigo':
'border-indigo-500 text-indigo-500 disabled:hocus:shadow-none hocus:shadow-indigo-300/[.35] disabled:text-gray-500 disabled:border-gray-100 focus:ring-indigo-600',
Expand Down
7 changes: 5 additions & 2 deletions components/Button/react/Button.rootstory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ export default ({
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode',
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode',
},
)}
>
Expand All @@ -40,13 +41,15 @@ export default ({
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode',
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode',
'text-gray-700': ![
'outline-dark',
'outline-red-dark-mode',
'outline-jade-dark-mode',
'outline-indigo-dark-mode',
'red-dark-mode',
'disabled-dark-mode',
].includes(variant),
})}
>
Expand Down
5 changes: 4 additions & 1 deletion components/Button/react/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ export const Button: React.FC<ReactButtonProps> = ({
const finalVariant = useDisabledVariant ? 'disabled' : variant

const finalDisabled =
disabled || variant === 'disabled' || variant === 'outline-disabled'
disabled ||
variant === 'disabled' ||
variant === 'outline-disabled' ||
variant === 'disabled-dark-mode'

const Comp = href ? 'a' : 'button'

Expand Down
6 changes: 4 additions & 2 deletions components/Button/react/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,17 @@ export default () => {
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode'
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode'
? '#1a202c'
: 'white',
color:
variant === 'outline-dark' ||
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode'
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode'
? 'white'
: 'black',
}}
Expand Down
7 changes: 5 additions & 2 deletions components/Button/vue/Button.rootstory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export default ({
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode',
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode',
},
)}
>
Expand All @@ -37,13 +38,15 @@ export default ({
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode',
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode',
'text-gray-700': ![
'outline-dark',
'outline-red-dark-mode',
'outline-jade-dark-mode',
'outline-indigo-dark-mode',
'red-dark-mode',
'disabled-dark-mode',
].includes(variant),
})}
>
Expand Down
3 changes: 2 additions & 1 deletion components/Button/vue/Button.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ export default defineComponent({
() =>
props.disabled ||
props.variant === 'disabled' ||
props.variant === 'outline-disabled',
props.variant === 'outline-disabled' ||
props.variant === 'disabled-dark-mode',
)

const variantClasses = computed(
Expand Down
4 changes: 3 additions & 1 deletion components/Button/vue/ReadMe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@ import {
variant === 'outline-red-dark-mode' ||
variant === 'outline-jade-dark-mode' ||
variant === 'outline-indigo-dark-mode' ||
variant === 'red-dark-mode',
variant === 'red-dark-mode' ||
variant === 'disabled-dark-mode',
'bg-white text-gray-900': ![
'outline-dark',
'outline-red-dark-mode',
'outline-jade-dark-mode',
'outline-indigo-dark-mode',
'red-dark-mode',
'disabled-dark-mode',
].includes(variant),
}"
>
Expand Down
Loading