Merge branch 'refs/heads/main' into feature/ai-chat

# Conflicts: # frontend/components/dashboard/newProject.tsx # frontend/components/editor/AIChat/ChatMessage.tsx # frontend/components/editor/AIChat/ContextDisplay.tsx # frontend/components/editor/AIChat/index.tsx # frontend/components/editor/index.tsx # frontend/components/editor/sidebar/index.tsx # frontend/components/editor/terminals/terminal.tsx
2024-10-21 17:06:13 -06:00
parent 6fb1364d6f 3f8e27d969
commit 4f7a4a5312
29 changed files with 1778 additions and 1198 deletions
--- a/frontend/components/editor/index.tsx
+++ b/frontend/components/editor/index.tsx
@ -24,6 +24,7 @@ import { parseTSConfigToMonacoOptions } from "@/lib/tsconfig"
 import { Sandbox, TFile, TFolder, TTab, User } from "@/lib/types"
 import {
  addNew,
+  cn,
  debounce,
  deepMerge,
  processFileType,
@ -926,7 +927,10 @@ export default function CodeEditor({
            )}
          </AnimatePresence>
        </div>
-        <div className="z-50 p-1" ref={generateWidgetRef}>
+        <div
+          className={cn(generate.show && "z-50 p-1")}
+          ref={generateWidgetRef}
+        >
          {generate.show ? (
            <GenerateInput
              user={userData}