dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-20 12:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

error boundary

Browse Source
This commit is contained in:
Jan Prochazka
2020-12-08 17:24:47 +01:00
parent b47c9f81d2
commit cc11e63cd7
4 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/web/src/TabContent.js
View File

@@ -3,6 +3,7 @@ import _ from 'lodash';
import styled from 'styled-components';
import tabs from './tabs';
import { useOpenedTabs } from './utility/globalState';
import ErrorBoundary from './utility/ErrorBoundary';
const TabContainer = styled.div`
position: absolute;
@@ -11,7 +12,7 @@ const TabContainer = styled.div`
right: 0;
bottom: 0;
display: flex;
visibility: ${props =>
visibility: ${(props) =>
// @ts-ignore
props.tabVisible ? 'visible' : 'hidden'};
`;
@@ -34,10 +35,10 @@ export default function TabContent({ toolbarPortalRef }) {
// cleanup closed tabs
if (_.difference(_.keys(mountedTabs), _.map(files, 'tabid')).length > 0) {
setMountedTabs(_.pickBy(mountedTabs, (v, k) => files.find(x => x.tabid == k)));
setMountedTabs(_.pickBy(mountedTabs, (v, k) => files.find((x) => x.tabid == k)));
}
const selectedTab = files.find(x => x.selected);
const selectedTab = files.find((x) => x.selected);
if (selectedTab) {
const { tabid } = selectedTab;
if (tabid && !mountedTabs[tabid])
@@ -47,13 +48,15 @@ export default function TabContent({ toolbarPortalRef }) {
});
}
return _.keys(mountedTabs).map(tabid => {
return _.keys(mountedTabs).map((tabid) => {
const { TabComponent, props } = mountedTabs[tabid];
const tabVisible = tabid == (selectedTab && selectedTab.tabid);
return (
// @ts-ignore
<TabContainer key={tabid} tabVisible={tabVisible}>
<TabComponent {...props} tabid={tabid} tabVisible={tabVisible} toolbarPortalRef={toolbarPortalRef} />
<ErrorBoundary>
<TabComponent {...props} tabid={tabid} tabVisible={tabVisible} toolbarPortalRef={toolbarPortalRef} />
</ErrorBoundary>
</TabContainer>
);
});