Skip to content

fix: Smooth out animation of indeterminate progress bar #27201

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
behowell merged 3 commits into from
Mar 14, 2023
Merged

fix: Smooth out animation of indeterminate progress bar #27201

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
99a8fe1
fix: Smooth out animation of indeterminate progress bar
behowell Mar 14, 2023
d417cb3
Merge branch 'master' of https://github.com/microsoft/fluentui into p…
behowell Mar 14, 2023
703bb75
Add back inadvertantly commented code
behowell Mar 14, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-progress-f5145f44-c47b-4c22-a051-e884f22b88ce.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Smooth out animation of indeterminate progress bar",
"packageName": "@fluentui/react-progress",
"email": "[email protected]",
"dependentChangeType": "patch"
}
20 changes: 3 additions & 17 deletions packages/react-components/react-progress/src/components/ProgressBar/useProgressBarStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { makeStyles, mergeClasses, shorthands } from '@griffel/react';
import { tokens } from '@fluentui/react-theme';
import { useFluent_unstable as useFluent } from '@fluentui/react-shared-contexts';
import type { ProgressBarState, ProgressBarSlots } from './ProgressBar.types';
import type { SlotClassNames } from '@fluentui/react-utilities';

Expand All @@ -20,18 +19,10 @@ const barThicknessValues = {

const indeterminateProgressBar = {
'0%': {
left: '-100% /* @noflip */',
left: '-33%', // matches indeterminate bar width
},
'100%': {
left: '100% /* @noflip */',
},
};
const indeterminateProgressBarRTL = {
'100%': {
right: '-100% /* @noflip */',
},
'0%': {
right: '100% /* @noflip */',
left: '100%',
},
};

Expand Down Expand Up @@ -90,17 +81,14 @@ const useBarStyles = makeStyles({
)`,
animationName: indeterminateProgressBar,
animationDuration: '3s',
animationTimingFunction: 'linear',
animationIterationCount: 'infinite',
'@media screen and (prefers-reduced-motion: reduce)': {
animationDuration: '0.01ms',
animationIterationCount: '1',
},
},

rtl: {
animationName: indeterminateProgressBarRTL,
},

brand: {
backgroundColor: tokens.colorCompoundBrandBackground,
},
Expand All @@ -123,7 +111,6 @@ export const useProgressBarStyles_unstable = (state: ProgressBarState): Progress
const { color, max, shape, thickness, value } = state;
const rootStyles = useRootStyles();
const barStyles = useBarStyles();
const { dir } = useFluent();

state.root.className = mergeClasses(
progressBarClassNames.root,
Expand All @@ -139,7 +126,6 @@ export const useProgressBarStyles_unstable = (state: ProgressBarState): Progress
barStyles.base,
barStyles.brand,
value === undefined && barStyles.indeterminate,
value === undefined && dir === 'rtl' && barStyles.rtl,
value !== undefined && value > ZERO_THRESHOLD && barStyles.nonZeroDeterminate,
color && value !== undefined && barStyles[color],
state.bar.className,
Expand Down