@enspiredigital/xlms-headless 0.0.4 → 0.0.6

package/dist/hooks/useMatching.d.ts

@@ -1,16 +1,17 @@
-import { MatchingAnswer, MatchingQuestionType, MatchingSource } from '../types';
+import { MatchingAnswer, MatchingQuestionType, MatchingSource, MatchingTarget } from '../types';
 export declare function useMatching(question: MatchingQuestionType): {
     sources: MatchingSource[];
-    targets: import('..').MatchingTarget[];
+    targets: MatchingTarget[];
     answers: MatchingAnswer[];
     question: MatchingQuestionType;
     availableSources: MatchingSource[];
+    availableTargets: MatchingTarget[];
     submitted: boolean | null;
     isCorrect: boolean | null;
     attempts: number;
     canAnswer: boolean;
     select: (targetId: string, sourceId: string) => void;
-    remove: (targetId: string) => void;
+    remove: (id: string) => void;
     submit: () => {
         isCorrect: boolean;
         score: number;

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,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEhF,wBAAgB,WAAW,CAAC,QAAQ,EAAE,oBAAoB;;;;;;;;;;uBAe9B,MAAM,YAAY,MAAM;uBAaxB,MAAM;;;;;;;EA0EjC"}
+{"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;iBAa9B,MAAM;;;;;;;EAgG3B"}

package/dist/index.js

@@ -1,150 +1,164 @@
-import { useState as b, useEffect as x } from "react";
-function h() {
-  const [t, e] = b(null), [s, c] = b(null), [a, p] = b(0);
-  function w(u) {
-    t || (e(!0), c(u), p((g) => g + 1));
+import { useState as b, useEffect as B } from "react";
+function S() {
+  const [t, e] = b(null), [s, u] = b(null), [f, p] = b(0);
+  function g(l) {
+    t || (e(!0), u(l), p((C) => C + 1));
   }
-  function o() {
-    e(!1), c(null);
+  function r() {
+    e(!1), u(null);
   }
   return {
     // state
     submitted: t,
     isCorrect: s,
-    attempts: a,
+    attempts: f,
     // derived
     canAnswer: !t,
     // actions
-    submitQuestion: w,
-    resetQuestion: o
+    submitQuestion: g,
+    resetQuestion: r
   };
 }
-function B(t, e) {
+function k(t, e) {
   if (t.length !== e.length) return !1;
-  const s = new Set(t), c = new Set(e);
-  if (s.size !== c.size) return !1;
-  for (const a of s)
-    if (!c.has(a)) return !1;
+  const s = new Set(t), u = new Set(e);
+  if (s.size !== u.size) return !1;
+  for (const f of s)
+    if (!u.has(f)) return !1;
   return !0;
 }
-function M(t) {
+function V(t) {
   const {
     canAnswer: e,
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     resetQuestion: p,
-    submitQuestion: w
-  } = h(), [o, u] = b([]);
-  function g(d) {
-    u((n) => t.options.allowMultipleAnswers ? n.includes(d) ? n.filter((f) => f !== d) : [...n, d] : [d]);
+    submitQuestion: g
+  } = S(), [r, l] = b([]);
+  function C(m) {
+    l((n) => t.options.allowMultipleAnswers ? n.includes(m) ? n.filter((a) => a !== m) : [...n, m] : [m]);
   }
-  function A() {
-    if (o.length === 0) return;
-    const d = t.options.answers.reduce(
-      (f, m) => (m.is_correct && f.push(m.id), f),
+  function Q() {
+    if (r.length === 0) return;
+    const m = t.options.answers.reduce(
+      (a, d) => (d.is_correct && a.push(d.id), a),
       []
-    ), n = B(o, d);
-    w(n);
+    ), n = k(r, m);
+    g(n);
   }
-  function Q() {
-    u([]), p();
+  function h() {
+    l([]), p();
   }
   return {
     // data
     question: t,
-    selectedIds: o,
+    selectedIds: r,
     // actions
-    select: g,
-    submit: A,
-    reset: Q,
+    select: C,
+    submit: Q,
+    reset: h,
     // base
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     canAnswer: e
   };
 }
-function k(t) {
+function v(t) {
   const {
     canAnswer: e,
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     submitQuestion: p,
-    resetQuestion: w
-  } = h(), [o, u] = b([]), [g, A] = b(
+    resetQuestion: g
+  } = S(), [r, l] = b([]), [C, Q] = b(
+    []
+  ), [h, m] = b(
     []
   );
-  function Q(r, i) {
-    u((l) => [
-      ...l.filter(
-        (C) => C.targetId !== r && C.sourceId !== i
+  function n(i, c) {
+    l((o) => [
+      ...o.filter(
+        (I) => I.targetId !== i && I.sourceId !== c
       ),
-      { targetId: r, sourceId: i }
+      { targetId: i, sourceId: c }
     ]);
   }
-  function d(r) {
-    u((i) => i.filter((l) => l.targetId !== r));
+  function a(i) {
+    l(
+      (c) => c.filter((o) => o.targetId !== i || o.sourceId !== i)
+    );
   }
-  function n() {
-    let r = 0, i = !0;
-    return t.options.targets.forEach((l) => {
-      const C = o.find((S) => S.targetId === l.id), I = t.options.sources[l.content.correct_position - 1];
-      C && I && C.sourceId === I.id ? r += l.content.point : i = !1;
+  function d() {
+    let i = 0, c = !0;
+    return t.options.targets.forEach((o) => {
+      const I = r.find((M) => M.targetId === o.id), x = t.options.sources[o.content.correct_position - 1];
+      I && x && I.sourceId === x.id ? i += o.content.point : c = !1;
     }), {
-      isCorrect: i,
-      score: r,
+      isCorrect: c,
+      score: i,
       maxScore: t.options.targets.reduce(
-        (l, C) => l + C.content.point,
+        (o, I) => o + I.content.point,
         0
       )
     };
   }
-  function f() {
-    const r = n();
-    return p(r.isCorrect), r;
+  function A() {
+    const i = d();
+    return p(i.isCorrect), i;
   }
-  function m() {
-    u([]), w();
+  function w() {
+    l([]), g();
   }
-  return x(() => {
-    const r = t.options.sources.filter(
-      (i) => !o.some((l) => l.sourceId === i.id)
+  return B(() => {
+    const i = t.options.sources.filter(
+      (c) => !r.some(
+        (o) => o.sourceId === c.id || o.sourceId.includes(c.id) || c.id.includes(o.sourceId)
+      )
+    );
+    Q(i);
+  }, [r, t.options.sources]), B(() => {
+    const i = t.options.targets.filter(
+      (c) => !r.some(
+        (o) => o.targetId === c.id || o.targetId.includes(c.id) || c.id.includes(o.targetId)
+      )
     );
-    A(r);
-  }, [o, t.options.sources]), {
+    m(i);
+  }, [r, t.options.targets]), {
     // data
     sources: t.options.sources,
     targets: t.options.targets,
-    answers: o,
+    answers: r,
     question: t,
-    availableSources: g,
+    availableSources: C,
+    availableTargets: h,
     // base
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     canAnswer: e,
     // actions
-    select: Q,
-    remove: d,
-    submit: f,
-    reset: m
+    select: n,
+    remove: a,
+    submit: A,
+    reset: w
   };
 }
-function V(t) {
+function T(t) {
   const {
     canAnswer: e,
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     resetQuestion: p,
-    submitQuestion: w
-  } = h();
-  function o() {
-    w(!0);
+    submitQuestion: g
+  } = S();
+  function r() {
+    g(!0);
   }
-  function u() {
+  function l() {
     p();
   }
   return {
@@ -153,12 +167,12 @@ function V(t) {
     url: t.options.url,
     type: t.options.urlType,
     // actions
-    submit: o,
-    reset: u,
+    submit: r,
+    reset: l,
     // base
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     canAnswer: e
   };
 }
@@ -166,29 +180,29 @@ function _(t) {
   const {
     canAnswer: e,
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     submitQuestion: p,
-    resetQuestion: w
-  } = h(), [o, u] = b([]);
-  function g(n, f) {
-    e && u((m) => {
-      const r = m.findIndex((i) => i.targetId === n);
-      if (r >= 0) {
-        const i = [...m];
-        return i[r] = { targetId: n, value: f }, i;
+    resetQuestion: g
+  } = S(), [r, l] = b([]);
+  function C(n, a) {
+    e && l((d) => {
+      const A = d.findIndex((w) => w.targetId === n);
+      if (A >= 0) {
+        const w = [...d];
+        return w[A] = { targetId: n, value: a }, w;
       }
-      return [...m, { targetId: n, value: f }];
+      return [...d, { targetId: n, value: a }];
     });
   }
-  function A() {
+  function Q() {
     let n = !0;
-    if (o.length < t.options.targets.length)
+    if (r.length < t.options.targets.length)
       n = !1;
     else
-      for (const f of t.options.targets) {
-        const m = o.find((l) => l.targetId === f.id), r = m ? m.value.trim() : "", i = f.content.correct_answer.trim();
-        if (r.toLowerCase() !== i.toLowerCase()) {
+      for (const a of t.options.targets) {
+        const d = r.find((i) => i.targetId === a.id), A = d ? d.value.trim() : "", w = a.content.correct_answer.trim();
+        if (A.toLowerCase() !== w.toLowerCase()) {
           n = !1;
           break;
         }
@@ -199,48 +213,48 @@ function _(t) {
       maxScore: 1
     };
   }
-  function Q() {
-    const n = A();
+  function h() {
+    const n = Q();
     return p(n.isCorrect), n;
   }
-  function d() {
-    u([]), w();
+  function m() {
+    l([]), g();
   }
   return {
     // data
     targets: t.options.targets,
-    answers: o,
+    answers: r,
     question: t,
     // base
     submitted: s,
-    isCorrect: c,
-    attempts: a,
+    isCorrect: u,
+    attempts: f,
     canAnswer: e,
     // actions
-    answer: g,
-    submit: Q,
-    reset: d
+    answer: C,
+    submit: h,
+    reset: m
   };
 }
 function z({
   getData: t,
   children: e
 }) {
-  const s = M(t());
+  const s = V(t());
   return e(s);
 }
 function E({
   getData: t,
   children: e
 }) {
-  const s = k(t());
+  const s = v(t());
   return e(s);
 }
 function F({
   getData: t,
   children: e
 }) {
-  const s = V(t());
+  const s = T(t());
   return e(s);
 }
 function L({
@@ -255,10 +269,10 @@ export {
   E as MatchingQuestion,
   z as MultipleChoicesQuestion,
   F as VideoQuestion,
-  B as isSameSet,
-  h as useBaseQuestion,
+  k as isSameSet,
+  S as useBaseQuestion,
   _ as useFillInBlank,
-  k as useMatching,
-  M as useMultipleChoice,
-  V as useVideo
+  v as useMatching,
+  V as useMultipleChoice,
+  T as useVideo
 };

package/package.json

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