@doenet/doenetml-iframe 0.7.19 → 0.7.20

package/index.js

@@ -25856,6 +25856,60 @@ const editorIframeJsSource = `(function() {
   "use strict";
   let editorControlHandle = null;
   let lastAugmentedProps = null;
+  let currentFunctionProps = {};
+  const functionPropDispatchers = {};
+  function getFunctionPropDispatcher(key) {
+    let dispatcher = functionPropDispatchers[key];
+    if (!dispatcher) {
+      dispatcher = (...callArgs) => currentFunctionProps[key]?.(...callArgs);
+      functionPropDispatchers[key] = dispatcher;
+    }
+    return dispatcher;
+  }
+  function functionPropArgsToMap(args) {
+    const map = {};
+    for (let i = 0; i < args.length; i += 2) {
+      const key = args[i];
+      const fn = args[i + 1];
+      if (typeof key === "string" && typeof fn === "function") {
+        map[key] = fn;
+      }
+    }
+    return map;
+  }
+  function releaseFunctionProxy(fn) {
+    try {
+      fn?.[ComlinkEditor.releaseProxy]?.();
+    } catch (e) {
+      console.warn(
+        "iframe DoenetEditor: failed to release stale Comlink proxy",
+        e
+      );
+    }
+  }
+  function setCurrentFunctionProps(incoming) {
+    for (const [key, fn] of Object.entries(currentFunctionProps)) {
+      if (incoming[key] !== fn) {
+        releaseFunctionProxy(fn);
+      }
+    }
+    currentFunctionProps = incoming;
+  }
+  function syncAugmentedFunctionProps() {
+    if (!lastAugmentedProps) {
+      return;
+    }
+    const next = {};
+    for (const [key, val] of Object.entries(lastAugmentedProps)) {
+      if (typeof val !== "function") {
+        next[key] = val;
+      }
+    }
+    for (const key of Object.keys(currentFunctionProps)) {
+      next[key] = getFunctionPropDispatcher(key);
+    }
+    lastAugmentedProps = next;
+  }
   let initialDoenetMLSource = null;
   function resolveInitialDoenetMLSource(root) {
     if (initialDoenetMLSource !== null) {
@@ -25901,30 +25955,15 @@ const editorIframeJsSource = `(function() {
           );
           return;
         }
-        const next = {};
-        for (const [key, val] of Object.entries(lastAugmentedProps)) {
-          if (typeof val === "function") {
-            try {
-              val[ComlinkEditor.releaseProxy]?.();
-            } catch (e) {
-              console.warn(
-                "iframe DoenetEditor: failed to release stale Comlink proxy",
-                e
-              );
-            }
-          } else {
-            next[key] = val;
-          }
-        }
-        for (let i = 0; i < args.length; i += 2) {
-          const key = args[i];
-          const fn = args[i + 1];
-          if (typeof key === "string" && typeof fn === "function") {
-            next[key] = fn;
-          }
+        const incoming = functionPropArgsToMap(args);
+        const prevKeys = Object.keys(currentFunctionProps).sort();
+        const nextKeys = Object.keys(incoming).sort();
+        const keysChanged = prevKeys.length !== nextKeys.length || prevKeys.some((key, i) => key !== nextKeys[i]);
+        setCurrentFunctionProps(incoming);
+        if (keysChanged) {
+          syncAugmentedFunctionProps();
+          renderWithLastAugmentedProps();
         }
-        lastAugmentedProps = next;
-        renderWithLastAugmentedProps();
       },
       openDiagnosticsTab(tabId) {
         if (!editorControlHandle) {
@@ -25957,14 +25996,12 @@ const editorIframeJsSource = `(function() {
     ComlinkEditor.windowEndpoint(globalThis.parent)
   );
   function renderEditorWithFunctionProps(...args) {
+    setCurrentFunctionProps(functionPropArgsToMap(args));
     const augmentedDoenetEditorProps = { ...doenetEditorProps };
     augmentedDoenetEditorProps.externalVirtualKeyboardProvided = true;
     for (const propName of doenetEditorPropsSpecified) {
-      if (!(propName in doenetEditorProps)) {
-        const idx = args.indexOf(propName);
-        if (idx !== -1) {
-          augmentedDoenetEditorProps[propName] = args[idx + 1];
-        }
+      if (!(propName in doenetEditorProps) && propName in currentFunctionProps) {
+        augmentedDoenetEditorProps[propName] = getFunctionPropDispatcher(propName);
       }
     }
     lastAugmentedProps = augmentedDoenetEditorProps;
@@ -63138,7 +63175,7 @@ function ExternalVirtualKeyboard() {
     }
   );
 }
-const version = "0.7.19";
+const version = "0.7.20";
 const latestDoenetmlVersion = version;
 function DoenetViewer({
   doenetML,