chore: Merge support into master (#2883)

Co-authored-by: @NicholasBoll <[email protected]>
Workday · Aug 23, 2024 · c2cb407 · c2cb407
2 parents 8415b4a + b61820c
commit c2cb407
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [v10.3.55](https://github.com/Workday/canvas-kit/releases/tag/v10.3.55) (2024-08-22)
+
+### Components
+
+- fix(combobox): Show selected state when multiple is enabled ([#2882](https://github.com/Workday/canvas-kit/pull/2882)) ([@NicholasBoll](https://github.com/NicholasBoll))
 ## [v11.1.4](https://github.com/Workday/canvas-kit/releases/tag/v11.1.4) (2024-08-21)
 
 ### Documentation

diff --git a/modules/react/combobox/lib/ComboboxMenuItem.tsx b/modules/react/combobox/lib/ComboboxMenuItem.tsx
@@ -11,6 +11,7 @@ import {SystemIcon} from '@workday/canvas-kit-react/icon';
 import {
   useListItemAllowChildStrings,
   useListItemRegister,
+  isSelected,
 } from '@workday/canvas-kit-react/collection';
 import {OverflowTooltip} from '@workday/canvas-kit-react/tooltip';
 
@@ -45,7 +46,7 @@ export const useComboboxMenuItem = composeHooks(
       event.preventDefault();
     };
 
-    const selected = model.state.selectedIds[0] === id;
+    const selected = isSelected(id, model.state);
 
     return {
       role: 'option',

diff --git a/modules/styling/package.json b/modules/styling/package.json
@@ -54,8 +54,8 @@
     "@emotion/serialize": "^1.0.2",
     "@emotion/styled": "^11.6.0",
     "@workday/canvas-kit-react": "^11.1.4",
-    "@workday/canvas-system-icons-web": "^3.0.0",
     "@workday/canvas-tokens-web": "^2.0.0",
+    "@workday/canvas-system-icons-web": "^3.0.0",
     "typescript": "4.2"
   }
 }