app: Move global styles setup to app.js

evanpurkhiser · Nov 23, 2020 · 781aa20 · 781aa20
1 parent 5e794ff
commit 781aa20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
@@ -5,17 +5,25 @@ import * as Sentry from '@sentry/browser';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import {when} from 'mobx';
+import {Global} from '@emotion/core';
 
 import Application from 'app/views/Application';
+import globalCss, {noSelect} from 'src/shared/globalCss';
 import {registerRendererIpc, registerRendererConfigIpc} from 'src/shared/store/ipc';
 import store from 'src/shared/store';
 
 // Create main element
 const mainElement = document.createElement('div');
 document.body.appendChild(mainElement);
 
-// Render components
-ReactDOM.render(<Application />, mainElement);
+const main = (
+  <React.Fragment>
+    <Global styles={[globalCss, noSelect]} />
+    <Application />
+  </React.Fragment>
+);
+
+ReactDOM.render(main, mainElement);
 
 registerRendererIpc();
 

diff --git a/src/renderer/views/Application.tsx b/src/renderer/views/Application.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
-import {Global} from '@emotion/core';
 import styled from '@emotion/styled';
 import {MemoryRouter, Switch, Route, Redirect} from 'react-router-dom';
 
-import globalCss, {noSelect} from 'src/shared/globalCss';
 import Titlebar from 'app/components/Titlebar';
 import Footer from 'app/components/Footer';
 import Devices from 'app/views/devices';
@@ -12,7 +10,6 @@ import Settings from 'app/views/settings';
 
 const Application = () => (
   <MemoryRouter>
-    <Global styles={[globalCss, noSelect]} />
     <Titlebar />
     <Frame>
       <Switch>