-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(Loading): Add a new component Loading and fix an issue with load…
…ing on component Button after upgrade to daisyui version 3 (#358)
- Loading branch information
1 parent
e5161fd
commit 65550d9
Showing
5 changed files
with
177 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
import React from 'react' | ||
import { StoryFn as Story, Meta } from '@storybook/react' | ||
|
||
import Loading, { LoadingProps } from '.' | ||
|
||
const meta: Meta = { | ||
title: 'Data Display/Loading', | ||
component: Loading, | ||
parameters: { | ||
controls: { expanded: true }, | ||
}, | ||
}; | ||
|
||
export default meta | ||
|
||
const Template: Story<LoadingProps> = (args) => { | ||
return <Loading {...args} /> | ||
} | ||
export const Default = Template.bind({}) | ||
Default.args = { | ||
variant: 'spinner', | ||
} | ||
|
||
export const Colors: Story<LoadingProps> = (args) => { | ||
return ( | ||
<div> | ||
<div> | ||
<Loading {...args} /> | ||
<Loading {...args} color="primary" /> | ||
<Loading {...args} color="secondary" /> | ||
<Loading {...args} color="success" /> | ||
<Loading {...args} color="warning" /> | ||
<Loading {...args} color="error" /> | ||
<Loading {...args} color="info" /> | ||
<Loading {...args} color="accent" /> | ||
<Loading {...args} color="ghost" /> | ||
</div> | ||
</div> | ||
) | ||
} | ||
Colors.args = { | ||
className: "m-1" | ||
} | ||
|
||
export const Variants: Story<LoadingProps> = (args) => { | ||
return ( | ||
<div className="flex gap-x-2"> | ||
<Loading {...args} /> | ||
<Loading {...args} variant="dots" /> | ||
<Loading {...args} variant="ring" /> | ||
<Loading {...args} variant="ball" /> | ||
<Loading {...args} variant="bars" /> | ||
<Loading {...args} variant="infinity" /> | ||
</div> | ||
) | ||
} | ||
|
||
export const Sizes: Story<LoadingProps> = (args) => { | ||
return ( | ||
<div> | ||
<div> | ||
<Loading {...args} size="xs" /> | ||
<Loading {...args} size="sm" /> | ||
<Loading {...args} size="md" /> | ||
<Loading {...args} size="lg" /> | ||
</div> | ||
</div> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import { render } from '@testing-library/react' | ||
import Loading from '.' | ||
|
||
describe('Loading', () => { | ||
it('renders a default variant', () => { | ||
const {container} = render(<Loading />) | ||
expect(container.querySelector('.loading')).toHaveClass('loading-spinner') | ||
}) | ||
|
||
it('renders a variant', () => { | ||
const {container} = render(<Loading variant="infinity" />) | ||
expect(container.querySelector('.loading')).toHaveClass('loading-infinity') | ||
}) | ||
|
||
it('renders a size', () => { | ||
const {container} = render(<Loading size="xs" />) | ||
expect(container.querySelector('.loading')).toHaveClass('loading-xs') | ||
}) | ||
|
||
it('renders a color', () => { | ||
const {container} = render(<Loading color="primary" />) | ||
expect(container.querySelector('.loading')).toHaveClass('text-primary') | ||
}) | ||
|
||
it('renders a variant and size', () => { | ||
const {container} = render(<Loading variant="dots" size="xs" />) | ||
expect(container.querySelector('.loading')).toHaveClass('loading-dots') | ||
expect(container.querySelector('.loading')).toHaveClass('loading-xs') | ||
}) | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
import React, { forwardRef, ReactNode } from 'react' | ||
import clsx from 'clsx' | ||
import { twMerge } from 'tailwind-merge' | ||
|
||
import { | ||
IComponentBaseProps, | ||
ComponentColor, | ||
ComponentSize, | ||
} from '../types' | ||
|
||
export type LoadingProps = | ||
React.HTMLAttributes<HTMLSpanElement> | ||
& IComponentBaseProps | ||
& { | ||
size?: ComponentSize | ||
color?: ComponentColor | ||
variant?: 'spinner' | 'dots' | 'ring' | 'ball' | 'bars' | 'infinity' | ||
} | ||
|
||
const Loading = forwardRef<HTMLSpanElement, LoadingProps>( | ||
( | ||
{ | ||
size, | ||
variant = 'spinner', | ||
color, | ||
dataTheme, | ||
className, | ||
style, | ||
...props | ||
}, | ||
ref | ||
): JSX.Element => { | ||
const classes = twMerge( | ||
'loading', | ||
className, | ||
clsx({ | ||
'loading-lg': size === 'lg', | ||
'loading-md': size === 'md', | ||
'loading-sm': size === 'sm', | ||
'loading-xs': size === 'xs', | ||
'loading-spinner': variant === 'spinner', | ||
'loading-dots': variant === 'dots', | ||
'loading-ring': variant === 'ring', | ||
'loading-ball': variant === 'ball', | ||
'loading-bars': variant === 'bars', | ||
'loading-infinity': variant === 'infinity', | ||
'text-primary': color === 'primary', | ||
'text-secondary': color === 'secondary', | ||
'text-accent': color === 'accent', | ||
'text-info': color === 'info', | ||
'text-success': color === 'success', | ||
'text-warning': color === 'warning', | ||
'text-error': color === 'error', | ||
'text-ghost': color === 'ghost', | ||
}) | ||
) | ||
|
||
return ( | ||
<span | ||
{...props} | ||
ref={ref} | ||
data-theme={dataTheme} | ||
className={classes} | ||
style={style} | ||
/> | ||
) | ||
} | ||
) | ||
|
||
Loading.displayName = 'Loading' | ||
|
||
export default Loading |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import Loading, { LoadingProps as TLoadingProps } from './Loading' | ||
export type LoadingProps = TLoadingProps | ||
export default Loading |