Skip to content

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

Kinda fixed the Spinner (#522)

ggrandi739781300d30
diff --git a/apps/web/src/components/wizard/TestCasesEditor.tsx b/apps/web/src/components/wizard/TestCasesEditor.tsx
index 8cd7b9bb..a8b1e3c3 100644
--- a/apps/web/src/components/wizard/TestCasesEditor.tsx
+++ b/apps/web/src/components/wizard/TestCasesEditor.tsx
@@ -10,7 +10,7 @@ import { PrettierFormatProvider } from '@repo/monaco/prettier';
import type { WizardForm } from '.';
import { SettingsButton } from '~/app/challenge/_components/settings/settings-button';
-const VimStatusBar = dynamic(() => import('@repo/monaco/vim-mode').then((v) => v.VimStatusBar), {
+const VimStatusBar = dynamic(() => import('@repo/monaco/vim-mode'), {
ssr: false,
});
diff --git a/packages/monaco/src/index.tsx b/packages/monaco/src/index.tsx
index d888d1af..7ebff1c7 100644
--- a/packages/monaco/src/index.tsx
+++ b/packages/monaco/src/index.tsx
@@ -14,7 +14,7 @@ import { createTwoslashInlayProvider } from './twoslash';
import { PrettierFormatProvider } from './prettier';
import { useResetEditor } from './editor-hooks';
-const VimStatusBar = dynamic(() => import('./vim-mode').then((v) => v.VimStatusBar), {
+const VimStatusBar = dynamic(() => import('./vim-mode'), {
ssr: false,
});
@@ -40,13 +40,13 @@ export function CodePanel(props: CodePanelProps) {
const params = useSearchParams();
const router = useRouter();
const { toast } = useToast();
- const [tsErrors, setTsErrors] = useState<TsErrors | undefined>(undefined);
+ const [tsErrors, setTsErrors] = useState<TsErrors>();
const [localStorageCode, setLocalStorageCode] = useLocalStorage(
`challenge-${props.challenge.id}`,
'',
);
- const initialTypecheckDone = tsErrors === undefined;
+ const showSubmitSpinner = props.submissionDisabled || tsErrors === undefined;
const defaultCode =
lzstring.decompressFromEncodedURIComponent(params.get('code') ?? '') ?? localStorageCode;
@@ -104,6 +104,7 @@ export function CodePanel(props: CodePanelProps) {
onMount={{
tests: (editor) => {
setTestEditorState(editor);
+ setTsErrors([[], [], [], []]);
},
user: async (editor, monaco) => {
setMonacoInstance(monaco);
@@ -173,13 +174,13 @@ export function CodePanel(props: CodePanelProps) {
<Tooltip>
<TooltipTrigger asChild>
<Button
- disabled={!initialTypecheckDone || props.submissionDisabled}
+ disabled={showSubmitSpinner}
size="sm"
className="cursor-pointer rounded-lg bg-emerald-600 duration-300 hover:bg-emerald-500 dark:bg-emerald-400 dark:hover:bg-emerald-300"
onClick={handleSubmit}
>
- {!initialTypecheckDone && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
- Submit
+ {showSubmitSpinner && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+ Submit{tsErrors === undefined && ' (open test cases)'}
</Button>
</TooltipTrigger>
<TooltipContent>
diff --git a/packages/monaco/src/vim-mode.tsx b/packages/monaco/src/vim-mode.tsx
index 88de1454..97198104 100644
--- a/packages/monaco/src/vim-mode.tsx
+++ b/packages/monaco/src/vim-mode.tsx
@@ -42,7 +42,7 @@ interface VimStatusBarProps {
editor: monaco.editor.IStandaloneCodeEditor;
}
-export function VimStatusBar({ editor }: VimStatusBarProps) {
+export default function VimStatusBar({ editor }: VimStatusBarProps) {
const statusBarRef = useRef<HTMLDivElement>(null);
// NOTE: Maybe doesn't need to be a ref anymore?
const vimModeRef = useRef<VimMode>();