fix: renamed Spinner -> Loading

This commit is contained in:
Tobias Johansson
2025-04-24 11:46:25 +02:00
committed by Simon Emanuelsson
parent d0c6d1d875
commit 32ce7d819b
7 changed files with 20 additions and 22 deletions

View File

@@ -1,11 +1,9 @@
import { Button as ButtonRAC } from 'react-aria-components'
import { Loading, type LoadingProps } from '../Loading/Loading'
import { variants } from './variants'
import type { ButtonProps } from './types'
import { Spinner } from '../Spinner'
import styles from './button.module.css'
import { SpinnerProps } from '../Spinner/Spinner'
export function Button({
variant,
@@ -27,17 +25,17 @@ export function Button({
className,
})
let spinnerType: SpinnerProps['type'] = 'Dark'
let loadingType: LoadingProps['type'] = 'Dark'
switch (color) {
case 'Primary':
spinnerType = 'Dark'
loadingType = 'Dark'
break
case 'Inverted':
spinnerType = 'White'
loadingType = 'White'
break
default:
spinnerType = 'Dark'
loadingType = 'Dark'
}
return (
@@ -48,7 +46,7 @@ export function Button({
{children}
{isPending && (
<div className={styles.spinnerWrapper}>
<Spinner size={20} type={spinnerType} />
<Loading size={20} type={loadingType} />
</div>
)}
</>

View File

@@ -2,11 +2,11 @@ import 'react-material-symbols/rounded'
import type { Meta, StoryObj } from '@storybook/react'
import { Spinner } from './Spinner'
import { Loading } from './Loading'
const meta: Meta<typeof Spinner> = {
title: 'Components/Spinner',
component: Spinner,
const meta: Meta<typeof Loading> = {
title: 'Components/Loading',
component: Loading,
argTypes: {
type: {
control: 'text',
@@ -19,7 +19,7 @@ const meta: Meta<typeof Spinner> = {
export default meta
type Story = StoryObj<typeof Spinner>
type Story = StoryObj<typeof Loading>
export const Dark: Story = {
args: {

View File

@@ -1,13 +1,13 @@
import styles from './spinner.module.css'
import styles from './loading.module.css'
import { VariantProps } from 'class-variance-authority'
import { variants } from './variants'
export interface SpinnerProps extends VariantProps<typeof variants> {
export interface LoadingProps extends VariantProps<typeof variants> {
size?: number
}
export function Spinner({ type, size = 20 }: SpinnerProps) {
export function Loading({ type, size = 20 }: LoadingProps) {
const classNames = variants({
type,
})

View File

@@ -0,0 +1 @@
export { Loading } from './Loading'

View File

@@ -1,9 +1,9 @@
.spinner {
.loading {
display: inline-block;
}
.dot {
animation: spinnerAnimation 0.8s linear infinite;
animation: pulse 0.8s linear infinite;
transform-origin: center;
}
@@ -40,7 +40,7 @@
animation-delay: 0s;
}
@keyframes spinnerAnimation {
@keyframes pulse {
0% {
opacity: 1;
}

View File

@@ -1,6 +1,6 @@
import { cva } from 'class-variance-authority'
import styles from './spinner.module.css'
import styles from './loading.module.css'
export const config = {
variants: {
@@ -14,4 +14,4 @@ export const config = {
},
} as const
export const variants = cva(styles.spinner, config)
export const variants = cva(styles.loading, config)

View File

@@ -1 +0,0 @@
export { Spinner } from './Spinner'