gwchq-textjam 0.2.24 → 0.2.25

package/dist/index.js

@@ -368757,7 +368757,7 @@ const TextJamEditor = ({ onLogoutClick = () => { }, onViewProfileClick = () => {
         if (!store || !navigationGuardCoordinator)
             return;
         const guardController = new LeaveGuardController_1.LeaveGuardController(store);
-        const unsubscribe = navigationGuardCoordinator.register(guardController.canLeave);
+        const unsubscribe = navigationGuardCoordinator.register(guardController.canLeave, guardController.shouldBlock);
         return () => {
             guardController?.cleanup();
             unsubscribe?.();
@@ -373943,6 +373943,12 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             if (!hasContentChanges && !hasNameChanges && !isInitialSave) {
                 dispatch((0, EditorSlice_1.setSaveTriggered)(false));
                 dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.IDLE));
+                // If we got here from the Save-in-modal path, resolve the leave flow
+                // so the pending navigation isn't stuck on a no-op save.
+                if (leaveFlow.requestId &&
+                    leaveFlow.status === LeaveFlowSlice_1.LeaveFlowStatus.SAVING) {
+                    dispatch((0, LeaveFlowSlice_1.leaveConfirmed)({ requestId: leaveFlow.requestId }));
+                }
                 console.warn("No changes detected. Save won't be processed.");
                 return;
             }
@@ -373966,6 +373972,14 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
                 (0, sendToast_1.showError)(`The project exceeds the ${constants_1.MAX_PROJECT_TOTAL_SIZE_MB} MB maximum allowed size. Please reduce the project size to save successfully.`);
                 dispatch((0, EditorSlice_1.setSaveTriggered)(false));
                 dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.IDLE));
+                // Surface the failure to a pending leave flow so the modal doesn't get stuck
+                if (leaveFlow.requestId &&
+                    leaveFlow.status === LeaveFlowSlice_1.LeaveFlowStatus.SAVING) {
+                    dispatch((0, LeaveFlowSlice_1.saveFailed)({
+                        requestId: leaveFlow.requestId,
+                        error: "Project size exceeds the maximum allowed size.",
+                    }));
+                }
                 return;
             }
             await saveProject?.({
@@ -373991,6 +374005,7 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         project.identifier,
         hasContentChanges,
         hasNameChanges,
+        leaveFlow.requestId,
         leaveFlow.status,
     ]);
     // finish the process if save failed
@@ -374026,6 +374041,9 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         });
         const incomingCommitId = projectData?.commitId;
         const incomingIdentifier = projectData?.identifier;
+        dispatch((0, EditorSlice_1.setSaveTriggered)(false));
+        if (leaveFlow.requestId && leaveFlow.status === LeaveFlowSlice_1.LeaveFlowStatus.SAVING)
+            dispatch((0, LeaveFlowSlice_1.leaveConfirmed)({ requestId: leaveFlow.requestId }));
         if (!incomingIdentifier)
             return;
         // first save: new commitId incoming, but no commitId were set before
@@ -374047,10 +374065,6 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             dispatch((0, EditorSlice_1.updateProjectIdentifier)(projectData.identifier));
             deleteValueFromCache(project.identifier);
         }
-        dispatch((0, EditorSlice_1.setSaveTriggered)(false));
-        // if the save was triggered by the leave flow, mark it as completed to allow the flow to proceed
-        if (leaveFlow.requestId && leaveFlow.status === LeaveFlowSlice_1.LeaveFlowStatus.SAVING)
-            dispatch((0, LeaveFlowSlice_1.leaveConfirmed)({ requestId: leaveFlow.requestId }));
         // Build new snapshot after save (remove isDirty from components, reset file structure, update identifier)
         const cleanedComponents = project.components.map(({ isDirty, ...rest }) => rest);
         const cleanedProject = {
@@ -375401,6 +375415,12 @@ class LeaveGuardController {
     constructor(store) {
         this.store = store;
     }
+    // Returning false here lets useRouteGuard short-circuit and allow native
+    // POP/PUSH for clean states without async work or a modal.
+    shouldBlock = () => {
+        const state = this.store.getState();
+        return (0, selectors_1.selectProjectDirtyState)(state);
+    };
     canLeave = () => {
         const state = this.store.getState();
         const isDirty = (0, selectors_1.selectProjectDirtyState)(state);

package/package.json

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