@capytale/meta-player 0.5.6 → 0.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capytale/meta-player",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/src/App.tsx

@@ -11,6 +11,7 @@ import { classNames } from "primereact/utils";
 import {
   selectIsPedagoVisible,
   selectOrientation,
+  selectShowSaveForStudents,
   toggleIsPedagoVisible,
 } from "./features/layout/layoutSlice";
 import { FC, KeyboardEvent, PropsWithChildren, useCallback } from "react";
@@ -20,6 +21,7 @@ import {
   selectHasInstructions,
   selectIsDirty,
   selectMode,
+  selectShowSaveButton,
 } from "./features/activityData/activityDataSlice";
 import settings from "./settings";
 import ReviewNavbar from "./features/navbar/review-navbar";
@@ -41,14 +43,19 @@ const App: FC<AppProps> = (props) => {
   const isDirty = useAppSelector(selectIsDirty);
   const save = useSave();
 
+  const showSaveButton = useAppSelector(selectShowSaveButton);
+  const showSaveForStudents = useAppSelector(selectShowSaveForStudents);
+  const hasSaveButton =
+    showSaveButton && !(mode === "assignment" && !showSaveForStudents);
+
   const handleCtrlS = useCallback(
     (e: KeyboardEvent<HTMLDivElement>) => {
       if ((e.ctrlKey || e.metaKey) && e.key === "s") {
         e.preventDefault();
-        save(); // Checks if can save inside of save()
+        if (hasSaveButton && isDirty) save(); // Checks if can save inside of save()
       }
     },
-    [isDirty, save],
+    [hasSaveButton, isDirty, save],
   );
 
   const pedagoOpenLabel = hasPedago

package/src/features/activityData/hooks.ts

@@ -1,7 +1,6 @@
 import { useCallback } from "react";
 import { useAppDispatch, useAppSelector } from "../../app/hooks";
-import { selectShowSaveForStudents } from "../layout/layoutSlice";
-import { selectHasEvaluations, selectIsDirty, selectMode, selectPreventEditIfHasEvaluations, selectShowSaveButton, setIsPlayerDirty, setSaveState } from "./activityDataSlice";
+import { selectHasEvaluations, selectMode, selectPreventEditIfHasEvaluations, setIsPlayerDirty, setSaveState } from "./activityDataSlice";
 
 export const useNotifyIsDirty = () => {
   const dispatch = useAppDispatch();
@@ -9,30 +8,17 @@ export const useNotifyIsDirty = () => {
 };
 
 export const useCanSave = () => {
-  const isDirty = useAppSelector(selectIsDirty);
   const preventEditIfHasEvaluations = useAppSelector(
     selectPreventEditIfHasEvaluations,
   );
   const hasEvaluations = useAppSelector(selectHasEvaluations);
 
   const mode = useAppSelector(selectMode);
-  const showSaveButton = useAppSelector(selectShowSaveButton);
-  const showSaveForStudents = useAppSelector(selectShowSaveForStudents);
-  const hasSaveButton =
-    showSaveButton && !(mode === "assignment" && !showSaveForStudents);
-
-  if (!hasSaveButton) {
-    return false;
-  }
 
   if (mode === "create" && hasEvaluations && preventEditIfHasEvaluations) {
     return false;
   }
 
-  if (!isDirty) {
-    return false;
-  }
-
   return true;
 }