@doenet/doenetml-iframe 0.7.0-beta8 → 0.7.0-beta9

package/index.js

@@ -23709,8 +23709,8 @@ 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 wrappedDoenetViewerProps = ComlinkViewer.wrap(\n      ComlinkViewer.windowEndpoint(globalThis.parent)\n    );\n    const augmentedDoenetViewerProps = { ...doenetViewerProps };\n    augmentedDoenetViewerProps.externalVirtualKeyboardProvided = true;\n    for (const propName of doenetViewerPropsSpecified) {\n      if (!(propName in doenetViewerProps)) {\n        augmentedDoenetViewerProps[propName] = wrappedDoenetViewerProps[propName];\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  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    const wrappedDoenetEditorProps = ComlinkEditor.wrap(\n      ComlinkEditor.windowEndpoint(globalThis.parent)\n    );\n    const augmentedDoenetEditorProps = { ...doenetEditorProps };\n    augmentedDoenetEditorProps.externalVirtualKeyboardProvided = true;\n    for (const propName of doenetEditorPropsSpecified) {\n      if (!(propName in doenetEditorProps)) {\n        augmentedDoenetEditorProps[propName] = wrappedDoenetEditorProps[propName];\n      }\n    }\n    window.renderDoenetEditorToContainer(\n      document.getElementById("root"),\n      void 0,\n      augmentedDoenetEditorProps\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 doenetViewerPropsSpecified = Object.keys(doenetViewerProps);
   return `
@@ -46764,7 +46764,7 @@ function ExternalVirtualKeyboard() {
     }
   );
 }
-const version = "0.7.0-beta8";
+const version = "0.7.0-beta9";
 const latestDoenetmlVersion = version;
 function DoenetViewer({
   doenetML,
@@ -46824,18 +46824,30 @@ function DoenetViewer({
       }
       if (data.error) {
         return setInErrorState(data.error);
+      } else if (data.iframeReady) {
+        if (ref.current) {
+          const viewerIframe = wrap$2(
+            windowEndpoint(ref.current.contentWindow)
+          );
+          const proxiedFunctions = [];
+          for (const [key, prop] of Object.entries(
+            doenetViewerProps
+          )) {
+            if (typeof prop === "function") {
+              proxiedFunctions.push(key);
+              proxiedFunctions.push(proxy(prop));
+            }
+          }
+          viewerIframe?.renderViewerWithFunctionProps(
+            ...proxiedFunctions
+          );
+        }
       }
     };
     if (ref.current) {
       window.addEventListener("message", listener);
     }
     const clearResize = watchForResize(ref, () => height, setHeight);
-    if (ref.current) {
-      expose(
-        doenetViewerProps,
-        windowEndpoint(ref.current.contentWindow)
-      );
-    }
     return () => {
       window.removeEventListener("message", listener);
       clearResize();
@@ -46947,17 +46959,29 @@ function DoenetEditor({
       const data = event.data.data;
       if (data.error) {
         return setInErrorState(data.error);
+      } else if (data.iframeReady) {
+        if (ref.current) {
+          const editorIframe = wrap$2(
+            windowEndpoint(ref.current.contentWindow)
+          );
+          const proxiedFunctions = [];
+          for (const [key, prop] of Object.entries(
+            doenetEditorProps
+          )) {
+            if (typeof prop === "function") {
+              proxiedFunctions.push(key);
+              proxiedFunctions.push(proxy(prop));
+            }
+          }
+          editorIframe?.renderEditorWithFunctionProps(
+            ...proxiedFunctions
+          );
+        }
       }
     };
     if (ref.current) {
       window.addEventListener("message", listener);
     }
-    if (ref.current) {
-      expose(
-        doenetEditorProps,
-        windowEndpoint(ref.current.contentWindow)
-      );
-    }
     return () => {
       window.removeEventListener("message", listener);
     };