@marimo-team/islands 0.22.1-dev9 → 0.22.2

package/src/components/ui/combobox.tsx

@@ -230,7 +230,8 @@ interface ComboboxItemOptions<TValue> {
 }
 
 export interface ComboboxItemProps<TValue>
-  extends ComboboxItemOptions<TValue>,
+  extends
+    ComboboxItemOptions<TValue>,
     Omit<
       React.ComponentProps<typeof CommandItem>,
       keyof ComboboxItemOptions<TValue> | "onSelect" | "role"

package/src/components/ui/command.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { DialogProps } from "@radix-ui/react-dialog";
+import type { Dialog as DialogPrimitive } from "radix-ui";
+
+type DialogProps = DialogPrimitive.DialogProps;
+
 import type { VariantProps } from "class-variance-authority";
 import { Command as CommandPrimitive } from "cmdk";
 import { Search } from "lucide-react";
@@ -58,7 +61,7 @@ const CommandInput = React.forwardRef<
 >(({ className, icon, rootClassName, ...props }, ref) => (
   <div
     className={cn("flex items-center border-b px-3", rootClassName)}
-    // eslint-disable-next-line react/no-unknown-property
+    // oxlint-disable-next-line react/no-unknown-property
     cmdk-input-wrapper=""
   >
     {icon === null ? null : (

package/src/components/ui/context-menu.tsx

@@ -1,12 +1,12 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ContextMenuPrimitive from "@radix-ui/react-context-menu";
 import {
   CheckIcon,
   ChevronRightIcon,
   DotFilledIcon,
 } from "@radix-ui/react-icons";
 import type { VariantProps } from "class-variance-authority";
+import { ContextMenu as ContextMenuPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/date-input.tsx

@@ -41,8 +41,7 @@ const DateSegment = ({ className, ...props }: AriaDateSegmentProps) => {
 };
 
 interface DateInputProps
-  extends AriaDateInputProps,
-    VariantProps<typeof fieldGroupVariants> {}
+  extends AriaDateInputProps, VariantProps<typeof fieldGroupVariants> {}
 
 const DateInput = ({
   className,
@@ -61,8 +60,9 @@ const DateInput = ({
   );
 };
 
-interface DateFieldProps<T extends AriaDateValue>
-  extends AriaDateFieldProps<T> {
+interface DateFieldProps<
+  T extends AriaDateValue,
+> extends AriaDateFieldProps<T> {
   label?: string;
   description?: string;
   errorMessage?: string | ((validation: AriaValidationResult) => string);
@@ -94,8 +94,9 @@ const DateField = <T extends AriaDateValue>({
   );
 };
 
-interface TimeFieldProps<T extends AriaTimeValue>
-  extends AriaTimeFieldProps<T> {
+interface TimeFieldProps<
+  T extends AriaTimeValue,
+> extends AriaTimeFieldProps<T> {
   label?: string;
   description?: string;
   errorMessage?: string | ((validation: AriaValidationResult) => string);

package/src/components/ui/date-picker.tsx

@@ -51,8 +51,9 @@ const DatePickerContent = ({
   </Popover>
 );
 
-interface DatePickerProps<T extends AriaDateValue>
-  extends AriaDatePickerProps<T> {
+interface DatePickerProps<
+  T extends AriaDateValue,
+> extends AriaDatePickerProps<T> {
   label?: string;
   description?: string;
   errorMessage?: string | ((validation: AriaValidationResult) => string);
@@ -115,8 +116,9 @@ const DatePicker = <T extends AriaDateValue>({
   );
 };
 
-interface DateRangePickerProps<T extends AriaDateValue>
-  extends AriaDateRangePickerProps<T> {
+interface DateRangePickerProps<
+  T extends AriaDateValue,
+> extends AriaDateRangePickerProps<T> {
   label?: string;
   description?: string;
   errorMessage?: string | ((validation: AriaValidationResult) => string);

package/src/components/ui/dialog.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
+import { Dialog as DialogPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/draggable-popover.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type * as PopoverPrimitive from "@radix-ui/react-popover";
 import { GripHorizontalIcon } from "lucide-react";
+import type { Popover as PopoverPrimitive } from "radix-ui";
 import { useRef, useState } from "react";
 import { Popover, PopoverContent, PopoverTrigger } from "./popover";
 

package/src/components/ui/dropdown-menu.tsx

@@ -1,7 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import type { VariantProps } from "class-variance-authority";
 import { Check, ChevronRight, Circle } from "lucide-react";
+import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
 import React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/field.tsx

@@ -66,8 +66,7 @@ const fieldGroupVariants = cva("", {
 });
 
 interface GroupProps
-  extends AriaGroupProps,
-    VariantProps<typeof fieldGroupVariants> {}
+  extends AriaGroupProps, VariantProps<typeof fieldGroupVariants> {}
 
 const FieldGroup = ({ className, variant, ...props }: GroupProps) => {
   return (

package/src/components/ui/form.tsx

@@ -1,8 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type * as LabelPrimitive from "@radix-ui/react-label";
-import { Slot } from "@radix-ui/react-slot";
 import { AlertCircleIcon } from "lucide-react";
+import { type Label as LabelPrimitive, Slot as SlotPrimitive } from "radix-ui";
 import * as React from "react";
 import {
   Controller,
@@ -130,14 +129,14 @@ const FormLabel = React.forwardRef<
 FormLabel.displayName = "FormLabel";
 
 const FormControl = React.forwardRef<
-  React.ElementRef<typeof Slot>,
-  React.ComponentPropsWithoutRef<typeof Slot>
+  React.ElementRef<typeof SlotPrimitive.Slot>,
+  React.ComponentPropsWithoutRef<typeof SlotPrimitive.Slot>
 >(({ ...props }, ref) => {
   const { error, formItemId, formDescriptionId, formMessageId } =
     useFormField();
 
   return (
-    <Slot
+    <SlotPrimitive.Slot
       ref={ref}
       id={formItemId}
       aria-describedby={

package/src/components/ui/fullscreen.tsx

@@ -1,6 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import type { PopoverContentProps } from "@radix-ui/react-popover";
+import type { Popover } from "radix-ui";
+
+type PopoverContentProps = Popover.PopoverContentProps;
+
 import React, { useState } from "react";
 import { isInVscodeExtension } from "@/core/vscode/is-in-vscode";
 import { useEventListener } from "@/hooks/useEventListener";

package/src/components/ui/label.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as LabelPrimitive from "@radix-ui/react-label";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Label as LabelPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/navigation.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import { ChevronDownIcon } from "@radix-ui/react-icons";
-import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";
 import { cva, type VariantProps } from "class-variance-authority";
+import { NavigationMenu as NavigationMenuPrimitive } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/popover.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as PopoverPrimitive from "@radix-ui/react-popover";
+import { Popover as PopoverPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/progress.tsx

@@ -1,12 +1,13 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ProgressPrimitive from "@radix-ui/react-progress";
+import { Progress as ProgressPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";
 
-interface ProgressProps
-  extends React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root> {
+interface ProgressProps extends React.ComponentPropsWithoutRef<
+  typeof ProgressPrimitive.Root
+> {
   /**
    * When true, shows an indeterminate animated progress bar.
    */

package/src/components/ui/query-param-preserving-link.tsx

@@ -3,8 +3,10 @@
 import React, { useRef } from "react";
 import { usePress } from "react-aria";
 
-interface QueryParamPreservingLinkProps
-  extends Omit<React.HTMLAttributes<HTMLAnchorElement>, "href"> {
+interface QueryParamPreservingLinkProps extends Omit<
+  React.HTMLAttributes<HTMLAnchorElement>,
+  "href"
+> {
   href: string;
   children: React.ReactNode;
 }

package/src/components/ui/radio-group.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";
 import { Circle } from "lucide-react";
+import { RadioGroup as RadioGroupPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/range-slider.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SliderPrimitive from "@radix-ui/react-slider";
+import { Slider as SliderPrimitive } from "radix-ui";
 import * as React from "react";
 import { useLocale } from "react-aria";
 import { cn } from "@/utils/cn";

package/src/components/ui/scroll-area.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
+import { ScrollArea as ScrollAreaPrimitive } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/select.tsx

@@ -1,6 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SelectPrimitive from "@radix-ui/react-select";
 import type { VariantProps } from "class-variance-authority";
 import {
   CheckIcon,
@@ -9,6 +8,7 @@ import {
   ChevronUpIcon,
   XIcon,
 } from "lucide-react";
+import { Select as SelectPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/ui/sheet.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SheetPrimitive from "@radix-ui/react-dialog";
 import { Cross2Icon } from "@radix-ui/react-icons";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Dialog as SheetPrimitive } from "radix-ui";
 import React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";
@@ -51,7 +51,8 @@ const sheetVariants = cva(
 );
 
 interface SheetContentProps
-  extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+  extends
+    React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
     VariantProps<typeof sheetVariants> {}
 
 const SheetContent = React.forwardRef<

package/src/components/ui/slider.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SliderPrimitive from "@radix-ui/react-slider";
+import { Slider as SliderPrimitive } from "radix-ui";
 import * as React from "react";
 import { useLocale } from "react-aria";
 import { cn } from "@/utils/cn";

package/src/components/ui/switch.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as SwitchPrimitives from "@radix-ui/react-switch";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Switch as SwitchPrimitives } from "radix-ui";
 import * as React from "react";
 import { cn } from "@/utils/cn";
 

package/src/components/ui/tabs.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TabsPrimitive from "@radix-ui/react-tabs";
+import { Tabs as TabsPrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/textarea.tsx

@@ -6,8 +6,7 @@ import { useDebounceControlledState } from "@/hooks/useDebounce";
 import { cn } from "@/utils/cn";
 import { Events } from "@/utils/events";
 
-export interface TextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
+export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
   bottomAdornment?: React.ReactNode;
 }
 

package/src/components/ui/toast.tsx

@@ -1,8 +1,8 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as ToastPrimitives from "@radix-ui/react-toast";
 import { cva, type VariantProps } from "class-variance-authority";
 import { X } from "lucide-react";
+import { Toast as ToastPrimitives } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/toggle.tsx

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TogglePrimitive from "@radix-ui/react-toggle";
 import { cva, type VariantProps } from "class-variance-authority";
+import { Toggle as TogglePrimitive } from "radix-ui";
 import * as React from "react";
 
 import { cn } from "@/utils/cn";

package/src/components/ui/tooltip.tsx

@@ -1,6 +1,6 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import { Tooltip as TooltipPrimitive } from "radix-ui";
 import * as React from "react";
 import { StyleNamespace } from "@/theme/namespace";
 import { cn } from "@/utils/cn";

package/src/components/variables/variables-table.tsx

@@ -226,7 +226,7 @@ function sortData({
       break;
   }
 
-  return sort.desc ? sortedVariables.reverse() : sortedVariables;
+  return sort.desc ? sortedVariables.toReversed() : sortedVariables;
 }
 
 export const VariableTable: React.FC<Props> = memo(

package/src/core/ai/context/providers/__tests__/datasource.test.ts

@@ -1,5 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* oxlint-disable typescript/no-explicit-any */
 
 import { beforeEach, describe, expect, it } from "vitest";
 import { cellId, variableName } from "@/__tests__/branded";

package/src/core/ai/context/providers/__tests__/error.test.ts

@@ -1,5 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* oxlint-disable typescript/no-explicit-any */
 
 import { createStore } from "jotai";
 import { beforeEach, describe, expect, it } from "vitest";

package/src/core/ai/context/providers/__tests__/variable.test.ts

@@ -1,5 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* oxlint-disable typescript/no-explicit-any */
 
 import { describe, expect, it, vi } from "vitest";
 import { cellId, variableName } from "@/__tests__/branded";

package/src/core/ai/context/providers/cell-output.ts

@@ -34,8 +34,7 @@ export interface CellOutputData {
 // For the context provider
 // Currently, we enforce that cellOutput is present.
 interface CellOutputContextData
-  extends CellOutputData,
-    Record<string, unknown> {
+  extends CellOutputData, Record<string, unknown> {
   cellOutput: BaseOutput;
 }
 

package/src/core/ai/context/registry.ts

@@ -98,7 +98,7 @@ export abstract class AIContextProvider<
  * Registry for managing different AI context providers
  */
 export class AIContextRegistry<T extends AIContextItem> {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  // oxlint-disable-next-line typescript/no-explicit-any
   private providers = new Set<AIContextProvider<any>>();
 
   /**
@@ -106,7 +106,7 @@ export class AIContextRegistry<T extends AIContextItem> {
    */
   register<U extends AIContextItem>(
     provider: AIContextProvider<U>,
-    // eslint-disable-next-line @typescript-eslint/prefer-return-this-type
+    // oxlint-disable-next-line typescript/prefer-return-this-type
   ): AIContextRegistry<U | T> {
     this.providers.add(provider);
     return this;

package/src/core/ai/tools/edit-notebook-tool.ts

@@ -72,9 +72,10 @@ type EditNotebookInput = z.infer<typeof editNotebookSchema>;
 type EditOperation = EditNotebookInput["edit"];
 export type EditType = EditOperation["type"];
 
-export class EditNotebookTool
-  implements AiTool<EditNotebookInput, ToolOutputBase>
-{
+export class EditNotebookTool implements AiTool<
+  EditNotebookInput,
+  ToolOutputBase
+> {
   readonly name = "edit_notebook_tool";
   readonly description = description;
   readonly schema = editNotebookSchema;

package/src/core/ai/tools/registry.ts

@@ -14,7 +14,7 @@ import { formatToolDescription } from "./utils";
 
 export type AnyZodObject = ZodObject<z.ZodRawShape>;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// oxlint-disable-next-line typescript/no-explicit-any
 type StoredTool = AiTool<any, any>;
 
 interface InvokeResult<TName> {

package/src/core/ai/tools/run-cells-tool.ts

@@ -50,9 +50,10 @@ const filePartSchema = z.object({
   mediaType: z.string(),
 }) satisfies z.ZodType<FileUIPart>;
 
-export class RunStaleCellsTool
-  implements AiTool<EmptyToolInput, RunStaleCellsOutput>
-{
+export class RunStaleCellsTool implements AiTool<
+  EmptyToolInput,
+  RunStaleCellsOutput
+> {
   readonly name = "run_stale_cells_tool";
   readonly description = description;
   readonly schema = z.object({});

package/src/core/cells/__tests__/add-missing-import.test.ts

@@ -48,28 +48,29 @@ describe("maybeAddMissingImport", () => {
     "import marimo as mo\nimport marimo as mo",
     "import   marimo    as   mo",
   ];
-  it.each(
-    VALID_IMPORTS,
-  )("should not add an import if the import statement already exists in the notebook", (code) => {
-    const appStore = createStore();
-    appStore.set(variablesAtom, {} as Variables);
-    appStore.set(
-      notebookAtom,
-      MockNotebook.notebookState({
-        cellData: {
-          [Cell1]: { code: code },
-        },
-      }),
-    );
-    const onAddImport = vi.fn();
-    maybeAddMissingImport({
-      moduleName: "marimo",
-      variableName: "mo",
-      onAddImport,
-      appStore,
-    });
-    expect(onAddImport).not.toHaveBeenCalled();
-  });
+  it.each(VALID_IMPORTS)(
+    "should not add an import if the import statement already exists in the notebook",
+    (code) => {
+      const appStore = createStore();
+      appStore.set(variablesAtom, {} as Variables);
+      appStore.set(
+        notebookAtom,
+        MockNotebook.notebookState({
+          cellData: {
+            [Cell1]: { code: code },
+          },
+        }),
+      );
+      const onAddImport = vi.fn();
+      maybeAddMissingImport({
+        moduleName: "marimo",
+        variableName: "mo",
+        onAddImport,
+        appStore,
+      });
+      expect(onAddImport).not.toHaveBeenCalled();
+    },
+  );
 
   it("should add an import if the variable is not in the variables state and the import statement does not exist in the notebook", () => {
     const appStore = createStore();

package/src/core/cells/__tests__/cell.test.ts

@@ -43,19 +43,20 @@ describe("outputIsLoading", () => {
 });
 
 describe("outputIsStale", () => {
-  it.each(
-    STATUSES,
-  )("should return true if the cell is edited and status is %s", (status) => {
-    const cell = {
-      status: status,
-      staleInputs: true,
-      output: null,
-      runStartTimestamp: null,
-      interrupted: false,
-    };
-    const edited = true;
-    expect(outputIsStale(cell, edited)).toBe(true);
-  });
+  it.each(STATUSES)(
+    "should return true if the cell is edited and status is %s",
+    (status) => {
+      const cell = {
+        status: status,
+        staleInputs: true,
+        output: null,
+        runStartTimestamp: null,
+        interrupted: false,
+      };
+      const edited = true;
+      expect(outputIsStale(cell, edited)).toBe(true);
+    },
+  );
 
   it("should return true if the cell is loading", () => {
     const cell = {

package/src/core/cells/__tests__/cells.test.ts

@@ -45,7 +45,7 @@ vi.mock("@/core/codemirror/editing/commands", () => ({
 vi.mock("../scrollCellIntoView", async (importOriginal) => {
   const actual = await importOriginal();
   return {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // oxlint-disable-next-line typescript/no-explicit-any
     ...(actual as any),
     scrollToTop: vi.fn(),
     scrollToBottom: vi.fn(),
@@ -1023,7 +1023,7 @@ describe("cell reducer", () => {
     });
     cell = cells[0];
     expect(cell.status).toBe("idle");
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // oxlint-disable-next-line typescript/no-explicit-any no-unsafe-optional-chaining
     expect((cell.output?.data as any)[0].msg).toBe(
       "This cell wasn't run because an ancestor was stopped with `mo.stop`: ",
     );

package/src/core/cells/__tests__/scrollCellIntoView.test.ts

@@ -40,7 +40,7 @@ describe("scrollCellIntoView", () => {
 
   it("should scroll active line when editor has focus", () => {
     const mockEditor = { hasFocus: true };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // oxlint-disable-next-line typescript/no-explicit-any
     mockGetCellEditorView.mockReturnValue(mockEditor as any);
 
     scrollCellIntoView(cid);

package/src/core/cells/__tests__/session.test.ts

@@ -1,7 +1,7 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
 import type * as api from "@marimo-team/marimo-api";
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* oxlint-disable typescript/no-explicit-any */
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { Mocks } from "@/__mocks__/common";
 import { cellId } from "@/__tests__/branded";

package/src/core/cells/__tests__/utils.test.ts

@@ -1,5 +1,5 @@
 /* Copyright 2026 Marimo. All rights reserved. */
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* oxlint-disable typescript/no-explicit-any */
 import { describe, expect, it } from "vitest";
 import {
   getCellConfigs,