diff --git a/.changeset/cool-results-show.md b/.changeset/cool-results-show.md new file mode 100644 index 000000000..912a5d675 --- /dev/null +++ b/.changeset/cool-results-show.md @@ -0,0 +1,5 @@ +--- +'@drivenets/design-system': patch +--- + +fix styles of input based components in disabled state diff --git a/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.module.scss b/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.module.scss index 55b332181..bd3401d74 100644 --- a/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.module.scss +++ b/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.module.scss @@ -200,7 +200,6 @@ $autocomplete-opacity-visible: 1; .disabled { .control { color: var(--color-background-deselected); - background: var(--color-background-secondary); border-color: var(--color-border-disabled); cursor: not-allowed; diff --git a/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.stories.tsx b/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.stories.tsx index be5f9d938..2f95572a8 100644 --- a/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.stories.tsx +++ b/packages/design-system/src/components/ds-autocomplete/ds-autocomplete.stories.tsx @@ -36,6 +36,10 @@ const meta: Meta = { control: 'object', description: 'Locale strings for the autocomplete component', }, + disabled: { + control: 'boolean', + description: 'Whether the autocomplete is disabled', + }, }, args: { onValueChange: fn(), diff --git a/packages/design-system/src/components/ds-select/ds-select.module.scss b/packages/design-system/src/components/ds-select/ds-select.module.scss index 0f0e09488..b4fdbfa4e 100644 --- a/packages/design-system/src/components/ds-select/ds-select.module.scss +++ b/packages/design-system/src/components/ds-select/ds-select.module.scss @@ -53,8 +53,11 @@ @include typography.ellipsis; grid-column: 1; grid-row: 1; - color: var(--color-font-secondary); text-align: start; + + .trigger:not([data-disabled]) & { + color: var(--color-font-secondary); + } } .multiSelectItemsContainer { diff --git a/packages/design-system/src/components/ds-select/ds-select.stories.tsx b/packages/design-system/src/components/ds-select/ds-select.stories.tsx index 57a615dd1..9ac0c9cf7 100644 --- a/packages/design-system/src/components/ds-select/ds-select.stories.tsx +++ b/packages/design-system/src/components/ds-select/ds-select.stories.tsx @@ -46,6 +46,10 @@ const meta: Meta = { control: 'boolean', description: 'Whether the selection can be cleared', }, + disabled: { + control: 'boolean', + description: 'Whether the select is disabled', + }, }, }; diff --git a/packages/design-system/src/styles/shared/_input.scss b/packages/design-system/src/styles/shared/_input.scss index 74287391c..af6c3a315 100644 --- a/packages/design-system/src/styles/shared/_input.scss +++ b/packages/design-system/src/styles/shared/_input.scss @@ -57,7 +57,6 @@ $textarea-height-default: 120px; &:has(.input:disabled) { color: var(--color-background-deselected); - background: var(--color-background-secondary); border-color: var(--color-border-disabled); cursor: not-allowed; @@ -82,7 +81,6 @@ $textarea-height-default: 120px; &:disabled { color: var(--color-background-deselected); - background: var(--color-background-secondary); border-color: var(--color-border-disabled); cursor: not-allowed; } @@ -129,7 +127,6 @@ $textarea-height-default: 120px; &[data-disabled] { color: var(--color-background-deselected); - background: var(--color-background-secondary); border-color: var(--color-border-disabled); &,