Skip to content

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

618 - Added resizer to test panel (#641)

Micheletto Lucabb88780f6b43
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx b/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
index 6d932ff0..2274212f 100644
--- a/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
@@ -5,6 +5,7 @@ import { create } from 'zustand';
import { persist } from 'zustand/middleware';
import { useFullscreenSettingsStore } from './fullscreen';
import usePanelAdjustments from './usePanelAdjustments';
+import { getEventDeltas } from '@repo/monaco/utils';
export const DEFAULT_SETTINGS = {
width: '500px',
@@ -78,33 +79,9 @@ export function ChallengeLayout({ left, right }: ChallengeLayoutProps) {
let leftWidth = 0;
let topHeight = 0;
- const getEventDeltas = (e: MouseEvent | TouchEvent) => {
- if (e instanceof MouseEvent) {
- return {
- dx: e.clientX - x,
- dy: e.clientY - y,
- currPos: isDesktop ? e.clientX : e.clientY,
- };
- }
-
- const touch = e.changedTouches[0];
- if (!touch) {
- return {
- dx: 0,
- dy: 0,
- currPos: 0,
- };
- }
-
- return {
- dx: touch.clientX - x,
- dy: touch.clientY - y,
- currPos: isDesktop ? touch.clientX : touch.clientY,
- };
- };
-
const mouseMoveHandler = (e: MouseEvent | TouchEvent) => {
- const { dx, dy, currPos } = getEventDeltas(e);
+ const { dx, dy, currPosX, currPosY } = getEventDeltas(e, { x, y });
+ const currPos = isDesktop ? currPosX : currPosY;
const { width: divideByW, height: divideByH } = parent.current?.getBoundingClientRect() || {
width: 0,
height: 0,
diff --git a/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx b/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
index 542b04e7..31f76774 100644
--- a/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
@@ -45,7 +45,7 @@ export function SettingsForm() {
const isVimBindings = form.getValues().bindings === 'vim';
function onSubmit(data: FormSchema) {
- updateSettings(data);
+ updateSettings({ ...settings, ...data });
toast({
title: 'Settings updated!',
description: (
diff --git a/packages/monaco/package.json b/packages/monaco/package.json
index 7b70f778..cf58076b 100644
--- a/packages/monaco/package.json
+++ b/packages/monaco/package.json
@@ -9,7 +9,8 @@
"./vim-mode": "./src/vim-mode.tsx",
"./twoslash": "./src/twoslash.ts",
"./prettier": "./src/prettier.ts",
- "./editor-hooks": "./src/editor-hooks.ts"
+ "./editor-hooks": "./src/editor-hooks.ts",
+ "./utils": "./src/utils.ts"
},
"typesVersions": {
"*": {
@@ -33,6 +34,9 @@
],
"editor-hooks": [
"./src/editor-hooks.ts"
+ ],
+ "utils": [
+ "./src/utils.ts"
]
}
},
diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsx
index d86a3b74..63af196c 100644
--- a/packages/monaco/src/index.tsx
+++ b/packages/monaco/src/index.tsx
@@ -99,6 +99,7 @@ export function CodePanel(props: CodePanelProps) {
userEditorState={userEditorState}
monaco={monacoInstance}
expandTestPanel={isTestPanelExpanded}
+ setIsTestPanelExpanded={setIsTestPanelExpanded}
tests={props.challenge.tests}
userCode={code}
onMount={{
@@ -184,7 +185,7 @@ export function CodePanel(props: CodePanelProps) {
{
'justify-between': testEditorState,
},
- 'sticky bottom-0 flex items-center justify-between p-2 dark:bg-[#1e1e1e]',
+ 'sticky bottom-0 flex items-center justify-between border-t border-zinc-300 p-2 dark:border-zinc-700 dark:bg-[#1e1e1e]',
)}
>
<div className="flex items-center gap-4">
diff --git a/packages/monaco/src/settings-store.ts b/packages/monaco/src/settings-store.ts
index 1ac88a00..0f2361bd 100644
--- a/packages/monaco/src/settings-store.ts
+++ b/packages/monaco/src/settings-store.ts
@@ -15,6 +15,7 @@ nmap gi :M<Space>editor.action.goToImplementation
nmap gx :M<Space>editor.action.openLink
nmap ]d :M<Space>editor.action.marker.next
nmap [d :M<Space>editor.action.marker.prev`,
+ testPanelHeight: 300,
};
type Settings = typeof DEFAULT_SETTINGS;
diff --git a/packages/monaco/src/split-editor.tsx b/packages/monaco/src/split-editor.tsx
index 18817e8c..93913313 100644
--- a/packages/monaco/src/split-editor.tsx
+++ b/packages/monaco/src/split-editor.tsx
@@ -3,16 +3,24 @@
import { type OnChange, type OnMount, type OnValidate } from '@monaco-editor/react';
import clsx from 'clsx';
import type * as monaco from 'monaco-editor';
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
import { CodeEditor, LIB_URI } from './code-editor';
import { libSource } from './editor-types';
import dynamic from 'next/dynamic';
import { useEditorSettingsStore } from './settings-store';
+import { getEventDeltas } from './utils';
+
+function preventSelection(event: Event) {
+ event.preventDefault();
+}
const VimStatusBar = dynamic(() => import('./vim-mode'), {
ssr: false,
});
+const MIN_HEIGHT = 150;
+const COLLAPSE_THRESHOLD = MIN_HEIGHT / 2;
+
export const TESTS_PATH = 'file:///tests.ts';
export const USER_CODE_PATH = 'file:///user.ts';
@@ -20,6 +28,7 @@ export interface SplitEditorProps {
/** the classes applied to the container div */
className?: string;
expandTestPanel: boolean;
+ setIsTestPanelExpanded: (isExpanded: boolean) => void;
tests: string;
userCode: string;
onValidate?: {
@@ -43,6 +52,7 @@ export default function SplitEditor({
className,
userEditorState,
expandTestPanel,
+ setIsTestPanelExpanded,
tests,
userCode,
onMount,
@@ -50,7 +60,109 @@ export default function SplitEditor({
onChange,
monaco,
}: SplitEditorProps) {
- const { settings } = useEditorSettingsStore();
+ const { settings, updateSettings } = useEditorSettingsStore();
+
+ const wrapper = useRef<HTMLDivElement>(null);
+ const resizer = useRef<HTMLDivElement>(null);
+ const testPanel = useRef<HTMLDivElement>(null);
+
+ useEffect(() => {
+ const resizerRef = resizer.current;
+ const testPanelRef = testPanel.current;
+ const wrapperRef = wrapper.current;
+
+ if (!resizerRef || !testPanelRef || !wrapperRef) {
+ return;
+ }
+
+ let y = 0;
+ let initialHeight = testPanelRef.offsetHeight;
+
+ const mouseMoveHandler = (e: MouseEvent | TouchEvent) => {
+ // Remove transition during drag because of performance issues
+ if (testPanelRef.classList.contains('transition-all')) {
+ testPanelRef.classList.remove('transition-all');
+ }
+
+ document.body.style.setProperty('cursor', 'row-resize');
+
+ const { dy } = getEventDeltas(e, { x: 0, y });
+
+ const height = initialHeight - dy;
+
+ if (height >= MIN_HEIGHT) {
+ testPanelRef.style.height = `${Math.min(height, wrapperRef.offsetHeight)}px`;
+ setIsTestPanelExpanded(true);
+ } else if (height < COLLAPSE_THRESHOLD) {
+ setIsTestPanelExpanded(false);
+ }
+ };
+
+ const mouseDownHandler = (e: MouseEvent | TouchEvent) => {
+ initialHeight = testPanelRef.offsetHeight;
+
+ if (e instanceof MouseEvent) {
+ y = e.clientY;
+ } else if (e instanceof TouchEvent) {
+ y = e.touches[0]?.clientY ?? 0;
+ }
+
+ if (e instanceof MouseEvent) {
+ document.addEventListener('mousemove', mouseMoveHandler);
+ document.addEventListener('mouseup', mouseUpHandler);
+ } else if (e instanceof TouchEvent) {
+ document.addEventListener('touchmove', mouseMoveHandler);
+ document.addEventListener('touchend', mouseUpHandler);
+ }
+
+ // Prevent selection during drag
+ document.addEventListener('selectstart', preventSelection);
+ };
+
+ const mouseUpHandler = function () {
+ // Restore transition
+ testPanelRef.classList.add('transition-all');
+
+ document.body.style.removeProperty('cursor');
+
+ document.removeEventListener('touchmove', mouseMoveHandler);
+ document.removeEventListener('mousemove', mouseMoveHandler);
+ document.removeEventListener('touchend', mouseUpHandler);
+ document.removeEventListener('mouseup', mouseUpHandler);
+
+ // Restore selection
+ document.removeEventListener('selectstart', preventSelection);
+
+ updateSettings({
+ ...settings,
+ testPanelHeight:
+ testPanelRef.offsetHeight < MIN_HEIGHT ? MIN_HEIGHT : testPanelRef.offsetHeight,
+ });
+ };
+
+ const resizeHandler = () => {
+ if (testPanelRef.offsetHeight >= MIN_HEIGHT) {
+ testPanelRef.style.height = `${Math.min(
+ testPanelRef.offsetHeight,
+ wrapperRef.offsetHeight,
+ )}px`;
+ setIsTestPanelExpanded(true);
+ } else {
+ setIsTestPanelExpanded(false);
+ }
+ };
+
+ window.addEventListener('resize', resizeHandler);
+ resizerRef.addEventListener('mousedown', mouseDownHandler);
+ resizerRef.addEventListener('touchstart', mouseDownHandler);
+
+ return () => {
+ window.removeEventListener('resize', resizeHandler);
+ resizerRef.removeEventListener('mousedown', mouseDownHandler);
+ resizerRef.removeEventListener('touchstart', mouseDownHandler);
+ };
+ }, [settings, updateSettings, setIsTestPanelExpanded]);
+
useEffect(() => {
if (monaco) {
const libUri = monaco.Uri.parse(LIB_URI);
@@ -67,9 +179,11 @@ export default function SplitEditor({
}, [monaco]);
return (
- <div className={clsx('flex h-[calc(100%-_90px)] flex-col', className)}>
- <section className="min-h-0 flex-grow">
+ <div className={clsx('flex h-[calc(100%-_90px)] flex-col', className)} ref={wrapper}>
+ <section className="h-full overflow-hidden">
<CodeEditor
+ className="overflow-hidden"
+ height={userEditorState && settings.bindings === 'vim' ? 'calc(100% - 36px)' : '100%'}
defaultPath={USER_CODE_PATH}
onMount={onMount?.user}
defaultValue={userCode}
@@ -110,14 +224,23 @@ export default function SplitEditor({
onChange?.user?.(e, a);
}}
/>
+ {userEditorState && settings.bindings === 'vim' && (
+ <VimStatusBar editor={userEditorState} />
+ )}
</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,
- })}
+ className="transition-all"
+ style={{
+ height: `${expandTestPanel ? settings.testPanelHeight || MIN_HEIGHT : 0}px`,
+ }}
+ ref={testPanel}
>
+ <div
+ className="cursor-row-resize border-y border-zinc-300 bg-zinc-800 p-2 dark:border-zinc-700"
+ ref={resizer}
+ >
+ <div className="m-auto h-1 w-24 rounded-full bg-zinc-700" />
+ </div>
<CodeEditor
options={{
lineNumbers: 'off',
diff --git a/packages/monaco/src/utils.ts b/packages/monaco/src/utils.ts
new file mode 100644
index 00000000..d7f662df
--- /dev/null
+++ b/packages/monaco/src/utils.ts
@@ -0,0 +1,27 @@
+export function getEventDeltas(e: MouseEvent | TouchEvent, origin: { x: number; y: number }) {
+ if (e instanceof MouseEvent) {
+ return {
+ dx: e.clientX - origin.x,
+ dy: e.clientY - origin.y,
+ currPosX: e.clientX,
+ currPosY: e.clientY,
+ };
+ }
+
+ const touch = e.changedTouches[0];
+ if (!touch) {
+ return {
+ dx: 0,
+ dy: 0,
+ currPosX: 0,
+ currPosY: 0,
+ };
+ }
+
+ return {
+ dx: touch.clientX - origin.x,
+ dy: touch.clientY - origin.y,
+ currPosX: touch.clientX,
+ currPosY: touch.clientY,
+ };
+}