Merge pull request #297 from six-group/fix/283-six-select-checkmark-bug

Fix #283 six-select checkmark bug
six-group · Sep 19, 2024 · 27228f4 · 27228f4
2 parents 7a9e772 + 2ee4e4a
commit 27228f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 
 - `six-select`: fix displaying label instead of value in autocomplete mode
+- `six-select`: fix multiple checkmark bug for single select mode
 
 ### Changed
 

diff --git a/libraries/ui-library/src/components/six-select/six-select.tsx b/libraries/ui-library/src/components/six-select/six-select.tsx
@@ -478,11 +478,20 @@ export class SixSelect {
 
     selectionContainerItems.forEach((item) => {
       item.checkType = this.multiple ? 'checkbox' : 'check';
-      item.checked = value.includes(item.value);
+      if (Array.isArray(value)) {
+        item.checked = value.some((val) => val === item.value);
+      } else {
+        item.checked = value === item.value;
+      }
     });
+
     mainItems.forEach((item) => {
       item.checkType = this.multiple ? 'checkbox' : 'check';
-      item.checked = value.includes(item.value);
+      if (Array.isArray(value)) {
+        item.checked = value.some((val) => val === item.value);
+      } else {
+        item.checked = value === item.value;
+      }
     });
 
     const checkedItems = getCheckedItems(convertToValidArrayValue(this.value), mainItems);