StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get spinners back in working order

Browse source
This commit is contained in:
Dane Everitt 2020-07-04 12:39:55 -07:00
parent d260200947
commit 5473edc006
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
16 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/scripts/components/elements/Button.tsx
View file

@ -7,10 +7,9 @@ interface Props {
size?: 'xsmall' | 'small' | 'large' | 'xlarge';
color?: 'green' | 'red' | 'primary' | 'grey';
isSecondary?: boolean;
disabled?: boolean;
}
const StyledButton = styled.button<Props>`
const StyledButton = styled.button<Omit<Props, 'isLoading'>>`
${tw`rounded p-2 uppercase tracking-wide text-sm transition-all duration-150`};
${props => props.isSecondary && css<Props>`
@ -73,9 +72,6 @@ const StyledButton = styled.button<Props>`
${props => props.size === 'xlarge' && tw`p-4 w-full`};
&:disabled { opacity: 0.55; cursor: default }
${props => props.disabled && css`opacity: 0.55; cursor: default`};
`;
type ComponentProps = Props &
@ -88,7 +84,7 @@ const Button: React.FC<ComponentProps> = ({ children, isLoading, ...props }) =>
<div className={'spinner-circle spinner-white spinner-sm'}/>
</div>
}
<span css={isLoading && tw`text-transparent`}>
<span css={isLoading ? tw`text-transparent` : undefined}>
{children}
</span>
</StyledButton>