@lessonkit/react 1.0.2 → 1.1.0

package/dist/index.js

@@ -1,7 +1,30 @@
 // src/components.tsx
-import { useEffect as useEffect2, useId, useMemo as useMemo3, useRef as useRef2, useState as useState2 } from "react";
+import { useEffect as useEffect2, useId, useMemo as useMemo4, useRef as useRef2, useState as useState2 } from "react";
 import { visuallyHiddenStyle } from "@lessonkit/accessibility";
 
+// src/assessment/scoring.ts
+function resolvePassingThreshold(passingScore, maxScore) {
+  return passingScore ?? maxScore;
+}
+function meetsPassingThreshold(score, maxScore, passingScore) {
+  const threshold = resolvePassingThreshold(passingScore, maxScore);
+  return score >= threshold;
+}
+function scoreFromCustom(custom, fallbackCorrect, fallbackMax = 1, passingScore) {
+  const maxScore = custom?.maxScore ?? fallbackMax;
+  if (custom?.passed !== void 0) {
+    const score2 = custom.passed ? custom.score ?? maxScore : custom.score ?? 0;
+    return { score: score2, maxScore, passed: custom.passed };
+  }
+  if (custom?.maxScore != null && custom.maxScore > 0 && custom.score != null) {
+    const passed2 = meetsPassingThreshold(custom.score, custom.maxScore, passingScore);
+    return { score: custom.score, maxScore: custom.maxScore, passed: passed2 };
+  }
+  const score = fallbackCorrect ? maxScore : 0;
+  const passed = meetsPassingThreshold(score, maxScore, passingScore);
+  return { score, maxScore, passed };
+}
+
 // src/context.tsx
 import { createContext } from "react";
 
@@ -240,7 +263,10 @@ async function disposeTrackingClient(client) {
 }
 
 // src/provider/useLessonkitProviderRuntime.ts
-var useIsoLayoutEffect = typeof window !== "undefined" ? useLayoutEffect : useEffect;
+var useIsoLayoutEffect = (
+  /* v8 ignore next -- SSR uses useEffect when window is unavailable */
+  typeof window !== "undefined" ? useLayoutEffect : useEffect
+);
 var defaultStorage = createSessionStoragePort();
 var courseStartedTrackingFlightKey = null;
 function isTrackingActive(tracking) {
@@ -313,22 +339,15 @@ async function emitCourseStartedPipelineOnly(opts) {
 async function emitCourseStarted(opts) {
   const event = buildCourseStartedEvent(opts);
   if (event === null) return "filtered";
-  const trackingAlreadyEmitted = hasCourseStartedEmittedToTracking(
+  const tracked = await emitCourseStartedToTracking(
+    opts.tracking,
     opts.storage,
     opts.sessionId,
-    opts.courseId
+    opts.courseId,
+    event,
+    opts.shouldCommit
   );
-  if (!trackingAlreadyEmitted) {
-    const tracked = await emitCourseStartedToTracking(
-      opts.tracking,
-      opts.storage,
-      opts.sessionId,
-      opts.courseId,
-      event,
-      opts.shouldCommit
-    );
-    if (!tracked) return "failed";
-  }
+  if (!tracked) return "failed";
   return emitCourseStartedPipelineOnly({
     ...opts,
     event,
@@ -340,22 +359,15 @@ async function emitCourseStarted(opts) {
 async function emitCourseStartedToTrackingOnly(opts) {
   const event = buildCourseStartedEvent(opts);
   if (event === null) return "filtered";
-  const trackingAlreadyEmitted = hasCourseStartedEmittedToTracking(
+  const tracked = await emitCourseStartedToTracking(
+    opts.tracking,
     opts.storage,
     opts.sessionId,
-    opts.courseId
+    opts.courseId,
+    event,
+    opts.shouldCommit
   );
-  if (!trackingAlreadyEmitted) {
-    const tracked = await emitCourseStartedToTracking(
-      opts.tracking,
-      opts.storage,
-      opts.sessionId,
-      opts.courseId,
-      event,
-      opts.shouldCommit
-    );
-    if (!tracked) return "failed";
-  }
+  if (!tracked) return "failed";
   try {
     if (opts.shouldCommit && !opts.shouldCommit()) return "failed";
     await emitCourseStartedNonTrackingPipeline({
@@ -394,6 +406,9 @@ async function emitPendingCourseStarted(opts) {
     opts.sessionId,
     opts.courseId
   );
+  if (sessionStarted && trackingEmitted && pipelineDelivered) {
+    return "emitted";
+  }
   if (sessionStarted && trackingEmitted && !pipelineDelivered) {
     const event = buildCourseStartedEvent(opts);
     if (event === null) return "filtered";
@@ -597,7 +612,10 @@ function useLessonkitProviderRuntime(config) {
     const baseSink = normalizedConfig.tracking?.sink;
     const userBatchSink = normalizedConfig.tracking?.batchSink;
     assertTrackingSinkConfig(normalizedConfig.tracking);
-    const sink = pluginHostRef.current && baseSink ? pluginHostRef.current.composeTrackingSink(baseSink, buildCurrentPluginCtx) ?? baseSink : baseSink;
+    const sink = pluginHostRef.current && baseSink ? (
+      /* v8 ignore next -- composeTrackingSink may return null; fall back to base sink */
+      pluginHostRef.current.composeTrackingSink(baseSink, buildCurrentPluginCtx) ?? baseSink
+    ) : baseSink;
     const batchSink = pluginHostRef.current && userBatchSink ? async (events) => {
       const host = pluginHostRef.current;
       const ctx = buildCurrentPluginCtx();
@@ -934,7 +952,27 @@ function LessonkitProvider(props) {
 }
 
 // src/hooks.ts
-import { useContext, useMemo as useMemo2 } from "react";
+import { useContext, useMemo as useMemo3 } from "react";
+
+// src/assessment/useAssessmentState.ts
+import { useMemo as useMemo2 } from "react";
+function useAssessmentState(enclosingLessonId) {
+  const { track } = useLessonkit();
+  const trackOpts = enclosingLessonId ? { lessonId: enclosingLessonId } : void 0;
+  return useMemo2(
+    () => ({
+      answer: (data) => {
+        track("assessment_answered", data, trackOpts);
+      },
+      complete: (data) => {
+        track("assessment_completed", data, trackOpts);
+      }
+    }),
+    [track, enclosingLessonId]
+  );
+}
+
+// src/hooks.ts
 function useLessonkit() {
   const ctx = useContext(LessonkitContext);
   if (!ctx) throw new Error("LessonKit: missing LessonkitProvider");
@@ -946,16 +984,16 @@ function useProgress() {
 }
 function useTracking() {
   const { track } = useLessonkit();
-  return useMemo2(() => ({ track }), [track]);
+  return useMemo3(() => ({ track }), [track]);
 }
 function useCompletion() {
   const { completeLesson, completeCourse } = useLessonkit();
-  return useMemo2(() => ({ completeLesson, completeCourse }), [completeLesson, completeCourse]);
+  return useMemo3(() => ({ completeLesson, completeCourse }), [completeLesson, completeCourse]);
 }
 function useQuizState(enclosingLessonId) {
   const { track } = useLessonkit();
   const trackOpts = enclosingLessonId ? { lessonId: enclosingLessonId } : void 0;
-  return useMemo2(
+  return useMemo3(
     () => ({
       answer: (opts) => {
         track("quiz_answered", opts, trackOpts);
@@ -1020,8 +1058,8 @@ function resetQuizWarningsForTests() {
   warnedQuizOutsideLesson = false;
 }
 function Course(props) {
-  const courseId = useMemo3(() => normalizeComponentId(props.courseId, "courseId"), [props.courseId]);
-  const providerConfig = useMemo3(
+  const courseId = useMemo4(() => normalizeComponentId(props.courseId, "courseId"), [props.courseId]);
+  const providerConfig = useMemo4(
     () => ({ ...props.config, courseId }),
     [props.config, courseId]
   );
@@ -1031,7 +1069,7 @@ function Course(props) {
   ] }) });
 }
 function Lesson(props) {
-  const lessonId = useMemo3(() => normalizeComponentId(props.lessonId, "lessonId"), [props.lessonId]);
+  const lessonId = useMemo4(() => normalizeComponentId(props.lessonId, "lessonId"), [props.lessonId]);
   const autoComplete = props.autoCompleteOnUnmount !== false;
   const { setActiveLesson, config } = useLessonkit();
   const { completeLesson } = useCompletion();
@@ -1069,14 +1107,14 @@ function Lesson(props) {
   ] }) });
 }
 function Scenario(props) {
-  const blockId = useMemo3(
+  const blockId = useMemo4(
     () => props.blockId !== void 0 ? normalizeComponentId(props.blockId, "blockId") : void 0,
     [props.blockId]
   );
   return /* @__PURE__ */ jsx2("section", { "aria-label": "Scenario", "data-lk-block-id": blockId, children: props.children });
 }
 function Reflection(props) {
-  const blockId = useMemo3(
+  const blockId = useMemo4(
     () => props.blockId !== void 0 ? normalizeComponentId(props.blockId, "blockId") : void 0,
     [props.blockId]
   );
@@ -1139,7 +1177,7 @@ function Quiz(props) {
 }
 function QuizInner(props) {
   const { enclosingLessonId } = props;
-  const checkId = useMemo3(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const checkId = useMemo4(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
   const quiz = useQuizState(enclosingLessonId);
   const { plugins, config, session } = useLessonkit();
   const [selected, setSelected] = useState2(null);
@@ -1157,8 +1195,8 @@ function QuizInner(props) {
   const isChoiceCorrect = (choice, custom) => {
     if (!custom) return choice === props.answer;
     if (custom.passed !== void 0) return custom.passed;
-    if (custom.maxScore != null && custom.maxScore > 0) {
-      return custom.score / custom.maxScore >= 1;
+    if (custom.maxScore != null && custom.maxScore > 0 && custom.score != null) {
+      return meetsPassingThreshold(custom.score, custom.maxScore, props.passingScore);
     }
     return choice === props.answer;
   };
@@ -1208,7 +1246,7 @@ function QuizInner(props) {
                 const maxScore = custom?.maxScore ?? 1;
                 quiz.complete({
                   checkId,
-                  score: custom?.score ?? 1,
+                  score: custom?.score ?? maxScore,
                   maxScore,
                   passingScore: props.passingScore ?? maxScore
                 });
@@ -1251,6 +1289,859 @@ function ProgressTracker(props) {
   ] }) });
 }
 
+// src/blocks/TrueFalse.tsx
+import React5, { forwardRef, useEffect as useEffect4, useImperativeHandle, useMemo as useMemo6, useRef as useRef4, useState as useState3 } from "react";
+
+// src/assessment/AssessmentLessonGuard.tsx
+import { useEffect as useEffect3 } from "react";
+import { Fragment, jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+var warnedAssessmentOutsideLesson = false;
+function resetAssessmentWarningsForTests() {
+  warnedAssessmentOutsideLesson = false;
+}
+function AssessmentLessonGuard(props) {
+  const enclosingLessonId = useEnclosingLessonId();
+  const missingLesson = enclosingLessonId === void 0;
+  useEffect3(() => {
+    if (!missingLesson || isDevEnvironment4()) return;
+    if (!warnedAssessmentOutsideLesson) {
+      warnedAssessmentOutsideLesson = true;
+      console.error(
+        `[lessonkit] <${props.blockLabel}> must be wrapped in <Lesson>; assessment telemetry will not be emitted.`
+      );
+    }
+  }, [missingLesson, props.blockLabel]);
+  if (missingLesson && isDevEnvironment4()) {
+    throw new Error(`[lessonkit] <${props.blockLabel}> must be wrapped in <Lesson>`);
+  }
+  if (missingLesson) {
+    return /* @__PURE__ */ jsx3("section", { role: "alert", "aria-label": `${props.blockLabel} configuration error`, "data-lk-check-id": props.checkId, children: /* @__PURE__ */ jsxs2("p", { children: [
+      props.blockLabel,
+      " must be placed inside a Lesson."
+    ] }) });
+  }
+  return /* @__PURE__ */ jsx3(Fragment, { children: props.children(enclosingLessonId) });
+}
+
+// src/assessment/AssessmentSequenceContext.tsx
+import React4, { createContext as createContext3, useCallback as useCallback2, useContext as useContext3, useMemo as useMemo5, useRef as useRef3 } from "react";
+import { jsx as jsx4 } from "react/jsx-runtime";
+var AssessmentSequenceContext = createContext3(null);
+function AssessmentSequenceProvider({ children }) {
+  const registryRef = useRef3(/* @__PURE__ */ new Map());
+  const register = useCallback2((checkId, handle) => {
+    registryRef.current.set(checkId, handle);
+    return () => {
+      registryRef.current.delete(checkId);
+    };
+  }, []);
+  const value = useMemo5(
+    () => ({
+      register,
+      getHandles: () => registryRef.current
+    }),
+    [register]
+  );
+  return /* @__PURE__ */ jsx4(AssessmentSequenceContext.Provider, { value, children });
+}
+function useAssessmentSequenceRegistry() {
+  return useContext3(AssessmentSequenceContext);
+}
+function useRegisterAssessmentHandle(checkId, handle) {
+  const ctx = useAssessmentSequenceRegistry();
+  React4.useEffect(() => {
+    if (!ctx || !handle) return;
+    return ctx.register(checkId, handle);
+  }, [ctx, checkId, handle]);
+}
+
+// src/blocks/TrueFalse.tsx
+import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
+var INTERACTION = "trueFalse";
+function TrueFalseInner(props, ref) {
+  const { enclosingLessonId } = props;
+  const checkId = useMemo6(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const assessment = useAssessmentState(enclosingLessonId);
+  const { plugins, config, session } = useLessonkit();
+  const [selected, setSelected] = useState3(null);
+  const [selectionCorrect, setSelectionCorrect] = useState3(null);
+  const [showSolutions, setShowSolutions] = useState3(false);
+  const [passed, setPassed] = useState3(false);
+  const completedRef = useRef4(false);
+  const questionId = React5.useId();
+  const reset = () => {
+    completedRef.current = false;
+    setPassed(false);
+    setSelected(null);
+    setSelectionCorrect(null);
+    setShowSolutions(false);
+  };
+  useEffect4(() => {
+    reset();
+  }, [checkId, props.answer, props.question, config.courseId, enclosingLessonId]);
+  const handle = useMemo6(() => {
+    const maxScore = 1;
+    const score = passed ? maxScore : selected === null ? 0 : selected === props.answer ? maxScore : 0;
+    return {
+      getScore: () => score,
+      getMaxScore: () => maxScore,
+      getAnswerGiven: () => selected !== null,
+      resetTask: reset,
+      showSolutions: () => setShowSolutions(true),
+      getXAPIData: () => ({
+        checkId,
+        interactionType: INTERACTION,
+        response: selected ?? void 0,
+        correct: selected === props.answer,
+        score,
+        maxScore
+      })
+    };
+  }, [checkId, passed, props.answer, selected]);
+  useImperativeHandle(ref, () => handle, [handle]);
+  useRegisterAssessmentHandle(checkId, handle);
+  const submit = (value) => {
+    if (passed && !props.enableRetry) return;
+    setSelected(value);
+    const pluginCtx = buildPluginContext({
+      courseId: config.courseId,
+      sessionId: session.sessionId,
+      attemptId: session.attemptId,
+      user: session.user
+    });
+    const custom = plugins?.scoreAssessment(
+      { checkId, lessonId: enclosingLessonId, response: value },
+      pluginCtx
+    ) ?? null;
+    const correct = value === props.answer;
+    const scored = scoreFromCustom(custom, correct, 1, props.passingScore);
+    setSelectionCorrect(scored.passed);
+    assessment.answer({
+      checkId,
+      interactionType: INTERACTION,
+      question: props.question,
+      response: value,
+      correct: scored.passed
+    });
+    if (scored.passed && !completedRef.current) {
+      completedRef.current = true;
+      setPassed(true);
+      assessment.complete({
+        checkId,
+        interactionType: INTERACTION,
+        score: scored.score,
+        maxScore: scored.maxScore,
+        passingScore: props.passingScore ?? scored.maxScore
+      });
+    }
+  };
+  const reveal = showSolutions || passed && props.enableSolutionsButton;
+  return /* @__PURE__ */ jsxs3("section", { "aria-label": "True or False", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ jsx5("p", { id: questionId, children: props.question }),
+    /* @__PURE__ */ jsxs3("fieldset", { "aria-labelledby": questionId, children: [
+      /* @__PURE__ */ jsx5("legend", { className: "lk-visually-hidden", children: "True or False" }),
+      /* @__PURE__ */ jsxs3("label", { style: { display: "block", marginRight: "1rem" }, children: [
+        /* @__PURE__ */ jsx5(
+          "input",
+          {
+            type: "radio",
+            name: `${questionId}-tf`,
+            checked: selected === true,
+            disabled: passed && !props.enableRetry,
+            onChange: () => submit(true)
+          }
+        ),
+        "True"
+      ] }),
+      /* @__PURE__ */ jsxs3("label", { style: { display: "block" }, children: [
+        /* @__PURE__ */ jsx5(
+          "input",
+          {
+            type: "radio",
+            name: `${questionId}-tf`,
+            checked: selected === false,
+            disabled: passed && !props.enableRetry,
+            onChange: () => submit(false)
+          }
+        ),
+        "False"
+      ] })
+    ] }),
+    reveal ? /* @__PURE__ */ jsxs3("p", { children: [
+      "Correct answer: ",
+      /* @__PURE__ */ jsx5("strong", { children: props.answer ? "True" : "False" })
+    ] }) : null,
+    selected !== null && selectionCorrect !== null ? /* @__PURE__ */ jsx5("p", { role: "status", "aria-live": "polite", children: selectionCorrect ? "Correct" : "Try again" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ jsx5("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ jsx5("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+  ] });
+}
+var TrueFalseInnerForwarded = forwardRef(TrueFalseInner);
+var TrueFalse = forwardRef(function TrueFalse2(props, ref) {
+  return /* @__PURE__ */ jsx5(AssessmentLessonGuard, { blockLabel: "TrueFalse", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ jsx5(TrueFalseInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+});
+
+// src/blocks/MarkTheWords.tsx
+import React6, { forwardRef as forwardRef2, useEffect as useEffect5, useImperativeHandle as useImperativeHandle2, useMemo as useMemo7, useRef as useRef5, useState as useState4 } from "react";
+import { jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
+var INTERACTION2 = "markTheWords";
+function tokenize(text) {
+  return text.split(/(\s+)/).filter((t) => t.length > 0);
+}
+function MarkTheWordsInner(props, ref) {
+  const checkId = useMemo7(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const assessment = useAssessmentState(props.enclosingLessonId);
+  const tokens = useMemo7(() => tokenize(props.text), [props.text]);
+  const correctSet = useMemo7(
+    () => new Set(props.correctWords.map((w) => w.toLowerCase())),
+    [props.correctWords]
+  );
+  const [marked, setMarked] = useState4(() => /* @__PURE__ */ new Set());
+  const [passed, setPassed] = useState4(false);
+  const [showSolutions, setShowSolutions] = useState4(false);
+  const completedRef = useRef5(false);
+  const reset = () => {
+    completedRef.current = false;
+    setPassed(false);
+    setMarked(/* @__PURE__ */ new Set());
+    setShowSolutions(false);
+  };
+  useEffect5(() => {
+    reset();
+  }, [checkId, props.text, props.correctWords.join("\0")]);
+  const selectableIndices = useMemo7(() => {
+    const indices = [];
+    tokens.forEach((t, i) => {
+      if (!/^\s+$/.test(t) && correctSet.has(t.toLowerCase())) indices.push(i);
+    });
+    return indices;
+  }, [tokens, correctSet]);
+  const hasTargets = selectableIndices.length > 0;
+  const allMarked = hasTargets && selectableIndices.every((i) => marked.has(i));
+  const maxScore = selectableIndices.length;
+  const score = allMarked ? maxScore : marked.size;
+  const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
+  const handle = useMemo7(() => {
+    const handleMax = maxScore || 1;
+    return {
+      getScore: () => score,
+      getMaxScore: () => handleMax,
+      getAnswerGiven: () => marked.size > 0,
+      resetTask: reset,
+      showSolutions: () => setShowSolutions(true),
+      getXAPIData: () => ({
+        checkId,
+        interactionType: INTERACTION2,
+        response: [...marked].map((i) => tokens[i]),
+        correct: passedThreshold,
+        score,
+        maxScore: handleMax
+      })
+    };
+  }, [checkId, marked, maxScore, passedThreshold, score, tokens]);
+  useImperativeHandle2(ref, () => handle, [handle]);
+  useRegisterAssessmentHandle(checkId, handle);
+  const toggle = (index) => {
+    if (passed && !props.enableRetry) return;
+    setMarked((prev) => {
+      const next = new Set(prev);
+      if (next.has(index)) next.delete(index);
+      else next.add(index);
+      return next;
+    });
+  };
+  useEffect5(() => {
+    if (!hasTargets) {
+      if (isDevEnvironment4()) {
+        console.warn(
+          "[lessonkit] MarkTheWords: no tokens match correctWords",
+          props.correctWords
+        );
+      }
+      return;
+    }
+    if (!passedThreshold || completedRef.current) return;
+    completedRef.current = true;
+    setPassed(true);
+    assessment.answer({
+      checkId,
+      interactionType: INTERACTION2,
+      question: props.text,
+      response: [...marked].map((i) => tokens[i]),
+      correct: true
+    });
+    assessment.complete({
+      checkId,
+      interactionType: INTERACTION2,
+      score,
+      maxScore,
+      passingScore: props.passingScore ?? maxScore
+    });
+  }, [
+    assessment,
+    checkId,
+    hasTargets,
+    marked,
+    maxScore,
+    passedThreshold,
+    props.passingScore,
+    props.correctWords,
+    props.text,
+    score,
+    tokens
+  ]);
+  return /* @__PURE__ */ jsxs4("section", { "aria-label": "Mark the Words", "data-lk-check-id": checkId, children: [
+    !hasTargets ? /* @__PURE__ */ jsxs4("p", { role: "alert", children: [
+      "No words in this sentence match ",
+      /* @__PURE__ */ jsx6("code", { children: "correctWords" }),
+      ". Check spelling and capitalization in the source text."
+    ] }) : null,
+    /* @__PURE__ */ jsx6("p", { id: `${checkId}-hint`, children: "Select the correct words in the sentence." }),
+    /* @__PURE__ */ jsx6("p", { "aria-describedby": `${checkId}-hint`, children: tokens.map((token, i) => {
+      const isWord = !/^\s+$/.test(token);
+      const isTarget = isWord && correctSet.has(token.toLowerCase());
+      if (!isTarget) return /* @__PURE__ */ jsx6(React6.Fragment, { children: token }, i);
+      const selected = marked.has(i);
+      const solution = showSolutions || passed && props.enableSolutionsButton;
+      return /* @__PURE__ */ jsx6(
+        "button",
+        {
+          type: "button",
+          "data-testid": `mark-word-${i}`,
+          "aria-pressed": selected,
+          disabled: passed && !props.enableRetry,
+          onClick: () => toggle(i),
+          style: {
+            margin: "0 0.1em",
+            textDecoration: solution ? "underline" : void 0,
+            fontWeight: selected || solution ? "bold" : void 0
+          },
+          children: token
+        },
+        i
+      );
+    }) }),
+    allMarked ? /* @__PURE__ */ jsx6("p", { role: "status", "aria-live": "polite", children: "Correct" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ jsx6("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !showSolutions ? /* @__PURE__ */ jsx6("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+  ] });
+}
+var MarkTheWordsInnerForwarded = forwardRef2(MarkTheWordsInner);
+var MarkTheWords = forwardRef2(function MarkTheWords2(props, ref) {
+  return /* @__PURE__ */ jsx6(AssessmentLessonGuard, { blockLabel: "MarkTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ jsx6(MarkTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+});
+
+// src/blocks/FillInTheBlanks.tsx
+import React7, { forwardRef as forwardRef3, useEffect as useEffect6, useImperativeHandle as useImperativeHandle3, useMemo as useMemo8, useRef as useRef6, useState as useState5 } from "react";
+import { jsx as jsx7, jsxs as jsxs5 } from "react/jsx-runtime";
+var INTERACTION3 = "fillInBlanks";
+function parseTemplate(template) {
+  const parts = [];
+  const blanks = [];
+  const re = /\*([^*]+)\*/g;
+  let last = 0;
+  let match;
+  let n = 0;
+  while ((match = re.exec(template)) !== null) {
+    parts.push(template.slice(last, match.index));
+    const id = `blank-${n++}`;
+    blanks.push({ id, answer: match[1].trim() });
+    parts.push(id);
+    last = match.index + match[0].length;
+  }
+  parts.push(template.slice(last));
+  return { parts, blanks };
+}
+function FillInTheBlanksInner(props, ref) {
+  const checkId = useMemo8(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const assessment = useAssessmentState(props.enclosingLessonId);
+  const parsed = useMemo8(() => parseTemplate(props.template), [props.template]);
+  const blanks = props.blanks ?? parsed.blanks;
+  const [values, setValues] = useState5(
+    () => Object.fromEntries(blanks.map((b) => [b.id, ""]))
+  );
+  const [passed, setPassed] = useState5(false);
+  const [showSolutions, setShowSolutions] = useState5(false);
+  const completedRef = useRef6(false);
+  const answeredRef = useRef6(false);
+  const reset = () => {
+    completedRef.current = false;
+    answeredRef.current = false;
+    setPassed(false);
+    setValues(Object.fromEntries(blanks.map((b) => [b.id, ""])));
+    setShowSolutions(false);
+  };
+  useEffect6(() => {
+    reset();
+  }, [checkId, props.template, blanks.map((b) => b.answer).join("\0")]);
+  const hasBlanks = blanks.length > 0;
+  const allFilled = hasBlanks && blanks.every((b) => (values[b.id] ?? "").trim().length > 0);
+  let score = 0;
+  blanks.forEach((b) => {
+    if ((values[b.id] ?? "").trim().toLowerCase() === b.answer.toLowerCase()) score += 1;
+  });
+  const maxScore = blanks.length;
+  const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
+  const handle = useMemo8(() => {
+    const handleMax = maxScore || 1;
+    return {
+      getScore: () => score,
+      getMaxScore: () => handleMax,
+      getAnswerGiven: () => allFilled,
+      resetTask: reset,
+      showSolutions: () => setShowSolutions(true),
+      getXAPIData: () => ({
+        checkId,
+        interactionType: INTERACTION3,
+        response: values,
+        correct: passedThreshold,
+        score,
+        maxScore: handleMax
+      })
+    };
+  }, [allFilled, blanks.length, checkId, maxScore, passedThreshold, score, values]);
+  useImperativeHandle3(ref, () => handle, [handle]);
+  useRegisterAssessmentHandle(checkId, handle);
+  const check = () => {
+    if (!hasBlanks) {
+      if (isDevEnvironment4()) {
+        console.warn("[lessonkit] FillInTheBlanks has no blanks in template");
+      }
+      return;
+    }
+    if (!allFilled) return;
+    if (!answeredRef.current) {
+      answeredRef.current = true;
+      assessment.answer({
+        checkId,
+        interactionType: INTERACTION3,
+        question: props.template,
+        response: values,
+        correct: passedThreshold
+      });
+    }
+    if (passedThreshold && !completedRef.current) {
+      completedRef.current = true;
+      setPassed(true);
+      assessment.complete({
+        checkId,
+        interactionType: INTERACTION3,
+        score,
+        maxScore,
+        passingScore: props.passingScore ?? maxScore
+      });
+    }
+  };
+  useEffect6(() => {
+    if (!allFilled) answeredRef.current = false;
+  }, [allFilled]);
+  useEffect6(() => {
+    if (props.autoCheck && allFilled) check();
+  }, [allFilled, props.autoCheck, values, passedThreshold]);
+  const reveal = showSolutions || passed && props.enableSolutionsButton;
+  return /* @__PURE__ */ jsxs5("section", { "aria-label": "Fill in the Blanks", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ jsx7("p", { children: parsed.parts.map((part, i) => {
+      const blank = blanks.find((b) => b.id === part);
+      if (!blank) return /* @__PURE__ */ jsx7(React7.Fragment, { children: part }, i);
+      return /* @__PURE__ */ jsxs5("label", { style: { margin: "0 0.25em" }, children: [
+        /* @__PURE__ */ jsx7("span", { className: "lk-visually-hidden", children: blank.answer }),
+        /* @__PURE__ */ jsx7(
+          "input",
+          {
+            type: "text",
+            "data-testid": `blank-${blank.id}`,
+            "aria-label": `Blank ${blank.id}`,
+            value: reveal ? blank.answer : values[blank.id] ?? "",
+            readOnly: reveal,
+            disabled: passed && !props.enableRetry,
+            onChange: (e) => setValues((v) => ({ ...v, [blank.id]: e.target.value })),
+            onBlur: () => props.autoCheck && check(),
+            size: Math.max(8, blank.answer.length + 2)
+          }
+        )
+      ] }, blank.id);
+    }) }),
+    !props.autoCheck ? /* @__PURE__ */ jsx7("button", { type: "button", "data-testid": "check-blanks", disabled: !allFilled || passed, onClick: check, children: "Check" }) : null,
+    !hasBlanks ? /* @__PURE__ */ jsx7("p", { role: "alert", children: "This activity has no blanks. Add text wrapped in asterisks, e.g. The *answer* here." }) : null,
+    allFilled ? /* @__PURE__ */ jsx7("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null,
+    props.enableRetry && passed ? /* @__PURE__ */ jsx7("button", { type: "button", onClick: reset, children: "Try again" }) : null,
+    props.enableSolutionsButton && !reveal ? /* @__PURE__ */ jsx7("button", { type: "button", onClick: () => setShowSolutions(true), children: "Show solution" }) : null
+  ] });
+}
+var FillInTheBlanksInnerForwarded = forwardRef3(FillInTheBlanksInner);
+var FillInTheBlanks = forwardRef3(
+  function FillInTheBlanks2(props, ref) {
+    return /* @__PURE__ */ jsx7(AssessmentLessonGuard, { blockLabel: "FillInTheBlanks", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ jsx7(FillInTheBlanksInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+  }
+);
+
+// src/blocks/DragTheWords.tsx
+import React8, { forwardRef as forwardRef4, useEffect as useEffect7, useImperativeHandle as useImperativeHandle4, useMemo as useMemo9, useRef as useRef7, useState as useState6 } from "react";
+import { jsx as jsx8, jsxs as jsxs6 } from "react/jsx-runtime";
+var INTERACTION4 = "dragTheWords";
+function parseZones(template) {
+  const parts = [];
+  const answers = [];
+  const re = /\*([^*]+)\*/g;
+  let last = 0;
+  let match;
+  let n = 0;
+  while ((match = re.exec(template)) !== null) {
+    parts.push(template.slice(last, match.index));
+    answers.push(match[1].trim());
+    parts.push(`zone-${n++}`);
+    last = match.index + match[0].length;
+  }
+  parts.push(template.slice(last));
+  return { parts, answers };
+}
+function DragTheWordsInner(props, ref) {
+  const checkId = useMemo9(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const assessment = useAssessmentState(props.enclosingLessonId);
+  const { parts, answers } = useMemo9(() => parseZones(props.template), [props.template]);
+  const [zones, setZones] = useState6(
+    () => Object.fromEntries(answers.map((_, i) => [`zone-${i}`, ""]))
+  );
+  const [pool, setPool] = useState6(() => [...props.words]);
+  const [keyboardWord, setKeyboardWord] = useState6(null);
+  const [passed, setPassed] = useState6(false);
+  const completedRef = useRef7(false);
+  const answeredRef = useRef7(false);
+  const reset = () => {
+    completedRef.current = false;
+    answeredRef.current = false;
+    setPassed(false);
+    setZones(Object.fromEntries(answers.map((_, i) => [`zone-${i}`, ""])));
+    setPool([...props.words]);
+    setKeyboardWord(null);
+  };
+  useEffect7(() => {
+    reset();
+  }, [checkId, props.template, props.words.join("\0")]);
+  const hasZones = answers.length > 0;
+  const allFilled = hasZones && answers.every((_, i) => (zones[`zone-${i}`] ?? "").length > 0);
+  let score = 0;
+  answers.forEach((ans, i) => {
+    if ((zones[`zone-${i}`] ?? "").trim().toLowerCase() === ans.toLowerCase()) score += 1;
+  });
+  const maxScore = answers.length;
+  const passedThreshold = meetsPassingThreshold(score, maxScore || 1, props.passingScore);
+  const handle = useMemo9(() => {
+    const handleMax = maxScore || 1;
+    return {
+      getScore: () => score,
+      getMaxScore: () => handleMax,
+      getAnswerGiven: () => allFilled,
+      resetTask: reset,
+      showSolutions: () => {
+      },
+      getXAPIData: () => ({
+        checkId,
+        interactionType: INTERACTION4,
+        response: zones,
+        correct: passedThreshold,
+        score,
+        maxScore: handleMax
+      })
+    };
+  }, [allFilled, answers.length, checkId, maxScore, passedThreshold, score, zones]);
+  useImperativeHandle4(ref, () => handle, [handle]);
+  useRegisterAssessmentHandle(checkId, handle);
+  const placeInZone = (zoneId, word) => {
+    if (passed && !props.enableRetry) return;
+    const prev = zones[zoneId];
+    setZones((z) => ({ ...z, [zoneId]: word }));
+    setPool((p) => {
+      const next = p.filter((w) => w !== word);
+      if (prev) next.push(prev);
+      return next;
+    });
+    setKeyboardWord(null);
+  };
+  const onDragStart = (word) => (e) => {
+    e.dataTransfer.setData("text/plain", word);
+  };
+  const onDrop = (zoneId) => (e) => {
+    e.preventDefault();
+    const word = e.dataTransfer.getData("text/plain");
+    if (word) placeInZone(zoneId, word);
+  };
+  const check = () => {
+    if (!hasZones) {
+      if (isDevEnvironment4()) {
+        console.warn("[lessonkit] DragTheWords has no drop zones in template");
+      }
+      return;
+    }
+    if (!allFilled) return;
+    if (!answeredRef.current) {
+      answeredRef.current = true;
+      assessment.answer({
+        checkId,
+        interactionType: INTERACTION4,
+        question: props.template,
+        response: zones,
+        correct: passedThreshold
+      });
+    }
+    if (passedThreshold && !completedRef.current) {
+      completedRef.current = true;
+      setPassed(true);
+      assessment.complete({
+        checkId,
+        interactionType: INTERACTION4,
+        score,
+        maxScore,
+        passingScore: props.passingScore ?? maxScore
+      });
+    }
+  };
+  useEffect7(() => {
+    if (!allFilled) answeredRef.current = false;
+  }, [allFilled]);
+  useEffect7(() => {
+    if (props.autoCheck && allFilled) check();
+  }, [allFilled, props.autoCheck, zones, passedThreshold]);
+  return /* @__PURE__ */ jsxs6("section", { "aria-label": "Drag the Words", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ jsx8("p", { children: "Drag words into the blanks (or select a word, then activate a blank)." }),
+    /* @__PURE__ */ jsx8("div", { role: "list", "aria-label": "Word bank", "data-testid": "word-bank", children: pool.map((word) => /* @__PURE__ */ jsx8(
+      "button",
+      {
+        type: "button",
+        draggable: true,
+        "data-testid": `word-${word}`,
+        "aria-pressed": keyboardWord === word,
+        onDragStart: onDragStart(word),
+        onClick: () => setKeyboardWord(keyboardWord === word ? null : word),
+        style: { margin: "0.25rem" },
+        children: word
+      },
+      word
+    )) }),
+    /* @__PURE__ */ jsx8("p", { children: parts.map((part, i) => {
+      if (!part.startsWith("zone-")) return /* @__PURE__ */ jsx8(React8.Fragment, { children: part }, i);
+      return /* @__PURE__ */ jsx8(
+        "span",
+        {
+          role: "button",
+          tabIndex: 0,
+          "data-testid": part,
+          onDragOver: (e) => e.preventDefault(),
+          onDrop: onDrop(part),
+          onClick: () => keyboardWord && placeInZone(part, keyboardWord),
+          onKeyDown: (e) => {
+            if (e.key === "Enter" && keyboardWord) placeInZone(part, keyboardWord);
+          },
+          style: {
+            display: "inline-block",
+            minWidth: "6em",
+            border: "1px dashed currentColor",
+            padding: "0.2em 0.5em",
+            margin: "0 0.2em"
+          },
+          children: zones[part] || "___"
+        },
+        part
+      );
+    }) }),
+    /* @__PURE__ */ jsx8("button", { type: "button", "data-testid": "check-drag-words", disabled: !allFilled || passed, onClick: check, children: "Check" }),
+    !hasZones ? /* @__PURE__ */ jsx8("p", { role: "alert", children: "This activity has no drop zones. Wrap answers in asterisks in the template." }) : null,
+    allFilled ? /* @__PURE__ */ jsx8("p", { role: "status", "aria-live": "polite", children: passed || passedThreshold ? "Correct" : "Try again" }) : null
+  ] });
+}
+var DragTheWordsInnerForwarded = forwardRef4(DragTheWordsInner);
+var DragTheWords = forwardRef4(function DragTheWords2(props, ref) {
+  return /* @__PURE__ */ jsx8(AssessmentLessonGuard, { blockLabel: "DragTheWords", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ jsx8(DragTheWordsInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+});
+
+// src/blocks/DragAndDrop.tsx
+import { forwardRef as forwardRef5, useEffect as useEffect8, useImperativeHandle as useImperativeHandle5, useMemo as useMemo10, useRef as useRef8, useState as useState7 } from "react";
+import { jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
+var INTERACTION5 = "dragAndDrop";
+function DragAndDropInner(props, ref) {
+  const checkId = useMemo10(() => normalizeComponentId(props.checkId, "checkId"), [props.checkId]);
+  const assessment = useAssessmentState(props.enclosingLessonId);
+  const [assignments, setAssignments] = useState7(
+    () => Object.fromEntries(props.targets.map((t) => [t.id, ""]))
+  );
+  const [pool, setPool] = useState7(() => props.items.map((i) => i.id));
+  const [keyboardItem, setKeyboardItem] = useState7(null);
+  const [passed, setPassed] = useState7(false);
+  const completedRef = useRef8(false);
+  const reset = () => {
+    completedRef.current = false;
+    setPassed(false);
+    setAssignments(Object.fromEntries(props.targets.map((t) => [t.id, ""])));
+    setPool(props.items.map((i) => i.id));
+    setKeyboardItem(null);
+  };
+  useEffect8(() => {
+    reset();
+  }, [checkId, props.items.map((i) => i.id).join(","), props.targets.map((t) => t.id).join(",")]);
+  const allFilled = props.targets.every((t) => (assignments[t.id] ?? "").length > 0);
+  const allCorrect = props.targets.every((t) => assignments[t.id] === t.accepts);
+  const handle = useMemo10(() => {
+    const maxScore = props.targets.length || 1;
+    let score = 0;
+    props.targets.forEach((t) => {
+      if (assignments[t.id] === t.accepts) score += 1;
+    });
+    return {
+      getScore: () => score,
+      getMaxScore: () => maxScore,
+      getAnswerGiven: () => allFilled,
+      resetTask: reset,
+      showSolutions: () => {
+      },
+      getXAPIData: () => ({
+        checkId,
+        interactionType: INTERACTION5,
+        response: assignments,
+        correct: allCorrect,
+        score,
+        maxScore
+      })
+    };
+  }, [allCorrect, allFilled, assignments, checkId, props.targets]);
+  useImperativeHandle5(ref, () => handle, [handle]);
+  useRegisterAssessmentHandle(checkId, handle);
+  const place = (targetId, itemId) => {
+    if (passed && !props.enableRetry) return;
+    const prev = assignments[targetId];
+    setAssignments((a) => ({ ...a, [targetId]: itemId }));
+    setPool((p) => {
+      const next = p.filter((id) => id !== itemId);
+      if (prev) next.push(prev);
+      return next;
+    });
+    setKeyboardItem(null);
+  };
+  const check = () => {
+    if (!allFilled) return;
+    assessment.answer({
+      checkId,
+      interactionType: INTERACTION5,
+      response: assignments,
+      correct: allCorrect
+    });
+    if (allCorrect && !completedRef.current) {
+      completedRef.current = true;
+      setPassed(true);
+      assessment.complete({
+        checkId,
+        interactionType: INTERACTION5,
+        score: props.targets.length,
+        maxScore: props.targets.length,
+        passingScore: props.passingScore ?? props.targets.length
+      });
+    }
+  };
+  return /* @__PURE__ */ jsxs7("section", { "aria-label": "Drag and Drop", "data-lk-check-id": checkId, children: [
+    /* @__PURE__ */ jsx9("p", { children: "Match each item to the correct target (drag or use keyboard: select item, then activate target)." }),
+    /* @__PURE__ */ jsx9("div", { role: "list", "aria-label": "Draggable items", children: pool.map((id) => {
+      const item = props.items.find((i) => i.id === id);
+      return /* @__PURE__ */ jsx9(
+        "button",
+        {
+          type: "button",
+          draggable: true,
+          "data-testid": `drag-item-${id}`,
+          "aria-pressed": keyboardItem === id,
+          onDragStart: (e) => e.dataTransfer.setData("text/plain", id),
+          onClick: () => setKeyboardItem(keyboardItem === id ? null : id),
+          style: { margin: "0.25rem" },
+          children: item.label
+        },
+        id
+      );
+    }) }),
+    /* @__PURE__ */ jsx9("ul", { children: props.targets.map((target) => {
+      const assigned = assignments[target.id];
+      const label = assigned ? props.items.find((i) => i.id === assigned)?.label ?? assigned : "Drop here";
+      return /* @__PURE__ */ jsxs7("li", { children: [
+        /* @__PURE__ */ jsx9("strong", { children: target.label }),
+        " ",
+        /* @__PURE__ */ jsx9(
+          "span",
+          {
+            role: "button",
+            tabIndex: 0,
+            "data-testid": `drop-${target.id}`,
+            onDragOver: (e) => e.preventDefault(),
+            onDrop: (e) => {
+              e.preventDefault();
+              const id = e.dataTransfer.getData("text/plain");
+              if (id) place(target.id, id);
+            },
+            onClick: () => keyboardItem && place(target.id, keyboardItem),
+            onKeyDown: (e) => {
+              if (e.key === "Enter" && keyboardItem) place(target.id, keyboardItem);
+            },
+            style: {
+              display: "inline-block",
+              minWidth: "8em",
+              border: "1px dashed currentColor",
+              padding: "0.25em"
+            },
+            children: label
+          }
+        )
+      ] }, target.id);
+    }) }),
+    /* @__PURE__ */ jsx9("button", { type: "button", "data-testid": "check-drag-drop", disabled: !allFilled || passed, onClick: check, children: "Check" }),
+    allFilled ? /* @__PURE__ */ jsx9("p", { role: "status", "aria-live": "polite", children: passed || allCorrect ? "Correct" : "Try again" }) : null
+  ] });
+}
+var DragAndDropInnerForwarded = forwardRef5(DragAndDropInner);
+var DragAndDrop = forwardRef5(function DragAndDrop2(props, ref) {
+  return /* @__PURE__ */ jsx9(AssessmentLessonGuard, { blockLabel: "DragAndDrop", checkId: props.checkId, children: (lessonId) => /* @__PURE__ */ jsx9(DragAndDropInnerForwarded, { ...props, enclosingLessonId: lessonId, ref }) });
+});
+
+// src/blocks/AssessmentSequence.tsx
+import React10, { useCallback as useCallback3, useMemo as useMemo11, useState as useState8 } from "react";
+import { jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
+function AssessmentSequence(props) {
+  const sequential = props.sequential !== false;
+  const childArray = React10.Children.toArray(props.children).filter(React10.isValidElement);
+  const [index, setIndex] = useState8(0);
+  const current = childArray[index] ?? null;
+  const goNext = useCallback3(() => {
+    setIndex((i) => Math.min(i + 1, childArray.length - 1));
+  }, [childArray.length]);
+  const goPrev = useCallback3(() => {
+    setIndex((i) => Math.max(i - 1, 0));
+  }, []);
+  const progress = useMemo11(
+    () => ({ current: index + 1, total: childArray.length }),
+    [index, childArray.length]
+  );
+  if (!sequential) {
+    return /* @__PURE__ */ jsx10(AssessmentSequenceProvider, { children: /* @__PURE__ */ jsx10("section", { "aria-label": "Assessment sequence", children: props.children }) });
+  }
+  return /* @__PURE__ */ jsx10(AssessmentSequenceProvider, { children: /* @__PURE__ */ jsxs8("section", { "aria-label": "Assessment sequence", "data-testid": "assessment-sequence", children: [
+    /* @__PURE__ */ jsxs8("p", { children: [
+      "Question ",
+      progress.current,
+      " of ",
+      progress.total
+    ] }),
+    /* @__PURE__ */ jsx10("div", { "data-testid": "assessment-sequence-step", children: current }),
+    /* @__PURE__ */ jsxs8("nav", { "aria-label": "Sequence navigation", children: [
+      /* @__PURE__ */ jsx10("button", { type: "button", "data-testid": "sequence-prev", disabled: index === 0, onClick: goPrev, children: "Previous" }),
+      /* @__PURE__ */ jsx10(
+        "button",
+        {
+          type: "button",
+          "data-testid": "sequence-next",
+          disabled: index >= childArray.length - 1,
+          onClick: goNext,
+          children: "Next"
+        }
+      )
+    ] })
+  ] }) });
+}
+
 // src/index.tsx
 import {
   buildTelemetryEvent as buildTelemetryEvent2,
@@ -1263,14 +2154,14 @@ import {
 } from "@lessonkit/core";
 
 // src/theme/ThemeProvider.tsx
-import React3, {
-  createContext as createContext3,
-  useCallback as useCallback2,
-  useContext as useContext3,
+import React11, {
+  createContext as createContext4,
+  useCallback as useCallback4,
+  useContext as useContext4,
   useLayoutEffect as useLayoutEffect2,
-  useMemo as useMemo4,
-  useRef as useRef3,
-  useState as useState3
+  useMemo as useMemo12,
+  useRef as useRef9,
+  useState as useState9
 } from "react";
 import {
   brandThemeOverrides,
@@ -1297,9 +2188,12 @@ function applyCssVariables(target, vars, previousKeys) {
 }
 
 // src/theme/ThemeProvider.tsx
-import { jsx as jsx3 } from "react/jsx-runtime";
-var ThemeContext = createContext3(null);
-var useIsoLayoutEffect2 = typeof window !== "undefined" ? useLayoutEffect2 : React3.useEffect;
+import { jsx as jsx11 } from "react/jsx-runtime";
+var ThemeContext = createContext4(null);
+var useIsoLayoutEffect2 = (
+  /* v8 ignore next -- SSR uses useEffect when window is unavailable */
+  typeof window !== "undefined" ? useLayoutEffect2 : React11.useEffect
+);
 function getSystemMode() {
   if (typeof window === "undefined" || typeof window.matchMedia !== "function") {
     return "light";
@@ -1317,7 +2211,7 @@ function ThemeProvider(props) {
   const preset = props.preset ?? "default";
   const mode = props.mode ?? "light";
   const targetKind = props.target ?? "document";
-  const [resolvedMode, setResolvedMode] = useState3(
+  const [resolvedMode, setResolvedMode] = useState9(
     () => mode === "system" ? getSystemMode() : mode
   );
   useIsoLayoutEffect2(() => {
@@ -1333,20 +2227,20 @@ function ThemeProvider(props) {
     return () => mq.removeEventListener("change", onChange);
   }, [mode]);
   const dataTheme = mode === "system" ? resolvedMode : mode === "dark" ? "dark" : "light";
-  const effectiveTheme = useMemo4(() => {
+  const effectiveTheme = useMemo12(() => {
     const modeBase = resolveModeBase(mode, dataTheme);
     const base = preset === "default" ? modeBase : preset === "brand" ? mergeThemes(modeBase, brandThemeOverrides) : mergeThemes(modeBase, getPresetTheme(preset));
     return mergeThemes(base, props.theme ?? {});
   }, [preset, mode, dataTheme, props.theme]);
-  const hostRef = useRef3(null);
-  const appliedKeysRef = useRef3(/* @__PURE__ */ new Set());
+  const hostRef = useRef9(null);
+  const appliedKeysRef = useRef9(/* @__PURE__ */ new Set());
   useIsoLayoutEffect2(() => {
     if (targetKind === "document" && typeof document !== "undefined") {
       document.documentElement.setAttribute("data-lk-theme", dataTheme);
       return () => document.documentElement.removeAttribute("data-lk-theme");
     }
   }, [targetKind, dataTheme]);
-  const inject = useCallback2(() => {
+  const inject = useCallback4(() => {
     const vars = themeToCssVariables(effectiveTheme);
     const el = targetKind === "document" && typeof document !== "undefined" ? document.documentElement : hostRef.current;
     if (!el) return;
@@ -1363,7 +2257,7 @@ function ThemeProvider(props) {
       appliedKeysRef.current = /* @__PURE__ */ new Set();
     };
   }, [inject, targetKind]);
-  const value = useMemo4(
+  const value = useMemo12(
     () => ({
       theme: effectiveTheme,
       preset,
@@ -1373,12 +2267,12 @@ function ThemeProvider(props) {
     [effectiveTheme, preset, mode, dataTheme]
   );
   if (targetKind === "document") {
-    return /* @__PURE__ */ jsx3(ThemeContext.Provider, { value, children: /* @__PURE__ */ jsx3("div", { "data-lk-theme": dataTheme, style: { display: "contents" }, children: props.children }) });
+    return /* @__PURE__ */ jsx11(ThemeContext.Provider, { value, children: /* @__PURE__ */ jsx11("div", { "data-lk-theme": dataTheme, style: { display: "contents" }, children: props.children }) });
   }
-  return /* @__PURE__ */ jsx3(ThemeContext.Provider, { value, children: /* @__PURE__ */ jsx3("div", { ref: hostRef, "data-lk-theme": dataTheme, children: props.children }) });
+  return /* @__PURE__ */ jsx11(ThemeContext.Provider, { value, children: /* @__PURE__ */ jsx11("div", { ref: hostRef, "data-lk-theme": dataTheme, children: props.children }) });
 }
 function useTheme() {
-  const ctx = useContext3(ThemeContext);
+  const ctx = useContext4(ThemeContext);
   if (!ctx) {
     throw new Error("useTheme must be used within a ThemeProvider");
   }
@@ -1387,6 +2281,7 @@ function useTheme() {
 
 // src/blockCatalog.ts
 var blockCatalogVersion = 1;
+var blockCatalogV2Version = 2;
 var BLOCK_CATALOG = [
   {
     type: "Course",
@@ -1573,8 +2468,163 @@ var BLOCK_CATALOG = [
     }
   }
 ];
-function buildBlockCatalog() {
-  return BLOCK_CATALOG.map((entry) => ({
+var assessmentBehaviourProps = [
+  { name: "enableRetry", type: "boolean", required: false, description: "Allow retry after completion." },
+  { name: "enableSolutionsButton", type: "boolean", required: false, description: "Show solution control." },
+  { name: "autoCheck", type: "boolean", required: false, description: "Check answers automatically when possible." },
+  { name: "passingScore", type: "number", required: false, description: "Minimum score to pass." }
+];
+var v2AssessmentEntries = [
+  {
+    type: "TrueFalse",
+    category: "assessment",
+    assessmentContract: true,
+    h5pMachineName: "H5P.TrueFalse",
+    h5pAlias: "True/False",
+    description: "Binary true/false question with assessment contract.",
+    props: [
+      { name: "checkId", type: "CheckId", required: true, description: "Stable check id." },
+      { name: "question", type: "string", required: true, description: "Question text." },
+      { name: "answer", type: "boolean", required: true, description: "Correct answer." },
+      ...assessmentBehaviourProps
+    ],
+    requiredIds: ["checkId"],
+    parentConstraints: ["Lesson", "AssessmentSequence"],
+    a11y: {
+      element: "section",
+      ariaLabel: "True or False",
+      keyboard: "Radio group with True/False options.",
+      liveRegions: "role='status' for feedback.",
+      notes: "H5P True/False equivalent."
+    },
+    theming: { surface: "global-inherit", dataAttributes: ["data-lk-check-id"], stylingNotes: "Uses data-lk-check-id." },
+    telemetry: { emits: ["assessment_answered", "assessment_completed"], requiresActiveLesson: true }
+  },
+  {
+    type: "FillInTheBlanks",
+    category: "assessment",
+    assessmentContract: true,
+    h5pMachineName: "H5P.Blanks",
+    h5pAlias: "Fill in the Blanks",
+    description: "Fill-in-the-blank text with *answer* markers in template.",
+    props: [
+      { name: "checkId", type: "CheckId", required: true, description: "Stable check id." },
+      { name: "template", type: "string", required: true, description: "Text with *blank* markers." },
+      { name: "blanks", type: "FillInBlankSpec[]", required: false, description: "Explicit blank specs." },
+      ...assessmentBehaviourProps
+    ],
+    requiredIds: ["checkId"],
+    parentConstraints: ["Lesson", "AssessmentSequence"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Fill in the Blanks",
+      keyboard: "Tab between text inputs.",
+      notes: "H5P Fill in the Blanks equivalent."
+    },
+    theming: { surface: "global-inherit", dataAttributes: ["data-lk-check-id"], stylingNotes: "Uses data-lk-check-id." },
+    telemetry: { emits: ["assessment_answered", "assessment_completed"], requiresActiveLesson: true }
+  },
+  {
+    type: "DragAndDrop",
+    category: "assessment",
+    assessmentContract: true,
+    h5pMachineName: "H5P.DragQuestion",
+    h5pAlias: "Drag and Drop",
+    description: "Drag items onto labeled targets.",
+    props: [
+      { name: "checkId", type: "CheckId", required: true, description: "Stable check id." },
+      { name: "items", type: "DragItem[]", required: true, description: "Draggable items." },
+      { name: "targets", type: "DropTarget[]", required: true, description: "Drop targets." },
+      ...assessmentBehaviourProps
+    ],
+    requiredIds: ["checkId"],
+    parentConstraints: ["Lesson", "AssessmentSequence"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Drag and Drop",
+      keyboard: "Select item then activate target; drag also supported.",
+      notes: "H5P Drag and Drop equivalent."
+    },
+    theming: { surface: "global-inherit", dataAttributes: ["data-lk-check-id"], stylingNotes: "Uses data-lk-check-id." },
+    telemetry: { emits: ["assessment_answered", "assessment_completed"], requiresActiveLesson: true }
+  },
+  {
+    type: "DragTheWords",
+    category: "assessment",
+    assessmentContract: true,
+    h5pMachineName: "H5P.DragText",
+    h5pAlias: "Drag the Words",
+    description: "Drag words into inline blanks.",
+    props: [
+      { name: "checkId", type: "CheckId", required: true, description: "Stable check id." },
+      { name: "template", type: "string", required: true, description: "Sentence with *blank* zones." },
+      { name: "words", type: "string[]", required: true, description: "Draggable word bank." },
+      ...assessmentBehaviourProps
+    ],
+    requiredIds: ["checkId"],
+    parentConstraints: ["Lesson", "AssessmentSequence"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Drag the Words",
+      keyboard: "Select word then activate zone.",
+      notes: "H5P Drag the Words equivalent."
+    },
+    theming: { surface: "global-inherit", dataAttributes: ["data-lk-check-id"], stylingNotes: "Uses data-lk-check-id." },
+    telemetry: { emits: ["assessment_answered", "assessment_completed"], requiresActiveLesson: true }
+  },
+  {
+    type: "MarkTheWords",
+    category: "assessment",
+    assessmentContract: true,
+    h5pMachineName: "H5P.MarkTheWords",
+    h5pAlias: "Mark the Words",
+    description: "Select correct words in a sentence.",
+    props: [
+      { name: "checkId", type: "CheckId", required: true, description: "Stable check id." },
+      { name: "text", type: "string", required: true, description: "Source text." },
+      { name: "correctWords", type: "string[]", required: true, description: "Words to mark." },
+      ...assessmentBehaviourProps
+    ],
+    requiredIds: ["checkId"],
+    parentConstraints: ["Lesson", "AssessmentSequence"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Mark the Words",
+      keyboard: "Toggle words with buttons.",
+      notes: "H5P Mark the Words equivalent."
+    },
+    theming: { surface: "global-inherit", dataAttributes: ["data-lk-check-id"], stylingNotes: "Uses data-lk-check-id." },
+    telemetry: { emits: ["assessment_answered", "assessment_completed"], requiresActiveLesson: true }
+  },
+  {
+    type: "AssessmentSequence",
+    category: "container",
+    h5pMachineName: "H5P.QuestionSet",
+    h5pAlias: "Question Set",
+    description: "Ordered sequence of contract-compliant assessments.",
+    props: [
+      { name: "children", type: "ReactNode", required: true, description: "Assessment blocks." },
+      { name: "sequential", type: "boolean", required: false, description: "One question at a time." },
+      ...assessmentBehaviourProps.filter((p) => p.name !== "passingScore")
+    ],
+    requiredIds: [],
+    parentConstraints: ["Lesson"],
+    a11y: {
+      element: "section",
+      ariaLabel: "Assessment sequence",
+      keyboard: "Previous/Next navigation between steps.",
+      notes: "H5P Question Set equivalent."
+    },
+    theming: { surface: "global-inherit", stylingNotes: "Container for assessments." },
+    telemetry: { emits: [], manualTracking: "Child assessments emit assessment_* events." }
+  }
+];
+var BLOCK_CATALOG_V2 = [
+  ...BLOCK_CATALOG,
+  ...v2AssessmentEntries
+];
+function cloneCatalogEntry(entry) {
+  return {
     ...entry,
     props: entry.props.map((p) => ({ ...p })),
     aliases: entry.aliases ? [...entry.aliases] : void 0,
@@ -1589,22 +2639,37 @@ function buildBlockCatalog() {
       ...entry.telemetry,
       emits: [...entry.telemetry.emits]
     }
-  }));
+  };
+}
+function buildBlockCatalog(opts) {
+  const version = opts?.version ?? 2;
+  const source = version === 2 ? BLOCK_CATALOG_V2 : BLOCK_CATALOG;
+  return source.map((entry) => cloneCatalogEntry(entry));
 }
-function getBlockCatalogEntry(type) {
-  return BLOCK_CATALOG.find((entry) => entry.type === type || entry.aliases?.includes(type));
+function getBlockCatalogEntry(type, opts) {
+  const version = opts?.version ?? 2;
+  const source = version === 2 ? BLOCK_CATALOG_V2 : BLOCK_CATALOG;
+  return source.find((entry) => entry.type === type || entry.aliases?.includes(type));
 }
 export {
+  AssessmentSequence,
   BLOCK_CATALOG,
+  BLOCK_CATALOG_V2,
   Course,
+  DragAndDrop,
+  DragTheWords,
+  FillInTheBlanks,
   KnowledgeCheck,
   Lesson,
   LessonkitProvider,
+  MarkTheWords,
   ProgressTracker,
   Quiz,
   Reflection,
   Scenario,
   ThemeProvider,
+  TrueFalse,
+  blockCatalogV2Version,
   blockCatalogVersion,
   buildBlockCatalog,
   buildTelemetryEvent2 as buildTelemetryEvent,
@@ -1615,7 +2680,9 @@ export {
   defineLifecyclePlugin,
   defineTelemetryPlugin,
   getBlockCatalogEntry,
+  resetAssessmentWarningsForTests,
   resetQuizWarningsForTests,
+  useAssessmentState,
   useCompletion,
   useLessonkit,
   useProgress,