From 3077a3d874ecff6a9c54d171db29b799b4da739c Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Tue, 26 May 2020 17:19:59 +0200
Subject: [PATCH] feat: add black spinner
---
src/components/CommonKit/Spinner/StyledBlackSpinner.tsx | 8 ++++----
.../ContentComponents/Konnector/KonnectorResult.tsx | 2 +-
src/components/ContentComponents/OAuth/OAuthForm.tsx | 7 ++++++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/CommonKit/Spinner/StyledBlackSpinner.tsx b/src/components/CommonKit/Spinner/StyledBlackSpinner.tsx
index 677d5ed25..3895685d0 100644
--- a/src/components/CommonKit/Spinner/StyledBlackSpinner.tsx
+++ b/src/components/CommonKit/Spinner/StyledBlackSpinner.tsx
@@ -10,12 +10,12 @@ const SpinnerBase = withStyles({
},
})(MuiCircularProgress)
-type StyledSpinnerProps = CircularProgressProps
+type StyledBlackSpinnerProps = CircularProgressProps
-const StyledSpinner: React.ComponentType<StyledSpinnerProps> = ({
+const StyledBlackSpinner: React.ComponentType<StyledBlackSpinnerProps> = ({
...props
-}: StyledSpinnerProps) => {
+}: StyledBlackSpinnerProps) => {
return <SpinnerBase {...props} />
}
-export default StyledSpinner
+export default StyledBlackSpinner
diff --git a/src/components/ContentComponents/Konnector/KonnectorResult.tsx b/src/components/ContentComponents/Konnector/KonnectorResult.tsx
index df956a677..ffccef533 100644
--- a/src/components/ContentComponents/Konnector/KonnectorResult.tsx
+++ b/src/components/ContentComponents/Konnector/KonnectorResult.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import { translate } from 'cozy-ui/react/I18n'
import StyledButton from 'components/CommonKit/Button/StyledButton'
-import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner '
+import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
interface KonnectorResultProps {
date: string
diff --git a/src/components/ContentComponents/OAuth/OAuthForm.tsx b/src/components/ContentComponents/OAuth/OAuthForm.tsx
index 25aafedf8..fb8b91c0f 100644
--- a/src/components/ContentComponents/OAuth/OAuthForm.tsx
+++ b/src/components/ContentComponents/OAuth/OAuthForm.tsx
@@ -8,6 +8,7 @@ import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow'
import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg'
import StyledOauthButton from 'components/CommonKit/Button/StyledOauthButton'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner'
interface OAuthFormProps {
konnector: Konnector
@@ -55,7 +56,11 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
>
<div className="oauthform-button-content">
<div className="oauthform-button-content-icon">
- <StyledIcon icon={iconEnedisLogo} size={48} />
+ {isWaiting ? (
+ <StyledBlackSpinner size={48} />
+ ) : (
+ <StyledIcon icon={iconEnedisLogo} size={48} />
+ )}
</div>
<div className="oauthform-button-text text-18-bold">
<div>{t('oauth.connect.' + konnector.slug + '.label1')}</div>
--
GitLab