@enspiredigital/xlms-headless 0.0.20 → 0.0.22

package/dist/hooks/useMatching.d.ts

@@ -10,6 +10,7 @@ export declare function useMatching(question: MatchingQuestionType): {
     isCorrect: boolean | null;
     attempts: number;
     canAnswer: boolean;
+    getTargetBySourceId: (sourceId: string) => MatchingTarget | undefined;
     select: (targetId: string, sourceId: string) => void;
     remove: (targetId: string, sourceId: string) => void;
     submit: () => {

package/dist/hooks/useMatching.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMatching.d.ts","sourceRoot":"","sources":["../../src/hooks/useMatching.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,wBAAgB,WAAW,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;uBAkB9B,MAAM,YAAY,MAAM;uBAaxB,MAAM,YAAY,MAAM;;;;;;;EAoFnD"}
+{"version":3,"file":"useMatching.d.ts","sourceRoot":"","sources":["../../src/hooks/useMatching.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,cAAc,EACd,cAAc,EACf,MAAM,UAAU,CAAC;AAGlB,wBAAgB,WAAW,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;;oCAiFjB,MAAM;uBA9DnB,MAAM,YAAY,MAAM;uBAaxB,MAAM,YAAY,MAAM;;;;;;;EA8FnD"}

package/dist/index.js

@@ -1,37 +1,37 @@
-import { useState as x, useEffect as y, useMemo as _ } from "react";
-function v() {
-  const [t, i] = x(null), [c, f] = x(null), [m, b] = x(0);
-  function w(l) {
-    i(!0), f(l), b((A) => A + 1);
+import { useState as k, useRef as E, useEffect as _, useMemo as y } from "react";
+function M() {
+  const [t, i] = k(null), [c, m] = k(null), [g, w] = k(0);
+  function C(f) {
+    i(!0), m(f), w((A) => A + 1);
   }
   function s() {
-    i(!1), f(null);
+    i(!1), m(null);
   }
   return {
     // state
     submitted: t,
     isCorrect: c,
-    attempts: m,
+    attempts: g,
     // derived
     canAnswer: !t,
     // actions
-    submitQuestion: w,
+    submitQuestion: C,
     resetQuestion: s
   };
 }
-function D(t, i) {
+function T(t, i) {
   if (t.length !== i.length) return !1;
-  const c = new Set(t), f = new Set(i);
-  if (c.size !== f.size) return !1;
-  for (const m of c)
-    if (!f.has(m)) return !1;
+  const c = new Set(t), m = new Set(i);
+  if (c.size !== m.size) return !1;
+  for (const g of c)
+    if (!m.has(g)) return !1;
   return !0;
 }
-function E(t) {
+function j(t) {
   const i = [...t];
   for (let c = i.length - 1; c > 0; c--) {
-    const f = Math.floor(Math.random() * (c + 1));
-    [i[c], i[f]] = [i[f], i[c]];
+    const m = Math.floor(Math.random() * (c + 1));
+    [i[c], i[m]] = [i[m], i[c]];
   }
   return i;
 }
@@ -39,24 +39,24 @@ function V(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    resetQuestion: b,
-    submitQuestion: w
-  } = v(), [s, l] = x([]);
-  function A(I) {
-    l((d) => t.options.allowMultipleAnswers ? d.includes(I) ? d.filter((g) => g !== I) : [...d, I] : [I]);
-  }
-  function h() {
+    isCorrect: m,
+    attempts: g,
+    resetQuestion: w,
+    submitQuestion: C
+  } = M(), [s, f] = k([]);
+  function A(h) {
+    f((p) => t.options.allowMultipleAnswers ? p.includes(h) ? p.filter((I) => I !== h) : [...p, h] : [h]);
+  }
+  function S() {
     if (s.length === 0) return;
-    const I = t.options.answers.reduce(
-      (g, p) => (p.is_correct && g.push(p.id), g),
+    const h = t.options.answers.reduce(
+      (I, b) => (b.is_correct && I.push(b.id), I),
       []
-    ), d = D(s, I);
-    w(d);
+    ), p = T(s, h);
+    C(p);
   }
-  function Q() {
-    l([]), b();
+  function x() {
+    f([]), w();
   }
   return {
     // data
@@ -64,106 +64,113 @@ function V(t) {
     selectedIds: s,
     // actions
     select: A,
-    submit: h,
-    reset: Q,
+    submit: S,
+    reset: x,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i
   };
 }
-function T(t) {
+function F(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x([]), [A, h] = x(
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k([]), [A, S] = k(
     []
-  ), [Q, I] = x(
+  ), [x, h] = k(
     []
-  );
-  function d(n, e) {
-    l((r) => [
-      ...r.filter(
-        (u) => u.targetId !== n && u.sourceId !== e
+  ), p = E([]);
+  function I(e, u) {
+    f((l) => [
+      ...l.filter(
+        (d) => d.targetId !== e && d.sourceId !== u
       ),
-      { targetId: n, sourceId: e }
+      { targetId: e, sourceId: u }
     ]);
   }
-  function g(n, e) {
-    l(
-      (r) => r.filter((u) => u.targetId !== n || u.sourceId !== e)
+  function b(e, u) {
+    f(
+      (l) => l.filter((d) => d.targetId !== e || d.sourceId !== u)
     );
   }
-  function p() {
-    let n = 0, e = !0;
-    return t.options.targets.forEach((r) => {
-      const u = s.find((C) => C.targetId === r.id), S = t.options.sources[r.content.correct_position - 1];
-      u && S && u.sourceId === S.id ? n += r.content.point : e = !1;
+  function a() {
+    let e = 0, u = !0;
+    return t.options.targets.forEach((l) => {
+      const d = s.find((v) => v.targetId === l.id), Q = t.options.sources[l.content.correct_position - 1];
+      d && Q && d.sourceId === Q.id ? e += l.content.point : u = !1;
     }), {
-      isCorrect: e,
-      score: n,
+      isCorrect: u,
+      score: e,
       maxScore: t.options.targets.reduce(
-        (r, u) => r + u.content.point,
+        (l, d) => l + d.content.point,
         0
       )
     };
   }
-  function a() {
-    const n = p();
-    return b(n.isCorrect), n;
-  }
   function o() {
-    l([]), w();
+    const e = a();
+    return w(e.isCorrect), e;
+  }
+  function r() {
+    f([]), C();
+  }
+  function n(e) {
+    const u = s.find((l) => l.sourceId === e)?.targetId;
+    return t.options.targets.find((l) => l.id === u);
   }
-  return y(() => {
-    const n = t.options.sources.filter(
-      (e) => !s.some((r) => r.sourceId === e.id)
+  return _(() => {
+    const e = t.options.sources.filter(
+      (u) => !s.some((l) => l.sourceId === u.id)
     );
-    h(n);
-  }, [s, t.options.sources]), y(() => {
-    const n = t.options.targets.filter(
-      (e) => !s.some((r) => r.targetId === e.id)
+    S(e);
+  }, [s, t.options.sources]), _(() => {
+    const e = p.current.filter(
+      (u) => !s.some((l) => l.targetId === u.id)
     );
-    I(n);
-  }, [s, t.options.targets]), {
+    h(e);
+  }, [s]), _(() => {
+    p.current = j(t.options.targets);
+  }, [t.options.targets]), {
     // data
     sources: t.options.sources,
     targets: t.options.targets,
     answers: s,
     question: t,
     availableSources: A,
-    availableTargets: Q,
+    availableTargets: x,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
-    select: d,
-    remove: g,
-    submit: a,
-    reset: o
+    getTargetBySourceId: n,
+    select: I,
+    remove: b,
+    submit: o,
+    reset: r
   };
 }
-function F(t) {
+function z(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    resetQuestion: b,
-    submitQuestion: w
-  } = v();
+    isCorrect: m,
+    attempts: g,
+    resetQuestion: w,
+    submitQuestion: C
+  } = M();
   function s() {
-    w(!0);
+    C(!0);
   }
-  function l() {
-    b();
+  function f() {
+    w();
   }
   return {
     // data
@@ -172,149 +179,149 @@ function F(t) {
     type: t.options.urlType,
     // actions
     submit: s,
-    reset: l,
+    reset: f,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i
   };
 }
-function z(t) {
+function G(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x([]), [A, h] = x(null), Q = _(() => {
-    const e = new Set(s.map((r) => r.itemId));
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k([]), [A, S] = k(null), x = y(() => {
+    const n = new Set(s.map((e) => e.itemId));
     return t.options.answers.filter(
-      (r) => !e.has(String(r.id))
+      (e) => !n.has(String(e.id))
     );
   }, [s, t.options.answers]);
-  function I(e, r) {
-    l((u) => [
+  function h(n, e) {
+    f((u) => [
       ...u.filter(
-        (C) => C.blankIndex !== r && C.itemId !== e
+        (d) => d.blankIndex !== e && d.itemId !== n
       ),
       {
-        itemId: e,
-        blankIndex: r
+        itemId: n,
+        blankIndex: e
       }
     ]);
   }
-  function d(e) {
-    l((r) => r.filter((u) => u.itemId !== e));
+  function p(n) {
+    f((e) => e.filter((u) => u.itemId !== n));
   }
-  function g(e, r) {
-    I(e, r);
+  function I(n, e) {
+    h(n, e);
   }
-  function p() {
-    let e = 0, r = !0, u = 0;
-    const S = t.correct_answers.list, C = new Map(s.map((k) => [k.blankIndex, k.itemId]));
-    return Object.entries(S).forEach(([k, M]) => {
-      const O = k, B = C.get(O);
+  function b() {
+    let n = 0, e = !0, u = 0;
+    const l = t.correct_answers.list, d = new Map(s.map((Q) => [Q.blankIndex, Q.itemId]));
+    return Object.entries(l).forEach(([Q, v]) => {
+      const O = Q, B = d.get(O);
       if (!B) {
-        r = !1;
+        e = !1;
         return;
       }
-      const L = t.options.answers.find((j) => j.id === B);
-      L && String(L.group_position) === String(M) ? (e++, u += L.point) : r = !1;
+      const L = t.options.answers.find((D) => D.id === B);
+      L && String(L.group_position) === String(v) ? (n++, u += L.point) : e = !1;
     }), {
-      isCorrect: r,
-      correctCount: e,
-      totalCount: Object.keys(S).length,
+      isCorrect: e,
+      correctCount: n,
+      totalCount: Object.keys(l).length,
       maxScore: t.metadata.points,
       score: u
     };
   }
   function a() {
-    const e = p();
-    return b(e.isCorrect), e;
+    const n = b();
+    return w(n.isCorrect), n;
   }
   function o() {
-    l([]), w();
+    f([]), C();
   }
-  function n(e) {
-    const r = s.find((u) => u.blankIndex === e)?.itemId;
-    return t.options.answers.find((u) => u.id === r);
+  function r(n) {
+    const e = s.find((u) => u.blankIndex === n)?.itemId;
+    return t.options.answers.find((u) => u.id === e);
   }
   return {
     // data
     items: t.options.answers,
     groups: t.options.groups,
     answers: s,
-    availableItems: Q,
+    availableItems: x,
     question: t,
     draggingItemId: A,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
-    dropItem: I,
-    removeItem: d,
-    moveItem: g,
-    setDraggingItemId: h,
-    getItemByBlankId: n,
+    dropItem: h,
+    removeItem: p,
+    moveItem: I,
+    setDraggingItemId: S,
+    getItemByBlankId: r,
     submit: a,
     reset: o
   };
 }
-function G(t) {
+function R(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x(() => E(
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k(() => j(
     t.options.answers.map((o) => String(o.id))
-  )), A = _(() => s.map(
-    (o) => t.options.answers.find((n) => String(n.id) === o)
+  )), A = y(() => s.map(
+    (o) => t.options.answers.find((r) => String(r.id) === o)
   ).filter((o) => o !== void 0), [s, t.options.answers]);
-  function h(o, n) {
-    l((e) => {
-      const r = [...e], [u] = r.splice(o, 1);
-      return r.splice(n, 0, u), r;
+  function S(o, r) {
+    f((n) => {
+      const e = [...n], [u] = e.splice(o, 1);
+      return e.splice(r, 0, u), e;
     });
   }
-  function Q(o) {
-    const n = s.indexOf(o);
-    n > 0 && h(n, n - 1);
+  function x(o) {
+    const r = s.indexOf(o);
+    r > 0 && S(r, r - 1);
   }
-  function I(o) {
-    const n = s.indexOf(o);
-    n < s.length - 1 && h(n, n + 1);
+  function h(o) {
+    const r = s.indexOf(o);
+    r < s.length - 1 && S(r, r + 1);
   }
-  function d(o, n) {
-    const e = s.indexOf(o);
-    e !== -1 && n >= 0 && n < s.length && h(e, n);
+  function p(o, r) {
+    const n = s.indexOf(o);
+    n !== -1 && r >= 0 && r < s.length && S(n, r);
   }
-  function g() {
-    let o = 0, n = !0;
-    return t.options.answers.forEach((e, r) => {
-      const u = s.indexOf(String(e.id));
-      u !== -1 && u + 1 === e.correct_position ? o += e.point : n = !1;
+  function I() {
+    let o = 0, r = !0;
+    return t.options.answers.forEach((n, e) => {
+      const u = s.indexOf(String(n.id));
+      u !== -1 && u + 1 === n.correct_position ? o += n.point : r = !1;
     }), {
-      isCorrect: n,
+      isCorrect: r,
       score: o,
       maxScore: t.options.answers.reduce(
-        (e, r) => e + r.point,
+        (n, e) => n + e.point,
         0
       )
     };
   }
-  function p() {
-    const o = g();
-    return b(o.isCorrect), o;
+  function b() {
+    const o = I();
+    return w(o.isCorrect), o;
   }
   function a() {
-    l(t.options.answers.map((o) => String(o.id))), w();
+    f(t.options.answers.map((o) => String(o.id))), C();
   }
   return {
     // data
@@ -325,16 +332,16 @@ function G(t) {
     question: t,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
-    setOrderedItemIds: l,
-    moveItem: h,
-    moveUp: Q,
-    moveDown: I,
-    moveToPosition: d,
-    submit: p,
+    setOrderedItemIds: f,
+    moveItem: S,
+    moveUp: x,
+    moveDown: h,
+    moveToPosition: p,
+    submit: b,
     reset: a
   };
 }
@@ -342,70 +349,70 @@ function W(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x([]), A = _(() => {
-    const n = new Set(s.map((e) => e.labelId));
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k([]), A = y(() => {
+    const r = new Set(s.map((n) => n.labelId));
     return t.options.labels.filter(
-      (e) => !n.has(String(e.id))
+      (n) => !r.has(String(n.id))
     );
   }, [s, t.options.labels]);
-  function h(n, e, r, u) {
-    const S = t.options.blanks.find((C) => String(C.id) === e);
-    S && l((C) => [
-      ...C.filter(
-        (M) => M.labelId !== n && M.blankId !== e
+  function S(r, n, e, u) {
+    const l = t.options.blanks.find((d) => String(d.id) === n);
+    l && f((d) => [
+      ...d.filter(
+        (v) => v.labelId !== r && v.blankId !== n
       ),
       {
-        labelId: n,
-        blankId: e,
-        x: r ?? S.coordinates.x,
-        y: u ?? S.coordinates.y
+        labelId: r,
+        blankId: n,
+        x: e ?? l.coordinates.x,
+        y: u ?? l.coordinates.y
       }
     ]);
   }
-  function Q(n) {
-    l((e) => e.filter((r) => r.labelId !== n));
+  function x(r) {
+    f((n) => n.filter((e) => e.labelId !== r));
   }
-  function I(n, e, r, u) {
-    h(n, e, r, u);
+  function h(r, n, e, u) {
+    S(r, n, e, u);
   }
-  function d(n) {
-    const e = s.find((r) => r.blankId === n);
-    return e && t.options.labels.find(
-      (r) => String(r.id) === e.labelId
+  function p(r) {
+    const n = s.find((e) => e.blankId === r);
+    return n && t.options.labels.find(
+      (e) => String(e.id) === n.labelId
     ) || null;
   }
-  function g(n) {
-    const e = s.find((r) => r.labelId === n);
-    return e ? e.blankId : null;
+  function I(r) {
+    const n = s.find((e) => e.labelId === r);
+    return n ? n.blankId : null;
   }
-  function p() {
-    let n = 0, e = !0;
-    return t.options.labels.forEach((r) => {
+  function b() {
+    let r = 0, n = !0;
+    return t.options.labels.forEach((e) => {
       const u = s.find(
-        (C) => String(C.labelId) === String(r.id)
-      ), S = t.options.blanks.find(
-        (C, k) => k + 1 === r.correct_position
+        (d) => String(d.labelId) === String(e.id)
+      ), l = t.options.blanks.find(
+        (d, Q) => Q + 1 === e.correct_position
       );
-      u && S && u.blankId === String(S.id) ? n += r.point : e = !1;
+      u && l && u.blankId === String(l.id) ? r += e.point : n = !1;
     }), {
-      isCorrect: e,
-      score: n,
+      isCorrect: n,
+      score: r,
       maxScore: t.options.labels.reduce(
-        (r, u) => r + u.point,
+        (e, u) => e + u.point,
         0
       )
     };
   }
   function a() {
-    const n = p();
-    return b(n.isCorrect), n;
+    const r = b();
+    return w(r.isCorrect), r;
   }
   function o() {
-    l([]), w();
+    f([]), C();
   }
   return {
     // data
@@ -419,15 +426,15 @@ function W(t) {
     question: t,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
-    attachLabel: h,
-    removeLabel: Q,
-    moveLabel: I,
-    getLabelAtBlank: d,
-    getBlankForLabel: g,
+    attachLabel: S,
+    removeLabel: x,
+    moveLabel: h,
+    getLabelAtBlank: p,
+    getBlankForLabel: I,
     submit: a,
     reset: o
   };
@@ -436,45 +443,45 @@ function H(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x([]);
-  function A(d, g) {
-    l((p) => {
-      const a = p.findIndex((o) => o.blankId === d);
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k([]);
+  function A(p, I) {
+    f((b) => {
+      const a = b.findIndex((o) => o.blankId === p);
       if (a >= 0) {
-        const o = [...p];
-        return o[a] = { blankId: d, value: g }, o;
+        const o = [...b];
+        return o[a] = { blankId: p, value: I }, o;
       }
-      return [...p, { blankId: d, value: g }];
+      return [...b, { blankId: p, value: I }];
     });
   }
-  function h() {
-    let d = 0, g = 0, p = 0;
+  function S() {
+    let p = 0, I = 0, b = 0;
     const a = t.correct_answers.list || {}, o = Object.keys(a).length;
-    Object.entries(a).forEach(([e, r]) => {
-      const u = String(r).trim().toLowerCase(), S = t.options.answers.find(
-        (O) => O.correct_position === Number(e)
-      ), C = S && S.point || 1;
-      p += C;
-      const k = s.find((O) => O.blankId === e);
-      (k ? String(k.value).trim().toLowerCase() : "") === u && (d += C, g++);
+    Object.entries(a).forEach(([n, e]) => {
+      const u = String(e).trim().toLowerCase(), l = t.options.answers.find(
+        (O) => O.correct_position === Number(n)
+      ), d = l && l.point || 1;
+      b += d;
+      const Q = s.find((O) => O.blankId === n);
+      (Q ? String(Q.value).trim().toLowerCase() : "") === u && (p += d, I++);
     });
-    const n = g === o && o > 0;
-    return p === 0 && o > 0 && (p = o), {
-      isCorrect: n,
-      score: Math.round(d * 100) / 100,
-      maxScore: Math.round(p * 100) / 100
+    const r = I === o && o > 0;
+    return b === 0 && o > 0 && (b = o), {
+      isCorrect: r,
+      score: Math.round(p * 100) / 100,
+      maxScore: Math.round(b * 100) / 100
     };
   }
-  function Q() {
-    const d = h();
-    return b(d.isCorrect), d;
+  function x() {
+    const p = S();
+    return w(p.isCorrect), p;
   }
-  function I() {
-    l([]), w();
+  function h() {
+    f([]), C();
   }
   return {
     // data
@@ -483,64 +490,64 @@ function H(t) {
     question: t,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
     answer: A,
-    submit: Q,
-    reset: I
+    submit: x,
+    reset: h
   };
 }
 function N(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    submitQuestion: b,
-    resetQuestion: w
-  } = v(), [s, l] = x([]);
+    isCorrect: m,
+    attempts: g,
+    submitQuestion: w,
+    resetQuestion: C
+  } = M(), [s, f] = k([]);
   function A(a, o) {
-    l((n) => {
-      const e = n.findIndex((r) => r.itemId === a);
-      if (e >= 0) {
-        const r = [...n];
-        return r[e] = { itemId: a, categoryId: o }, r;
+    f((r) => {
+      const n = r.findIndex((e) => e.itemId === a);
+      if (n >= 0) {
+        const e = [...r];
+        return e[n] = { itemId: a, categoryId: o }, e;
       }
-      return [...n, { itemId: a, categoryId: o }];
+      return [...r, { itemId: a, categoryId: o }];
     });
   }
-  function h(a) {
-    l((o) => o.filter((n) => n.itemId !== a));
+  function S(a) {
+    f((o) => o.filter((r) => r.itemId !== a));
   }
-  function Q() {
+  function x() {
     let a = 0, o = 0;
-    const e = t.correct_answers.list || {}, r = Object.keys(e).length;
+    const n = t.correct_answers.list || {}, e = Object.keys(n).length;
     let u = 0;
-    return Object.entries(e).forEach(([C, k]) => {
-      const M = t.options.items.find((L) => L.id === C), O = M ? M.point : 0;
+    return Object.entries(n).forEach(([d, Q]) => {
+      const v = t.options.items.find((L) => L.id === d), O = v ? v.point : 0;
       u += O;
-      const B = s.find((L) => L.itemId === C);
-      B && B.categoryId === k && (a += O, o++);
+      const B = s.find((L) => L.itemId === d);
+      B && B.categoryId === Q && (a += O, o++);
     }), a = Math.round(a * 100) / 100, u = Math.round(u * 100) / 100, {
-      isCorrect: o === r && r > 0,
+      isCorrect: o === e && e > 0,
       score: a,
       maxScore: u
     };
   }
-  function I() {
-    const a = Q();
-    return b(a.isCorrect), a;
+  function h() {
+    const a = x();
+    return w(a.isCorrect), a;
   }
-  function d() {
-    l([]), w();
+  function p() {
+    f([]), C();
   }
-  const g = _(() => t.options.items.filter(
+  const I = y(() => t.options.items.filter(
     (a) => !s.some((o) => o.itemId === a.id)
-  ), [t.options.items, s]), p = _(() => t.options.categories.map((a) => {
-    const o = s.filter((n) => n.categoryId === a.id).map((n) => ({
-      ...t.options.items.find((r) => r.id === n.itemId)
+  ), [t.options.items, s]), b = y(() => t.options.categories.map((a) => {
+    const o = s.filter((r) => r.categoryId === a.id).map((r) => ({
+      ...t.options.items.find((e) => e.id === r.itemId)
     }));
     return {
       ...a,
@@ -552,36 +559,36 @@ function N(t) {
     categories: t.options.categories,
     allItems: t.options.items,
     question: t,
-    categoriesWithItems: p,
+    categoriesWithItems: b,
     // state
     answers: s,
-    unassignedItems: g,
+    unassignedItems: I,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i,
     // actions
     move: A,
-    remove: h,
-    submit: I,
-    reset: d
+    remove: S,
+    submit: h,
+    reset: p
   };
 }
 function P(t) {
   const {
     canAnswer: i,
     submitted: c,
-    isCorrect: f,
-    attempts: m,
-    resetQuestion: b,
-    submitQuestion: w
-  } = v();
+    isCorrect: m,
+    attempts: g,
+    resetQuestion: w,
+    submitQuestion: C
+  } = M();
   function s() {
-    c || w(!0);
+    c || C(!0);
   }
-  function l() {
-    b();
+  function f() {
+    w();
   }
   return {
     // data
@@ -590,11 +597,11 @@ function P(t) {
     type: t.options.urlType,
     // actions
     submit: s,
-    reset: l,
+    reset: f,
     // base
     submitted: c,
-    isCorrect: f,
-    attempts: m,
+    isCorrect: m,
+    attempts: g,
     canAnswer: i
   };
 }
@@ -605,13 +612,6 @@ function J({
   const c = V(t());
   return i(c);
 }
-function R({
-  getData: t,
-  children: i
-}) {
-  const c = T(t());
-  return i(c);
-}
 function X({
   getData: t,
   children: i
@@ -637,50 +637,57 @@ function $({
   getData: t,
   children: i
 }) {
-  const c = W(t());
+  const c = R(t());
   return i(c);
 }
 function K({
   getData: t,
   children: i
 }) {
-  const c = H(t());
+  const c = W(t());
   return i(c);
 }
 function q({
   getData: t,
   children: i
 }) {
-  const c = N(t());
+  const c = H(t());
   return i(c);
 }
 function tt({
   getData: t,
   children: i
+}) {
+  const c = N(t());
+  return i(c);
+}
+function et({
+  getData: t,
+  children: i
 }) {
   const c = P(t());
   return i(c);
 }
 export {
-  Y as DragDropQuestion,
-  K as FillInBlankQuestion,
-  q as GroupingQuestion,
-  $ as LabelingQuestion,
-  R as MatchingQuestion,
+  Z as DragDropQuestion,
+  q as FillInBlankQuestion,
+  tt as GroupingQuestion,
+  K as LabelingQuestion,
+  X as MatchingQuestion,
   J as MultipleChoicesQuestion,
-  Z as OrderingQuestion,
-  tt as PowerpointQuestion,
-  X as VideoQuestion,
-  D as isSameSet,
-  E as shuffleArray,
-  v as useBaseQuestion,
-  z as useDragDrop,
+  $ as OrderingQuestion,
+  et as PowerpointQuestion,
+  Y as VideoQuestion,
+  T as isSameSet,
+  j as shuffleArray,
+  M as useBaseQuestion,
+  G as useDragDrop,
   H as useFillInBlank,
   N as useGrouping,
   W as useLabeling,
-  T as useMatching,
+  F as useMatching,
   V as useMultipleChoice,
-  G as useOrdering,
+  R as useOrdering,
   P as usePowerpoint,
-  F as useVideo
+  z as useVideo
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enspiredigital/xlms-headless",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",