fix(react-combobox): Option's checkIcon adds provided className at th…

…e end to avoid overrides (#28143) * fix: Option's checkIcon adds provided className at the end to avoid overrides. * change file
microsoft · Jun 5, 2023 · 1b46051 · 1b46051
1 parent 713a02b
commit 1b46051
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/change/@fluentui-react-combobox-a0ef5216-e89a-420a-9879-ec97275c3f1f.json b/change/@fluentui-react-combobox-a0ef5216-e89a-420a-9879-ec97275c3f1f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: Option's checkIcon adds provided className at the end to avoid overrides.",
+  "packageName": "@fluentui/react-combobox",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts b/packages/react-components/react-combobox/src/components/Option/useOptionStyles.styles.ts
@@ -140,11 +140,11 @@ export const useOptionStyles_unstable = (state: OptionState): OptionState => {
     state.checkIcon.className = mergeClasses(
       optionClassNames.checkIcon,
       styles.checkIcon,
-      state.checkIcon.className,
       multiselect && styles.multiselectCheck,
       selected && styles.selectedCheck,
       selected && multiselect && styles.selectedMultiselectCheck,
       disabled && styles.checkDisabled,
+      state.checkIcon.className,
     );
   }