@lessonkit/react 0.8.0 → 0.8.1

package/README.md

@@ -59,7 +59,7 @@ export default function App() {
 }
 ```
 
-## API (0.8.0)
+## API (0.8.1)
 
 ### Block catalog
 

package/dist/index.cjs

@@ -58,7 +58,7 @@ var import_accessibility = require("@lessonkit/accessibility");
 
 // src/context.tsx
 var import_react = require("react");
-var import_core3 = require("@lessonkit/core");
+var import_core4 = require("@lessonkit/core");
 var import_xapi3 = require("@lessonkit/xapi");
 var import_xapi4 = require("@lessonkit/xapi");
 
@@ -98,7 +98,10 @@ function forwardTelemetryToLxpack(event, mode = "auto") {
       bridge.submitAssessment?.({
         id: data.checkId,
         score: scaled,
-        passingScore: (0, import_bridge.normalizeAssessmentPassingScore)(data.passingScore)
+        passingScore: (0, import_bridge.normalizeAssessmentPassingScore)({
+          passingScore: data.passingScore,
+          maxScore: data.maxScore
+        })
       });
       return;
     }
@@ -229,6 +232,12 @@ function createSessionStoragePort() {
         sessionStorage.setItem(key, value);
       } catch {
       }
+    },
+    removeItem: (key) => {
+      try {
+        sessionStorage.removeItem(key);
+      } catch {
+      }
     }
   };
 }
@@ -276,6 +285,8 @@ function createXapiClientFromConfig(config, queue) {
   if (config.xapi?.enabled === false) return null;
   if (config.xapi?.client) return config.xapi.client;
   if (!config.courseId) return null;
+  const hasTransport = typeof config.xapi?.transport === "function";
+  if (!hasTransport && config.xapi?.enabled !== true) return null;
   return (0, import_xapi2.createXAPIClient)({
     courseId: config.courseId,
     transport: config.xapi?.transport,
@@ -286,6 +297,9 @@ function createXapiClientFromConfig(config, queue) {
 // src/runtime/session.ts
 var import_core2 = require("@lessonkit/core");
 var SESSION_STORAGE_KEY = "lessonkit:sessionId";
+function getTabSessionId(storage) {
+  return storage.getItem(SESSION_STORAGE_KEY);
+}
 var COURSE_STARTED_PREFIX = "lessonkit:course_started:";
 function resolveSessionId(storage, provided) {
   if (provided) return provided;
@@ -306,30 +320,47 @@ function markCourseStarted(storage, sessionId, courseId) {
   if (!courseId) return;
   storage.setItem(courseStartedStorageKey(sessionId, courseId), "1");
 }
-
-// src/context.tsx
-var import_jsx_runtime = require("react/jsx-runtime");
-var LessonkitContext = (0, import_react.createContext)(null);
-var useIsoLayoutEffect = typeof window !== "undefined" ? import_react.useLayoutEffect : import_react.useEffect;
-function disposeTrackingClient(client) {
-  client?.flush?.();
-  client?.dispose?.();
+function migrateCourseStartedMark(storage, fromSessionId, toSessionId, courseId) {
+  if (!courseId || fromSessionId === toSessionId) return;
+  if (hasCourseStarted(storage, fromSessionId, courseId)) {
+    markCourseStarted(storage, toSessionId, courseId);
+    storage.removeItem?.(courseStartedStorageKey(fromSessionId, courseId));
+  }
 }
-var defaultStorage = createSessionStoragePort();
+
+// src/runtime/telemetry.ts
+var import_core3 = require("@lessonkit/core");
 function createTrackingClientFromConfig(config) {
-  if (config.tracking?.enabled === false) {
-    return (0, import_core3.createTrackingClient)();
-  }
+  if (config.tracking?.enabled === false) return (0, import_core3.createTrackingClient)();
+  if (config.tracking?.createClient) return config.tracking.createClient();
   return (0, import_core3.createTrackingClient)({
     sink: config.tracking?.sink,
     batchSink: config.tracking?.batchSink,
     batch: config.tracking?.batch
   });
 }
+function disposeTrackingClient(client) {
+  client?.flush?.();
+  client?.dispose?.();
+}
+
+// src/context.tsx
+var import_jsx_runtime = require("react/jsx-runtime");
+var LessonkitContext = (0, import_react.createContext)(null);
+var useIsoLayoutEffect = typeof window !== "undefined" ? import_react.useLayoutEffect : import_react.useEffect;
+var defaultStorage = createSessionStoragePort();
+function isTrackingActive(tracking) {
+  return tracking?.enabled !== false;
+}
 function LessonkitProvider(props) {
   const config = props.config;
   const sessionIdRef = (0, import_react.useRef)(resolveSessionId(defaultStorage, config.session?.sessionId));
-  if (config.session?.sessionId) sessionIdRef.current = config.session.sessionId;
+  const prevConfiguredSessionIdRef = (0, import_react.useRef)(config.session?.sessionId);
+  if (config.session?.sessionId) {
+    sessionIdRef.current = config.session.sessionId;
+  } else if (prevConfiguredSessionIdRef.current) {
+    sessionIdRef.current = resolveSessionId(defaultStorage, void 0);
+  }
   const attemptIdRef = (0, import_react.useRef)(config.session?.attemptId);
   const userRef = (0, import_react.useRef)(config.session?.user);
   attemptIdRef.current = config.session?.attemptId;
@@ -339,6 +370,15 @@ function LessonkitProvider(props) {
   const lxpackBridgeModeRef = (0, import_react.useRef)(config.lxpack?.bridge ?? "auto");
   lxpackBridgeModeRef.current = config.lxpack?.bridge ?? "auto";
   const progressRef = (0, import_react.useRef)(createProgressController());
+  const courseStartedEmittedToSinkRef = (0, import_react.useRef)(false);
+  const prevCourseIdForProgressRef = (0, import_react.useRef)(config.courseId);
+  const pendingCourseIdResetRef = (0, import_react.useRef)(false);
+  if (prevCourseIdForProgressRef.current !== config.courseId) {
+    prevCourseIdForProgressRef.current = config.courseId;
+    progressRef.current = createProgressController();
+    pendingCourseIdResetRef.current = true;
+    courseStartedEmittedToSinkRef.current = false;
+  }
   const [progress, setProgress] = (0, import_react.useState)(() => progressRef.current.getState());
   const syncProgress = (0, import_react.useCallback)(() => {
     setProgress(progressRef.current.getState());
@@ -348,11 +388,16 @@ function LessonkitProvider(props) {
   const xapiQueueRef = (0, import_react.useRef)((0, import_xapi3.createInMemoryXAPIQueue)());
   const xapiRef = (0, import_react.useRef)(null);
   const [xapi, setXapi] = (0, import_react.useState)(null);
+  const prevXapiCourseIdRef = (0, import_react.useRef)(config.courseId);
   const xapiEnabled = config.xapi?.enabled;
   const xapiClient = config.xapi?.client;
   const xapiTransport = config.xapi?.transport;
   const courseId = config.courseId;
   useIsoLayoutEffect(() => {
+    if (prevXapiCourseIdRef.current !== courseId) {
+      xapiQueueRef.current = (0, import_xapi3.createInMemoryXAPIQueue)();
+      prevXapiCourseIdRef.current = courseId;
+    }
     const prev = xapiRef.current;
     const next = createXapiClientFromConfig(config, xapiQueueRef.current);
     xapiRef.current = next;
@@ -360,22 +405,21 @@ function LessonkitProvider(props) {
     if (next && !prev) {
       const sessionId = sessionIdRef.current;
       const cid = courseIdRef.current;
-      if (hasCourseStarted(defaultStorage, sessionId, cid)) {
-        try {
-          const statement = (0, import_xapi4.telemetryEventToXAPIStatement)(
-            buildTrackEvent({
-              name: "course_started",
-              courseId: cid,
-              sessionId,
-              attemptId: attemptIdRef.current,
-              user: userRef.current
-            })
-          );
-          if (statement) next.send(statement);
-        } catch {
-        }
+      try {
+        const statement = (0, import_xapi4.telemetryEventToXAPIStatement)(
+          buildTrackEvent({
+            name: "course_started",
+            courseId: cid,
+            sessionId,
+            attemptId: attemptIdRef.current,
+            user: userRef.current
+          })
+        );
+        if (statement) next.send(statement);
+      } catch {
       }
     }
+    let cancelled = false;
     void (async () => {
       if (prev) {
         try {
@@ -383,16 +427,19 @@ function LessonkitProvider(props) {
         } catch {
         }
       }
+      if (cancelled) return;
       try {
         await next?.flush();
       } catch {
       }
     })();
     return () => {
+      cancelled = true;
       void prev?.flush();
     };
   }, [xapiEnabled, xapiClient, xapiTransport, courseId]);
-  const trackingRef = (0, import_react.useRef)((0, import_core3.createTrackingClient)());
+  const trackingRef = (0, import_react.useRef)((0, import_core4.createTrackingClient)());
+  const trackingClientForUnmountRef = (0, import_react.useRef)(trackingRef.current);
   const [tracking, setTracking] = (0, import_react.useState)(() => trackingRef.current);
   const trackingEnabled = config.tracking?.enabled;
   const trackingSink = config.tracking?.sink;
@@ -402,12 +449,16 @@ function LessonkitProvider(props) {
   const batchMaxBatchSize = config.tracking?.batch?.maxBatchSize;
   useIsoLayoutEffect(() => {
     const prev = trackingRef.current;
-    const next = createTrackingClientFromConfig(config);
+    const next = createTrackingClientFromConfig({ tracking: config.tracking });
     trackingRef.current = next;
+    trackingClientForUnmountRef.current = next;
     setTracking(next);
     const sessionId = sessionIdRef.current;
     const cid = courseIdRef.current;
-    if (!hasCourseStarted(defaultStorage, sessionId, cid)) {
+    const trackingActive = isTrackingActive(config.tracking);
+    if (!trackingActive) {
+      courseStartedEmittedToSinkRef.current = false;
+    } else if (!courseStartedEmittedToSinkRef.current && !hasCourseStarted(defaultStorage, sessionId, cid)) {
       markCourseStarted(defaultStorage, sessionId, cid);
       emitTelemetry(
         next,
@@ -421,6 +472,9 @@ function LessonkitProvider(props) {
         }),
         { lxpackBridge: lxpackBridgeModeRef.current }
       );
+      courseStartedEmittedToSinkRef.current = true;
+    } else if (trackingActive) {
+      courseStartedEmittedToSinkRef.current = true;
     }
     return () => {
       if (prev !== trackingRef.current) {
@@ -459,21 +513,14 @@ function LessonkitProvider(props) {
     },
     [emitWithBridge]
   );
-  const prevCourseIdRef = (0, import_react.useRef)(config.courseId);
-  (0, import_react.useEffect)(() => {
-    if (prevCourseIdRef.current === config.courseId) return;
-    const previousActiveLesson = progressRef.current.getState().activeLessonId;
-    prevCourseIdRef.current = config.courseId;
-    progressRef.current = createProgressController();
+  (0, import_react.useLayoutEffect)(() => {
+    if (!pendingCourseIdResetRef.current) return;
+    pendingCourseIdResetRef.current = false;
     syncProgress();
-    if (previousActiveLesson) {
-      progressRef.current.setActiveLesson(previousActiveLesson, Date.now());
-      syncProgress();
-      track("lesson_started", { lessonId: previousActiveLesson }, { lessonId: previousActiveLesson });
-    }
+    if (!isTrackingActive(config.tracking)) return;
     const sessionId = sessionIdRef.current;
-    const cid = config.courseId;
-    if (!hasCourseStarted(defaultStorage, sessionId, cid)) {
+    const cid = courseIdRef.current;
+    if (!courseStartedEmittedToSinkRef.current && !hasCourseStarted(defaultStorage, sessionId, cid)) {
       markCourseStarted(defaultStorage, sessionId, cid);
       emitTelemetry(
         trackingRef.current,
@@ -487,8 +534,9 @@ function LessonkitProvider(props) {
         }),
         { lxpackBridge: lxpackBridgeModeRef.current }
       );
+      courseStartedEmittedToSinkRef.current = true;
     }
-  }, [config.courseId, syncProgress, track]);
+  }, [config.courseId, config.tracking?.enabled, syncProgress]);
   const emitLessonCompleted = (0, import_react.useCallback)(
     (lessonId, durationMs) => {
       track("lesson_completed", { lessonId, durationMs }, { lessonId });
@@ -508,16 +556,21 @@ function LessonkitProvider(props) {
     },
     [syncProgress, emitLessonCompleted]
   );
+  const unmountTimerIdsRef = (0, import_react.useRef)([]);
   (0, import_react.useEffect)(() => {
     return () => {
-      const client = trackingRef.current;
+      for (const id of unmountTimerIdsRef.current) clearTimeout(id);
+      unmountTimerIdsRef.current = [];
+      const client = trackingClientForUnmountRef.current;
       void xapiRef.current?.flush();
-      setTimeout(() => {
+      const flushTimer = setTimeout(() => {
         client?.flush?.();
-        setTimeout(() => {
+        const disposeTimer = setTimeout(() => {
           client?.dispose?.();
         }, 0);
+        unmountTimerIdsRef.current.push(disposeTimer);
       }, 0);
+      unmountTimerIdsRef.current.push(flushTimer);
     };
   }, []);
   const setActiveLesson = (0, import_react.useCallback)(
@@ -542,10 +595,34 @@ function LessonkitProvider(props) {
     if (!result.didComplete) return;
     syncProgress();
     track("course_completed");
+    void trackingRef.current?.flush?.();
   }, [track, syncProgress]);
   const sessionUser = config.session?.user;
   const sessionAttemptId = config.session?.attemptId;
   const sessionConfiguredId = config.session?.sessionId;
+  (0, import_react.useEffect)(() => {
+    const nextConfigured = config.session?.sessionId;
+    const prevConfigured = prevConfiguredSessionIdRef.current;
+    if (nextConfigured === prevConfigured) return;
+    prevConfiguredSessionIdRef.current = nextConfigured;
+    const cid = courseIdRef.current;
+    if (nextConfigured) {
+      const fromIds = /* @__PURE__ */ new Set();
+      if (prevConfigured) fromIds.add(prevConfigured);
+      const tabId = getTabSessionId(defaultStorage);
+      if (tabId) fromIds.add(tabId);
+      for (const fromId of fromIds) {
+        if (fromId !== nextConfigured) {
+          migrateCourseStartedMark(defaultStorage, fromId, nextConfigured, cid);
+        }
+      }
+      sessionIdRef.current = nextConfigured;
+    } else if (prevConfigured) {
+      const nextAuto = resolveSessionId(defaultStorage, void 0);
+      migrateCourseStartedMark(defaultStorage, prevConfigured, nextAuto, cid);
+      sessionIdRef.current = nextAuto;
+    }
+  }, [sessionConfiguredId, config.courseId]);
   const runtime = (0, import_react.useMemo)(
     () => ({
       config,
@@ -610,7 +687,7 @@ function useQuizState() {
 }
 
 // src/runtime/validateComponentId.ts
-var import_core4 = require("@lessonkit/core");
+var import_core5 = require("@lessonkit/core");
 var warnedPaths = /* @__PURE__ */ new Set();
 function isDevEnvironment2() {
   const g = globalThis;
@@ -620,7 +697,7 @@ function warnInvalidComponentId(id, path) {
   if (!isDevEnvironment2()) return;
   const key = `${path}:${String(id)}`;
   if (warnedPaths.has(key)) return;
-  const result = (0, import_core4.validateId)(id, path);
+  const result = (0, import_core5.validateId)(id, path);
   if (result.ok) return;
   warnedPaths.add(key);
   const detail = result.issues.map((i) => `${i.path}: ${i.message}`).join("; ");
@@ -698,6 +775,10 @@ function Quiz(props) {
   const [selected, setSelected] = (0, import_react3.useState)(null);
   const completedRef = (0, import_react3.useRef)(false);
   const questionId = (0, import_react3.useId)();
+  (0, import_react3.useEffect)(() => {
+    completedRef.current = false;
+    setSelected(null);
+  }, [props.checkId, props.answer, props.question]);
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("section", { "aria-label": "Quiz", "data-lk-check-id": props.checkId, children: [
     /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { id: questionId, children: props.question }),
     /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("fieldset", { "aria-labelledby": questionId, children: [

package/dist/index.js

@@ -12,7 +12,7 @@ import {
   useRef,
   useState
 } from "react";
-import { createTrackingClient } from "@lessonkit/core";
+import { createTrackingClient as createTrackingClient2 } from "@lessonkit/core";
 import { createInMemoryXAPIQueue } from "@lessonkit/xapi";
 import { telemetryEventToXAPIStatement as telemetryEventToXAPIStatement2 } from "@lessonkit/xapi";
 
@@ -55,7 +55,10 @@ function forwardTelemetryToLxpack(event, mode = "auto") {
       bridge.submitAssessment?.({
         id: data.checkId,
         score: scaled,
-        passingScore: normalizeAssessmentPassingScore(data.passingScore)
+        passingScore: normalizeAssessmentPassingScore({
+          passingScore: data.passingScore,
+          maxScore: data.maxScore
+        })
       });
       return;
     }
@@ -186,6 +189,12 @@ function createSessionStoragePort() {
         sessionStorage.setItem(key, value);
       } catch {
       }
+    },
+    removeItem: (key) => {
+      try {
+        sessionStorage.removeItem(key);
+      } catch {
+      }
     }
   };
 }
@@ -233,6 +242,8 @@ function createXapiClientFromConfig(config, queue) {
   if (config.xapi?.enabled === false) return null;
   if (config.xapi?.client) return config.xapi.client;
   if (!config.courseId) return null;
+  const hasTransport = typeof config.xapi?.transport === "function";
+  if (!hasTransport && config.xapi?.enabled !== true) return null;
   return createXAPIClient({
     courseId: config.courseId,
     transport: config.xapi?.transport,
@@ -243,6 +254,9 @@ function createXapiClientFromConfig(config, queue) {
 // src/runtime/session.ts
 import { createSessionId } from "@lessonkit/core";
 var SESSION_STORAGE_KEY = "lessonkit:sessionId";
+function getTabSessionId(storage) {
+  return storage.getItem(SESSION_STORAGE_KEY);
+}
 var COURSE_STARTED_PREFIX = "lessonkit:course_started:";
 function resolveSessionId(storage, provided) {
   if (provided) return provided;
@@ -263,30 +277,47 @@ function markCourseStarted(storage, sessionId, courseId) {
   if (!courseId) return;
   storage.setItem(courseStartedStorageKey(sessionId, courseId), "1");
 }
-
-// src/context.tsx
-import { jsx } from "react/jsx-runtime";
-var LessonkitContext = createContext(null);
-var useIsoLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
-function disposeTrackingClient(client) {
-  client?.flush?.();
-  client?.dispose?.();
+function migrateCourseStartedMark(storage, fromSessionId, toSessionId, courseId) {
+  if (!courseId || fromSessionId === toSessionId) return;
+  if (hasCourseStarted(storage, fromSessionId, courseId)) {
+    markCourseStarted(storage, toSessionId, courseId);
+    storage.removeItem?.(courseStartedStorageKey(fromSessionId, courseId));
+  }
 }
-var defaultStorage = createSessionStoragePort();
+
+// src/runtime/telemetry.ts
+import { createTrackingClient } from "@lessonkit/core";
 function createTrackingClientFromConfig(config) {
-  if (config.tracking?.enabled === false) {
-    return createTrackingClient();
-  }
+  if (config.tracking?.enabled === false) return createTrackingClient();
+  if (config.tracking?.createClient) return config.tracking.createClient();
   return createTrackingClient({
     sink: config.tracking?.sink,
     batchSink: config.tracking?.batchSink,
     batch: config.tracking?.batch
   });
 }
+function disposeTrackingClient(client) {
+  client?.flush?.();
+  client?.dispose?.();
+}
+
+// src/context.tsx
+import { jsx } from "react/jsx-runtime";
+var LessonkitContext = createContext(null);
+var useIsoLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
+var defaultStorage = createSessionStoragePort();
+function isTrackingActive(tracking) {
+  return tracking?.enabled !== false;
+}
 function LessonkitProvider(props) {
   const config = props.config;
   const sessionIdRef = useRef(resolveSessionId(defaultStorage, config.session?.sessionId));
-  if (config.session?.sessionId) sessionIdRef.current = config.session.sessionId;
+  const prevConfiguredSessionIdRef = useRef(config.session?.sessionId);
+  if (config.session?.sessionId) {
+    sessionIdRef.current = config.session.sessionId;
+  } else if (prevConfiguredSessionIdRef.current) {
+    sessionIdRef.current = resolveSessionId(defaultStorage, void 0);
+  }
   const attemptIdRef = useRef(config.session?.attemptId);
   const userRef = useRef(config.session?.user);
   attemptIdRef.current = config.session?.attemptId;
@@ -296,6 +327,15 @@ function LessonkitProvider(props) {
   const lxpackBridgeModeRef = useRef(config.lxpack?.bridge ?? "auto");
   lxpackBridgeModeRef.current = config.lxpack?.bridge ?? "auto";
   const progressRef = useRef(createProgressController());
+  const courseStartedEmittedToSinkRef = useRef(false);
+  const prevCourseIdForProgressRef = useRef(config.courseId);
+  const pendingCourseIdResetRef = useRef(false);
+  if (prevCourseIdForProgressRef.current !== config.courseId) {
+    prevCourseIdForProgressRef.current = config.courseId;
+    progressRef.current = createProgressController();
+    pendingCourseIdResetRef.current = true;
+    courseStartedEmittedToSinkRef.current = false;
+  }
   const [progress, setProgress] = useState(() => progressRef.current.getState());
   const syncProgress = useCallback(() => {
     setProgress(progressRef.current.getState());
@@ -305,11 +345,16 @@ function LessonkitProvider(props) {
   const xapiQueueRef = useRef(createInMemoryXAPIQueue());
   const xapiRef = useRef(null);
   const [xapi, setXapi] = useState(null);
+  const prevXapiCourseIdRef = useRef(config.courseId);
   const xapiEnabled = config.xapi?.enabled;
   const xapiClient = config.xapi?.client;
   const xapiTransport = config.xapi?.transport;
   const courseId = config.courseId;
   useIsoLayoutEffect(() => {
+    if (prevXapiCourseIdRef.current !== courseId) {
+      xapiQueueRef.current = createInMemoryXAPIQueue();
+      prevXapiCourseIdRef.current = courseId;
+    }
     const prev = xapiRef.current;
     const next = createXapiClientFromConfig(config, xapiQueueRef.current);
     xapiRef.current = next;
@@ -317,22 +362,21 @@ function LessonkitProvider(props) {
     if (next && !prev) {
       const sessionId = sessionIdRef.current;
       const cid = courseIdRef.current;
-      if (hasCourseStarted(defaultStorage, sessionId, cid)) {
-        try {
-          const statement = telemetryEventToXAPIStatement2(
-            buildTrackEvent({
-              name: "course_started",
-              courseId: cid,
-              sessionId,
-              attemptId: attemptIdRef.current,
-              user: userRef.current
-            })
-          );
-          if (statement) next.send(statement);
-        } catch {
-        }
+      try {
+        const statement = telemetryEventToXAPIStatement2(
+          buildTrackEvent({
+            name: "course_started",
+            courseId: cid,
+            sessionId,
+            attemptId: attemptIdRef.current,
+            user: userRef.current
+          })
+        );
+        if (statement) next.send(statement);
+      } catch {
       }
     }
+    let cancelled = false;
     void (async () => {
       if (prev) {
         try {
@@ -340,16 +384,19 @@ function LessonkitProvider(props) {
         } catch {
         }
       }
+      if (cancelled) return;
       try {
         await next?.flush();
       } catch {
       }
     })();
     return () => {
+      cancelled = true;
       void prev?.flush();
     };
   }, [xapiEnabled, xapiClient, xapiTransport, courseId]);
-  const trackingRef = useRef(createTrackingClient());
+  const trackingRef = useRef(createTrackingClient2());
+  const trackingClientForUnmountRef = useRef(trackingRef.current);
   const [tracking, setTracking] = useState(() => trackingRef.current);
   const trackingEnabled = config.tracking?.enabled;
   const trackingSink = config.tracking?.sink;
@@ -359,12 +406,16 @@ function LessonkitProvider(props) {
   const batchMaxBatchSize = config.tracking?.batch?.maxBatchSize;
   useIsoLayoutEffect(() => {
     const prev = trackingRef.current;
-    const next = createTrackingClientFromConfig(config);
+    const next = createTrackingClientFromConfig({ tracking: config.tracking });
     trackingRef.current = next;
+    trackingClientForUnmountRef.current = next;
     setTracking(next);
     const sessionId = sessionIdRef.current;
     const cid = courseIdRef.current;
-    if (!hasCourseStarted(defaultStorage, sessionId, cid)) {
+    const trackingActive = isTrackingActive(config.tracking);
+    if (!trackingActive) {
+      courseStartedEmittedToSinkRef.current = false;
+    } else if (!courseStartedEmittedToSinkRef.current && !hasCourseStarted(defaultStorage, sessionId, cid)) {
       markCourseStarted(defaultStorage, sessionId, cid);
       emitTelemetry(
         next,
@@ -378,6 +429,9 @@ function LessonkitProvider(props) {
         }),
         { lxpackBridge: lxpackBridgeModeRef.current }
       );
+      courseStartedEmittedToSinkRef.current = true;
+    } else if (trackingActive) {
+      courseStartedEmittedToSinkRef.current = true;
     }
     return () => {
       if (prev !== trackingRef.current) {
@@ -416,21 +470,14 @@ function LessonkitProvider(props) {
     },
     [emitWithBridge]
   );
-  const prevCourseIdRef = useRef(config.courseId);
-  useEffect(() => {
-    if (prevCourseIdRef.current === config.courseId) return;
-    const previousActiveLesson = progressRef.current.getState().activeLessonId;
-    prevCourseIdRef.current = config.courseId;
-    progressRef.current = createProgressController();
+  useLayoutEffect(() => {
+    if (!pendingCourseIdResetRef.current) return;
+    pendingCourseIdResetRef.current = false;
     syncProgress();
-    if (previousActiveLesson) {
-      progressRef.current.setActiveLesson(previousActiveLesson, Date.now());
-      syncProgress();
-      track("lesson_started", { lessonId: previousActiveLesson }, { lessonId: previousActiveLesson });
-    }
+    if (!isTrackingActive(config.tracking)) return;
     const sessionId = sessionIdRef.current;
-    const cid = config.courseId;
-    if (!hasCourseStarted(defaultStorage, sessionId, cid)) {
+    const cid = courseIdRef.current;
+    if (!courseStartedEmittedToSinkRef.current && !hasCourseStarted(defaultStorage, sessionId, cid)) {
       markCourseStarted(defaultStorage, sessionId, cid);
       emitTelemetry(
         trackingRef.current,
@@ -444,8 +491,9 @@ function LessonkitProvider(props) {
         }),
         { lxpackBridge: lxpackBridgeModeRef.current }
       );
+      courseStartedEmittedToSinkRef.current = true;
     }
-  }, [config.courseId, syncProgress, track]);
+  }, [config.courseId, config.tracking?.enabled, syncProgress]);
   const emitLessonCompleted = useCallback(
     (lessonId, durationMs) => {
       track("lesson_completed", { lessonId, durationMs }, { lessonId });
@@ -465,16 +513,21 @@ function LessonkitProvider(props) {
     },
     [syncProgress, emitLessonCompleted]
   );
+  const unmountTimerIdsRef = useRef([]);
   useEffect(() => {
     return () => {
-      const client = trackingRef.current;
+      for (const id of unmountTimerIdsRef.current) clearTimeout(id);
+      unmountTimerIdsRef.current = [];
+      const client = trackingClientForUnmountRef.current;
       void xapiRef.current?.flush();
-      setTimeout(() => {
+      const flushTimer = setTimeout(() => {
         client?.flush?.();
-        setTimeout(() => {
+        const disposeTimer = setTimeout(() => {
           client?.dispose?.();
         }, 0);
+        unmountTimerIdsRef.current.push(disposeTimer);
       }, 0);
+      unmountTimerIdsRef.current.push(flushTimer);
     };
   }, []);
   const setActiveLesson = useCallback(
@@ -499,10 +552,34 @@ function LessonkitProvider(props) {
     if (!result.didComplete) return;
     syncProgress();
     track("course_completed");
+    void trackingRef.current?.flush?.();
   }, [track, syncProgress]);
   const sessionUser = config.session?.user;
   const sessionAttemptId = config.session?.attemptId;
   const sessionConfiguredId = config.session?.sessionId;
+  useEffect(() => {
+    const nextConfigured = config.session?.sessionId;
+    const prevConfigured = prevConfiguredSessionIdRef.current;
+    if (nextConfigured === prevConfigured) return;
+    prevConfiguredSessionIdRef.current = nextConfigured;
+    const cid = courseIdRef.current;
+    if (nextConfigured) {
+      const fromIds = /* @__PURE__ */ new Set();
+      if (prevConfigured) fromIds.add(prevConfigured);
+      const tabId = getTabSessionId(defaultStorage);
+      if (tabId) fromIds.add(tabId);
+      for (const fromId of fromIds) {
+        if (fromId !== nextConfigured) {
+          migrateCourseStartedMark(defaultStorage, fromId, nextConfigured, cid);
+        }
+      }
+      sessionIdRef.current = nextConfigured;
+    } else if (prevConfigured) {
+      const nextAuto = resolveSessionId(defaultStorage, void 0);
+      migrateCourseStartedMark(defaultStorage, prevConfigured, nextAuto, cid);
+      sessionIdRef.current = nextAuto;
+    }
+  }, [sessionConfiguredId, config.courseId]);
   const runtime = useMemo(
     () => ({
       config,
@@ -655,6 +732,10 @@ function Quiz(props) {
   const [selected, setSelected] = useState2(null);
   const completedRef = useRef2(false);
   const questionId = useId();
+  useEffect2(() => {
+    completedRef.current = false;
+    setSelected(null);
+  }, [props.checkId, props.answer, props.question]);
   return /* @__PURE__ */ jsxs("section", { "aria-label": "Quiz", "data-lk-check-id": props.checkId, children: [
     /* @__PURE__ */ jsx2("p", { id: questionId, children: props.question }),
     /* @__PURE__ */ jsxs("fieldset", { "aria-labelledby": questionId, children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lessonkit/react",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "private": false,
   "description": "React components and hooks for building learning experiences with LessonKit.",
   "license": "Apache-2.0",
@@ -54,11 +54,11 @@
     "react-dom": ">=18"
   },
   "dependencies": {
-    "@lessonkit/accessibility": "0.8.0",
-    "@lessonkit/core": "0.8.0",
-    "@lessonkit/lxpack": "0.8.0",
-    "@lessonkit/themes": "0.8.0",
-    "@lessonkit/xapi": "0.8.0"
+    "@lessonkit/accessibility": "0.8.1",
+    "@lessonkit/core": "0.8.1",
+    "@lessonkit/lxpack": "0.8.1",
+    "@lessonkit/themes": "0.8.1",
+    "@lessonkit/xapi": "0.8.1"
   },
   "devDependencies": {
     "@testing-library/react": "^16.3.0",