ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-21 07:28:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Skeleton: fix grid styling on hidden sidebar

Browse Source 
Fixes urbit/landscape#1006
This commit is contained in:
Liam Fitzgerald 2021-06-29 13:11:26 +10:00
parent aa8551a3ab
commit 5e2f4215a8
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/interface/src/views/components/AsyncFallback.tsx
View File

@ -14,11 +14,12 @@ class AsyncFallback extends React.Component<
this.state = { error: false };
}
componentDidCatch() {
this.setState({ error: true });
return false;
static getDerivedStateFromError(error) {
return { error: true };
}
componentDidCatch(error, info) {}
render() {
const { fallback, children } = this.props;
return (

22
pkg/interface/src/views/landscape/components/Skeleton.tsx
View File

@ -20,22 +20,26 @@ export const Skeleton = React.memo((props: SkeletonProps): ReactElement => {
setSidebar(s => !s);
}, []));
return !sidebar ? (<Body> {props.children} </Body>) : (
return (
<Body
display="grid"
gridTemplateColumns={
['100%', 'minmax(150px, 1fr) 3fr', 'minmax(250px, 1fr) 4fr']
sidebar
? ['100%', 'minmax(150px, 1fr) 3fr', 'minmax(250px, 1fr) 4fr']
: '100%'
}
gridTemplateRows="100%"
>
<ErrorBoundary>
<Sidebar
recentGroups={props.recentGroups}
selected={props.selected}
baseUrl={props.baseUrl}
mobileHide={props.mobileHide}
workspace={props.workspace}
/>
{ sidebar && (
<Sidebar
recentGroups={props.recentGroups}
selected={props.selected}
baseUrl={props.baseUrl}
mobileHide={props.mobileHide}
workspace={props.workspace}
/>
)}
</ErrorBoundary>
{props.children}
</Body>