Skip to content

[Northstar][Dropdown] Fix styling mutation when merging themes #24787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
layershifter merged 3 commits into from
Sep 16, 2022
Merged

[Northstar][Dropdown] Fix styling mutation when merging themes #24787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07eed1f
[Northstar][Dropdown] Fix styling mutation when merging themes
petrjaros Sep 14, 2022
a1f8f88
fix
petrjaros Sep 14, 2022
97c53a8
Update CHANGELOG.md
layershifter Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/fluentui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
18 changes: 9 additions & 9 deletions packages/fluentui/react-northstar/src/themes/teams/components/Dropdown/dropdownStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -99,7 +99,7 @@ export const dropdownStyles: ComponentSlotStylesPrepared<DropdownStylesProps, Dr
getBorderFocusStyles({ variables: siteVariables })[':focus-visible']),
}),
...(p.inline && {
...transparentColorStyleObj,
...createTransparentColorStyleObj(),
alignItems: 'center',
}),
...(p.inverted && {
Expand Down Expand Up @@ -156,7 +156,7 @@ export const dropdownStyles: ComponentSlotStylesPrepared<DropdownStylesProps, Dr
overflow: 'hidden',
boxShadow: 'none',
minHeight: pxToRem(32),
...transparentColorStyleObj,
...createTransparentColorStyleObj(),
margin: '0',
justifyContent: 'left',
padding: v.comboboxPaddingButton,
Expand All @@ -172,10 +172,10 @@ export const dropdownStyles: ComponentSlotStylesPrepared<DropdownStylesProps, Dr
height: '100%',
}),
}),
...transparentColorStyleObj,
...createTransparentColorStyleObj(),
':focus': {
color: v.color,
...transparentColorStyleObj,
...createTransparentColorStyleObj(),
},
':focus-visible': {
color: v.color,
Expand Down