@capytale/meta-player 0.9.3 → 0.9.5

package/package.json

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

package/src/features/activityData/activityDataSlice.ts

@@ -40,6 +40,7 @@ export const activityDataSlice = createAppSlice({
         state.accessTimerange = action.payload.accessTimerange;
         state.studentInfo = action.payload.studentInfo;
         state.instructions = action.payload.instructions;
+        state.loadedInstructions = action.payload.loadedInstructions;
         state.instructionsType = action.payload.instructionsType;
         state.sharedNotesContent = action.payload.sharedNotesContent;
         state.sharedNotesType = action.payload.sharedNotesType;
@@ -145,6 +146,7 @@ export const activityDataSlice = createAppSlice({
       codeLink: data.codeLink,
     }),
     selectInstructions: (data) => data.instructions,
+    selectLoadedInstructions: (data) => data.loadedInstructions,
     selectInstructionsType: (data) => data.instructionsType,
     selectPdfInstructions: (data) => data.pdfInstructions,
     selectSharedNotesContent: (data) => data.sharedNotesContent,
@@ -220,6 +222,7 @@ export const {
   selectActivityInfo,
   selectSharingInfo,
   selectInstructions,
+  selectLoadedInstructions,
   selectInstructionsType,
   selectPdfInstructions,
   selectSharedNotesContent,

package/src/features/activityData/activityJsData.ts

@@ -17,6 +17,12 @@ export type Instructions = {
   format: "html" | "markdown" | "lexical";
 };
 
+export type LoadedInstructions = {
+  value: string | null;
+  htmlValue: string | null;
+  format: "html" | "markdown" | "lexical";
+}
+
 export type Icon = {
   path: string;
   style?: any;
@@ -36,6 +42,7 @@ export type ActivityJSData = {
   accessTimerange: TimeRange | null;
   studentInfo: StudentInfo | null;
   instructions: Instructions | null;
+  loadedInstructions: LoadedInstructions | null;
   instructionsType: EditorType;
   pdfInstructions: Blob | null;
   sharedNotesContent: InitialEditorStateType | null;
@@ -69,6 +76,7 @@ export const defaultActivityJSData: ActivityJSData = {
     class: "",
   },
   instructions: null,
+  loadedInstructions: null,
   instructionsType: "rich",
   pdfInstructions: null,
   sharedNotesContent: null,

package/src/features/activityJS/ActivityJSProvider.tsx

@@ -87,6 +87,17 @@ export const ActivityJSProvider: FC<ActivityJSProviderProps> = (props) => {
               htmlValue: ab.instructions.value.html || "",
               format: "html",
             },
+        loadedInstructions: ab.instructions.value.lexical
+          ? {
+              value: ab.instructions.value.lexical,
+              htmlValue: ab.instructions.value.html,
+              format: "lexical",
+            }
+          : {
+              value: null,
+              htmlValue: ab.instructions.value.html || "",
+              format: "html",
+            },
         instructionsType:
           ab.instructions.value.lexical ||
           ab.instructions.value.html ||

package/src/features/pedago/hooks.ts

@@ -3,10 +3,10 @@ import { useAppSelector } from "../../app/hooks";
 import {
   selectHasGradingOrComments,
   selectShowPedagoByDefault,
-  selectInstructions,
   selectInstructionsType,
   selectMode,
   selectSharedNotesType,
+  selectLoadedInstructions,
 } from "../activityData/activityDataSlice";
 import {
   selectIsGradingVisible,
@@ -22,34 +22,35 @@ export const usePedagoOptions = () => {
   const showPedagoByDefault = useAppSelector(selectShowPedagoByDefault);
   const hasGradingOrComments = useAppSelector(selectHasGradingOrComments);
   const instructionsType = useAppSelector(selectInstructionsType);
-  const instructions = useAppSelector(selectInstructions);
+  const loadedInstructions = useAppSelector(selectLoadedInstructions);
   const sharedNotesType = useAppSelector(selectSharedNotesType);
+
   const hasNonEmptyInstructions = useMemo(() => {
-    if (instructionsType === "none" || !instructions) {
+    if (instructionsType === "none" || !loadedInstructions) {
       return false;
     }
-    if (instructions.format === "html") {
-      if (typeof instructions.value !== "string") {
-        console.warn("HTML instructions value is not a string");
+    if (loadedInstructions.format === "html") {
+      if (typeof loadedInstructions.value !== "string") {
+        console.warn("HTML loaded instructions value is not a string");
         return true;
       }
       return (
-        instructions.value.trim() !== "" &&
-        instructions.value.trim() !== "<p></p>"
+        loadedInstructions.value.trim() !== "" &&
+        loadedInstructions.value.trim() !== "<p></p>"
       );
-    } else if (instructions.format === "markdown") {
-      if (typeof instructions.value !== "string") {
-        console.warn("Markdown instructions value is not a string");
+    } else if (loadedInstructions.format === "markdown") {
+      if (typeof loadedInstructions.value !== "string") {
+        console.warn("Markdown loaded instructions value is not a string");
         return true;
       }
-      return instructions.value.trim() !== "";
-    } else if (instructions.format === "lexical") {
-      if (typeof instructions.value !== "string") {
-        console.warn("Lexical instructions value is not a string");
+      return loadedInstructions.value.trim() !== "";
+    } else if (loadedInstructions.format === "lexical") {
+      if (typeof loadedInstructions.value !== "string") {
+        console.warn("Lexical loaded instructions value is not a string");
         return true;
       }
       try {
-        const parsedInstructions = JSON.parse(instructions.value);
+        const parsedInstructions = JSON.parse(loadedInstructions.value);
         if (
           !parsedInstructions.root ||
           !parsedInstructions.root.children ||
@@ -66,12 +67,12 @@ export const usePedagoOptions = () => {
         }
         return singleNode.children && singleNode.children.length > 0;
       } catch (error) {
-        console.warn("Lexical instructions value is not valid JSON");
+        console.warn("Lexical loaded instructions value is not valid JSON");
         return true;
       }
     }
     return false;
-  }, [instructionsType, instructions]);
+  }, [instructionsType, loadedInstructions]);
 
   const hasSharedNotes = sharedNotesType !== "none";
   const hasPedago =
@@ -84,7 +85,10 @@ export const usePedagoOptions = () => {
           : hasNonEmptyInstructions || hasSharedNotes || hasGradingOrComments;
 
   const showPedago =
-    isPedagoVisible ?? (mode === "create" ? showPedagoByDefault : hasPedago);
+    isPedagoVisible ??
+    (mode === "create"
+      ? hasNonEmptyInstructions || hasSharedNotes || showPedagoByDefault
+      : hasPedago);
 
   const showInstructions =
     mode === "create" ? true : hasNonEmptyInstructions || hasSharedNotes;