diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-12-09 01:01:12 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-12-09 01:01:12 +0100 |
commit | f01957203f77fce8b65d5e034a8acd68f1e0ae2e (patch) | |
tree | 2f8d0d232266cdc7ed74e1913b270527f46bb33d /src/components/ui | |
parent | Add dark mode styles to content tabs (diff) | |
download | ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.tar.gz ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.tar.zst ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.zip |
Upgrade to react 16
TODO: add componentDidCatch
Diffstat (limited to 'src/components/ui')
-rw-r--r-- | src/components/ui/FullscreenLoader/index.js | 34 | ||||
-rw-r--r-- | src/components/ui/ImageUpload.js | 6 | ||||
-rw-r--r-- | src/components/ui/Tabs/TabItem.js | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index 145c15c2d..36cd32d2a 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js | |||
@@ -8,21 +8,21 @@ import Loader from '../Loader'; | |||
8 | import styles from './styles'; | 8 | import styles from './styles'; |
9 | 9 | ||
10 | export default inject('stores')(injectSheet(styles)(({ stores, classes, className, title, children }) => ( | 10 | export default inject('stores')(injectSheet(styles)(({ stores, classes, className, title, children }) => ( |
11 | <div className={classes.wrapper}> | 11 | <div className={classes.wrapper}> |
12 | <div | 12 | <div |
13 | className={classnames({ | 13 | className={classnames({ |
14 | [`${classes.component}`]: true, | 14 | [`${classes.component}`]: true, |
15 | [`${className}`]: className, | 15 | [`${className}`]: className, |
16 | })} | 16 | })} |
17 | > | 17 | > |
18 | <h1 className={classes.title}>{title}</h1> | 18 | <h1 className={classes.title}>{title}</h1> |
19 | <Loader color={stores.settings.app.darkMode ? '#FFF' : '#000'} /> | 19 | <Loader color={stores.settings.app.darkMode ? '#FFF' : '#000'} /> |
20 | {children && ( | 20 | {children && ( |
21 | <div className={classes.content}> | 21 | <div className={classes.content}> |
22 | {children} | 22 | {children} |
23 | </div> | 23 | </div> |
24 | )} | 24 | )} |
25 | </div> | ||
26 | </div> | 25 | </div> |
27 | ) | 26 | </div> |
28 | )); | 27 | ), |
28 | )); | ||
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 76f77d631..cbe70ac88 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Field } from 'mobx-react-form'; | 4 | import { Field } from 'mobx-react-form'; |
@@ -57,7 +57,7 @@ export default @observer class ImageUpload extends Component { | |||
57 | <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label> | 57 | <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label> |
58 | <div className="image-upload"> | 58 | <div className="image-upload"> |
59 | {(field.value && field.value !== 'delete') || this.state.path ? ( | 59 | {(field.value && field.value !== 'delete') || this.state.path ? ( |
60 | <div> | 60 | <Fragment> |
61 | <div | 61 | <div |
62 | className="image-upload__preview" | 62 | className="image-upload__preview" |
63 | style={({ | 63 | style={({ |
@@ -84,7 +84,7 @@ export default @observer class ImageUpload extends Component { | |||
84 | </button> | 84 | </button> |
85 | <div className="image-upload__action-background" /> | 85 | <div className="image-upload__action-background" /> |
86 | </div> | 86 | </div> |
87 | </div> | 87 | </Fragment> |
88 | ) : ( | 88 | ) : ( |
89 | <Dropzone | 89 | <Dropzone |
90 | ref={(node) => { this.dropzoneRef = node; }} | 90 | ref={(node) => { this.dropzoneRef = node; }} |
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js index 9ff9f009e..16881a7f7 100644 --- a/src/components/ui/Tabs/TabItem.js +++ b/src/components/ui/Tabs/TabItem.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | 2 | ||
3 | import { oneOrManyChildElements } from '../../../prop-types'; | 3 | import { oneOrManyChildElements } from '../../../prop-types'; |
4 | 4 | ||
@@ -11,7 +11,7 @@ export default class TabItem extends Component { | |||
11 | const { children } = this.props; | 11 | const { children } = this.props; |
12 | 12 | ||
13 | return ( | 13 | return ( |
14 | <div>{children}</div> | 14 | <Fragment>{children}</Fragment> |
15 | ); | 15 | ); |
16 | } | 16 | } |
17 | } | 17 | } |