Merge pull request #959 from 3DStreet/animated-save-button

Less moving parts during the saved animation
3DStreet · Jan 15, 2025 · 40ace74 · 40ace74
2 parents 7a074f6 + 9fa71ce
commit 40ace74
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/editor/components/components/Save/Save.component.jsx b/src/editor/components/components/Save/Save.component.jsx
@@ -81,19 +81,23 @@ export const Save = ({ currentUser }) => {
   return (
     <div>
       {currentUser ? (
-        <div className="saveButtonWrapper relative w-24">
+        <div className="saveButtonWrapper relative">
           {isSavingScene ? (
-            <Button variant="filled">
-              <div>Saved</div>
+            <Button
+              leadingIcon={<Save24Icon />}
+              variant="filled"
+              className="min-w-[110px]"
+            >
+              <div className="grow">Saved</div>
             </Button>
           ) : (
             <Button
               leadingIcon={<Save24Icon />}
               onClick={toggleSaveActionState}
-              disabled={isSavingScene}
               variant="toolbtn"
+              className="min-w-[110px]"
             >
-              <div>Save</div>
+              <div className="grow">Save</div>
             </Button>
           )}
           {isSaveActionActive && (
@@ -120,11 +124,11 @@ export const Save = ({ currentUser }) => {
       ) : (
         <Button
           leadingIcon={<Save24Icon />}
-          onClick={handleUnsignedSave}
-          disabled={isSavingScene}
+          onClick={!isSavingScene ? handleUnsignedSave : undefined}
           variant="toolbtn"
+          className="min-w-[110px]"
         >
-          <div>Save</div>
+          <div className="grow">Save</div>
         </Button>
       )}
     </div>

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
@@ -31,8 +31,7 @@ function Toolbar({ currentUser }) {
             <div className="col-span-2 flex items-center justify-end gap-2">
               <Button
                 leadingIcon={<Edit24Icon />}
-                onClick={newHandler}
-                disabled={isSavingScene}
+                onClick={!isSavingScene ? newHandler : undefined}
                 variant="toolbtn"
               >
                 <div>New</div>