diff --git a/src/e2e/app.ts b/src/e2e/app.ts index b2e094a60..d748cf774 100644 --- a/src/e2e/app.ts +++ b/src/e2e/app.ts @@ -2,6 +2,7 @@ import { waitFor } from "@testing-library/dom"; import * as fs from "fs"; import * as fsp from "fs/promises"; import * as path from "path"; +import * as os from "os"; import "pptr-testing-library/extend"; import puppeteer, { Page } from "puppeteer"; @@ -22,7 +23,9 @@ export interface BrowserDownload { */ export class App { private page: Promise; - private downloadPath = fs.mkdtempSync("puppeteer-downloads"); + private downloadPath = fs.mkdtempSync( + path.join(os.tmpdir(), "puppeteer-downloads-") + ); constructor() { this.page = (async () => { diff --git a/src/editor/EditorArea.tsx b/src/editor/EditorArea.tsx index 481a241e6..4aed7585c 100644 --- a/src/editor/EditorArea.tsx +++ b/src/editor/EditorArea.tsx @@ -1,9 +1,8 @@ import { Box, Flex } from "@chakra-ui/react"; import { MAIN_FILE } from "../fs/fs"; -import ZoomControls from "./ZoomControls"; -import NonMainFileNotice from "./NonMainFileNotice"; import EditorContainer from "./EditorContainer"; -import ProjectActionBar from "../project/ProjectActionBar"; +import NonMainFileNotice from "./NonMainFileNotice"; +import ZoomControls from "./ZoomControls"; interface EditorAreaProps { filename: string; @@ -37,13 +36,6 @@ const EditorArea = ({ filename, onSelectedFileChanged }: EditorAreaProps) => { /> - ); }; diff --git a/src/workbench/Workbench.tsx b/src/workbench/Workbench.tsx index 1b4338343..3776a744e 100644 --- a/src/workbench/Workbench.tsx +++ b/src/workbench/Workbench.tsx @@ -1,9 +1,16 @@ import { useState } from "react"; -import { BottomResizable, Fill, LeftResizable, ViewPort } from "react-spaces"; +import { + Bottom, + BottomResizable, + Fill, + LeftResizable, + ViewPort, +} from "react-spaces"; import { ConnectionStatus } from "../device/device"; import { useConnectionStatus } from "../device/device-hooks"; import EditorArea from "../editor/EditorArea"; import { MAIN_FILE } from "../fs/fs"; +import ProjectActionBar from "../project/ProjectActionBar"; import SerialArea from "../serial/SerialArea"; import LeftPanel from "./LeftPanel"; @@ -31,15 +38,24 @@ const Workbench = () => { filename={filename} onSelectedFileChanged={setFilename} /> - - - {/* For accessibility. + + {/* For accessibility. Using `display` breaks the terminal height adjustment */} - - + + + + + +