Skip to content

Monaco editor switches theme with site (dark/light), add light theme … #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jvcByte merged 2 commits into from
Apr 16, 2026
Merged

Monaco editor switches theme with site (dark/light), add light theme … #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4831a1e
Monaco editor switches theme with site (dark/light), add light theme …
jvcByte Apr 16, 2026
fe143cb
Merge branch 'main' into preview
jvcByte Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,10 @@ tbody tr:hover td { color: var(--text); }
border-color: rgba(99,102,241,0.5);
box-shadow: 0 0 0 3px var(--glow2);
}
.form-input::placeholder, .form-textarea::placeholder { color: var(--text4); }
.form-textarea { resize: vertical; min-height: 200px; line-height: 1.7; }
.form-input::placeholder, .form-textarea::placeholder { color: var(--text3); }
.form-textarea { resize: vertical; min-height: 200px; line-height: 1.7; color: var(--text); }
/* Ensure disabled state is readable in both themes */
.form-textarea:disabled { color: var(--text2); background: var(--bg3); cursor: not-allowed; }

/* ── Alerts ── */
.alert {
Expand Down
52 changes: 48 additions & 4 deletions app/participant/session/[id]/CodeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type * as Monaco from 'monaco-editor';
import { Play } from 'lucide-react';
import { toast } from 'sonner';

// Match the site's dark palette
// Define both themes matching the site palette
loader.init().then((monaco) => {
monaco.editor.defineTheme('recoding-dark', {
base: 'vs-dark',
Expand All @@ -28,7 +28,6 @@ loader.init().then((monaco) => {
'editorLineNumber.foreground': '#2d3a52',
'editorLineNumber.activeForeground': '#6366f1',
'editorCursor.foreground': '#6366f1',
'editorIndentGuide.background': '#1a2235',
'editorWidget.background': '#111520',
'editorWidget.border': '#1e2d45',
'editorSuggestWidget.background': '#111520',
Expand All @@ -42,6 +41,40 @@ loader.init().then((monaco) => {
'scrollbarSlider.hoverBackground': '#1e2d4590',
},
});

monaco.editor.defineTheme('recoding-light', {
base: 'vs',
inherit: true,
rules: [
{ token: 'comment', foreground: '78716c', fontStyle: 'italic' },
{ token: 'keyword', foreground: '4f46e5' },
{ token: 'string', foreground: '059669' },
{ token: 'number', foreground: 'd97706' },
{ token: 'type', foreground: '0369a1' },
{ token: 'function', foreground: '7c3aed' },
{ token: 'delimiter', foreground: '78716c' },
],
colors: {
'editor.background': '#faf7f2',
'editor.foreground': '#1c1917',
'editor.lineHighlightBackground': '#ede8df',
'editor.selectionBackground': '#6366f130',
'editorLineNumber.foreground': '#a8a29e',
'editorLineNumber.activeForeground': '#4f46e5',
'editorCursor.foreground': '#4f46e5',
'editorWidget.background': '#faf7f2',
'editorWidget.border': '#e4ddd2',
'editorSuggestWidget.background': '#faf7f2',
'editorSuggestWidget.border': '#e4ddd2',
'editorSuggestWidget.foreground': '#1c1917',
'editorSuggestWidget.selectedBackground': '#ede8df',
'editorSuggestWidget.highlightForeground':'#4f46e5',
'editorHoverWidget.background': '#faf7f2',
'editorHoverWidget.border': '#e4ddd2',
'scrollbarSlider.background': '#e4ddd260',
'scrollbarSlider.hoverBackground': '#e4ddd290',
},
});
});

interface RunResult {
Expand Down Expand Up @@ -73,6 +106,7 @@ export default function CodeEditor({ sessionId, questionIndex, language, starter
const [saveStatus, setSaveStatus] = useState<'idle' | 'saving' | 'saved' | 'failed'>('idle');
const [stdin, setStdin] = useState('');
const [showStdin, setShowStdin] = useState(false);
const [editorTheme, setEditorTheme] = useState('recoding-dark');

const codeRef = useRef(code);
codeRef.current = code;
Expand All @@ -83,7 +117,17 @@ export default function CodeEditor({ sessionId, questionIndex, language, starter
const focusLostAtRef = useRef<string | null>(null);
const editorRef = useRef<Monaco.editor.IStandaloneCodeEditor | null>(null);

// ── Reset on question change ──────────────────────────────────────────────
// Sync Monaco theme with site theme
useEffect(() => {
function syncTheme() {
const isDark = document.documentElement.getAttribute('data-theme') !== 'light';
setEditorTheme(isDark ? 'recoding-dark' : 'recoding-light');
}
syncTheme();
const observer = new MutationObserver(syncTheme);
observer.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme'] });
return () => observer.disconnect();
}, []);
useEffect(() => {
setCode(starter);
setResult(null);
Expand Down Expand Up @@ -300,7 +344,7 @@ export default function CodeEditor({ sessionId, questionIndex, language, starter
value={code}
onChange={(val) => { setCode(val ?? ''); setSaveStatus('idle'); }}
onMount={handleEditorMount}
theme="recoding-dark"
theme={editorTheme}
options={{
fontSize: 14,
minimap: { enabled: false },
Expand Down
Loading