gwchq-textjam 0.1.113 → 0.1.115

package/dist/index.js

@@ -68347,8 +68347,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* 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 D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(89379);
+/* harmony import */ var D_gwc_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);
@@ -68372,7 +68372,7 @@ var DraggableTab = _ref => {
       panelIndex,
       fileIndex
     } = _ref,
-    otherProps = (0,D_gwc2_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectWithoutProperties_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)(_ref, _excluded);
+    otherProps = (0,D_gwc_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)();
@@ -68389,7 +68389,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,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)({
+  var InnerTab = () => /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_tabs__WEBPACK_IMPORTED_MODULE_2__.Tab, (0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
     onClick: e => {
       e.stopPropagation();
       switchToFileTab(panelIndex, fileIndex);
@@ -68407,7 +68407,7 @@ var DraggableTab = _ref => {
         draggableProps,
         dragHandleProps
       } = _ref2;
-      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)({
+      return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", (0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)({
         className: "draggable-tab",
         ref: innerRef
       }, draggableProps), dragHandleProps), {}, {
@@ -68429,8 +68429,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* 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 D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(89379);
+/* harmony import */ var D_gwc_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);
@@ -68449,8 +68449,8 @@ var DroppableTabList = _ref => {
       children: _children,
       index
     } = _ref,
-    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), {}, {
+    otherProps = (0,D_gwc_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_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,D_gwc_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(),
@@ -68460,7 +68460,7 @@ var DroppableTabList = _ref => {
           droppableProps,
           placeholder
         } = _ref2;
-        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)({
+        return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", (0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)((0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .A)({
           className: "droppable-tab-list"
         }, droppableProps), {}, {
           ref: innerRef,
@@ -102918,7 +102918,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* 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_gwc_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);
@@ -102998,7 +102998,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,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)({
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", (0,D_gwc_gwchq_textjam_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .A)((0,D_gwc_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()), {
@@ -370068,7 +370068,7 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
                     handleLoaded(data.stdinBuffer, data.interruptBuffer);
                     break;
                 case "handleInput":
-                    handleInput();
+                    handleInput(worker);
                     break;
                 case "handleOutput":
                     handleOutput(data.stream, data.content);
@@ -370147,13 +370147,14 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
         dispatch((0, EditorSlice_1.codeRunHandled)());
         disableInput();
     };
-    const handleInput = async () => {
+    const handleInput = async (workerOverride) => {
+        const targetWorker = workerOverride ?? pyodideWorker;
         if (stdinClosed.current) {
             if (stdinBuffer.current) {
                 stdinBuffer.current[0] = -1;
             }
             else {
-                pyodideWorker?.postMessage({
+                targetWorker?.postMessage({
                     method: "stdinResponse",
                     ctrlD: true,
                 });
@@ -370173,7 +370174,7 @@ const PyodideRunner = ({ active, packageApiUrl, }) => {
             stdinBuffer.current[0] = currentLength;
         }
         else {
-            pyodideWorker?.postMessage({
+            targetWorker?.postMessage({
                 method: "stdinResponse",
                 content: content !== undefined ? content + "\n" : "",
                 ctrlD,
@@ -370315,7 +370316,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)());
     };
@@ -372343,7 +372344,7 @@ const WebComponentProject = ({ nameEditable = false, sidebarOptions = [], packag
         return () => clearTimeout(timeout);
     }, [project]);
     renderer.link = function (data) {
-        return `<a href="${data.href}" target="_blank" rel="noreferrer"
+        return `<a href="${data.href}" target="_blank" rel="noreferrer"
     }">${data.text}</a>`;
     };
     marked_1.marked.setOptions({
@@ -373641,6 +373642,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 +373732,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 +373786,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 +373794,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 +373817,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 +373834,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.115",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",