gwchq-textjam 0.2.19 → 0.2.20

package/dist/index.js

@@ -68344,8 +68344,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
-/* harmony import */ var C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53986);
+/* harmony import */ var D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
+/* harmony import */ var D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53986);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var _hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(98850);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14062);
@@ -68369,7 +68369,7 @@ var DraggableTab = _ref => {
       panelIndex,
       fileIndex
     } = _ref,
-    otherProps = (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(_ref, _excluded);
+    otherProps = (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(_ref, _excluded);
   var openFiles = (0,react_redux__WEBPACK_IMPORTED_MODULE_1__.useSelector)(state => state.editor.openedFiles);
   var openFilesCount = openFiles[panelIndex].length;
   var dispatch = (0,react_redux__WEBPACK_IMPORTED_MODULE_1__.useDispatch)();
@@ -68386,7 +68386,7 @@ var DraggableTab = _ref => {
       switchToFileTab(panelIndex, (fileIndex + openFilesCount - 1) % openFilesCount);
     }
   };
-  var InnerTab = () => /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_2__.Tab, (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+  var InnerTab = () => /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_2__.Tab, (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
     onClick: e => {
       e.stopPropagation();
       switchToFileTab(panelIndex, fileIndex);
@@ -68404,7 +68404,7 @@ var DraggableTab = _ref => {
         draggableProps,
         dragHandleProps
       } = _ref2;
-      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
         className: "draggable-tab",
         ref: innerRef
       }, draggableProps), dragHandleProps), {}, {
@@ -68426,8 +68426,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(89379);
-/* harmony import */ var C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53986);
+/* harmony import */ var D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(89379);
+/* harmony import */ var D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(53986);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var _hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(98850);
 /* harmony import */ var react_tabs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39243);
@@ -68446,8 +68446,8 @@ var DroppableTabList = _ref => {
       children: _children,
       index
     } = _ref,
-    otherProps = (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(_ref, _excluded);
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_1__.TabList, (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({}, otherProps), {}, {
+    otherProps = (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .A)(_ref, _excluded);
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_1__.TabList, (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({}, otherProps), {}, {
     children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_hello_pangea_dnd__WEBPACK_IMPORTED_MODULE_6__.Droppable, {
       direction: "horizontal",
       droppableId: index.toString(),
@@ -68457,7 +68457,7 @@ var DroppableTabList = _ref => {
           droppableProps,
           placeholder
         } = _ref2;
-        return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({
+        return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({
           className: "droppable-tab-list"
         }, droppableProps), {}, {
           ref: innerRef,
@@ -103011,7 +103011,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
+/* harmony import */ var D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
 /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(14062);
 /* harmony import */ var _redux_EditorSlice__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(68512);
@@ -103091,7 +103091,7 @@ var ProjectName = _ref => {
       id: "project_name_label",
       className: _styles_module_scss__WEBPACK_IMPORTED_MODULE_3__["default"].projectLabel,
       children: "Project Name"
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", (0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,C_Project_source_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
       className: classnames__WEBPACK_IMPORTED_MODULE_2___default()(_styles_module_scss__WEBPACK_IMPORTED_MODULE_3__["default"].projectName, className)
     }, hoverProps), {}, {
       children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)((components_Tooltip_Tooltip__WEBPACK_IMPORTED_MODULE_8___default()), {
@@ -103392,9 +103392,16 @@ var types = __webpack_require__(92932);
 var SpinnerDotted = __webpack_require__(79458);
 ;// ./src/components/SaveButton/styles.module.scss
 // extracted by mini-css-extract-plugin
-/* harmony default export */ const styles_module = ({"grey-rpi-grey-15":"#d5d7dc","grey-rpi-grey-40":"#9497a4","grey-rpi-grey-5":"#f1f2f3","grey-rpi-grey-70":"#4a4d59","grey-rpf-white":"#fff","content":"styles-module__content--Cgvxl","icon":"styles-module__icon--y9Z7a"});
+/* harmony default export */ const styles_module = ({"grey-rpi-grey-15":"#d5d7dc","grey-rpi-grey-40":"#9497a4","grey-rpi-grey-5":"#f1f2f3","grey-rpi-grey-70":"#4a4d59","grey-rpf-white":"#fff","wrapper":"styles-module__wrapper--U1NAt","content":"styles-module__content--Cgvxl","icon":"styles-module__icon--y9Z7a"});
 // EXTERNAL MODULE: ./src/components/shared/SvgIcon/index.tsx
 var SvgIcon = __webpack_require__(82917);
+// EXTERNAL MODULE: ./src/components/Tooltip/Tooltip.tsx
+var Tooltip = __webpack_require__(26982);
+var Tooltip_default = /*#__PURE__*/__webpack_require__.n(Tooltip);
+// EXTERNAL MODULE: ./src/hooks/useHover.ts
+var useHover = __webpack_require__(78556);
+// EXTERNAL MODULE: ./src/redux/selectors.ts
+var selectors = __webpack_require__(43551);
 // EXTERNAL MODULE: ./node_modules/react/jsx-runtime.js
 var jsx_runtime = __webpack_require__(74848);
 ;// ./src/components/SaveButton/SaveButton.jsx
@@ -103410,14 +103417,26 @@ var jsx_runtime = __webpack_require__(74848);
 
 
 
+
+
+
+var NO_CHANGES_TO_SAVE_MESSAGE = "No new changes to save!";
 var SaveButton = props => {
   var dispatch = (0,external_react_redux_.useDispatch)();
+  var {
+    hovered,
+    hoverProps
+  } = (0,useHover.useHover)();
   var loading = (0,external_react_redux_.useSelector)(state => state.editor.loading);
   var saving = (0,external_react_redux_.useSelector)(state => state.editor.saving);
+  var hasContentChanges = (0,external_react_redux_.useSelector)(selectors.selectProjectHasContentChanges);
+  var hasNameChanges = (0,external_react_redux_.useSelector)(selectors.selectProjectHasNameChanges);
   var onClickSave = (0,external_react_.useCallback)(/*#__PURE__*/_asyncToGenerator(function* () {
     dispatch((0,EditorSlice.setSaveTriggered)(true));
   }), [dispatch]);
   var isSaving = saving === types.SavingState.PROCESS;
+  var hasChangesToSave = hasContentChanges || hasNameChanges;
+  var isDisabled = isSaving || !hasChangesToSave;
   var buttonIcon = isSaving ? null : () => /*#__PURE__*/(0,jsx_runtime.jsx)(SvgIcon.SvgIcon, {
     size: 24,
     SvgElement: save["default"],
@@ -103427,14 +103446,22 @@ var SaveButton = props => {
     className: styles_module.content,
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)(SpinnerDotted.SpinnerDotted, {}), " Saving..."]
   }) : "Save";
-  return loading === types.LoadingState.SUCCESS && /*#__PURE__*/(0,jsx_runtime.jsx)(Button["default"], (0,objectSpread2/* default */.A)({
-    buttonText: buttonText,
-    ButtonIcon: buttonIcon,
-    buttonIconPosition: "left",
-    variant: "secondary",
-    onClickHandler: onClickSave,
-    disabled: saving === types.SavingState.PROCESS
-  }, props));
+  return loading === types.LoadingState.SUCCESS && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", (0,objectSpread2/* default */.A)((0,objectSpread2/* default */.A)({
+    className: styles_module.wrapper
+  }, hoverProps), {}, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)((Tooltip_default()), {
+      message: NO_CHANGES_TO_SAVE_MESSAGE,
+      visible: !hasChangesToSave && hovered,
+      position: "bottom"
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(Button["default"], (0,objectSpread2/* default */.A)({
+      buttonText: buttonText,
+      ButtonIcon: buttonIcon,
+      buttonIconPosition: "left",
+      variant: "secondary",
+      onClickHandler: onClickSave,
+      disabled: isDisabled
+    }, props))]
+  }));
 };
 /* harmony default export */ const SaveButton_SaveButton = (SaveButton);
 
@@ -373618,10 +373645,8 @@ const useProject = ({ projectData, projectContent = null, isContentLoaded = null
             dispatch((0, EditorSlice_1.setCommits)({ commits: projectData?.commits ?? [] }));
             return;
         }
-        const isSaveInProgressOrSettling = saveTriggered ||
-            savingState === types_1.SavingState.PROCESS ||
-            savingState === types_1.SavingState.SUCCESS;
-        if (isSaveInProgressOrSettling) {
+        const isSaveInProgress = saveTriggered || savingState === types_1.SavingState.PROCESS;
+        if (isSaveInProgress) {
             return;
         }
         // if no local data found or cache should not be used, and commitId provided, try to load from commit
@@ -373834,6 +373859,7 @@ const sendToast_1 = __webpack_require__(50068);
 const projectTabSync_1 = __webpack_require__(48235);
 const LeaveFlowSlice_1 = __webpack_require__(52990);
 const buildProjectSnapshot_1 = __webpack_require__(10533);
+const selectors_1 = __webpack_require__(43551);
 const AUTO_SAVE_INTERVAL = 2000;
 const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProject, isShared, }) => {
     const project = (0, stores_1.useAppSelector)((state) => state.editor.project);
@@ -373843,13 +373869,35 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
     const leaveFlow = (0, stores_1.useAppSelector)((state) => state.leaveFlow);
     const codeRunTriggered = (0, stores_1.useAppSelector)((state) => state.editor.codeRunTriggered);
     const existingCommits = (0, stores_1.useAppSelector)((state) => state.editor.commits);
+    const hasContentChanges = (0, stores_1.useAppSelector)(selectors_1.selectProjectHasContentChanges);
+    const hasNameChanges = (0, stores_1.useAppSelector)(selectors_1.selectProjectHasNameChanges);
     const dispatch = (0, react_redux_1.useDispatch)();
     const { deleteValueFromCache, upsertCacheValue } = (0, useProjectCache_1.useProjectCache)();
     const handleSave = (0, react_1.useCallback)(async () => {
         if (!project?.components?.length)
             return;
-        dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.PROCESS));
         try {
+            const isInitialSave = !project.commitId;
+            // Nothing to persist. The save button is disabled in this state,
+            // but keep this guard for programmatic save triggers.
+            if (!hasContentChanges && !hasNameChanges && !isInitialSave) {
+                dispatch((0, EditorSlice_1.setSaveTriggered)(false));
+                dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.IDLE));
+                console.warn("No changes detected. Save won't be processed.");
+                return;
+            }
+            // Name-only save: patch repository name, but do not create/upload a new commit.
+            // Do not set PROCESS here because no archive is being created.
+            if (!hasContentChanges && hasNameChanges && !isInitialSave) {
+                await saveProject?.({
+                    project,
+                    commitBlob: null,
+                    hasContentChanges: false,
+                    hasNameChanges: true,
+                });
+                return;
+            }
+            dispatch((0, EditorSlice_1.setSaving)(types_1.SavingState.PROCESS));
             const { zipBlob, unzipSize } = await (0, createProjectArchive_1.createProjectArchive)(project);
             if (unzipSize > constants_1.MAX_PROJECT_TOTAL_SIZE_MB * 1024 * 1024) {
                 (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.`);
@@ -373859,7 +373907,13 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             }
             // should skip redirect to project on the first save to avoid conflicts with leave flow
             const skipRedirect = project?.commits?.length === 0;
-            await saveProject?.(project, zipBlob, skipRedirect);
+            await saveProject?.({
+                project,
+                commitBlob: zipBlob,
+                hasContentChanges: true,
+                hasNameChanges,
+                skipRedirect,
+            });
         }
         catch (e) {
             console.error(e);
@@ -373874,6 +373928,8 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
         project.name,
         project.commitId,
         project.identifier,
+        hasContentChanges,
+        hasNameChanges,
     ]);
     // finish the process if save failed
     (0, react_1.useEffect)(() => {
@@ -373889,12 +373945,9 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
     }, [dispatch, leaveFlow.requestId, leaveFlow.status, saving]);
     // handle successful saving update
     (0, react_1.useEffect)(() => {
-        if (!projectData?.commitId ||
-            projectData.commitId === project.commitId ||
-            !saveTriggered ||
-            saving !== types_1.SavingState.SUCCESS)
+        if (!saveTriggered || saving !== types_1.SavingState.SUCCESS)
             return;
-        const incomingCommits = projectData.commits ?? [];
+        const incomingCommits = projectData?.commits ?? [];
         const commitsById = new Map();
         [...existingCommits, ...incomingCommits].forEach((commit) => {
             if (!commit?.id)
@@ -373909,18 +373962,25 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             const bTime = new Date(b.createdAt || 0).getTime();
             return bTime - aTime;
         });
+        const incomingCommitId = projectData?.commitId;
+        const incomingIdentifier = projectData?.identifier;
+        if (!incomingIdentifier)
+            return;
         // first save: new commitId incoming, but no commitId were set before
-        const isFirstSave = commits.length === 1 && !project.commitId && projectData.commitId;
+        const isFirstSave = commits.length === 1 && !project.commitId && projectData?.commitId;
         // commit different: new commitId incoming, but another commitId is set before
-        const isCommitDifferent = projectData.commitId &&
+        const isCommitDifferent = projectData?.commitId &&
             project.commitId &&
             project.commitId !== projectData.commitId;
-        if (!isFirstSave && !isCommitDifferent)
-            return;
-        dispatch((0, EditorSlice_1.updateProjectCommits)({ commitId: projectData.commitId, commits }));
+        if ((isFirstSave || isCommitDifferent) && projectData?.commitId) {
+            dispatch((0, EditorSlice_1.updateProjectCommits)({
+                commitId: projectData.commitId,
+                commits,
+            }));
+        }
         // remove old cached project on the first save
         if (isFirstSave &&
-            projectData.identifier &&
+            projectData?.identifier &&
             project.identifier !== projectData.identifier) {
             dispatch((0, EditorSlice_1.updateProjectIdentifier)(projectData.identifier));
             deleteValueFromCache(project.identifier);
@@ -373935,8 +373995,8 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             ...project,
             hasStructureChanges: false,
             components: cleanedComponents,
-            identifier: projectData.identifier,
-            commitId: projectData.commitId,
+            identifier: incomingIdentifier,
+            commitId: incomingCommitId ?? project.commitId,
             commits,
         };
         const newLastSavedSnapshot = (0, buildProjectSnapshot_1.buildProjectSnapshot)(cleanedProject);
@@ -373944,7 +374004,7 @@ const useProjectPersistence = ({ user, projectData, hasShownSavePrompt, saveProj
             components: cleanedComponents,
             hasStructureChanges: false,
             lastSavedSnapshot: newLastSavedSnapshot,
-            identifier: projectData.identifier,
+            identifier: incomingIdentifier,
         };
         dispatch((0, EditorSlice_1.updateProjectSnapshot)(updatedProjectSnapshot));
         upsertCacheValue(cleanedProject.identifier, {
@@ -374045,9 +374105,14 @@ const useProjectRemix = ({ projectData, saveProject, }) => {
                 const remixName = `Remix of ${project.name}`;
                 const { zipBlob } = await (0, createProjectArchive_1.createProjectArchive)(project);
                 await saveProject?.({
-                    ...project,
-                    name: remixName,
-                }, zipBlob);
+                    project: {
+                        ...project,
+                        name: remixName,
+                    },
+                    commitBlob: zipBlob,
+                    hasContentChanges: true,
+                    hasNameChanges: false,
+                });
             }
             catch (e) {
                 console.error(e);
@@ -374867,20 +374932,26 @@ exports.startAppListening = exports.listenerMiddleware.startListening;
 
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.selectProjectDirtyState = void 0;
+exports.selectProjectDirtyState = exports.selectProjectHasNameChanges = exports.selectProjectHasContentChanges = void 0;
 const toolkit_1 = __webpack_require__(12069);
-exports.selectProjectDirtyState = (0, toolkit_1.createSelector)([
+exports.selectProjectHasContentChanges = (0, toolkit_1.createSelector)([
     (state) => state.editor.project?.hasStructureChanges,
-    (state) => state.editor.project?.name,
-    (state) => state.editor.project?.lastSavedSnapshot?.name,
     (state) => state.editor.project?.components,
     (state) => state.editor.commits,
-], (hasStructureChanges, projectName, snapshotName, components, commits) => {
+], (hasStructureChanges, components, commits) => {
     return (Boolean(hasStructureChanges) ||
-        (Boolean(snapshotName) && projectName !== snapshotName) ||
-        (components?.some((c) => c.isDirty) ?? false) ||
+        (components?.some((component) => component.isDirty) ?? false) ||
         commits.length === 0);
 });
+exports.selectProjectHasNameChanges = (0, toolkit_1.createSelector)([
+    (state) => state.editor.project?.name,
+    (state) => state.editor.project?.lastSavedSnapshot?.name,
+], (projectName, snapshotName) => {
+    return Boolean(snapshotName) && projectName !== snapshotName;
+});
+exports.selectProjectDirtyState = (0, toolkit_1.createSelector)([exports.selectProjectHasContentChanges, exports.selectProjectHasNameChanges], (hasContentChanges, hasNameChanges) => {
+    return hasContentChanges || hasNameChanges;
+});
 
 
 /***/ }),

package/dist/style.css

@@ -682,7 +682,7 @@
 :root{--rpf-white: #ffffff}.styles-module__tooltip--7XFyr{position:absolute;background-color:#242424;color:#e5e5e5;padding:calc(.25rem*var(--scale-factor, 1)) calc(.5rem*var(--scale-factor, 1));border-radius:calc(.25rem*var(--scale-factor, 1));font-size:calc(.75rem*var(--scale-factor, 1));line-height:calc(1rem*var(--scale-factor, 1));min-inline-size:calc(10.25rem*var(--scale-factor, 1));z-index:650;pointer-events:none;white-space:pre-wrap;opacity:0;visibility:hidden;transition:opacity .2s ease,transform .2s ease}.styles-module__tooltip--7XFyr.styles-module__visible--wGPCM{opacity:1;visibility:visible}.styles-module__position-bottom--Lwi\+l{inset-block-start:100%;inset-inline-end:0;margin-block-start:calc(.25rem*var(--scale-factor, 1))}.styles-module__position-fixed--t8yrP{position:fixed;margin-top:calc(.625rem*var(--scale-factor, 1));margin-right:calc(2rem*var(--scale-factor, 1))}
 :root{--rpf-white: #ffffff}.styles-module__btn--0Px6W{align-items:center;border-radius:calc(.75rem*var(--scale-factor, 1));border:0;box-sizing:border-box;padding:calc(.75rem*var(--scale-factor, 1)) calc(1.25rem*var(--scale-factor, 1));color:#003046;cursor:pointer;display:inline-flex;font-family:var(--wc-font-family-sans-serif);font-size:inherit;font-weight:500;gap:calc(.5rem*var(--scale-factor, 1));justify-content:center;position:relative;text-align:center;text-decoration:none;transition:all .2s ease}.styles-module__btn--0Px6W:disabled{background-color:#4a4d59;color:#69746d;cursor:default}.styles-module__btn--0Px6W:focus-visible{border:3px solid #cd2356;outline:none}.styles-module__btn--primary--k7oQ0{background-color:var(--rpf-button-primary-background-color);border-radius:calc(.5rem*var(--scale-factor, 1));color:var(--rpf-button-primary-text-color)}.styles-module__btn--primary--k7oQ0 svg{fill:var(--rpf-button-primary-text-color)}.styles-module__btn--primary--k7oQ0:active,.styles-module__btn-outer--4KgkG:active .styles-module__btn--primary--k7oQ0{background-color:var(--rpf-button-primary-background-color-active)}.styles-module__btn--primary--k7oQ0:focus-visible,.styles-module__btn-outer--4KgkG:focus-visible .styles-module__btn--primary--k7oQ0{background-color:var(--rpf-button-primary-background-color-focus)}.styles-module__btn--primary--k7oQ0:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--primary--k7oQ0{background-color:var(--rpf-button-primary-background-color-hover);border-radius:calc(.5rem*var(--scale-factor, 1))}.styles-module__btn--primary--k7oQ0:disabled{background-color:var(--rpf-button-primary-background-color-disabled);color:var(--rpf-button-primary-color-disabled)}.styles-module__btn--primary--k7oQ0:disabled svg{fill:var(--rpf-button-primary-color-disabled)}.styles-module__btn--primary--k7oQ0:disabled:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--primary--k7oQ0:disabled{background-color:var(--rpf-button-primary-background-color-disabled)}.styles-module__btn--secondary--tK09f{background-color:inherit;color:var(--rpf-button-secondary-text-color);border:2px solid var(--rpf-button-primary-background-color)}.styles-module__btn--secondary--tK09f svg{fill:var(--rpf-button-secondary-text-color)}.styles-module__btn--secondary--tK09f:active,.styles-module__btn-outer--4KgkG:active .styles-module__btn--secondary--tK09f{background-color:inherit}.styles-module__btn--secondary--tK09f:focus-visible,.styles-module__btn-outer--4KgkG:focus-visible .styles-module__btn--secondary--tK09f{background-color:inherit}.styles-module__btn--secondary--tK09f:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--secondary--tK09f{background-color:inherit}.styles-module__btn--secondary--tK09f:disabled{background-color:var(--rpf-button-secondary-background-color-disabled);color:var(--rpf-button-secondary-background-color-active)}.styles-module__btn--secondary--tK09f:disabled svg{fill:var(--rpf-button-secondary-background-color-active)}.styles-module__btn--secondary--tK09f:disabled:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--secondary--tK09f:disabled{background-color:var(--rpf-button-secondary-background-color-disabled)}.styles-module__btn--secondary--tK09f:active{border:2px solid var(--rpf-button-secondary-background-color-active)}.styles-module__btn--secondary--tK09f:hover{background-color:var(--rpf-button-secondary-background-color-hover);color:var(--rpf-button-secondary-text-color-hover);border-color:var(--rpf-button-secondary-border-color-hover) !important}.styles-module__btn--secondary--tK09f:hover svg{fill:var(--rpf-button-secondary-text-color-hover)}.styles-module__btn--secondary--tK09f:focus-visible{outline:3px solid var(--rpf-button-secondary-background-color-focus)}.styles-module__btn--tertiary--jf5po{background-color:inherit;color:inherit}.styles-module__btn--tertiary--jf5po:active,.styles-module__btn-outer--4KgkG:active .styles-module__btn--tertiary--jf5po{background-color:inherit}.styles-module__btn--tertiary--jf5po:focus-visible,.styles-module__btn-outer--4KgkG:focus-visible .styles-module__btn--tertiary--jf5po{background-color:inherit}.styles-module__btn--tertiary--jf5po:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--tertiary--jf5po{background-color:inherit}.styles-module__btn--tertiary--jf5po:disabled{background-color:inherit;color:#4a4d59}.styles-module__btn--tertiary--jf5po:disabled svg{fill:#4a4d59}.styles-module__btn--tertiary--jf5po:disabled:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--tertiary--jf5po:disabled{background-color:inherit}.styles-module__btn--tertiary--jf5po:active{color:#0e857a}.styles-module__btn--tertiary--jf5po:active svg{fill:#0e857a}.styles-module__btn--tertiary--jf5po:hover{color:var(--rpf-button-tertiary-text-color-hover)}.styles-module__btn--tertiary--jf5po:hover svg{fill:var(--rpf-button-tertiary-text-color-hover)}.styles-module__btn--tertiaryGray--gFHKt{background-color:inherit;color:inherit}.styles-module__btn--tertiaryGray--gFHKt:active,.styles-module__btn-outer--4KgkG:active .styles-module__btn--tertiaryGray--gFHKt{background-color:inherit}.styles-module__btn--tertiaryGray--gFHKt:focus-visible,.styles-module__btn-outer--4KgkG:focus-visible .styles-module__btn--tertiaryGray--gFHKt{background-color:inherit}.styles-module__btn--tertiaryGray--gFHKt:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--tertiaryGray--gFHKt{background-color:inherit}.styles-module__btn--tertiaryGray--gFHKt:disabled{background-color:inherit;color:#4a4d59}.styles-module__btn--tertiaryGray--gFHKt:disabled svg{fill:#4a4d59}.styles-module__btn--tertiaryGray--gFHKt:disabled:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--tertiaryGray--gFHKt:disabled{background-color:inherit}.styles-module__btn--tertiaryGray--gFHKt:active{color:#43d6b9}.styles-module__btn--tertiaryGray--gFHKt:active svg{fill:#43d6b9}.styles-module__btn--tertiaryGray--gFHKt:hover{color:var(#4a4d59)}.styles-module__btn--tertiaryGray--gFHKt:hover svg{fill:var(#4a4d59)}.styles-module__btn--danger--SmsoX{background-color:#9e0a0a;color:#fff}.styles-module__btn--danger--SmsoX svg{fill:#fff}.styles-module__btn--danger--SmsoX:active,.styles-module__btn-outer--4KgkG:active .styles-module__btn--danger--SmsoX{background-color:#9e0a0a}.styles-module__btn--danger--SmsoX:focus-visible,.styles-module__btn-outer--4KgkG:focus-visible .styles-module__btn--danger--SmsoX{background-color:#9e0a0a}.styles-module__btn--danger--SmsoX:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--danger--SmsoX{background-color:#86151e}.styles-module__btn--danger--SmsoX:disabled{background-color:#9e0a0a;color:#fff}.styles-module__btn--danger--SmsoX:disabled svg{fill:#fff}.styles-module__btn--danger--SmsoX:disabled:hover,.styles-module__btn-outer--4KgkG:hover .styles-module__btn--danger--SmsoX:disabled{background-color:#9e0a0a}.styles-module__btn--danger--SmsoX:focus-visible{background-clip:padding-box;border:2px solid rgba(0,0,0,0);outline:3px solid #cd2356}.styles-module__btn--small--cJ2bM{min-block-size:unset;min-inline-size:unset;padding:calc(.25rem*var(--scale-factor, 1))}.styles-module__btnOuter--ip64U{background:rgba(0,0,0,0);border-radius:calc(.5rem*var(--scale-factor, 1));cursor:pointer;padding:calc(.5rem*var(--scale-factor, 1)) 0;display:flex;align-items:center;justify-content:center}.styles-module__btnOuter--ip64U:focus-visible{outline:none}.styles-module__btnOuter--ip64U:focus-visible .styles-module__btn--0Px6W{border:3px solid #cd2356}.styles-module__btnOuter--ip64U:has(.styles-module__btn--0Px6W:disabled){cursor:default}.styles-module__svgOnly--eXeyf{background-color:#43d6b9}.styles-module__svgOnly--eXeyf svg{margin:0}.styles-module__primary--AeI1M{background:#fde246}.styles-module__primary--AeI1M:hover{background:#edce22}.styles-module__primary--AeI1M:active{background:#fff;border:1px solid #003046}.styles-module__primary--AeI1M:disabled{background:#fffbe3;color:#69746d}.styles-module__secondary--tAMJR{background:linear-gradient(139deg, rgba(185, 230, 238, 0.8) 9.38%, rgba(113, 235, 188, 0.8) 45.1%, rgba(113, 235, 188, 0.8) 59.39%, rgba(185, 230, 238, 0.8) 88.77%),#fff;border:none}.styles-module__secondary--tAMJR:hover{background:linear-gradient(0deg, hsla(0, 0%, 34%, 0.15), hsla(0, 0%, 34%, 0.15)),linear-gradient(320deg, #B9E6EE 17.77%, #71EBBC 47.58%, #71EBBC 59.5%, #B9E6EE 84%)}.styles-module__secondary--tAMJR:active{background:#fff;border:1px solid #003046}.styles-module__secondary--tAMJR:disabled{background:linear-gradient(135deg, #B9E6EE, #71EBBC, #71EBBC, #B9E6EE),linear-gradient(139deg, #B9E6EE 9.38%, #71EBBC 45.1%, #71EBBC 59.39%, #B9E6EE 88.77%),#fff}.styles-module__tertiary--Kr5w9{background:#43d6b9;color:#003046}.styles-module__tertiary--Kr5w9:hover{background:#cbcbcb}.styles-module__tertiary--Kr5w9:active{background:#fff}.styles-module__tertiary--Kr5w9:disabled{background:#e5e5e5;color:#69746d}.styles-module__tertiaryGray--gVUq6{background:#e5e5e5;color:#33625e}.styles-module__tertiaryGray--gVUq6:hover{background:#cbcbcb}.styles-module__tertiaryGray--gVUq6:disabled{background:#d5d7dc;color:#69746d}.styles-module__iconed--AMs-c{padding-top:10px;padding-bottom:10px}.styles-module__icon--C2jj1{padding:0px}
 :root{--rpf-white: #ffffff}.styles-module__spinnerDotted--tTFFI{position:relative;inline-size:1.125rem;block-size:1.125rem}.styles-module__spinnerDotted--tTFFI span{position:absolute;inset-block-start:40%;inset-inline-start:25%;inline-size:.225rem;block-size:.225rem;background-color:#69746d;border-radius:50%;transform-origin:center;transform:rotate(var(--angle)) translateY(-0.5625rem);opacity:.2;animation:styles-module__fade--jNeB5 1s linear infinite;--angle: calc(var(--itemIndex) * 45deg);animation-delay:calc(var(--itemIndex)*.125s)}@keyframes styles-module__fade--jNeB5{0%{opacity:1}100%{opacity:.2}}
-:root{--rpf-white: #ffffff}.styles-module__content--Cgvxl{display:flex;gap:calc(.5rem*var(--scale-factor, 1))}.styles-module__icon--y9Z7a{color:#003046}
+:root{--rpf-white: #ffffff}.styles-module__wrapper--U1NAt{display:inline-flex;position:relative}.styles-module__content--Cgvxl{display:flex;gap:calc(.5rem*var(--scale-factor, 1))}.styles-module__icon--y9Z7a{color:#003046}
 .styles-module__shareButtonWrapper--wEN8e{position:relative}
 :root{--rpf-white: #ffffff}.styles-module__historyActive--aOVxD{background-color:#fff}.styles-module__historyButton--LInbn{color:#003046}.styles-module__commitHoverElement--foGWE{color:#33625e;display:flex;align-items:center;gap:calc(.25rem*var(--scale-factor, 1))}.styles-module__btnContainer--OlkJ2{position:relative}
 :root{--rpf-white: #ffffff}.styles-module__contextMenu--HNX6Z{list-style-type:none;padding:0;margin-inline:calc(.5rem*var(--scale-factor, 1)) 0;margin-block:0;border-radius:calc(.25rem*var(--scale-factor, 1));display:flex;flex-direction:column;background-color:#fff;border:1px solid #e5e5e5;box-shadow:0 calc(.25rem*var(--scale-factor, 1)) calc(.5rem*var(--scale-factor, 1)) 0 rgba(0,0,0,.25);overflow:auto;z-index:700}.styles-module__contextMenu--HNX6Z .styles-module__hoverElement--GLCJ0{visibility:hidden;margin-left:calc(1rem*var(--scale-factor, 1))}.styles-module__contextMenu--HNX6Z .styles-module__contextItem--9nzMH{display:flex;justify-content:space-between;font-size:calc(.875rem*var(--scale-factor, 1));line-height:calc(1.25rem*var(--scale-factor, 1));color:#69746d;padding:calc(1rem*var(--scale-factor, 1));white-space:nowrap;inline-size:100%;gap:calc(.5rem*var(--scale-factor, 1));transition:all .2s ease}.styles-module__contextMenu--HNX6Z .styles-module__contextItem--9nzMH .styles-module__optionContent--3E8Zt{display:flex;align-items:center;gap:calc(.5rem*var(--scale-factor, 1));justify-items:start}.styles-module__contextMenu--HNX6Z .styles-module__contextItem--9nzMH:hover{background-color:#e5f6f1;cursor:pointer;color:#003046}.styles-module__contextMenu--HNX6Z .styles-module__contextItem--9nzMH:hover .styles-module__hoverElement--GLCJ0{visibility:visible}.styles-module__contextMenu--HNX6Z .styles-module__contextItemActive--KkppO{background-color:#c5ffe8;color:#003046}.styles-module__contextMenu--HNX6Z .styles-module__contextHeader--jA59O{font-size:calc(.625rem*var(--scale-factor, 1));line-height:calc(1rem*var(--scale-factor, 1));font-weight:500;padding:calc(.5rem*var(--scale-factor, 1)) calc(1rem*var(--scale-factor, 1)) calc(.25rem*var(--scale-factor, 1));color:#33625e}.styles-module__contextMenu--HNX6Z svg{inline-size:calc(1.125rem*var(--scale-factor, 1))}.styles-module__contextMenu--HNX6Z .styles-module__withDivider--X54Sw{border-bottom:1px solid #e5e5e5}.styles-module__visibleScrollbar--PEea9::-webkit-scrollbar{width:calc(.25rem*var(--scale-factor, 1));display:block}.styles-module__visibleScrollbar--PEea9::-webkit-scrollbar-thumb{background-color:HSL(0, 0%, 14%, 10%);border-radius:calc(1.125rem*var(--scale-factor, 1))}

package/package.json

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