diff --git a/package.json b/package.json index 9727227d7d728410daf99c2cd0ee0a392ad46568..4c5ebf4c0aed2e7df9097595c43d12841dbcbed0 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 142677d062e4d806fc35ede678d82406dcd35fb8..206e7c8968b7bf4e6b882d3fc91cdb4214adada5 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')