eat-js-sdk 2.2.7 → 2.2.9

package/dist/interaction-builder.mjs

@@ -19098,31 +19098,69 @@ const decodeNbsp = (text) => text.replace(/ /g, " ").replace(/ /g,
 const stripTags = (s) => s.replace(/<[^>]+>/g, "");
 const hasHtmlTags = (s) => /<[^>]/.test(s);
 const getTagName = (tag) => tag.replace(/^<\/?([^\s>]+).*$/, "$1").toLowerCase();
+const isSuperSubTag = (tag) => {
+  const name = getTagName(tag);
+  return name === "sup" || name === "sub";
+};
 const extractHtmlWords = (htmlText) => {
-  const re = /(<\/[^>]+>)|(<[^>]+>)|([^\s<>]+)/g;
+  const re = /(\s+)|(<\/[^>]+>)|(<[^>]+>)|([^\s<>]+)/g;
   const tokens = [];
   let m;
   while ((m = re.exec(htmlText)) !== null) {
-    if (m[1]) tokens.push({ type: "close", value: m[1] });
-    else if (m[2]) tokens.push({ type: "open", value: m[2] });
-    else tokens.push({ type: "word", value: m[3] });
+    if (m[1]) tokens.push({ type: "space", value: m[1] });
+    else if (m[2]) tokens.push({ type: "close", value: m[2] });
+    else if (m[3]) tokens.push({ type: "open", value: m[3] });
+    else tokens.push({ type: "word", value: m[4] });
   }
   const words = [];
   const openStack = [];
-  for (const tok of tokens) {
+  let lastWasSpace = true;
+  let mergingIntoLast = false;
+  let mergeDepth = 0;
+  for (let i = 0; i < tokens.length; i++) {
+    const tok = tokens[i];
+    if (tok.type === "space") {
+      lastWasSpace = true;
+      continue;
+    }
     if (tok.type === "open") {
-      openStack.push(tok.value);
-    } else if (tok.type === "close") {
-      const closingName = getTagName(tok.value);
-      for (let i = openStack.length - 1; i >= 0; i--) {
-        if (getTagName(openStack[i]) === closingName) {
-          openStack.splice(i, 1);
-          break;
+      if (!lastWasSpace && isSuperSubTag(tok.value) && words.length > 0) {
+        mergingIntoLast = true;
+        mergeDepth = 1;
+        words[words.length - 1].value += tok.value;
+      } else if (mergingIntoLast) {
+        mergeDepth++;
+        words[words.length - 1].value += tok.value;
+      } else {
+        openStack.push(tok.value);
+      }
+      continue;
+    }
+    if (tok.type === "close") {
+      if (mergingIntoLast) {
+        words[words.length - 1].value += tok.value;
+        mergeDepth--;
+        if (mergeDepth <= 0) {
+          mergingIntoLast = false;
+          mergeDepth = 0;
+        }
+      } else {
+        const closingName = getTagName(tok.value);
+        for (let j = openStack.length - 1; j >= 0; j--) {
+          if (getTagName(openStack[j]) === closingName) {
+            openStack.splice(j, 1);
+            break;
+          }
         }
       }
+      continue;
+    }
+    if (mergingIntoLast) {
+      words[words.length - 1].value += tok.value;
     } else {
       words.push({ value: tok.value, openStack: [...openStack] });
     }
+    lastWasSpace = false;
   }
   return words.map(({ value, openStack: openStack2 }) => {
     const open = openStack2.join("");
@@ -19142,7 +19180,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] : "";
@@ -19418,9 +19456,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.7",
+  "version": "2.2.9",
   "change version": "2.2.0",
   "description": "Authoring tool frontend SDK",
   "contributors": [