summaryrefslogtreecommitdiffstats
path: root/src/components/ui/FullscreenLoader
diff options
context:
space:
mode:
authorLibravatar Pawel Kowalski <25907418+MentorPK@users.noreply.github.com>2023-10-27 02:19:31 +0200
committerLibravatar GitHub <noreply@github.com>2023-10-27 01:19:31 +0100
commit78cb67c641e5723af59e0cf8a172a443aafa6f33 (patch)
treeec121e8efecf027717ce4e58b29c72fa93ed3315 /src/components/ui/FullscreenLoader
parent6.5.3-nightly.4 [skip ci] (diff)
downloadferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.tar.gz
ferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.tar.zst
ferdium-app-78cb67c641e5723af59e0cf8a172a443aafa6f33.zip
feat: change loader component (#1410)
* CHANGED react-loater to react-loader-spinner * CHANGED brandColor to primary * feat: change loader component - remove redundant /index path from Loader imports in multiple files - remove commented out braces in RecipesDashboard - remove redundant color which is default from Loader in InfoBar - update size of Loader in InfoBar to be the same as InfoBox - change passed size prop from string to number in Button component - add slight gap for FullscreenLoader to styles.ts - fix Loader to check for color primary which is passed rather than brandColor - remove hardcoded width and height from WorkspaceSwitchingIndicator which lead to elements not being vertically centered - remove color prop from Loader in WorkspaceSwitchingIndicator since white is already the default - remove switchingIndicator.spinnerColor from default theme since white is already the default * implement PR feedback * re-add color to WorkspaceSwitchingIndicator --------- Co-authored-by: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Diffstat (limited to 'src/components/ui/FullscreenLoader')
-rw-r--r--src/components/ui/FullscreenLoader/index.tsx8
-rw-r--r--src/components/ui/FullscreenLoader/styles.ts1
2 files changed, 4 insertions, 5 deletions
diff --git a/src/components/ui/FullscreenLoader/index.tsx b/src/components/ui/FullscreenLoader/index.tsx
index 002ee7932..09c1d5fbb 100644
--- a/src/components/ui/FullscreenLoader/index.tsx
+++ b/src/components/ui/FullscreenLoader/index.tsx
@@ -2,7 +2,7 @@ import { Component, ReactElement, ReactNode } from 'react';
2import { observer } from 'mobx-react'; 2import { observer } from 'mobx-react';
3import withStyles, { WithStylesProps } from 'react-jss'; 3import withStyles, { WithStylesProps } from 'react-jss';
4import classnames from 'classnames'; 4import classnames from 'classnames';
5import Loader from '../Loader'; 5import Loader from '../loader/index';
6import styles from './styles'; 6import styles from './styles';
7import { H1 } from '../headline'; 7import { H1 } from '../headline';
8import { Theme } from '../../../themes'; 8import { Theme } from '../../../themes';
@@ -21,7 +21,7 @@ class FullscreenLoader extends Component<IProps> {
21 render(): ReactElement { 21 render(): ReactElement {
22 const { 22 const {
23 classes, 23 classes,
24 theme = '', 24 theme,
25 className = '', 25 className = '',
26 spinnerColor = '', 26 spinnerColor = '',
27 children = null, 27 children = null,
@@ -39,9 +39,7 @@ class FullscreenLoader extends Component<IProps> {
39 > 39 >
40 <H1 className={classes.title}>{title}</H1> 40 <H1 className={classes.title}>{title}</H1>
41 <Loader 41 <Loader
42 color={ 42 color={spinnerColor || theme?.colorFullscreenLoaderSpinner}
43 spinnerColor || (theme && theme.colorFullscreenLoaderSpinner)
44 }
45 loaded={loaded} 43 loaded={loaded}
46 /> 44 />
47 {children && <div className={classes.content}>{children}</div>} 45 {children && <div className={classes.content}>{children}</div>}
diff --git a/src/components/ui/FullscreenLoader/styles.ts b/src/components/ui/FullscreenLoader/styles.ts
index 64d24e4ce..9a1b24400 100644
--- a/src/components/ui/FullscreenLoader/styles.ts
+++ b/src/components/ui/FullscreenLoader/styles.ts
@@ -12,6 +12,7 @@ export default {
12 alignItems: 'center', 12 alignItems: 'center',
13 textAlign: 'center', 13 textAlign: 'center',
14 height: 'auto', 14 height: 'auto',
15 gap: 8,
15 }, 16 },
16 title: { 17 title: {
17 fontSize: 35, 18 fontSize: 35,