@marimo-team/islands 0.25.2-dev105 → 0.25.2-dev107

package/src/core/codemirror/language/embedded/latex.ts

@@ -29,7 +29,7 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import { type Parser, parseMixed } from "@lezer/common";
+import { IterMode, type Parser, parseMixed } from "@lezer/common";
 import { tags } from "@lezer/highlight";
 import type {
   DelimiterType,
@@ -231,24 +231,31 @@ export function parseLatex(latexParser: Parser): MarkdownConfig {
       // Test if the node type is one of the math expression
       const delimiterLength = DELIMITER_LENGTH[node.type.name];
       if (delimiterLength) {
-        const from = node.from + delimiterLength;
-        const to = node.to - delimiterLength;
+        const from = node.node.firstChild?.to ?? node.from + delimiterLength;
+        const to = node.node.lastChild?.from ?? node.to - delimiterLength;
 
         // Ensure valid ranges
         if (from >= to || from < 0 || to < 0) {
           return null;
         }
 
-        return {
-          parser: latexParser,
-          // Remove delimiter from LaTeX parser otherwise it won't be highlighted
-          overlay: [
-            {
-              from,
-              to,
-            },
-          ],
-        };
+        // Leave Python replacements to their own parser and highlighter.
+        const overlay: { from: number; to: number }[] = [];
+        let start = from;
+        node.node.cursor(IterMode.IgnoreMounts).iterate((child) => {
+          if (child.name !== "Python") {
+            return;
+          }
+          if (start < child.from) {
+            overlay.push({ from: start, to: child.from });
+          }
+          start = child.to;
+          return false;
+        });
+        if (start < to) {
+          overlay.push({ from: start, to });
+        }
+        return overlay.length ? { parser: latexParser, overlay } : null;
       }
 
       return null;

package/src/hooks/__tests__/useEventListener.test.tsx

@@ -2,7 +2,7 @@
 
 import { renderHook } from "@testing-library/react";
 import { useRef } from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   type HTMLElementNotDerivedFromRef,
   isRefObject,
@@ -28,6 +28,50 @@ describe("isRefObject", () => {
   });
 });
 
+describe.each([1, 2])("with %i anchors named current", (count) => {
+  let iframe: HTMLIFrameElement;
+  let browserWindow: Window;
+
+  beforeEach(() => {
+    // An iframe preserves named properties hidden by Vitest's global window.
+    iframe = document.createElement("iframe");
+    document.body.append(iframe);
+    if (!iframe.contentWindow) {
+      throw new Error("Expected an iframe window");
+    }
+    browserWindow = iframe.contentWindow;
+    const anchors = Array.from({ length: count }, () => {
+      const anchor = browserWindow.document.createElement("a");
+      anchor.id = "current";
+      return anchor;
+    });
+    browserWindow.document.body.append(...anchors);
+  });
+
+  afterEach(() => {
+    iframe.remove();
+  });
+
+  it("does not mistake window for a React ref", () => {
+    expect("current" in browserWindow).toBe(true);
+    expect(isRefObject(browserWindow)).toBe(false);
+  });
+
+  it("attaches and removes the listener on window", () => {
+    const listener = vi.fn();
+    const { unmount } = renderHook(() =>
+      useEventListener(browserWindow, "resize", listener),
+    );
+
+    browserWindow.dispatchEvent(new Event("resize"));
+    expect(listener).toHaveBeenCalledTimes(1);
+
+    unmount();
+    browserWindow.dispatchEvent(new Event("resize"));
+    expect(listener).toHaveBeenCalledTimes(1);
+  });
+});
+
 describe("useEventListener", () => {
   beforeEach(() => {
     vi.clearAllMocks();

package/src/hooks/useEventListener.ts

@@ -13,7 +13,12 @@ export type HTMLElementNotDerivedFromRef<T = HTMLElement> = T & {
 };
 
 export function isRefObject<T>(target: unknown): target is RefObject<T | null> {
-  return target !== null && typeof target === "object" && "current" in target;
+  return (
+    target !== null &&
+    typeof target === "object" &&
+    !("addEventListener" in target) &&
+    "current" in target
+  );
 }
 
 export function useEventListener<K extends keyof DocumentEventMap>(