From 8ae6a941d29b3fceee2ba6b5072a4fd47082674c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9C=D0=B0?=
=?UTF-8?q?=D0=BB=D1=8E=D0=B3=D0=B8=D0=BD?= <d.malygin@iqdev.digital>
Date: Mon, 24 Feb 2025 19:19:46 +0500
Subject: [PATCH] fix: SelectButton
---
package.json | 2 +-
src/components/SelectButton/SelectButton.vue | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 9727227..4c5ebf4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@d.malygin/UI_storybook",
- "version": "1.0.15",
+ "version": "1.0.16",
"type": "module",
"scripts": {
"dev": "vite",
diff --git a/src/components/SelectButton/SelectButton.vue b/src/components/SelectButton/SelectButton.vue
index 142677d..206e7c8 100644
--- a/src/components/SelectButton/SelectButton.vue
+++ b/src/components/SelectButton/SelectButton.vue
@@ -62,7 +62,10 @@ const buttonHeight = computed(() => {
return '40px';
});
const calcItemColor = (item: ISBOption) => {
- if (((item.value ?? null) && value.value === item.value) || String(value.value) === item.label) {
+ if (
+ (item.value !== null && item.value !== undefined && value.value === item.value) ||
+ String(value.value) === item.label
+ ) {
const activeColor = item.activeColor;
if (!activeColor) {
return color.value;
@@ -79,7 +82,8 @@ const calcItemColor = (item: ISBOption) => {
}
};
const calcBGColorItem = (item: ISBOption) => {
- return ((value.value ?? false) && value.value === item.value) || String(value.value) === item.label
+ return (value.value !== null && value.value !== undefined && value.value === item.value) ||
+ String(value.value) === item.label
? activeBGColorComputed.value
: item.backgroundColor
? convertThemeToColor(item.backgroundColor, item.darknessBackgroundColor ?? '500')
--
GitLab