handle untitled experiences better

SotSF · Oct 26, 2024 · 9729155 · 9729155
1 parent fd1116c
commit 9729155
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 5 deletions.
diff --git a/src/components/LoginModal.tsx b/src/components/LoginModal.tsx
@@ -55,7 +55,11 @@ export const LoginModal = observer(function LoginModal() {
         {user || "Log in"}
       </Button>
 
-      <Modal isOpen={uiStore.showingUserPickerModal} onClose={onClose}>
+      <Modal
+        isOpen={uiStore.showingUserPickerModal}
+        onClose={onClose}
+        isCentered
+      >
         <ModalOverlay />
         <ModalContent>
           <ModalHeader>

diff --git a/src/components/Menu/MenuBar.tsx b/src/components/Menu/MenuBar.tsx
@@ -53,6 +53,7 @@ export const MenuBar = observer(function MenuBar() {
       <Modal
         isOpen={isKeyboardShortcutsOpen}
         onClose={onCloseKeyboardShortcuts}
+        isCentered
       >
         <ModalOverlay />
         <ModalContent>

diff --git a/src/components/Menu/OpenExperienceModal.tsx b/src/components/Menu/OpenExperienceModal.tsx
@@ -35,7 +35,11 @@ export const OpenExperienceModal = observer(function OpenExperienceModal() {
   if (isError) return null;
 
   return (
-    <Modal onClose={onClose} isOpen={uiStore.showingOpenExperienceModal}>
+    <Modal
+      onClose={onClose}
+      isOpen={uiStore.showingOpenExperienceModal}
+      isCentered
+    >
       <ModalOverlay />
       <ModalContent>
         <ModalHeader>

diff --git a/src/components/Menu/SaveExperienceModal.tsx b/src/components/Menu/SaveExperienceModal.tsx
@@ -56,6 +56,7 @@ export const SaveExperienceModal = observer(function SaveExperienceModal() {
     }
 
     setSaving(false);
+    setNewExperienceName("");
     onClose();
   };
 
@@ -123,7 +124,10 @@ export const SaveExperienceModal = observer(function SaveExperienceModal() {
         <ModalFooter>
           <Button
             isDisabled={
-              saving || !newExperienceName || willOverwriteExistingExperience
+              saving ||
+              !newExperienceName ||
+              newExperienceName === "untitled" ||
+              willOverwriteExistingExperience
             }
             onClick={onSaveExperience}
           >

diff --git a/src/components/PatternPlayground/PresetButton.tsx b/src/components/PatternPlayground/PresetButton.tsx
@@ -72,6 +72,7 @@ export const PresetButton = observer(function PresetButton({
         <Modal
           isOpen={showingEditModal}
           onClose={() => setShowingEditModal(false)}
+          isCentered
         >
           <ModalOverlay />
           <ModalContent>

diff --git a/src/components/PatternTimingModal.tsx b/src/components/PatternTimingModal.tsx
@@ -57,7 +57,7 @@ export const PatternTimingModal = observer(function PatternTimingModal({
         onClick={onOpen}
       />
 
-      <Modal isOpen={isOpen} onClose={onClose}>
+      <Modal isOpen={isOpen} onClose={onClose} isCentered>
         <ModalOverlay />
         <ModalContent>
           <ModalHeader>Adjust Pattern Timing</ModalHeader>

diff --git a/src/hooks/experience.ts b/src/hooks/experience.ts
@@ -15,6 +15,13 @@ export const useSaveExperience = () => {
     id?: number;
     name: string;
   }) => {
+    if ((saveMetadata?.name ?? store.experienceName) === "untitled") {
+      runInAction(() => {
+        store.uiStore.showingSaveExperienceModal = true;
+      });
+      return;
+    }
+
     const savePayload = {
       usingLocalData,
       ...store.serialize(),

diff --git a/src/types/ExperienceStore.ts b/src/types/ExperienceStore.ts
@@ -39,7 +39,7 @@ export class ExperienceStore {
   loadEmptyExperience = () => {
     this.rootStore.deserialize({
       id: undefined,
-      name: `untitled ${Date.now()}`,
+      name: "untitled",
       song: NO_SONG,
       status: "inprogress",
       version: EXPERIENCE_VERSION,