Bugfix 'new' confirmation on dirty scratch (#1708)

Author: mkst

frontend/src/components/Scratch/Scratch.tsx

@@ -168,13 +168,16 @@ export default function Scratch({
     const compilerOptsScrollPosition = useRef(0);
 
     const [isModified, setIsModified] = useState(false);
+    const [isDirty, setIsDirty] = useState(false);
     const setScratch = (scratch: Partial<api.Scratch>) => {
         onChange(scratch);
         setIsModified(true);
+        setIsDirty(true);
     };
     const [perSaveObj, setPerSaveObj] = useState({});
     const saveCallback = () => {
         setPerSaveObj({});
+        setIsDirty(false);
     };
 
     const shouldCompare = !isModified;
@@ -466,7 +469,7 @@ export default function Scratch({
                     isCompiling={isCompiling}
                     scratch={scratch}
                     setScratch={setScratch}
-                    isModified={isModified}
+                    isDirty={isDirty}
                     saveCallback={saveCallback}
                     setDecompilationTabEnabled={setDecompilationTabEnabled}
                 />

frontend/src/components/Scratch/ScratchToolbar.tsx

@@ -151,7 +151,7 @@ function ScratchName({
 
 function Actions({
     isCompiling,
-    isModified,
+    isDirty,
     compile,
     scratch,
     setScratch,
@@ -195,7 +195,7 @@ function Actions({
                 <button
                     onClick={() => {
                         if (
-                            !isModified ||
+                            !isDirty ||
                             confirm(
                                 "This scratch has pending changes, are you sure you want to navigate away?",
                             )
@@ -322,7 +322,7 @@ function useActionsLocation(): [ActionsLocation, FC<Props>] {
 
 export type Props = {
     isCompiling: boolean;
-    isModified: boolean;
+    isDirty: boolean;
     compile: () => Promise<void>;
     scratch: Readonly<api.Scratch>;
     setScratch: (scratch: Partial<api.Scratch>) => void;