eat-js-sdk 2.2.6 → 2.2.8

package/dist/interaction-builder.mjs

@@ -10240,15 +10240,14 @@ create_custom_element(
 );
 var root_1$d = /* @__PURE__ */ from_html(`<p class="p2 text-red-400 mb-3">Student's answer</p>`);
 var root_3$9 = /* @__PURE__ */ from_html(`<span class="w-8 h-8 absolute right-2 top-2.5 flex items-center justify-center" aria-hidden="true"><!></span>`);
-var root_2$7 = /* @__PURE__ */ from_html(`<div class="relative"><textarea id="answerText" data-testid="input-long-txa" autocomplete="off" rows="3"></textarea> <!></div>`);
+var root_2$7 = /* @__PURE__ */ from_html(`<div class="relative"><textarea id="answerText" data-testid="input-long-txa" placeholder="Type your answer here" autocomplete="off" rows="3"></textarea> <!></div>`);
 var root_5$3 = /* @__PURE__ */ from_html(`<span class="w-8 h-8 absolute right-2 top-2.5 flex items-center justify-center" aria-hidden="true"><!></span>`);
-var root_4$1 = /* @__PURE__ */ from_html(`<div class="relative"><input data-testid="input-short-txb" autocomplete="off"/> <!></div>`);
+var root_4$1 = /* @__PURE__ */ from_html(`<div class="relative"><input data-testid="input-short-txb" autocomplete="off" placeholder="Type your answer here"/> <!></div>`);
 var root$b = /* @__PURE__ */ from_html(`<div class="relative"><!> <!></div>`);
 function TypeInTextField($$anchor, $$props) {
   push($$props, true);
   let value = prop($$props, "value", 15), variant = prop($$props, "variant", 7), readonly = prop($$props, "readonly", 7, false), disabled = prop($$props, "disabled", 7, false), showStatus = prop($$props, "showStatus", 7, false), isCorrect = prop($$props, "isCorrect", 7, null), isSkipped = prop($$props, "isSkipped", 7, false), onBlur = prop($$props, "onBlur", 7);
   let ariaLabel = /* @__PURE__ */ user_derived(() => showStatus() && isCorrect() !== null ? `Submitted response is ${isCorrect() ? "correct" : "incorrect"}` : !value() ? "Answer input: Please type your response" : "Your response is");
-  let typeinPlaceholder = /* @__PURE__ */ user_derived(() => isSkipped() ? "No answer provided" : "Type your answer here");
   const focusHandlers = useTextInputFocus();
   const handleFocus = (e2) => {
     focusHandlers.handleFocus(e2);
@@ -10334,7 +10333,7 @@ function TypeInTextField($$anchor, $$props) {
       append($$anchor2, p);
     };
     if_block(node, ($$render) => {
-      if (showStatus() && isCorrect() === false || isSkipped()) $$render(consequent);
+      if (showStatus() && !isSkipped() && isCorrect() === false) $$render(consequent);
     });
   }
   var node_1 = sibling(node, 2);
@@ -10352,8 +10351,8 @@ function TypeInTextField($$anchor, $$props) {
           var span = root_3$9();
           var node_3 = child(span);
           {
-            let $0 = /* @__PURE__ */ user_derived(() => isSkipped() ? false : Boolean(isCorrect()));
-            let $1 = /* @__PURE__ */ user_derived(() => !isSkipped() && Boolean(isCorrect()) ? "text-green-700" : "text-red-850");
+            let $0 = /* @__PURE__ */ user_derived(() => Boolean(isCorrect()));
+            let $1 = /* @__PURE__ */ user_derived(() => Boolean(isCorrect()) ? "text-green-700" : "text-red-850");
             ResultIcon(node_3, {
               get isCorrect() {
                 return get$1($0);
@@ -10367,7 +10366,7 @@ function TypeInTextField($$anchor, $$props) {
           append($$anchor3, span);
         };
         if_block(node_2, ($$render) => {
-          if (showStatus() && value() && value().trim() && isCorrect() !== null || isSkipped()) $$render(consequent_1);
+          if (showStatus() && value() && value().trim() && isCorrect() !== null) $$render(consequent_1);
         });
       }
       reset(div_1);
@@ -10376,14 +10375,13 @@ function TypeInTextField($$anchor, $$props) {
           set_class(textarea, 1, `input-long-txa typein-textbox h-32 resize-none
           ${$0 ?? ""} 
           ${showStatus() && !isSkipped() && isCorrect() === true ? "border-2 border-green-700 bg-green-400" : ""} 
-          ${showStatus() && isCorrect() === false || isSkipped() ? "border-2 border-red-850" : ""}`);
+          ${showStatus() && !isSkipped() && isCorrect() === false ? "border-2 border-red-850" : ""}`);
           set_attribute(textarea, "aria-label", get$1(ariaLabel));
           textarea.readOnly = readonly();
           textarea.disabled = disabled();
-          set_attribute(textarea, "placeholder", get$1(typeinPlaceholder));
         },
         [
-          () => showStatus() && value() && value().trim() && isCorrect() !== null || isSkipped() ? "pr-10" : ""
+          () => showStatus() && value() && value().trim() && isCorrect() !== null ? "pr-10" : ""
         ]
       );
       event("focus", textarea, handleFocus);
@@ -10404,8 +10402,8 @@ function TypeInTextField($$anchor, $$props) {
           var span_1 = root_5$3();
           var node_5 = child(span_1);
           {
-            let $0 = /* @__PURE__ */ user_derived(() => isSkipped() ? false : Boolean(isCorrect()));
-            let $1 = /* @__PURE__ */ user_derived(() => !isSkipped() && Boolean(isCorrect()) ? "text-green-700" : "text-red-850");
+            let $0 = /* @__PURE__ */ user_derived(() => Boolean(isCorrect()));
+            let $1 = /* @__PURE__ */ user_derived(() => Boolean(isCorrect()) ? "text-green-700" : "text-red-850");
             ResultIcon(node_5, {
               get isCorrect() {
                 return get$1($0);
@@ -10419,16 +10417,15 @@ function TypeInTextField($$anchor, $$props) {
           append($$anchor3, span_1);
         };
         if_block(node_4, ($$render) => {
-          if (showStatus() && value() && value().trim() && isCorrect() !== null || isSkipped()) $$render(consequent_3);
+          if (showStatus() && value() && value().trim() && isCorrect() !== null) $$render(consequent_3);
         });
       }
       reset(div_2);
       template_effect(() => {
-        set_class(input, 1, `input-short-txb typein-textbox typein-input ${showStatus() && !isSkipped() && isCorrect() === true ? "border-2 border-green-700 bg-green-400" : ""} ${showStatus() && isCorrect() === false || isSkipped() ? "border-2 border-red-850" : ""}`);
+        set_class(input, 1, `input-short-txb typein-textbox typein-input ${showStatus() && !isSkipped() && isCorrect() === true ? "border-2 border-green-700 bg-green-400" : ""} ${showStatus() && !isSkipped() && isCorrect() === false ? "border-2 border-red-850" : ""}`);
         set_attribute(input, "aria-label", get$1(ariaLabel));
         input.readOnly = readonly();
         input.disabled = disabled();
-        set_attribute(input, "placeholder", get$1(typeinPlaceholder));
       });
       event("focus", input, handleFocus);
       event("blur", input, handleBlur);
@@ -11026,7 +11023,7 @@ function TypeInFeedback($$anchor, $$props) {
     }
     return false;
   })());
-  const showHasMultipleAnswers = /* @__PURE__ */ user_derived(() => get$1(hasMultipleAnswers) && config().variant !== "inline" && (feedbackState().isSkipped || feedbackState().showStatusLine));
+  const showHasMultipleAnswers = /* @__PURE__ */ user_derived(() => feedbackState().showStatusLine && get$1(hasMultipleAnswers) && (config().variant === "short" || config().variant === "long"));
   const showFeedbackAlert = /* @__PURE__ */ user_derived(() => feedbackState().isFeedbackShown && !feedbackState().isSkipped && config().variant === "inline" && !!feedbackState().resultFeedback?.trim());
   const showInlineComparisonTable = /* @__PURE__ */ user_derived(() => feedbackState().showComparisonTable && config().variant === "inline");
   const feedbackIconType = /* @__PURE__ */ user_derived(() => isInteractiveMode2() && config().variant === "inline" ? "info" : "result");
@@ -19145,7 +19142,7 @@ const parseSentences = (rawText, correctAnswers = []) => {
     const chunks = decoded.split("<eat-sentence>");
     for (const chunk of chunks) {
       const contentfulMatch = chunk.match(
-        /((?:<(?!\/?eat-)[^>]+>)*)<eat-contentful>(.*?)<\/eat-contentful>((?:<\/[^>]+>)*)/
+        /((?:<(?!\/?eat-)[^>]+>)*)<eat-contentful>(.*?)<\/eat-contentful>([\s\S]*)/
       );
       const outerOpen = contentfulMatch ? contentfulMatch[1] : "";
       const outerClose = contentfulMatch ? contentfulMatch[3] : "";
@@ -19421,9 +19418,48 @@ function SelectableTextInteractionContent($$anchor, $$props) {
     }
   });
   const splitLastWord = (text) => {
-    const lastSpace = text.lastIndexOf(" ");
-    if (lastSpace === -1) return ["", text];
-    return [text.slice(0, lastSpace + 1), text.slice(lastSpace + 1)];
+    const tagRe = /<[^>]+>|[^<]+/g;
+    const tokens = [];
+    let m;
+    while ((m = tagRe.exec(text)) !== null) {
+      tokens.push({ isTag: m[0].startsWith("<"), value: m[0] });
+    }
+    let splitTi = -1;
+    let splitPos = -1;
+    for (let i = tokens.length - 1; i >= 0; i--) {
+      if (!tokens[i].isTag) {
+        const sp = tokens[i].value.lastIndexOf(" ");
+        if (sp !== -1) {
+          splitTi = i;
+          splitPos = sp;
+          break;
+        }
+      }
+    }
+    if (splitTi === -1) return ["", text];
+    const getTagName2 = (tag) => tag.replace(/^<\/?([^\s>/]+).*$/, "$1").toLowerCase();
+    const openStack = [];
+    for (let i = 0; i < splitTi; i++) {
+      const tok = tokens[i];
+      if (!tok.isTag) continue;
+      if (tok.value.startsWith("</")) {
+        const name = getTagName2(tok.value);
+        for (let j = openStack.length - 1; j >= 0; j--) {
+          if (getTagName2(openStack[j]) === name) {
+            openStack.splice(j, 1);
+            break;
+          }
+        }
+      } else if (!tok.value.endsWith("/>")) {
+        openStack.push(tok.value);
+      }
+    }
+    const closeTags = [...openStack].reverse().map((t2) => `</${getTagName2(t2)}>`).join("");
+    const reopenTags = openStack.join("");
+    const textVal = tokens[splitTi].value;
+    const bodyText = tokens.slice(0, splitTi).map((t2) => t2.value).join("") + textVal.slice(0, splitPos + 1) + closeTags;
+    const lastWord = reopenTags + textVal.slice(splitPos + 1) + tokens.slice(splitTi + 1).map((t2) => t2.value).join("");
+    return [bodyText, lastWord];
   };
   const focusFirstSegment = () => {
     const first = get$1(passageEl)?.querySelector('[role="button"][tabindex="0"]');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eat-js-sdk",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "change version": "2.2.0",
   "description": "Authoring tool frontend SDK",
   "contributors": [