diff --git a/packages/fluentui/CHANGELOG.md b/packages/fluentui/CHANGELOG.md index 2e1f47aa26a5fd..e74a4e16beb1ca 100644 --- a/packages/fluentui/CHANGELOG.md +++ b/packages/fluentui/CHANGELOG.md @@ -28,6 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Remove `rotate(360deg)` from `PopupContent` content styles @yuanboxue-amber ([#24432](https://github.com/microsoft/fluentui/pull/24432)) - Fix `FocusZone` to reset tabindex when focus is outside the zone with prop `shouldResetActiveElementWhenTabFromZone` @yuanboxue-amber ([#24463](https://github.com/microsoft/fluentui/pull/24463)) - Change `useLayoutEffect` in `Dropdown` to `useIsomorphicLayoutEffect` @marwan38 ([#24559](https://github.com/microsoft/fluentui/pull/24559)) +- Fix styling mutation when merging themes in `Dropdown` @petrjaros ([#24787](https://github.com/microsoft/fluentui/pull/24787)) ### Performance - Avoid memory trashing in `felaExpandCssShorthandsPlugin` @layershifter ([#24663](https://github.com/microsoft/fluentui/pull/24663)) diff --git a/packages/fluentui/react-northstar/src/themes/teams/components/Dropdown/dropdownStyles.ts b/packages/fluentui/react-northstar/src/themes/teams/components/Dropdown/dropdownStyles.ts index 014133cd89ef1c..8e3d18807fe52c 100644 --- a/packages/fluentui/react-northstar/src/themes/teams/components/Dropdown/dropdownStyles.ts +++ b/packages/fluentui/react-northstar/src/themes/teams/components/Dropdown/dropdownStyles.ts @@ -10,15 +10,15 @@ const transparentColorStyle: ICSSInJSStyle = { borderBottomColor: 'transparent', }; -const transparentColorStyleObj: ICSSInJSStyle = { +const createTransparentColorStyleObj = (): ICSSInJSStyle => ({ ...transparentColorStyle, - ':hover': transparentColorStyle, - ':active': transparentColorStyle, + ':hover': { ...transparentColorStyle }, + ':active': { ...transparentColorStyle }, ':focus': { ...transparentColorStyle, - ':active': transparentColorStyle, + ':active': { ...transparentColorStyle }, }, -}; +}); const getWidth = (p: DropdownStylesProps, v: DropdownVariables): string => { if (p.fluid) { @@ -99,7 +99,7 @@ export const dropdownStyles: ComponentSlotStylesPrepared