gwchq-textjam 0.1.74 → 0.1.76

package/dist/index.js

@@ -65649,6 +65649,35 @@ function SvgPythonFile(props) {
 
 /***/ }),
 
+/***/ 48268:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(51649);
+var _path;
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+
+function SvgShare(props) {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("svg", _extends({
+    width: 19,
+    height: 20,
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), _path || (_path = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__.createElement("path", {
+    d: "M6.031 11.359l6.147 3.582m-.009-9.882L6.031 8.641M17.2 3.7a2.7 2.7 0 11-5.4 0 2.7 2.7 0 015.4 0zM6.4 10A2.7 2.7 0 111 10a2.7 2.7 0 015.4 0zm10.8 6.3a2.7 2.7 0 11-5.4 0 2.7 2.7 0 015.4 0z",
+    stroke: "#003046",
+    strokeWidth: 2,
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  })));
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (SvgShare);
+
+/***/ }),
+
 /***/ 54275:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
@@ -101698,7 +101727,7 @@ var EditorPanel = _ref => {
 
 /***/ }),
 
-/***/ 6455:
+/***/ 68065:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -101908,55 +101937,9 @@ var SaveButton = props => {
   }, props));
 };
 /* harmony default export */ const SaveButton_SaveButton = (SaveButton);
-;// ./src/assets/icons/share.svg
-var share_path;
-function share_extends() { return share_extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, share_extends.apply(null, arguments); }
-
-function SvgShare(props) {
-  return /*#__PURE__*/external_react_.createElement("svg", share_extends({
-    width: 19,
-    height: 20,
-    fill: "none",
-    xmlns: "http://www.w3.org/2000/svg"
-  }, props), share_path || (share_path = /*#__PURE__*/external_react_.createElement("path", {
-    d: "M6.031 11.359l6.147 3.582m-.009-9.882L6.031 8.641M17.2 3.7a2.7 2.7 0 11-5.4 0 2.7 2.7 0 015.4 0zM6.4 10A2.7 2.7 0 111 10a2.7 2.7 0 015.4 0zm10.8 6.3a2.7 2.7 0 11-5.4 0 2.7 2.7 0 015.4 0z",
-    stroke: "#003046",
-    strokeWidth: 2,
-    strokeLinecap: "round",
-    strokeLinejoin: "round"
-  })));
-}
-/* harmony default export */ const share = (SvgShare);
-;// ./src/components/ShareButton/ShareButton.jsx
-
-
-
-
-
-
-
-
-
-var ShareButton = props => {
-  var dispatch = (0,external_react_redux_.useDispatch)();
-  var shareLinks = (0,external_react_redux_.useSelector)(state => state.editor.shareLinks);
-  var onClickShare = (0,external_react_.useCallback)(/*#__PURE__*/_asyncToGenerator(function* () {
-    dispatch((0,EditorSlice.showModal)({
-      modal: types.ModalType.SHARE_PROJECT,
-      args: {
-        canShareProject: true,
-        hideCodeUrl: shareLinks.hideCode,
-        showCodeUrl: shareLinks.showCode
-      }
-    }));
-  }), [dispatch, shareLinks]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)(Button["default"], (0,objectSpread2/* default */.A)({
-    variant: "tertiary",
-    ButtonIcon: share,
-    onClickHandler: onClickShare
-  }, props));
-};
-/* harmony default export */ const ShareButton_ShareButton = (ShareButton);
+// EXTERNAL MODULE: ./src/components/ShareButton/ShareButton.tsx
+var ShareButton = __webpack_require__(21422);
+var ShareButton_default = /*#__PURE__*/__webpack_require__.n(ShareButton);
 ;// ./src/assets/icons/history.svg
 var history_path;
 function history_extends() { return history_extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, history_extends.apply(null, arguments); }
@@ -102049,7 +102032,7 @@ var ProjectBar = _ref => {
       className: ProjectBar_styles_module["default"].wrapper,
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)(RunBar["default"], {}), loading === "success" && /*#__PURE__*/(0,jsx_runtime.jsx)((DownloadButton_default()), {
         className: ProjectBar_styles_module["default"].btnSvg
-      }), /*#__PURE__*/(0,jsx_runtime.jsx)(ShareButton_ShareButton, {
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)((ShareButton_default()), {
         className: ProjectBar_styles_module["default"].btnSvg
       })]
     })]
@@ -368455,7 +368438,7 @@ const TextJamEditor = ({ onLogoutClick = () => { }, onViewProfileClick = () => {
     isLoading: false,
     error: null,
     data: null,
-}, shareLinks = { shareCode: "", hideCode: "" }, ...componentProps }) => {
+}, shareLinks = null, ...componentProps }) => {
     // Default props that match the previous web-component defaults
     const defaultProps = {
         sidebarOptions: [
@@ -368916,7 +368899,6 @@ function HtmlRunner() {
     const readOnly = (0, stores_1.useAppSelector)((state) => state.editor.readOnly);
     const outputOnly = (0, stores_1.useAppSelector)((state) => state.editor.isOutputOnly);
     const dispatch = (0, react_redux_1.useDispatch)();
-    const location = (0, react_router_dom_1.useLocation)();
     const output = (0, react_1.useRef)(null);
     const [searchParams, setSearchParams] = (0, react_router_dom_1.useSearchParams)();
     // Using BroadcastChannel to communicate between the main app and the preview tab
@@ -368940,13 +368922,17 @@ function HtmlRunner() {
         defaultPreviewFilePath = page;
     }
     const [runningFilePath, setRunningFilePath] = (0, react_1.useState)(defaultPreviewFilePath);
-    const isPreviewMode = location.pathname.includes("/preview");
+    const isPreviewMode = searchParams.get("preview") === "1";
     (0, react_1.useEffect)(() => {
         if (isPreviewMode) {
             dispatch((0, EditorSlice_1.setIsOutputOnly)(true));
             dispatch((0, EditorSlice_2.triggerCodeRun)());
-            if (page) {
-                setSearchParams({ page }, { replace: true });
+            if (page && isPreviewMode) {
+                setSearchParams((prevParams) => {
+                    const updatedParams = new URLSearchParams(prevParams);
+                    updatedParams.set("page", page);
+                    return updatedParams;
+                }, { replace: true });
             }
         }
     }, [isPreviewMode, page, setSearchParams]);
@@ -369077,7 +369063,7 @@ function HtmlRunner() {
         return () => window.removeEventListener("message", handler);
     }, []);
     const openPreview = () => {
-        window.open(`${window.location.href}/preview`, "_blank", "noopener,noreferrer");
+        window.open(`${window.location.href}?preview=1&page=${runningFilePath}`, "_blank", "noopener,noreferrer");
     };
     const openInNewTabLink = ((0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.previewLink, onClick: openPreview, children: (0, jsx_runtime_1.jsx)(SvgIcon_1.SvgIcon, { SvgElement: open_in_new_tab_svg_1.default, size: 16 }) }));
     const iframeClasses = (0, classnames_1.default)(styles_module_scss_1.default.iframe, {
@@ -371596,6 +371582,44 @@ const SharedProjectName = () => {
 exports["default"] = SharedProjectName;
 
 
+/***/ }),
+
+/***/ 21422:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const jsx_runtime_1 = __webpack_require__(74848);
+const react_1 = __webpack_require__(51649);
+const share_svg_1 = __importDefault(__webpack_require__(48268));
+const Button_1 = __importDefault(__webpack_require__(60232));
+const react_redux_1 = __webpack_require__(14062);
+const EditorSlice_1 = __webpack_require__(68512);
+const types_1 = __webpack_require__(92932);
+const stores_1 = __webpack_require__(32132);
+const ShareButton = (props) => {
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const shareLinks = (0, stores_1.useAppSelector)((state) => state.editor.shareLinks);
+    const onClickShare = (0, react_1.useCallback)(async () => {
+        dispatch((0, EditorSlice_1.showModal)({
+            modal: types_1.ModalType.SHARE_PROJECT,
+            args: {
+                type: types_1.ModalType.SHARE_PROJECT,
+                canShareProject: true,
+                hideCodeUrl: shareLinks?.hideCode ?? null,
+                showCodeUrl: shareLinks?.showCode ?? null,
+            },
+        }));
+    }, [dispatch, shareLinks]);
+    const canShare = Boolean(shareLinks);
+    return ((0, jsx_runtime_1.jsx)(Button_1.default, { disabled: !canShare, variant: "tertiary", ButtonIcon: share_svg_1.default, onClickHandler: onClickShare, ...props }));
+};
+exports["default"] = ShareButton;
+
+
 /***/ }),
 
 /***/ 82803:
@@ -371692,7 +371716,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const jsx_runtime_1 = __webpack_require__(74848);
 const react_1 = __webpack_require__(51649);
 const marked_1 = __webpack_require__(6709);
-const Project_1 = __importDefault(__webpack_require__(6455));
+const Project_1 = __importDefault(__webpack_require__(68065));
 const Output_1 = __importDefault(__webpack_require__(95148));
 const DefaultMZCriteria_1 = __webpack_require__(98748);
 const WebComponentCustomEvents_1 = __webpack_require__(30272);
@@ -372711,25 +372735,18 @@ const useProjectPersistence = ({ user, project, justLoaded, hasShownSavePrompt,
     // Autosave
     (0, react_1.useEffect)(() => {
         const debouncer = setTimeout(() => {
-            if (!project)
+            if (!project || Object.keys(project).length === 0)
                 return;
-            if ((0, projectHelpers_1.isOwner)(user, project) && project.identifier) {
-                if (justLoaded) {
-                    dispatch((0, EditorSlice_1.expireJustLoaded)());
-                }
-                saveToIndexedDB(project).catch(console.error);
+            if (justLoaded) {
+                dispatch((0, EditorSlice_1.expireJustLoaded)());
             }
             else {
-                if (justLoaded) {
-                    dispatch((0, EditorSlice_1.expireJustLoaded)());
-                }
-                else {
-                    if (!hasShownSavePrompt && user && (0, projectHelpers_1.isOwner)(user, project)) {
-                        (0, Notifications_1.showSavePrompt)();
-                        dispatch((0, EditorSlice_1.setHasShownSavePrompt)());
-                    }
+                if (!hasShownSavePrompt && user && (0, projectHelpers_1.isOwner)(user, project)) {
+                    (0, Notifications_1.showSavePrompt)();
+                    dispatch((0, EditorSlice_1.setHasShownSavePrompt)());
                 }
             }
+            saveToIndexedDB(project).catch(console.error);
         }, autoSaveInterval);
         return () => clearTimeout(debouncer);
     }, [dispatch, project, user, hasShownSavePrompt, onSave]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -372790,7 +372807,7 @@ exports.editorInitialState = {
     error: null,
     isCodeVisible: true,
     isSharedProject: false,
-    shareLinks: { shareCode: "", hideCode: "" },
+    shareLinks: null,
 };
 exports.EditorSlice = (0, toolkit_1.createSlice)({
     name: "editor",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gwchq-textjam",
   "description": "Embeddable React editor used in Raspberry Pi text-based projects.",
-  "version": "0.1.74",
+  "version": "0.1.76",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",
@@ -20,7 +20,8 @@
     "lint": "eslint \"src/**/*.{js,jsx,json}\"",
     "lint:fix": "eslint --fix \"src/**/*.{js,jsx,json}\"",
     "stylelint": "stylelint src/**/*.scss",
-    "test": "jest"
+    "test": "jest",
+    "prepare": "husky"
   },
   "module": "./dist/index.js",
   "exports": {
@@ -162,6 +163,7 @@
     "eslint-webpack-plugin": "^2.5.2",
     "file-loader": "6.1.1",
     "html-webpack-plugin": "5.6.0",
+    "husky": "^9.1.7",
     "jest": "^29.1.2",
     "jest-circus": "^29.1.2",
     "jest-css-modules-transform": "^4.4.2",
@@ -173,6 +175,7 @@
     "jest-transform-stub": "^2.0.0",
     "jest-transformer-svg": "^2.0.0",
     "jest-watch-typeahead": "^2.2.0",
+    "lint-staged": "^16.3.2",
     "mini-css-extract-plugin": "^2.9.4",
     "mock-match-media": "^0.4.3",
     "optimize-css-assets-webpack-plugin": "5.0.4",
@@ -216,6 +219,12 @@
     "workbox-webpack-plugin": "5.1.4",
     "worker-plugin": "5.0.1"
   },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx,css,scss,md}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
   "jest": {
     "roots": [
       "<rootDir>/src"