@marimo-team/islands 0.20.5-dev10 → 0.20.5-dev15

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

@@ -1,6 +1,12 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 import { describe, expect, it } from "vitest";
-import { type Hotkey, type HotkeyAction, HotkeyProvider } from "../hotkeys";
+import {
+  type Hotkey,
+  type HotkeyAction,
+  HotkeyProvider,
+  normalizeKeyString,
+  OverridingHotkeyProvider,
+} from "../hotkeys";
 
 /**
  * Just a helper.
@@ -72,3 +78,60 @@ describe("HotkeyProvider platform separation", () => {
     expect(linux.getHotkey("cell.format").key).toBe("Ctrl-Shift-L");
   });
 });
+
+describe("normalizeKeyString", () => {
+  it("should capitalize multi-character base key names", () => {
+    expect(normalizeKeyString("Shift-enter")).toBe("Shift-Enter");
+    expect(normalizeKeyString("Cmd-enter")).toBe("Cmd-Enter");
+    expect(normalizeKeyString("Ctrl-backspace")).toBe("Ctrl-Backspace");
+    expect(normalizeKeyString("Alt-tab")).toBe("Alt-Tab");
+    expect(normalizeKeyString("Cmd-Shift-arrowUp")).toBe("Cmd-Shift-ArrowUp");
+  });
+
+  it("should leave already-correct key names unchanged", () => {
+    expect(normalizeKeyString("Shift-Enter")).toBe("Shift-Enter");
+    expect(normalizeKeyString("Cmd-Enter")).toBe("Cmd-Enter");
+    expect(normalizeKeyString("Mod-Shift-Enter")).toBe("Mod-Shift-Enter");
+  });
+
+  it("should leave single-character keys unchanged", () => {
+    expect(normalizeKeyString("Cmd-a")).toBe("Cmd-a");
+    expect(normalizeKeyString("Ctrl-Shift-z")).toBe("Ctrl-Shift-z");
+    expect(normalizeKeyString("a")).toBe("a");
+  });
+
+  it("should handle keys without modifiers", () => {
+    expect(normalizeKeyString("enter")).toBe("Enter");
+    expect(normalizeKeyString("Escape")).toBe("Escape");
+    expect(normalizeKeyString("F12")).toBe("F12");
+  });
+});
+
+describe("OverridingHotkeyProvider", () => {
+  it("should normalize lowercase key overrides", () => {
+    const provider = new OverridingHotkeyProvider(
+      {
+        "cell.run": "Shift-enter",
+        "cell.runAndNewBelow": "Cmd-enter",
+      },
+      { platform: "mac" },
+    );
+
+    expect(provider.getHotkey("cell.run").key).toBe("Shift-Enter");
+    expect(provider.getHotkey("cell.runAndNewBelow").key).toBe("Cmd-Enter");
+  });
+
+  it("should return defaults when no override is set", () => {
+    const provider = new OverridingHotkeyProvider({}, { platform: "mac" });
+    expect(provider.getHotkey("cell.run").key).toBe("Cmd-Enter");
+    expect(provider.getHotkey("cell.runAndNewBelow").key).toBe("Shift-Enter");
+  });
+
+  it("should pass through correctly-cased overrides unchanged", () => {
+    const provider = new OverridingHotkeyProvider(
+      { "cell.run": "Shift-Enter" },
+      { platform: "mac" },
+    );
+    expect(provider.getHotkey("cell.run").key).toBe("Shift-Enter");
+  });
+});

package/src/core/hotkeys/hotkeys.ts

@@ -535,10 +535,26 @@ export class OverridingHotkeyProvider extends HotkeyProvider {
 
   override getHotkey(action: HotkeyAction): ResolvedHotkey {
     const base = super.getHotkey(action);
-    const key = this.overrides[action] || base.key;
+    const override = this.overrides[action];
     return {
       name: base.name,
-      key,
+      key: override ? normalizeKeyString(override) : base.key,
     };
   }
 }
+
+const MODIFIER_RE = /^(cmd|ctrl|alt|shift|meta|mod)$/i;
+
+/**
+ * Capitalize multi-character base key names so they match the
+ * casing that KeyboardEvent.key (and therefore CodeMirror) uses.
+ * e.g. "Shift-enter" → "Shift-Enter", "Cmd-backspace" → "Cmd-Backspace"
+ */
+export function normalizeKeyString(key: string): string {
+  const parts = key.split("-");
+  const last = parts[parts.length - 1];
+  if (last.length > 1 && !MODIFIER_RE.test(last)) {
+    parts[parts.length - 1] = last.charAt(0).toUpperCase() + last.slice(1);
+  }
+  return parts.join("-");
+}

package/src/plugins/impl/FileBrowserPlugin.tsx

@@ -4,10 +4,10 @@ import { CornerLeftUp } from "lucide-react";
 import { type JSX, useEffect, useState } from "react";
 import { z } from "zod";
 import {
-  FILE_TYPE_ICONS,
-  type FileType,
-  guessFileType,
-} from "@/components/editor/file-tree/types";
+  FILE_ICON as FILE_TYPE_ICONS,
+  type FileIconType as FileType,
+  guessFileIconType as guessFileType,
+} from "@/components/editor/file-tree/file-icons";
 import { Spinner } from "@/components/icons/spinner";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";

package/dist/dist-BAeGo2rp.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { i as pythonLanguage, n as localCompletionSource, r as python, t as globalCompletion } from "./dist-7ZF--V_D.js";
-export {
-  python
-};

package/dist/dist-BqwCMSEa.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as rustLanguage, t as rust } from "./dist-ovDpXuSB.js";
-export {
-  rust
-};

package/dist/dist-Bum8FwTO.js

@@ -1,6 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-BBcqvpvP.js";
-import { n as sassCompletionSource, r as sassLanguage, t as sass } from "./dist-Qjf6pcqK.js";
-export {
-  sass
-};

package/dist/dist-C0YiOwt_.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as cppLanguage, t as cpp } from "./dist-BTQbjEKU.js";
-export {
-  cpp
-};

package/dist/dist-C2uPv4iU.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as yamlLanguage, t as yaml } from "./dist-D0f6Yrrb.js";
-export {
-  yaml
-};

package/dist/dist-C5hOLsJN.js

@@ -1,8 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-Ch_JuCvc.js";
-import "./dist-BBcqvpvP.js";
-import "./dist-CsqiXw7J.js";
-import { n as phpLanguage, t as php } from "./dist-CFToYDWO.js";
-export {
-  php
-};

package/dist/dist-C9NIAKMs.js

@@ -1,8 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-Ch_JuCvc.js";
-import "./dist-BBcqvpvP.js";
-import "./dist-CsqiXw7J.js";
-import { i as jinjaLanguage, n as jinja, r as jinjaCompletionSource, t as closePercentBrace } from "./dist-I8MQW60_.js";
-export {
-  jinja
-};

package/dist/dist-CCrzTtvk.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { i as defineCSSCompletionSource, n as cssCompletionSource, r as cssLanguage, t as css } from "./dist-BBcqvpvP.js";
-export {
-  css
-};

package/dist/dist-CFS9i1rS.js

@@ -1,8 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-Ch_JuCvc.js";
-import "./dist-BBcqvpvP.js";
-import "./dist-CsqiXw7J.js";
-import { i as liquidLanguage, n as liquid, r as liquidCompletionSource, t as closePercentBrace } from "./dist-BLThQiU4.js";
-export {
-  liquid
-};

package/dist/dist-CyHZuhPH.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as javaLanguage, t as java } from "./dist-De9X_Des.js";
-export {
-  java
-};

package/dist/dist-CzcjWdIk.js

@@ -1,6 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-BBcqvpvP.js";
-import { n as lessCompletionSource, r as lessLanguage, t as less } from "./dist-DEFZ7dnD.js";
-export {
-  less
-};

package/dist/dist-DaYyUSNC.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as wastLanguage, t as wast } from "./dist-Cqpjy6bK.js";
-export {
-  wast
-};

package/dist/dist-DpDcJYNh.js

@@ -1,8 +0,0 @@
-import "./dist-BuapEdlD.js";
-import "./dist-Ch_JuCvc.js";
-import "./dist-BBcqvpvP.js";
-import "./dist-CsqiXw7J.js";
-import { n as vueLanguage, t as vue } from "./dist-CYo3w-nC.js";
-export {
-  vue
-};

package/dist/dist-U_BfxcPn.js

@@ -1,5 +0,0 @@
-import "./dist-BuapEdlD.js";
-import { n as jsonLanguage, t as json } from "./dist-CB6qhQ8K.js";
-export {
-  json
-};