Skip to content

Commit 4ebd553

Browse files
fix zindex of editor and header
1 parent 4661bb4 commit 4ebd553

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

packages/app/src/app/overmind/effects/vscode/sandboxFsSync/index.ts renamed to packages/app/src/app/overmind/effects/vscode/SandboxFsSync/index.ts

File renamed without changes.

packages/app/src/app/overmind/effects/vscode/sandboxFsSync/utils.ts renamed to packages/app/src/app/overmind/effects/vscode/SandboxFsSync/utils.ts

File renamed without changes.

packages/app/src/app/overmind/effects/vscode/extensionHostWorker/common/fs.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
} from '@codesandbox/common/lib/utils/global';
55

66
import { FileSystemConfiguration } from '../../../../../../../../../standalone-packages/codesandbox-browserfs';
7+
import { IModule } from '../../../../../../../../../standalone-packages/codesandbox-browserfs/dist/node/backend/CodeSandboxFS';
78
import { EXTENSIONS_LOCATION } from '../../constants';
89
import {
910
mkdir,
@@ -13,8 +14,6 @@ import {
1314
writeFile,
1415
} from '../../SandboxFsSync/utils';
1516

16-
import { IModule } from '../../../../../../../../../standalone-packages/codesandbox-browserfs/dist/node/backend/CodeSandboxFS';
17-
1817
const global = getGlobal();
1918

2019
export const BROWSER_FS_CONFIG: FileSystemConfiguration = {
@@ -65,6 +64,7 @@ export async function initializeBrowserFS({
6564
module: IModule;
6665
};
6766
} = {};
67+
let isResolved = false;
6868

6969
return new Promise(resolve => {
7070
const config = { ...BROWSER_FS_CONFIG };
@@ -119,6 +119,10 @@ export async function initializeBrowserFS({
119119
case 'types-sync': {
120120
types = evt.data.$data;
121121
touchFileSystem();
122+
if (!isResolved) {
123+
isResolved = true;
124+
resolve();
125+
}
122126
break;
123127
}
124128
case 'type-sync': {
@@ -135,7 +139,6 @@ export async function initializeBrowserFS({
135139
$type: 'sync-types',
136140
$data: {},
137141
});
138-
resolve();
139142
} else {
140143
resolve();
141144
}

packages/app/src/app/pages/Sandbox/Editor/Header/elements.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import styled, { css } from 'styled-components';
2-
import { Link } from 'react-router-dom';
3-
import { SignInButton as BaseSignInButton } from 'app/pages/common/SignInButton';
41
// @ts-ignore
2+
import { SignInButton as BaseSignInButton } from 'app/pages/common/SignInButton';
3+
import { Link } from 'react-router-dom';
4+
import styled, { css } from 'styled-components';
55
import Dashboard from '-!svg-react-loader!@codesandbox/common/lib/icons/dashboard.svg';
66

77
export const Container = styled.div<{ zenMode: boolean }>`
88
${({ theme, zenMode }) => css`
99
display: ${zenMode ? 'none' : 'flex'};
10-
position: fixed;
11-
z-index: 5;
1210
justify-content: space-between;
1311
align-items: center;
1412
background-color: ${theme['titleBar.activeBackground'] ||
@@ -39,7 +37,7 @@ export const Right = styled.div`
3937
display: flex;
4038
align-items: center;
4139
height: 100%;
42-
z-index: 1;
40+
z-index: 99999999999999;
4341
`;
4442

4543
export const Centered = styled.div`
@@ -89,6 +87,8 @@ export const AccountContainer = styled.div`
8987
`;
9088

9189
export const UserMenuContainer = styled.div`
90+
display: absolute;
91+
z-index: 999999999999;
9292
margin: 5px 0;
9393
margin-right: 0;
9494
font-size: 0.8rem;

packages/app/src/app/pages/Sandbox/Editor/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ const ContentSplit: React.FC = () => {
9494
right: 0,
9595
bottom: bottomOffset,
9696
height: statusBar ? 'auto' : 'calc(100% - 3.5rem)',
97+
zIndex: 999999,
9798
}}
9899
>
99100
<SplitPane

0 commit comments

Comments
 (0)