diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 10:45:11 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-02-21 10:45:11 +0100 |
| commit | de737c54c413f96c35b4e9bc6280fc7d26e4fa83 (patch) | |
| tree | 0cf470c59b4c7c8a6327e64610f68f5facd78d6d /app/components/Layout.js | |
| parent | ae9c255b3ecdec341090c932db6cb261147a7382 (diff) | |
| parent | 1214138633bcca19a1b96622400f3fbcf4044bd9 (diff) | |
| download | mullvadvpn-de737c54c413f96c35b4e9bc6280fc7d26e4fa83.tar.xz mullvadvpn-de737c54c413f96c35b4e9bc6280fc7d26e4fa83.zip | |
Merge branch 'update-flow'
Diffstat (limited to 'app/components/Layout.js')
| -rw-r--r-- | app/components/Layout.js | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/app/components/Layout.js b/app/components/Layout.js index 5c0e1f5bcb..51b135e8f5 100644 --- a/app/components/Layout.js +++ b/app/components/Layout.js @@ -1,14 +1,13 @@ // @flow -import React, { Component } from 'react'; +import * as React from 'react'; import HeaderBar from './HeaderBar'; import type { HeaderBarProps } from './HeaderBar'; -export class Header extends Component { - props: HeaderBarProps; +export class Header extends React.Component<HeaderBarProps> { static defaultProps = HeaderBar.defaultProps; - render(): React.Element<*> { + render() { return ( <div className="layout__header"> <HeaderBar { ...this.props } /> @@ -17,12 +16,13 @@ export class Header extends Component { } } -export class Container extends Component { - props: { - children: React.Element<*> - } - render(): React.Element<*> { +type ContainerProps = { + children?: React.Element<*> +}; + +export class Container extends React.Component<ContainerProps> { + render() { return ( <div className="layout__container"> { this.props.children } @@ -31,12 +31,12 @@ export class Container extends Component { } } -export class Layout extends Component { - props: { - children: Array<React.Element<*>> | React.Element<*> - } +type LayoutProps = { + children?: React.Node +}; - render(): React.Element<*> { +export class Layout extends React.Component<LayoutProps> { + render() { return ( <div className="layout"> { this.props.children } |
