Skip to content

Commit

Permalink
shell-ui: Add style to top level container
Browse files Browse the repository at this point in the history
Following the changing in Errorpage from 100vh to 100%, we have to make
sure the error page takes the remaining entire height
  • Loading branch information
ChengYanJin committed Dec 20, 2021
1 parent 90edfd9 commit 2eb5c9c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions shell-ui/src/FederatedApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ import {
useConfigRetriever,
useDiscoveredViews,
} from './initFederation/ConfigurationProviders';
import {
Route,
Switch,
Router,
} from 'react-router-dom';
import { Route, Switch, Router } from 'react-router-dom';
import {
ShellConfigProvider,
useShellConfig,
Expand Down Expand Up @@ -203,13 +199,17 @@ function WithInitFederationProviders({ children }: { children: Node }) {
export default function App(): Node {
return (
<ScrollbarWrapper>
<QueryClientProvider client={queryClient} contextSharing={true}>
<ShellConfigProvider shellConfigUrl={'/shell/config.json'}>
<WithInitFederationProviders>
<InternalApp />
</WithInitFederationProviders>
</ShellConfigProvider>
</QueryClientProvider>
<div
style={{ height: '100vh', display: 'flex', flexDirection: 'column' }}
>
<QueryClientProvider client={queryClient} contextSharing={true}>
<ShellConfigProvider shellConfigUrl={'/shell/config.json'}>
<WithInitFederationProviders>
<InternalApp />
</WithInitFederationProviders>
</ShellConfigProvider>
</QueryClientProvider>
</div>
</ScrollbarWrapper>
);
}

0 comments on commit 2eb5c9c

Please sign in to comment.