diff --git a/src/components/App.tsx b/src/components/App.tsx index 59fa3dad51248a910cf9eda8b95b3a6ce7ce2626..af33ff0167d75d232e4495d1224f460890fc791d 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -1,35 +1,35 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -import React from 'react' -import { HashRouter } from 'react-router-dom' -import { createBrowserHistory } from 'history' -import { Layout, Main, Content } from 'cozy-ui/transpiled/react/Layout' - -import Routes from 'components/Routes/Routes' -import Navbar from 'components/Navbar/Navbar' -import SplashRoot from './Splash/SplashRoot' -import SplashScreen from 'components/Splash/SplashScreen' -import SplashScreenError from 'components/Splash/SplashScreenError' - -export const history = createBrowserHistory() - -export const App = () => { - return ( - <HashRouter {...history}> - <Layout> - <SplashRoot - splashComponent={SplashScreen} - splashErrorComponent={SplashScreenError} - > - <Navbar /> - <Main> - <Content className="app-content"> - <Routes /> - </Content> - </Main> - </SplashRoot> - </Layout> - </HashRouter> - ) -} - -export default App +/* eslint-disable @typescript-eslint/no-explicit-any */ +import React from 'react' +import { HashRouter } from 'react-router-dom' +import { createBrowserHistory } from 'history' +import { Layout, Main, Content } from 'cozy-ui/transpiled/react/Layout' + +import Routes from 'components/Routes/Routes' +import Navbar from 'components/Navbar/Navbar' +import SplashRoot from './Splash/SplashRoot' +import SplashScreen from 'components/Splash/SplashScreen' +import SplashScreenError from 'components/Splash/SplashScreenError' + +export const history = createBrowserHistory() + +export const App = () => { + return ( + <HashRouter {...history}> + <Layout> + <SplashRoot + splashComponent={SplashScreen} + splashErrorComponent={SplashScreenError} + > + <Navbar /> + <Main> + <Content className="app-content" tabIndex="-1"> + <Routes /> + </Content> + </Main> + </SplashRoot> + </Layout> + </HashRouter> + ) +} + +export default App diff --git a/src/components/Content/Content.tsx b/src/components/Content/Content.tsx index 1ef4edf6d98d292ab43df3068e68453b95590276..dad91485624f2be5de3258f192ec0ff3d621103d 100644 --- a/src/components/Content/Content.tsx +++ b/src/components/Content/Content.tsx @@ -110,7 +110,6 @@ const Content: React.FC<ContentProps> = ({ handleCloseClick={handleFeedbackModalClose} /> <div - role="main" className="content-view" style={{ marginTop: height,