Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

Collapsible test panel (#538)

bautistaaa1ef00bb6d2bf
diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsx
index 5726100d..b2d91658 100644
--- a/packages/monaco/src/index.tsx
+++ b/packages/monaco/src/index.tsx
@@ -1,23 +1,18 @@
'use client';
import clsx from 'clsx';
-import { Loader2 } from '@repo/ui/icons';
+import { ChevronUp, Loader2, XCircle, CheckCircle2 } from '@repo/ui/icons';
import type * as monaco from 'monaco-editor';
-import dynamic from 'next/dynamic';
import { useRouter, useSearchParams } from 'next/navigation';
import React, { useState } from 'react';
import lzstring from 'lz-string';
import { Button, ToastAction, useToast, Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui';
import { useLocalStorage } from './useLocalStorage';
-import SplitEditor, { TESTS_PATH } from './split-editor';
+import SplitEditor, { TESTS_PATH, USER_CODE_PATH } from './split-editor';
import { createTwoslashInlayProvider } from './twoslash';
import { PrettierFormatProvider } from './prettier';
import { useResetEditor } from './editor-hooks';
-const VimStatusBar = dynamic(() => import('./vim-mode'), {
- ssr: false,
-});
-
export interface CodePanelProps {
challenge: {
id: number;
@@ -40,6 +35,7 @@ export function CodePanel(props: CodePanelProps) {
const router = useRouter();
const { toast } = useToast();
const [tsErrors, setTsErrors] = useState<TsErrors>();
+ const [isTestPanelExpanded, setIsTestPanelExpanded] = useState(false);
const [localStorageCode, setLocalStorageCode] = useLocalStorage(
`challenge-${props.challenge.id}`,
'',
@@ -89,86 +85,130 @@ export function CodePanel(props: CodePanelProps) {
});
}
};
+ const hasFailingTest = tsErrors?.some((e) => e.length) ?? false;
return (
<>
- <div className="sticky top-0 flex h-[40px] items-center justify-end gap-4 border-b border-zinc-300 px-3 py-2 dark:border-zinc-700 dark:bg-[#1e1e1e]">
+ <div className="sticky top-0 flex h-[40px] shrink-0 items-center justify-end gap-4 border-b border-zinc-300 px-3 py-2 dark:border-zinc-700 dark:bg-[#1e1e1e]">
{props.settingsElement}
</div>
- <div className="w-full flex-1">
- <SplitEditor
- monaco={monacoInstance}
- tests={props.challenge.tests}
- userCode={code}
- onMount={{
- tests: (editor) => {
- setTestEditorState(editor);
- setTsErrors([[], [], []]);
- },
- user: async (editor, monaco) => {
- setMonacoInstance(monaco);
-
- monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
- ...monaco.languages.typescript.typescriptDefaults.getCompilerOptions(),
- strict: true,
- target: monaco.languages.typescript.ScriptTarget.ESNext,
- strictNullChecks: true,
- });
-
- monaco.languages.registerDocumentFormattingEditProvider(
- 'typescript',
- PrettierFormatProvider,
- );
-
- setUserEditorState(editor);
-
- const model = editor.getModel();
-
- if (!model) {
- throw new Error();
- }
-
- const ts = await (await monaco.languages.typescript.getTypeScriptWorker())(model.uri);
-
- monaco.languages.registerInlayHintsProvider(
- 'typescript',
- createTwoslashInlayProvider(monaco, ts),
- );
- },
- }}
- onChange={{
- user: async (code) => {
- if (!monacoInstance) return null;
- setCode(code ?? '');
- setLocalStorageCode(code ?? '');
- const getTsWorker = await monacoInstance.languages.typescript.getTypeScriptWorker();
-
- const mm = monacoInstance.editor.getModel(monacoInstance.Uri.parse(TESTS_PATH));
- if (!mm) return null;
-
- const tsWorker = await getTsWorker(mm.uri);
-
- const errors = await Promise.all([
- tsWorker.getSemanticDiagnostics(TESTS_PATH),
- tsWorker.getSyntacticDiagnostics(TESTS_PATH),
- tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),
- ] as const);
-
- setTsErrors(errors);
- },
- }}
- />
- </div>
+ <SplitEditor
+ userEditorState={userEditorState}
+ monaco={monacoInstance}
+ expandTestPanel={isTestPanelExpanded}
+ tests={props.challenge.tests}
+ userCode={code}
+ onMount={{
+ tests: async (editor, monaco) => {
+ const getTsWorker = await monaco.languages.typescript.getTypeScriptWorker();
+
+ const mm = monaco.editor.getModel(monaco.Uri.parse(TESTS_PATH));
+ if (!mm) return null;
+
+ const tsWorker = await getTsWorker(mm.uri);
+ const errors = await Promise.all([
+ tsWorker.getSemanticDiagnostics(TESTS_PATH),
+ tsWorker.getSyntacticDiagnostics(TESTS_PATH),
+ tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),
+ ] as const);
+
+ console.log({ errors });
+
+ setTsErrors(errors);
+ setTestEditorState(editor);
+ },
+ user: async (editor, monaco) => {
+ setMonacoInstance(monaco);
+
+ monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
+ ...monaco.languages.typescript.typescriptDefaults.getCompilerOptions(),
+ strict: true,
+ target: monaco.languages.typescript.ScriptTarget.ESNext,
+ strictNullChecks: true,
+ });
+
+ monaco.languages.registerDocumentFormattingEditProvider(
+ 'typescript',
+ PrettierFormatProvider,
+ );
+
+ setUserEditorState(editor);
+
+ const model = editor.getModel();
+
+ if (!model) {
+ throw new Error();
+ }
+
+ const ts = await (await monaco.languages.typescript.getTypeScriptWorker())(model.uri);
+
+ const errors = await Promise.all([
+ ts.getSemanticDiagnostics(USER_CODE_PATH),
+ ts.getSyntacticDiagnostics(USER_CODE_PATH),
+ ts.getCompilerOptionsDiagnostics(USER_CODE_PATH),
+ ] as const);
+
+ setTsErrors(errors);
+
+ monaco.languages.registerInlayHintsProvider(
+ 'typescript',
+ createTwoslashInlayProvider(monaco, ts),
+ );
+ },
+ }}
+ onChange={{
+ user: async (code) => {
+ if (!monacoInstance) return null;
+ setCode(code ?? '');
+ setLocalStorageCode(code ?? '');
+ const getTsWorker = await monacoInstance.languages.typescript.getTypeScriptWorker();
+
+ const mm = monacoInstance.editor.getModel(monacoInstance.Uri.parse(TESTS_PATH));
+ if (!mm) return null;
+
+ const tsWorker = await getTsWorker(mm.uri);
+
+ const errors = await Promise.all([
+ tsWorker.getSemanticDiagnostics(TESTS_PATH),
+ tsWorker.getSyntacticDiagnostics(TESTS_PATH),
+ tsWorker.getCompilerOptionsDiagnostics(TESTS_PATH),
+ ] as const);
+
+ setTsErrors(errors);
+ },
+ }}
+ />
<div
className={clsx(
{
'justify-between': testEditorState,
},
- 'sticky bottom-0 flex items-center justify-end p-2 dark:bg-[#1e1e1e]',
+ 'sticky bottom-0 flex items-center justify-between p-2 dark:bg-[#1e1e1e]',
)}
>
- {userEditorState && <VimStatusBar editor={userEditorState} />}
- <div className="flex items-center justify-center gap-4">
+ <div className="flex items-center gap-4">
+ <Button
+ className="flex items-center gap-1"
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ setIsTestPanelExpanded((tp) => !tp);
+ }}
+ >
+ Tests
+ {isTestPanelExpanded ? (
+ <ChevronUp className="rotate-180 transform transition" size={16} />
+ ) : (
+ <ChevronUp className="transform transition" size={16} />
+ )}
+ </Button>
+ {hasFailingTest ? (
+ <XCircle className="stroke-red-600 dark:stroke-red-300" />
+ ) : (
+ <CheckCircle2 className="stroke-green-600 dark:stroke-green-300" />
+ )}
+ </div>
+ <div className="flex items-center justify-between gap-4">
<Tooltip>
<TooltipTrigger asChild>
<Button
diff --git a/packages/monaco/src/split-editor.tsx b/packages/monaco/src/split-editor.tsx
index 84f289d5..18817e8c 100644
--- a/packages/monaco/src/split-editor.tsx
+++ b/packages/monaco/src/split-editor.tsx
@@ -1,10 +1,17 @@
'use client';
+
+import { type OnChange, type OnMount, type OnValidate } from '@monaco-editor/react';
import clsx from 'clsx';
-import React, { useCallback, useEffect, useState } from 'react';
-import { useMonaco, type OnValidate, type OnMount, type OnChange } from '@monaco-editor/react';
-import type { editor } from 'monaco-editor';
+import type * as monaco from 'monaco-editor';
+import { useEffect } from 'react';
import { CodeEditor, LIB_URI } from './code-editor';
import { libSource } from './editor-types';
+import dynamic from 'next/dynamic';
+import { useEditorSettingsStore } from './settings-store';
+
+const VimStatusBar = dynamic(() => import('./vim-mode'), {
+ ssr: false,
+});
export const TESTS_PATH = 'file:///tests.ts';
export const USER_CODE_PATH = 'file:///user.ts';
@@ -12,6 +19,7 @@ export const USER_CODE_PATH = 'file:///user.ts';
export interface SplitEditorProps {
/** the classes applied to the container div */
className?: string;
+ expandTestPanel: boolean;
tests: string;
userCode: string;
onValidate?: {
@@ -27,11 +35,14 @@ export interface SplitEditorProps {
user?: OnChange;
};
monaco: typeof import('monaco-editor') | undefined;
+ userEditorState?: monaco.editor.IStandaloneCodeEditor;
}
// million-ignore
export default function SplitEditor({
className,
+ userEditorState,
+ expandTestPanel,
tests,
userCode,
onMount,
@@ -39,6 +50,7 @@ export default function SplitEditor({
onChange,
monaco,
}: SplitEditorProps) {
+ const { settings } = useEditorSettingsStore();
useEffect(() => {
if (monaco) {
const libUri = monaco.Uri.parse(LIB_URI);
@@ -54,38 +66,9 @@ export default function SplitEditor({
}
}, [monaco]);
- const [footerExpanded, setFooterExpanded] = useState(false);
-
return (
- <div className={clsx('flex h-full flex-col gap-2', className)}>
- <button onClick={() => setFooterExpanded(!footerExpanded)}>
- {footerExpanded ? 'hide' : 'show'} all
- </button>
- {footerExpanded ? (
- <header
- className={clsx('flex-shrink-0 overflow-hidden transition-all', {
- 'min-h-[30vh]': footerExpanded,
- 'min-h-0': !footerExpanded,
- })}
- >
- <CodeEditor
- onMount={(editor, monaco) => {
- editor.updateOptions({
- readOnly: true,
- renderValidationDecorations: 'on',
- });
-
- onMount?.tests?.(editor, monaco);
- }}
- defaultPath={TESTS_PATH}
- value={tests}
- defaultValue={tests}
- onChange={onChange?.tests}
- onValidate={onValidate?.tests}
- />
- </header>
- ) : null}
- <section className="flex-shrink flex-grow">
+ <div className={clsx('flex h-[calc(100%-_90px)] flex-col', className)}>
+ <section className="min-h-0 flex-grow">
<CodeEditor
defaultPath={USER_CODE_PATH}
onMount={onMount?.user}
@@ -93,7 +76,6 @@ export default function SplitEditor({
value={userCode}
onValidate={onValidate?.user}
onChange={async (e, a) => {
- // Most of this shamelessly stolen from Stackoverflow.
if (monaco) {
const models = monaco.editor.getModels();
const getWorker = await monaco.languages.typescript.getTypeScriptWorker();
@@ -118,7 +100,7 @@ export default function SplitEditor({
startColumn: start.column,
endColumn: end.column,
message: d.messageText as string,
- } satisfies editor.IMarkerData;
+ } satisfies monaco.editor.IMarkerData;
});
monaco.editor.setModelMarkers(model, model.getLanguageId(), markers);
@@ -129,6 +111,32 @@ export default function SplitEditor({
}}
/>
</section>
+ {userEditorState && settings.bindings === 'vim' && <VimStatusBar editor={userEditorState} />}
+ <div
+ className={clsx('transition-all', {
+ 'h-[30vh] border-t border-zinc-300 dark:border-zinc-700': expandTestPanel,
+ hidden: !expandTestPanel,
+ })}
+ >
+ <CodeEditor
+ options={{
+ lineNumbers: 'off',
+ }}
+ onMount={(editor, monaco) => {
+ editor.updateOptions({
+ readOnly: true,
+ renderValidationDecorations: 'on',
+ });
+
+ onMount?.tests?.(editor, monaco);
+ }}
+ defaultPath={TESTS_PATH}
+ value={tests}
+ defaultValue={tests}
+ onChange={onChange?.tests}
+ onValidate={onValidate?.tests}
+ />
+ </div>
</div>
);
}
diff --git a/packages/monaco/src/vim-mode.tsx b/packages/monaco/src/vim-mode.tsx
index 97198104..5fb3fbe2 100644
--- a/packages/monaco/src/vim-mode.tsx
+++ b/packages/monaco/src/vim-mode.tsx
@@ -68,7 +68,7 @@ export default function VimStatusBar({ editor }: VimStatusBarProps) {
return (
<div className="flex w-full">
<div
- className="gap-2 font-mono text-sm [&>*:first-child]:mr-2 [&_input]:border-none [&_input]:bg-transparent [&_input]:outline-none"
+ className="gap-2 p-2 font-mono text-sm [&>*:first-child]:mr-2 [&_input]:border-none [&_input]:bg-transparent [&_input]:outline-none"
ref={statusBarRef}
/>
</div>
diff --git a/packages/ui/src/icons.ts b/packages/ui/src/icons.ts
index 33fe1ca8..44b72e74 100644
--- a/packages/ui/src/icons.ts
+++ b/packages/ui/src/icons.ts
@@ -44,6 +44,7 @@ export {
Unlock,
User,
X,
+ XCircle,
RotateCcw,
Twitter,
Minimize2,