move WelcomeScreen

Summary: The sidebar is now shown, even if no device is connected. This prevents the jumping layout when Flipper launches, but still has not connected to devices.

Reviewed By: passy

Differential Revision: D9263892

fbshipit-source-id: d5b96a8619393ee4002863a83d9024f00c6cb396
This commit is contained in:
Daniel Büchele
2018-08-10 08:52:02 -07:00
committed by Facebook Github Bot
parent 7107efcc88
commit aace545ba6
6 changed files with 64 additions and 60 deletions

View File

@@ -52,16 +52,14 @@ export class App extends React.Component<Props> {
close={() => this.props.toggleBugDialogVisible(false)}
/>
)}
{this.props.selectedDevice ? (
<FlexRow fill={true}>
{this.props.leftSidebarVisible && <MainSidebar />}
<FlexRow fill={true}>
{this.props.leftSidebarVisible && <MainSidebar />}
{this.props.selectedDevice ? (
<PluginContainer logger={this.props.logger} />
</FlexRow>
) : this.props.pluginManagerVisible ? (
<PluginManager />
) : (
<WelcomeScreen />
)}
) : (
<WelcomeScreen />
)}
</FlexRow>
<ErrorBar text={this.props.error} />
</FlexColumn>
);