From 6bdbf7a4e928fcf557bca2bdacc7c92bb35fe025 Mon Sep 17 00:00:00 2001 From: Alexandr Isaev Date: Wed, 27 Mar 2024 13:01:08 +0300 Subject: [PATCH 1/3] fix(TreeSelect): rework popup border radius --- src/components/TreeSelect/TreeSelect.scss | 10 +++++++++- src/components/TreeSelect/TreeSelect.tsx | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/TreeSelect/TreeSelect.scss b/src/components/TreeSelect/TreeSelect.scss index bd7e427649..b5a9511056 100644 --- a/src/components/TreeSelect/TreeSelect.scss +++ b/src/components/TreeSelect/TreeSelect.scss @@ -11,8 +11,16 @@ $block: '.#{variables.$ns}tree-select'; &__popup { padding: 4px 0; - border-radius: 6px; + border-radius: 6px; // for `s` and `m` size overflow: hidden; + + &_size_l { + border-radius: 8px; + } + + &_size_xl { + border-radius: 10px; + } } &__list { diff --git a/src/components/TreeSelect/TreeSelect.tsx b/src/components/TreeSelect/TreeSelect.tsx index d43a700e45..541514d181 100644 --- a/src/components/TreeSelect/TreeSelect.tsx +++ b/src/components/TreeSelect/TreeSelect.tsx @@ -228,7 +228,7 @@ export const TreeSelect = React.forwardRef(function TreeSelect( {togglerNode} Date: Wed, 27 Mar 2024 15:59:31 +0300 Subject: [PATCH 2/3] fix(TreeSelect): add border radius to m size --- src/components/TreeSelect/TreeSelect.scss | 9 ++++++++- .../useList/components/ListItemView/ListItemView.scss | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/TreeSelect/TreeSelect.scss b/src/components/TreeSelect/TreeSelect.scss index b5a9511056..9716d249b3 100644 --- a/src/components/TreeSelect/TreeSelect.scss +++ b/src/components/TreeSelect/TreeSelect.scss @@ -11,9 +11,16 @@ $block: '.#{variables.$ns}tree-select'; &__popup { padding: 4px 0; - border-radius: 6px; // for `s` and `m` size overflow: hidden; + &_size_s { + border-radius: 5px; + } + + &_size_m { + border-radius: 6px; + } + &_size_l { border-radius: 8px; } diff --git a/src/components/useList/components/ListItemView/ListItemView.scss b/src/components/useList/components/ListItemView/ListItemView.scss index 83113115f0..a7c0574c60 100644 --- a/src/components/useList/components/ListItemView/ListItemView.scss +++ b/src/components/useList/components/ListItemView/ListItemView.scss @@ -30,10 +30,10 @@ $block: '.#{variables.$ns}list-item-view'; border-radius: var(--g-list-item-border-radius, 3px); } &_radius_m { - border-radius: var(--g-list-item-border-radius, 6px); + border-radius: var(--g-list-item-border-radius, 5px); } &_radius_l { - border-radius: var(--g-list-item-border-radius, 8px); + border-radius: var(--g-list-item-border-radius, 6px); } &_radius_xl { border-radius: var(--g-list-item-border-radius, 8px); From 2e560ac484567c719a6a2e06cf340b1b1b73af10 Mon Sep 17 00:00:00 2001 From: Alexandr Isaev Date: Thu, 28 Mar 2024 14:05:47 +0300 Subject: [PATCH 3/3] fix(TreeSelect): added css token for list container border radius --- src/components/TreeSelect/TreeSelect.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/TreeSelect/TreeSelect.scss b/src/components/TreeSelect/TreeSelect.scss index 9716d249b3..6b77af9c99 100644 --- a/src/components/TreeSelect/TreeSelect.scss +++ b/src/components/TreeSelect/TreeSelect.scss @@ -14,19 +14,19 @@ $block: '.#{variables.$ns}tree-select'; overflow: hidden; &_size_s { - border-radius: 5px; + border-radius: var(--g-list-container-border-radius, 5px); } &_size_m { - border-radius: 6px; + border-radius: var(--g-list-container-border-radius, 6px); } &_size_l { - border-radius: 8px; + border-radius: var(--g-list-container-border-radius, 8px); } &_size_xl { - border-radius: 10px; + border-radius: var(--g-list-container-border-radius, 10px); } }