Skip to content
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

Jump to bottom

make the spinner animation default to border #6468

Merged
merged 2 commits into from Nov 3, 2022
Merged

make the spinner animation default to border #6468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7d593
make the spinner animation default to border
factoidforrest Oct 17, 2022
f1b60c1
use default prop for spinner animation parameter
factoidforrest Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Spinner.tsx
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import { Variant } from './types';
export interface SpinnerProps
extends React.HTMLAttributes<HTMLElement>,
BsPrefixProps {
animation: 'border' | 'grow';
animation?: 'border' | 'grow';
size?: 'sm';
variant?: Variant;
}
Expand Down Expand Up @@ -64,7 +64,7 @@ const Spinner: BsPrefixRefForwardingComponent<'div', SpinnerProps> =
{
bsPrefix,
variant,
animation,
animation = 'border',
size,
// Need to define the default "as" during prop destructuring to be compatible with styled-components github.com/react-bootstrap/react-bootstrap/issues/3595
as: Component = 'div',
Expand All @@ -75,7 +75,6 @@ const Spinner: BsPrefixRefForwardingComponent<'div', SpinnerProps> =
) => {
bsPrefix = useBootstrapPrefix(bsPrefix, 'spinner');
const bsSpinnerPrefix = `${bsPrefix}-${animation}`;

return (
<Component
ref={ref}
Expand Down