From cb7c593fe105b54191330adecb8632ad618a155a Mon Sep 17 00:00:00 2001 From: Maximilian Franzke Date: Tue, 14 Jan 2025 09:14:54 +0100 Subject: [PATCH 1/2] fix(textarea): scope overflow declaration --- packages/components/src/components/textarea/textarea.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/components/src/components/textarea/textarea.scss b/packages/components/src/components/textarea/textarea.scss index 393002b8b62..9563d854812 100644 --- a/packages/components/src/components/textarea/textarea.scss +++ b/packages/components/src/components/textarea/textarea.scss @@ -43,8 +43,10 @@ @extend %resize-textarea; @extend %scrollbar; - cursor: auto; - overflow-y: scroll; + + &:not(:read-only, :disabled) { + overflow-y: scroll; + } // we don't have icons in textarea so we can overwrite it here padding-block: variables.$db-spacing-fixed-xs From 0d92dbb320245eb649d3457035b157137b2b8e81 Mon Sep 17 00:00:00 2001 From: Nicolas Merget Date: Tue, 14 Jan 2025 11:36:03 +0100 Subject: [PATCH 2/2] fix: issue with rounded up button for textarea scrollbar --- packages/components/src/components/textarea/textarea.scss | 5 +---- packages/components/src/styles/internal/_scrollbar.scss | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/components/src/components/textarea/textarea.scss b/packages/components/src/components/textarea/textarea.scss index 9563d854812..7d1f70949a0 100644 --- a/packages/components/src/components/textarea/textarea.scss +++ b/packages/components/src/components/textarea/textarea.scss @@ -43,10 +43,7 @@ @extend %resize-textarea; @extend %scrollbar; - - &:not(:read-only, :disabled) { - overflow-y: scroll; - } + overflow-y: scroll; // we don't have icons in textarea so we can overwrite it here padding-block: variables.$db-spacing-fixed-xs diff --git a/packages/components/src/styles/internal/_scrollbar.scss b/packages/components/src/styles/internal/_scrollbar.scss index 737fccf7bc2..82999e18459 100644 --- a/packages/components/src/styles/internal/_scrollbar.scss +++ b/packages/components/src/styles/internal/_scrollbar.scss @@ -27,7 +27,7 @@ $scrollbar-width: helpers.px-to-rem(8); &:read-only { &::-webkit-scrollbar-track, &::-webkit-scrollbar-button:single-button { - background-color: colors.$db-adaptive-bg-basic-level-1-default !important; + background-color: colors.$db-adaptive-bg-basic-level-1-default; } } @@ -58,6 +58,7 @@ $scrollbar-width: helpers.px-to-rem(8); /* Up */ &::-webkit-scrollbar-button:single-button:vertical:decrement { + border-start-end-radius: variables.$db-border-radius-xs; background-image: var(--db-textarea-scrollbar-button-decrement); }