enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-24 02:23:28 +03:00
Code Issues Projects Releases Wiki Activity

Hide GUI2 when not in Editor tab (#8445)

Browse Source 
Fixes #8443

# Important Notes
None
This commit is contained in:
somebody1234 2023-12-12 22:18:10 +10:00 committed by GitHub
parent 80f94a21e1
commit 56a6dcc875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ide-desktop/lib/content/src/index.ts
View File

@ -299,6 +299,10 @@ class Main implements AppRunner {
ideElement.style.top = '-100vh' ideElement.style.top = '-100vh'
ideElement.style.display = 'fixed' ideElement.style.display = 'fixed'
} }
const ide2Element = document.getElementById('app')
if (ide2Element) {
ide2Element.style.display = 'none'
}
/** TODO [NP]: https://github.com/enso-org/cloud-v2/issues/345 /** TODO [NP]: https://github.com/enso-org/cloud-v2/issues/345
* `content` and `dashboard` packages **MUST BE MERGED INTO ONE**. The IDE * `content` and `dashboard` packages **MUST BE MERGED INTO ONE**. The IDE

6
app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/editor.tsx
View File

@ -16,6 +16,8 @@ const LOADER_ELEMENT_ID = 'loader'
const TOP_BAR_X_OFFSET_PX = 96 const TOP_BAR_X_OFFSET_PX = 96
/** The `id` attribute of the element into which the IDE will be rendered. */ /** The `id` attribute of the element into which the IDE will be rendered. */
const IDE_ELEMENT_ID = 'root' const IDE_ELEMENT_ID = 'root'
/** The `id` attribute of the element into which the new IDE will be rendered. */
const IDE2_ELEMENT_ID = 'app'
const IDE_CDN_BASE_URL = 'https://cdn.enso.org/ide' const IDE_CDN_BASE_URL = 'https://cdn.enso.org/ide'
const JS_EXTENSION: Record<backendModule.BackendType, string> = { const JS_EXTENSION: Record<backendModule.BackendType, string> = {
[backendModule.BackendType.remote]: '.js.gz', [backendModule.BackendType.remote]: '.js.gz',
@ -51,6 +53,10 @@ export default function Editor(props: EditorProps) {
ideElement.style.display = 'absolute' ideElement.style.display = 'absolute'
} }
} }
const ide2Element = document.getElementById(IDE2_ELEMENT_ID)
if (ide2Element != null) {
ide2Element.style.display = hidden ? 'none' : ''
}
}, [hidden]) }, [hidden])
React.useEffect(() => { React.useEffect(() => {

3
app/ide-desktop/lib/dashboard/src/authentication/src/dashboard/components/pageSwitcher.tsx
View File

@ -49,7 +49,7 @@ export default function PageSwitcher(props: PageSwitcherProps) {
const { page, setPage, isEditorDisabled } = props const { page, setPage, isEditorDisabled } = props
return ( return (
<div <div
className={`flex items-center rounded-full shrink-0 gap-4 ${ className={`cursor-default pointer-events-auto flex items-center rounded-full shrink-0 gap-4 ${
page === Page.editor ? 'bg-frame backdrop-blur-3xl px-3 -mx-3' : '' page === Page.editor ? 'bg-frame backdrop-blur-3xl px-3 -mx-3' : ''
}`} }`}
> >
@ -63,7 +63,6 @@ export default function PageSwitcher(props: PageSwitcherProps) {
active={page === pageData.page} active={page === pageData.page}
disabled={isDisabled} disabled={isDisabled}
error={ERRORS[pageData.page]} error={ERRORS[pageData.page]}
className="cursor-default pointer-events-auto"
onClick={() => { onClick={() => {
setPage(pageData.page) setPage(pageData.page)
}} }}