@doenet/doenetml-iframe 0.7.0-beta1 → 0.7.0-beta10

package/index.d.ts

@@ -87,7 +87,7 @@ export declare type DoenetViewerIframeProps = DoenetViewerProps & {
     autodetectVersion?: boolean;
 };
 
-declare type DoenetViewerProps = Omit<React.ComponentProps<typeof DoenetViewer_2>, "doenetML" | "scrollableContainer" | "externalVirtualKeyboardProvided">;
+declare type DoenetViewerProps = Omit<React.ComponentProps<typeof DoenetViewer_2>, "doenetML" | "externalVirtualKeyboardProvided">;
 
 export { ErrorRecord }
 

package/index.js

@@ -30,6 +30,338 @@ function watchForResize(ref, getHeight, setHeight) {
     clearInterval(interval);
   };
 }
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const proxyMarker = Symbol("Comlink.proxy");
+const createEndpoint = Symbol("Comlink.endpoint");
+const releaseProxy = Symbol("Comlink.releaseProxy");
+const finalizer = Symbol("Comlink.finalizer");
+const throwMarker = Symbol("Comlink.thrown");
+const isObject$2 = (val) => typeof val === "object" && val !== null || typeof val === "function";
+const proxyTransferHandler = {
+  canHandle: (val) => isObject$2(val) && val[proxyMarker],
+  serialize(obj) {
+    const { port1, port2 } = new MessageChannel();
+    expose(obj, port1);
+    return [port2, [port2]];
+  },
+  deserialize(port) {
+    port.start();
+    return wrap$2(port);
+  }
+};
+const throwTransferHandler = {
+  canHandle: (value) => isObject$2(value) && throwMarker in value,
+  serialize({ value }) {
+    let serialized;
+    if (value instanceof Error) {
+      serialized = {
+        isError: true,
+        value: {
+          message: value.message,
+          name: value.name,
+          stack: value.stack
+        }
+      };
+    } else {
+      serialized = { isError: false, value };
+    }
+    return [serialized, []];
+  },
+  deserialize(serialized) {
+    if (serialized.isError) {
+      throw Object.assign(new Error(serialized.value.message), serialized.value);
+    }
+    throw serialized.value;
+  }
+};
+const transferHandlers = /* @__PURE__ */ new Map([
+  ["proxy", proxyTransferHandler],
+  ["throw", throwTransferHandler]
+]);
+function isAllowedOrigin(allowedOrigins, origin) {
+  for (const allowedOrigin of allowedOrigins) {
+    if (origin === allowedOrigin || allowedOrigin === "*") {
+      return true;
+    }
+    if (allowedOrigin instanceof RegExp && allowedOrigin.test(origin)) {
+      return true;
+    }
+  }
+  return false;
+}
+function expose(obj, ep = globalThis, allowedOrigins = ["*"]) {
+  ep.addEventListener("message", function callback(ev) {
+    if (!ev || !ev.data) {
+      return;
+    }
+    if (!isAllowedOrigin(allowedOrigins, ev.origin)) {
+      console.warn(`Invalid origin '${ev.origin}' for comlink proxy`);
+      return;
+    }
+    const { id: id2, type, path: path2 } = Object.assign({ path: [] }, ev.data);
+    const argumentList = (ev.data.argumentList || []).map(fromWireValue);
+    let returnValue;
+    try {
+      const parent = path2.slice(0, -1).reduce((obj2, prop) => obj2[prop], obj);
+      const rawValue = path2.reduce((obj2, prop) => obj2[prop], obj);
+      switch (type) {
+        case "GET":
+          {
+            returnValue = rawValue;
+          }
+          break;
+        case "SET":
+          {
+            parent[path2.slice(-1)[0]] = fromWireValue(ev.data.value);
+            returnValue = true;
+          }
+          break;
+        case "APPLY":
+          {
+            returnValue = rawValue.apply(parent, argumentList);
+          }
+          break;
+        case "CONSTRUCT":
+          {
+            const value = new rawValue(...argumentList);
+            returnValue = proxy(value);
+          }
+          break;
+        case "ENDPOINT":
+          {
+            const { port1, port2 } = new MessageChannel();
+            expose(obj, port2);
+            returnValue = transfer(port1, [port1]);
+          }
+          break;
+        case "RELEASE":
+          {
+            returnValue = void 0;
+          }
+          break;
+        default:
+          return;
+      }
+    } catch (value) {
+      returnValue = { value, [throwMarker]: 0 };
+    }
+    Promise.resolve(returnValue).catch((value) => {
+      return { value, [throwMarker]: 0 };
+    }).then((returnValue2) => {
+      const [wireValue, transferables] = toWireValue(returnValue2);
+      ep.postMessage(Object.assign(Object.assign({}, wireValue), { id: id2 }), transferables);
+      if (type === "RELEASE") {
+        ep.removeEventListener("message", callback);
+        closeEndPoint(ep);
+        if (finalizer in obj && typeof obj[finalizer] === "function") {
+          obj[finalizer]();
+        }
+      }
+    }).catch((error) => {
+      const [wireValue, transferables] = toWireValue({
+        value: new TypeError("Unserializable return value"),
+        [throwMarker]: 0
+      });
+      ep.postMessage(Object.assign(Object.assign({}, wireValue), { id: id2 }), transferables);
+    });
+  });
+  if (ep.start) {
+    ep.start();
+  }
+}
+function isMessagePort(endpoint) {
+  return endpoint.constructor.name === "MessagePort";
+}
+function closeEndPoint(endpoint) {
+  if (isMessagePort(endpoint))
+    endpoint.close();
+}
+function wrap$2(ep, target) {
+  const pendingListeners = /* @__PURE__ */ new Map();
+  ep.addEventListener("message", function handleMessage(ev) {
+    const { data } = ev;
+    if (!data || !data.id) {
+      return;
+    }
+    const resolver = pendingListeners.get(data.id);
+    if (!resolver) {
+      return;
+    }
+    try {
+      resolver(data);
+    } finally {
+      pendingListeners.delete(data.id);
+    }
+  });
+  return createProxy(ep, pendingListeners, [], target);
+}
+function throwIfProxyReleased(isReleased) {
+  if (isReleased) {
+    throw new Error("Proxy has been released and is not useable");
+  }
+}
+function releaseEndpoint(ep) {
+  return requestResponseMessage(ep, /* @__PURE__ */ new Map(), {
+    type: "RELEASE"
+  }).then(() => {
+    closeEndPoint(ep);
+  });
+}
+const proxyCounter = /* @__PURE__ */ new WeakMap();
+const proxyFinalizers = "FinalizationRegistry" in globalThis && new FinalizationRegistry((ep) => {
+  const newCount = (proxyCounter.get(ep) || 0) - 1;
+  proxyCounter.set(ep, newCount);
+  if (newCount === 0) {
+    releaseEndpoint(ep);
+  }
+});
+function registerProxy(proxy2, ep) {
+  const newCount = (proxyCounter.get(ep) || 0) + 1;
+  proxyCounter.set(ep, newCount);
+  if (proxyFinalizers) {
+    proxyFinalizers.register(proxy2, ep, proxy2);
+  }
+}
+function unregisterProxy(proxy2) {
+  if (proxyFinalizers) {
+    proxyFinalizers.unregister(proxy2);
+  }
+}
+function createProxy(ep, pendingListeners, path2 = [], target = function() {
+}) {
+  let isProxyReleased = false;
+  const proxy2 = new Proxy(target, {
+    get(_target, prop) {
+      throwIfProxyReleased(isProxyReleased);
+      if (prop === releaseProxy) {
+        return () => {
+          unregisterProxy(proxy2);
+          releaseEndpoint(ep);
+          pendingListeners.clear();
+          isProxyReleased = true;
+        };
+      }
+      if (prop === "then") {
+        if (path2.length === 0) {
+          return { then: () => proxy2 };
+        }
+        const r = requestResponseMessage(ep, pendingListeners, {
+          type: "GET",
+          path: path2.map((p) => p.toString())
+        }).then(fromWireValue);
+        return r.then.bind(r);
+      }
+      return createProxy(ep, pendingListeners, [...path2, prop]);
+    },
+    set(_target, prop, rawValue) {
+      throwIfProxyReleased(isProxyReleased);
+      const [value, transferables] = toWireValue(rawValue);
+      return requestResponseMessage(ep, pendingListeners, {
+        type: "SET",
+        path: [...path2, prop].map((p) => p.toString()),
+        value
+      }, transferables).then(fromWireValue);
+    },
+    apply(_target, _thisArg, rawArgumentList) {
+      throwIfProxyReleased(isProxyReleased);
+      const last2 = path2[path2.length - 1];
+      if (last2 === createEndpoint) {
+        return requestResponseMessage(ep, pendingListeners, {
+          type: "ENDPOINT"
+        }).then(fromWireValue);
+      }
+      if (last2 === "bind") {
+        return createProxy(ep, pendingListeners, path2.slice(0, -1));
+      }
+      const [argumentList, transferables] = processArguments(rawArgumentList);
+      return requestResponseMessage(ep, pendingListeners, {
+        type: "APPLY",
+        path: path2.map((p) => p.toString()),
+        argumentList
+      }, transferables).then(fromWireValue);
+    },
+    construct(_target, rawArgumentList) {
+      throwIfProxyReleased(isProxyReleased);
+      const [argumentList, transferables] = processArguments(rawArgumentList);
+      return requestResponseMessage(ep, pendingListeners, {
+        type: "CONSTRUCT",
+        path: path2.map((p) => p.toString()),
+        argumentList
+      }, transferables).then(fromWireValue);
+    }
+  });
+  registerProxy(proxy2, ep);
+  return proxy2;
+}
+function myFlat(arr) {
+  return Array.prototype.concat.apply([], arr);
+}
+function processArguments(argumentList) {
+  const processed = argumentList.map(toWireValue);
+  return [processed.map((v) => v[0]), myFlat(processed.map((v) => v[1]))];
+}
+const transferCache = /* @__PURE__ */ new WeakMap();
+function transfer(obj, transfers) {
+  transferCache.set(obj, transfers);
+  return obj;
+}
+function proxy(obj) {
+  return Object.assign(obj, { [proxyMarker]: true });
+}
+function windowEndpoint(w, context = globalThis, targetOrigin = "*") {
+  return {
+    postMessage: (msg, transferables) => w.postMessage(msg, targetOrigin, transferables),
+    addEventListener: context.addEventListener.bind(context),
+    removeEventListener: context.removeEventListener.bind(context)
+  };
+}
+function toWireValue(value) {
+  for (const [name2, handler] of transferHandlers) {
+    if (handler.canHandle(value)) {
+      const [serializedValue, transferables] = handler.serialize(value);
+      return [
+        {
+          type: "HANDLER",
+          name: name2,
+          value: serializedValue
+        },
+        transferables
+      ];
+    }
+  }
+  return [
+    {
+      type: "RAW",
+      value
+    },
+    transferCache.get(value) || []
+  ];
+}
+function fromWireValue(value) {
+  switch (value.type) {
+    case "HANDLER":
+      return transferHandlers.get(value.name).deserialize(value.value);
+    case "RAW":
+      return value.value;
+  }
+}
+function requestResponseMessage(ep, pendingListeners, msg, transfers) {
+  return new Promise((resolve) => {
+    const id2 = generateUUID();
+    pendingListeners.set(id2, resolve);
+    if (ep.start) {
+      ep.start();
+    }
+    ep.postMessage(Object.assign({ id: id2 }, msg), transfers);
+  });
+}
+function generateUUID() {
+  return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
+}
 var DefaultContext = {
   color: void 0,
   size: void 0,
@@ -23276,9 +23608,13 @@ const mathjaxConfig = {
       amp: "&",
       var: ["\\mathrm{#1}", 1],
       csch: "\\operatorname{csch}",
-      sech: "\\operatorname{sech}"
+      sech: "\\operatorname{sech}",
+      erf: "\\operatorname{erf}"
     },
     displayMath: [["\\[", "\\]"]]
+  },
+  output: {
+    displayOverflow: "linebreak"
   }
 };
 /*! https://mths.be/cssesc v3.0.0 by @mathias */
@@ -23373,23 +23709,10 @@ function requireCssesc() {
   return cssesc_1;
 }
 requireCssesc();
-const viewerIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", async () => {\n    let pause100 = function() {\n      return new Promise((resolve, _reject) => {\n        setTimeout(resolve, 100);\n      });\n    };\n    for (let i = 0; i < 10; i++) {\n      if (typeof window.renderDoenetViewerToContainer === "function") {\n        break;\n      }\n      await pause100();\n    }\n    if (typeof window.renderDoenetViewerToContainer !== "function") {\n      return messageParentFromViewer({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n    const callbackOverrides = {};\n    const callbackNames = [\n      "reportScoreAndStateCallback",\n      "setIsInErrorState",\n      "generatedVariantCallback",\n      "documentStructureCallback",\n      "initializedCallback",\n      "setErrorsAndWarningsCallback"\n    ];\n    for (const callback of callbackNames) {\n      callbackOverrides[callback] = haveViewerCallbacks.includes(callback) ? (args) => {\n        messageParentFromViewer({\n          callback,\n          args\n        });\n      } : void 0;\n    }\n    window.renderDoenetViewerToContainer(\n      document.getElementById("root"),\n      void 0,\n      {\n        ...doenetViewerProps,\n        externalVirtualKeyboardProvided: true,\n        ...callbackOverrides\n      }\n    );\n  });\n  window.addEventListener("message", (e) => {\n    if (e.origin !== window.parent.location.origin) {\n      return;\n    }\n    if (e.data.subject?.startsWith("SPLICE") && !e.data.subject?.endsWith("response")) {\n      window.parent.postMessage(e.data);\n    } else if (e.data.subject === "requestAnswerResponses") {\n      window.parent.postMessage(e.data);\n    }\n  });\n  function messageParentFromViewer(data) {\n    window.parent.postMessage(\n      {\n        origin: viewerId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
-const editorIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", async () => {\n    let pause100 = function() {\n      return new Promise((resolve, _reject) => {\n        setTimeout(resolve, 100);\n      });\n    };\n    for (let i = 0; i < 10; i++) {\n      if (typeof window.renderDoenetViewerToContainer === "function") {\n        break;\n      }\n      await pause100();\n    }\n    if (typeof window.renderDoenetEditorToContainer !== "function") {\n      return messageParentFromEditor({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n    const callbackOverrides = {};\n    const callbackNames = [\n      "doenetmlChangeCallback",\n      "immediateDoenetmlChangeCallback",\n      "documentStructureCallback"\n    ];\n    for (const callback of callbackNames) {\n      callbackOverrides[callback] = haveEditorCallbacks.includes(callback) ? (args) => {\n        messageParentFromEditor({\n          callback,\n          args\n        });\n      } : void 0;\n    }\n    window.renderDoenetEditorToContainer(\n      document.getElementById("root"),\n      void 0,\n      {\n        ...doenetEditorProps,\n        externalVirtualKeyboardProvided: true,\n        ...callbackOverrides\n      }\n    );\n  });\n  function messageParentFromEditor(data) {\n    window.parent.postMessage(\n      {\n        origin: editorId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
+const viewerIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", async () => {\n    let pause100 = function() {\n      return new Promise((resolve, _reject) => {\n        setTimeout(resolve, 100);\n      });\n    };\n    for (let i = 0; i < 10; i++) {\n      if (typeof window.renderDoenetViewerToContainer === "function") {\n        break;\n      }\n      await pause100();\n    }\n    if (typeof window.renderDoenetViewerToContainer !== "function") {\n      return messageParentFromViewer({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n  });\n  ComlinkViewer.expose(\n    { renderViewerWithFunctionProps },\n    ComlinkViewer.windowEndpoint(globalThis.parent)\n  );\n  function renderViewerWithFunctionProps(...args) {\n    const augmentedDoenetViewerProps = { ...doenetViewerProps };\n    augmentedDoenetViewerProps.externalVirtualKeyboardProvided = true;\n    for (const propName of doenetViewerPropsSpecified) {\n      if (!(propName in doenetViewerProps)) {\n        const idx = args.indexOf(propName);\n        if (idx !== -1) {\n          augmentedDoenetViewerProps[propName] = args[idx + 1];\n        }\n      }\n    }\n    if (!doenetViewerPropsSpecified.includes("requestScrollTo")) {\n      augmentedDoenetViewerProps.requestScrollTo = (offset) => {\n        messageParentFromViewer({ type: "scrollTo", offset });\n      };\n    }\n    window.renderDoenetViewerToContainer(\n      document.getElementById("root"),\n      void 0,\n      augmentedDoenetViewerProps\n    );\n  }\n  messageParentFromViewer({ iframeReady: true });\n  window.addEventListener("message", (e) => {\n    if (e.origin !== window.parent.location.origin) {\n      return;\n    }\n    if (e.data.subject?.startsWith("SPLICE") && (!e.data.subject?.endsWith("response") || e.data.subject.endsWith("submitAllAnswers.response")) && !e.data.subject.endsWith("submitAllAnswers")) {\n      window.parent.postMessage(e.data);\n    } else if (e.data.subject === "requestAnswerResponses") {\n      window.parent.postMessage(e.data);\n    }\n  });\n  function messageParentFromViewer(data) {\n    window.parent.postMessage(\n      {\n        origin: viewerId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
+const editorIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", async () => {\n    let pause100 = function() {\n      return new Promise((resolve, _reject) => {\n        setTimeout(resolve, 100);\n      });\n    };\n    for (let i = 0; i < 10; i++) {\n      if (typeof window.renderDoenetViewerToContainer === "function") {\n        break;\n      }\n      await pause100();\n    }\n    if (typeof window.renderDoenetEditorToContainer !== "function") {\n      return messageParentFromEditor({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n  });\n  ComlinkEditor.expose(\n    { renderEditorWithFunctionProps },\n    ComlinkEditor.windowEndpoint(globalThis.parent)\n  );\n  function renderEditorWithFunctionProps(...args) {\n    const augmentedDoenetEditorProps = { ...doenetEditorProps };\n    augmentedDoenetEditorProps.externalVirtualKeyboardProvided = true;\n    for (const propName of doenetEditorPropsSpecified) {\n      if (!(propName in doenetEditorProps)) {\n        const idx = args.indexOf(propName);\n        if (idx !== -1) {\n          augmentedDoenetEditorProps[propName] = args[idx + 1];\n        }\n      }\n    }\n    window.renderDoenetEditorToContainer(\n      document.getElementById("root"),\n      void 0,\n      augmentedDoenetEditorProps\n    );\n  }\n  messageParentFromEditor({ iframeReady: true });\n  function messageParentFromEditor(data) {\n    window.parent.postMessage(\n      {\n        origin: editorId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
 function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneUrl, cssUrl) {
-  const haveViewerCallbacks = [];
-  const callbackNames = [
-    "reportScoreAndStateCallback",
-    "setIsInErrorState",
-    "generatedVariantCallback",
-    "documentStructureCallback",
-    "initializedCallback",
-    "setErrorsAndWarningsCallback"
-  ];
-  for (const callback of callbackNames) {
-    if (callback in doenetViewerProps) {
-      haveViewerCallbacks.push(callback);
-    }
-  }
+  const doenetViewerPropsSpecified = Object.keys(doenetViewerProps);
   return `
     <html style="overflow:hidden">
     <head>
@@ -23400,10 +23723,11 @@ function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneU
         <script type="module">
             const viewerId = "${id2}";
             const doenetViewerProps = ${JSON.stringify(doenetViewerProps)};
-            const haveViewerCallbacks = ${JSON.stringify(haveViewerCallbacks)};
-            
+            const doenetViewerPropsSpecified = ${JSON.stringify(doenetViewerPropsSpecified)};
+            import * as ComlinkViewer from "https://unpkg.com/comlink/dist/esm/comlink.mjs";
+
             // This source code has been compiled by vite and should be directly included.
-            // It assumes that viewerId, doenetViewerProps, and haveViewerCallbacks are defined in the global scope.
+            // It assumes that viewerId, doenetViewerProps, doenetViewerPropsSpecified, and ComlinkViewer are defined in the global scope.
             ${viewerIframeJsSource}
         <\/script>
         <div id="root">
@@ -23415,17 +23739,7 @@ function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneU
 }
 function createHtmlForDoenetEditor(id2, doenetML, width, doenetEditorProps, standaloneUrl, cssUrl) {
   const augmentedProps = { width, height: "100vh", ...doenetEditorProps };
-  const haveEditorCallbacks = [];
-  const callbackNames = [
-    "doenetmlChangeCallback",
-    "immediateDoenetmlChangeCallback",
-    "documentStructureCallback"
-  ];
-  for (const callback of callbackNames) {
-    if (callback in doenetEditorProps) {
-      haveEditorCallbacks.push(callback);
-    }
-  }
+  const doenetEditorPropsSpecified = Object.keys(augmentedProps);
   return `
     <html style="overflow:hidden">
     <head>
@@ -23436,10 +23750,11 @@ function createHtmlForDoenetEditor(id2, doenetML, width, doenetEditorProps, stan
         <script type="module">
             const editorId = "${id2}";
             const doenetEditorProps = ${JSON.stringify(augmentedProps)};
-            const haveEditorCallbacks = ${JSON.stringify(haveEditorCallbacks)};
+            const doenetEditorPropsSpecified = ${JSON.stringify(doenetEditorPropsSpecified)};
+            import * as ComlinkEditor from "https://unpkg.com/comlink/dist/esm/comlink.mjs";
             
             // This source code has been compiled by vite and should be directly included.
-            // It assumes that editorId, doenetEditorProps, and have EditorCallbacks are defined in the global scope.
+            // It assumes that editorId, doenetEditorProps, doenetEditorPropsSpecified, and ComlinkEditor are defined in the global scope.
             ${editorIframeJsSource}
         <\/script>
         <div id="root">
@@ -46449,7 +46764,7 @@ function ExternalVirtualKeyboard() {
     }
   );
 }
-const version = "0.7.0-beta1";
+const version = "0.7.0-beta10";
 const latestDoenetmlVersion = version;
 function DoenetViewer({
   doenetML,
@@ -46491,7 +46806,7 @@ function DoenetViewer({
       if (event.origin !== window.location.origin) {
         return;
       }
-      if (event.data.subject === "SPLICE.getState.response" || event.data.subject === "SPLICE.requestSolutionView.response") {
+      if (event.data.subject === "SPLICE.getState.response" || event.data.subject === "SPLICE.requestSolutionView.response" || event.data.subject == "SPLICE.submitAllAnswers") {
         ref.current?.contentWindow?.postMessage(event.data);
         return;
       }
@@ -46499,34 +46814,32 @@ function DoenetViewer({
         return;
       }
       const data = event.data.data;
+      if (ref.current && data.type === "scrollTo" && typeof data.offset === "number") {
+        const iframeTop = ref.current.getBoundingClientRect().top + window.scrollY;
+        const targetAbsoluteTop = iframeTop + data.offset;
+        window.scrollTo({
+          top: targetAbsoluteTop - 20,
+          behavior: "smooth"
+        });
+      }
       if (data.error) {
         return setInErrorState(data.error);
-      }
-      switch (data.callback) {
-        case "reportScoreAndStateCallback": {
-          return doenetViewerProps.reportScoreAndStateCallback?.(
-            data.args
+      } else if (data.iframeReady) {
+        if (ref.current) {
+          const viewerIframe = wrap$2(
+            windowEndpoint(ref.current.contentWindow)
           );
-        }
-        case "setIsInErrorState": {
-          return doenetViewerProps.setIsInErrorState?.(data.args);
-        }
-        case "generatedVariantCallback": {
-          return doenetViewerProps.generatedVariantCallback?.(
-            data.args
-          );
-        }
-        case "documentStructureCallback": {
-          return doenetViewerProps.documentStructureCallback?.(
-            data.args
-          );
-        }
-        case "initializedCallback": {
-          return doenetViewerProps.initializedCallback?.(data.args);
-        }
-        case "setErrorsAndWarningsCallback": {
-          return doenetViewerProps.setErrorsAndWarningsCallback?.(
-            data.args
+          const proxiedFunctions = [];
+          for (const [key, prop] of Object.entries(
+            doenetViewerProps
+          )) {
+            if (typeof prop === "function") {
+              proxiedFunctions.push(key);
+              proxiedFunctions.push(proxy(prop));
+            }
+          }
+          viewerIframe?.renderViewerWithFunctionProps(
+            ...proxiedFunctions
           );
         }
       }
@@ -46571,6 +46884,7 @@ function DoenetViewer({
   return /* @__PURE__ */ React__default__default.createElement(React__default__default.Fragment, null, addVirtualKeyboard ? /* @__PURE__ */ React__default__default.createElement(ExternalVirtualKeyboard, null) : null, /* @__PURE__ */ React__default__default.createElement(
     "iframe",
     {
+      title: "Doenet document",
       ref,
       srcDoc: createHtmlForDoenetViewer(
         id2,
@@ -46645,21 +46959,22 @@ function DoenetEditor({
       const data = event.data.data;
       if (data.error) {
         return setInErrorState(data.error);
-      }
-      switch (data.callback) {
-        case "doenetmlChangeCallback": {
-          return doenetEditorProps.doenetmlChangeCallback?.(
-            data.args
-          );
-        }
-        case "immediateDoenetmlChangeCallback": {
-          return doenetEditorProps.immediateDoenetmlChangeCallback?.(
-            data.args
+      } else if (data.iframeReady) {
+        if (ref.current) {
+          const editorIframe = wrap$2(
+            windowEndpoint(ref.current.contentWindow)
           );
-        }
-        case "documentStructureCallback": {
-          return doenetEditorProps.documentStructureCallback?.(
-            data.args
+          const proxiedFunctions = [];
+          for (const [key, prop] of Object.entries(
+            doenetEditorProps
+          )) {
+            if (typeof prop === "function") {
+              proxiedFunctions.push(key);
+              proxiedFunctions.push(proxy(prop));
+            }
+          }
+          editorIframe?.renderEditorWithFunctionProps(
+            ...proxiedFunctions
           );
         }
       }
@@ -46714,6 +47029,7 @@ function DoenetEditor({
   return /* @__PURE__ */ React__default__default.createElement(React__default__default.Fragment, null, addVirtualKeyboard ? /* @__PURE__ */ React__default__default.createElement(ExternalVirtualKeyboard, null) : null, /* @__PURE__ */ React__default__default.createElement(
     "iframe",
     {
+      title: "Doenet Editor",
       ref,
       srcDoc: createHtmlForDoenetEditor(
         id2,