Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(Checkbox): toggle changes width during animation in Teams theme #2189

Merged
mnajdova merged 2 commits into from
Dec 17, 2019
Merged

fix(Checkbox): toggle changes width during animation in Teams theme #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9516478
-fixed styles
mnajdova Dec 17, 2019
7bd243d
-updated changelog
mnajdova Dec 17, 2019
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Features
- Add `tag` icon in Teams theme @codepretty ([#2180](https://github.com/microsoft/fluent-ui-react/pull/2180))

### Fixes
- Fix `toggle` changing width during animation in Teams theme @mnajdova ([#2189](https://github.com/microsoft/fluent-ui-react/pull/2189))

<!--------------------------------[ v0.42.0 ]------------------------------- -->
## [v0.42.0](https://github.com/microsoft/fluent-ui-react/tree/v0.42.0) (2019-12-12)
[Compare changes](https://github.com/microsoft/fluent-ui-react/compare/v0.41.01..v0.42.0)
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/themes/teams/components/Checkbox/checkboxStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ const checkboxStyles: ComponentSlotStylesPrepared<
padding: v.togglePadding,
transition: 'padding .3s ease',
userSelect: 'none',
width: v.toggleWidth,
height: v.toggleHeight,

[`& svg`]: {
width: v.toggleIndicatorSize,
Expand Down
4 changes: 4 additions & 0 deletions packages/react/src/themes/teams/components/Checkbox/checkboxVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ export type CheckboxVariables = {
checkboxToggleCheckedBorderColor: string
toggleCheckedPadding: string
toggleIndicatorSize: string
toggleWidth: string
toggleHeight: string

disabledColor: string
disabledBackground: string
Expand Down Expand Up @@ -94,6 +96,8 @@ export default (siteVars: any): CheckboxVariables => ({
toggleIndicatorSize: pxToRem(14),
toggleMargin: '0',
togglePadding: `${padding} ${toggleMovementDistance} ${padding} ${padding}`,
toggleWidth: pxToRem(38),
toggleHeight: pxToRem(20),

checkedTextColor: _.get(siteVars, 'colorScheme.default.foreground', defaultValue),
checkedBackground: _.get(siteVars, 'colorScheme.brand.backgroundActive1', defaultValue),
Expand Down