@doenet/doenetml-iframe 0.7.25-dev.502 → 0.7.25-dev.503

package/index.js

@@ -42078,23 +42078,71 @@ function loadMathJax(options = {}) {
   });
   return promise;
 }
+function isThenable(value) {
+  return !!value && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
+}
+function untilAborted(promise, signal) {
+  return new Promise((resolve, reject2) => {
+    promise.then(
+      (value) => {
+        if (!signal.aborted) {
+          resolve(value);
+        }
+      },
+      (reason) => {
+        if (!signal.aborted) {
+          reject2(reason);
+        }
+      }
+    );
+  });
+}
+function untilAbortedEngine(engine, signal) {
+  return new Proxy(engine, {
+    get(target, property2, receiver) {
+      const value = Reflect.get(target, property2, receiver);
+      if (property2 === "startup" && value && // MathJax 4 exposes `startup` as a callable function with the
+      // startup members attached; MathJax 3 as a plain object. Either
+      // way, the recursion is what gates `startup.promise` below.
+      (typeof value === "object" || typeof value === "function")) {
+        return untilAbortedEngine(value, signal);
+      }
+      if (property2 === "promise" && isThenable(value)) {
+        return untilAborted(Promise.resolve(value), signal);
+      }
+      if (typeof value === "function") {
+        if (property2 === "typesetClear") {
+          return (...args) => signal.aborted ? void 0 : value.apply(target, args);
+        }
+        if (property2 === "typesetPromise") {
+          return (...args) => signal.aborted ? Promise.resolve() : value.apply(target, args);
+        }
+      }
+      return value;
+    }
+  });
+}
 function MathJaxContext({
   config: config2,
   src,
   useExistingMathJax,
   timeoutMs,
   version: version2 = 4,
+  signal,
   children
 }) {
   const value = useMemo(() => {
-    const promise = loadMathJax({
+    const loaded = loadMathJax({
       config: config2,
       src,
       useExistingMathJax,
       timeoutMs
     });
+    const promise = signal ? untilAborted(loaded, signal).then(
+      (engine) => untilAbortedEngine(engine, signal)
+    ) : loaded;
     return { version: version2, promise };
-  }, [config2, src, useExistingMathJax, timeoutMs, version2]);
+  }, [config2, src, useExistingMathJax, timeoutMs, version2, signal]);
   return /* @__PURE__ */ React__default.createElement(MathJaxBaseContext.Provider, { value }, children);
 }
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
@@ -68252,6 +68300,7 @@ const virtualKeyboardState = globalThis$1?.virtualKeyboardState || {
   focusedMathInputSources: /* @__PURE__ */ new Set(),
   keyboardDomNode: null,
   keyboardReactRoot: null,
+  keyboardMathJaxAbort: null,
   registrations: [],
   lastActiveRegistrationId: null,
   nextRegistrationId: 0
@@ -68390,14 +68439,22 @@ function TrayWithSharedOpenState({
   );
 }
 function renderTray(theme, translate, direction) {
-  return /* @__PURE__ */ React__default.createElement(MathJaxContext, { config: mathjaxConfig, version: 4 }, /* @__PURE__ */ React__default.createElement(
-    TrayWithSharedOpenState,
+  return /* @__PURE__ */ React__default.createElement(
+    MathJaxContext,
     {
-      theme,
-      translate,
-      direction
-    }
-  ));
+      config: mathjaxConfig,
+      version: 4,
+      signal: virtualKeyboardState.keyboardMathJaxAbort?.signal
+    },
+    /* @__PURE__ */ React__default.createElement(
+      TrayWithSharedOpenState,
+      {
+        theme,
+        translate,
+        direction
+      }
+    )
+  );
 }
 function UniqueKeyboardTray({
   onClick,
@@ -68417,6 +68474,7 @@ function UniqueKeyboardTray({
       keyboardDomNode.id = "virtual-keyboard-dummy";
       document.body.appendChild(keyboardDomNode);
       virtualKeyboardState.keyboardDomNode = keyboardDomNode;
+      virtualKeyboardState.keyboardMathJaxAbort = new AbortController();
       const root2 = createRoot(keyboardDomNode);
       virtualKeyboardState.keyboardReactRoot = root2;
       virtualKeyboardState.handleFocusChange = () => {
@@ -68454,6 +68512,8 @@ function UniqueKeyboardTray({
           );
           virtualKeyboardState.handleFocusChange = void 0;
         }
+        virtualKeyboardState.keyboardMathJaxAbort?.abort();
+        virtualKeyboardState.keyboardMathJaxAbort = null;
         if (virtualKeyboardState.keyboardReactRoot) {
           const root2 = virtualKeyboardState.keyboardReactRoot;
           setTimeout(() => {
@@ -68534,7 +68594,7 @@ function ExternalVirtualKeyboard({
     }
   );
 }
-const version = "0.7.25-dev.502";
+const version = "0.7.25-dev.503";
 const latestDoenetmlVersion = version;
 function subscribeToPinnedTheme() {
   return () => {