gwchq-textjam 0.1.113 → 0.1.114

package/dist/index.js

@@ -370315,7 +370315,7 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
         destroyAndRecreateWorker();
         dispatch((0, EditorSlice_1.setError)({
             type: Errors_1.ErrorType.RUNTIME_ERROR,
-            message: "Execution was force-stopped.",
+            message: "Execution interrupted",
         }));
         dispatch((0, EditorSlice_1.codeRunHandled)());
     };
@@ -373641,6 +373641,7 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
     const saving = (0, stores_1.useAppSelector)((state) => state.editor.saving);
     const justLoaded = (0, stores_1.useAppSelector)((state) => state.editor.justLoaded);
     const leaveFlow = (0, stores_1.useAppSelector)((state) => state.leaveFlow);
+    const codeRunTriggered = (0, stores_1.useAppSelector)((state) => state.editor.codeRunTriggered);
     const dispatch = (0, react_redux_1.useDispatch)();
     const { deleteValueFromCache, upsertCacheValue } = (0, useProjectCache_1.useProjectCache)();
     const handleSave = (0, react_1.useCallback)(async () => {
@@ -373730,10 +373731,14 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         leaveFlow.status,
     ]);
     (0, react_1.useEffect)(() => {
-        if (saveTriggered && saving === types_1.SavingState.IDLE) {
-            handleSave();
+        if (!saveTriggered || saving !== types_1.SavingState.IDLE)
+            return;
+        if (codeRunTriggered) {
+            dispatch((0, EditorSlice_1.stopCodeRun)());
+            return;
         }
-    }, [saveTriggered, handleSave, saving]);
+        handleSave();
+    }, [saveTriggered, codeRunTriggered, handleSave, saving, dispatch]);
     // Autosave
     (0, react_1.useEffect)(() => {
         const debouncer = setTimeout(() => {
@@ -373780,6 +373785,7 @@ const createProjectArchive_1 = __webpack_require__(46514);
 const useProjectRemix = ({ projectData, saveProject, }) => {
     const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
     const remixTriggered = (0, stores_1.useAppSelector)((state) => state.editor.remixTriggered);
+    const codeRunTriggered = (0, stores_1.useAppSelector)((state) => state.editor.codeRunTriggered);
     const dispatch = (0, react_redux_1.useDispatch)();
     const remixStartedRef = (0, react_1.useRef)(false);
     (0, react_1.useEffect)(() => {
@@ -373787,11 +373793,16 @@ const useProjectRemix = ({ projectData, saveProject, }) => {
             remixStartedRef.current = false;
             return;
         }
-        if (remixStartedRef.current)
-            return;
         if (!project || Object.keys(project).length === 0)
             return;
-        if (!project?.components?.length)
+        if (!project.components?.length)
+            return;
+        if (codeRunTriggered) {
+            dispatch((0, EditorSlice_1.stopCodeRun)());
+            dispatch((0, EditorSlice_1.stopDraw)());
+            return;
+        }
+        if (remixStartedRef.current)
             return;
         remixStartedRef.current = true;
         const run = async () => {
@@ -373805,10 +373816,12 @@ const useProjectRemix = ({ projectData, saveProject, }) => {
             }
             catch (e) {
                 console.error(e);
+                remixStartedRef.current = false;
+                dispatch((0, EditorSlice_1.setRemixTriggered)(false));
             }
         };
         run().catch(console.error);
-    }, [remixTriggered, project, saveProject]);
+    }, [remixTriggered, codeRunTriggered, project, saveProject, dispatch]);
     (0, react_1.useEffect)(() => {
         if (!remixTriggered)
             return;
@@ -373820,6 +373833,7 @@ const useProjectRemix = ({ projectData, saveProject, }) => {
         dispatch((0, EditorSlice_1.stopDraw)());
         dispatch((0, EditorSlice_1.resetState)());
         dispatch((0, EditorSlice_1.setRemixTriggered)(false));
+        remixStartedRef.current = false;
     }, [dispatch, remixTriggered, project?.identifier, projectData?.identifier]);
 };
 exports.useProjectRemix = useProjectRemix;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gwchq-textjam",
   "description": "Embeddable React editor used in Raspberry Pi text-based projects.",
-  "version": "0.1.113",
+  "version": "0.1.114",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",