@marimo-team/islands 0.22.1-dev20 → 0.22.1-dev21

package/dist/main.js

@@ -35867,8 +35867,7 @@ ${E}`,
     ...e
   }));
   var AnyWidgetSlot = (e) => {
-    var _a3;
-    let r = (0, import_compiler_runtime$90.c)(16), { jsUrl: c, jsHash: d } = e.data, { model_id: f } = e.value, h = e.host, _;
+    let r = (0, import_compiler_runtime$90.c)(14), { jsUrl: c, jsHash: d } = e.data, { model_id: f } = e.value, h = e.host, _;
     r[0] !== d || r[1] !== c ? (_ = {
       jsUrl: c,
       jsHash: d
@@ -35889,14 +35888,12 @@ ${E}`,
         error: f2
       }), r[7] = f2, r[8] = h2), h2;
     }
-    let S;
-    r[9] === e.host ? S = r[10] : (S = (_a3 = e.host.closest(`[${RANDOM_ID_ATTR}]`)) == null ? void 0 : _a3.getAttribute(RANDOM_ID_ATTR), r[9] = e.host, r[10] = S);
-    let w = S ?? c, E;
-    return r[11] !== h || r[12] !== v.default || r[13] !== w || r[14] !== f ? (E = (0, import_jsx_runtime.jsx)(LoadedSlot, {
+    let S = `${d}:${f}`, w;
+    return r[9] !== h || r[10] !== v.default || r[11] !== f || r[12] !== S ? (w = (0, import_jsx_runtime.jsx)(LoadedSlot, {
       widget: v.default,
       modelId: f,
       host: h
-    }, w), r[11] = h, r[12] = v.default, r[13] = w, r[14] = f, r[15] = E) : E = r[15], E;
+    }, S), r[9] = h, r[10] = v.default, r[11] = f, r[12] = S, r[13] = w) : w = r[13], w;
   };
   async function runAnyWidgetModule(e, r, c, d, f) {
     d.innerHTML = "";
@@ -65425,7 +65422,7 @@ ${c}
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.22.1-dev20"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.22.1-dev21"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.22.1-dev20",
+  "version": "0.22.1-dev21",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx

@@ -4,7 +4,6 @@
 import type { AnyWidget } from "@anywidget/types";
 import { useEffect, useRef } from "react";
 import { z } from "zod";
-import { RANDOM_ID_ATTR } from "@/core/dom/ui-element-constants";
 import { useAsyncData } from "@/hooks/useAsyncData";
 import type { HTMLElementNotDerivedFromRef } from "@/hooks/useEventListener";
 import { createPlugin } from "@/plugins/core/builder";
@@ -145,18 +144,10 @@ const AnyWidgetSlot = (props: IPluginProps<ModelIdRef, Data>) => {
     return <ErrorBanner error={error} />;
   }
 
-  // Find the closest parent element with an attribute of `random-id`
-  const randomId = props.host
-    .closest(`[${RANDOM_ID_ATTR}]`)
-    ?.getAttribute(RANDOM_ID_ATTR);
-  const key = randomId ?? jsUrl;
-
   return (
     <LoadedSlot
-      // Use the a key to force a re-render when the randomId (or jsUrl) changes
-      // Plugins may be stateful and we cannot make assumptions that we won't be
-      // so it is safer to just re-render.
-      key={key}
+      // Force remount when the widget module or model changes (cell re-run).
+      key={`${jsHash}:${modelId}`}
       widget={jsModule.default}
       modelId={modelId}
       host={host}