@marimo-team/islands 0.16.4 → 0.16.5

package/src/core/cells/cells.ts

@@ -5,7 +5,7 @@ import { type Atom, atom, useAtom, useAtomValue } from "jotai";
 import { atomFamily, selectAtom, splitAtom } from "jotai/utils";
 import { isEqual, zip } from "lodash-es";
 import { createRef, type ReducerWithoutAction } from "react";
-import type { CellHandle } from "@/components/editor/Cell";
+import type { CellHandle } from "@/components/editor/notebook-cell";
 import {
   type CellColumnId,
   type CellIndex,
@@ -1324,21 +1324,19 @@ const {
       cellRuntime: newCellRuntime,
     };
   },
-  upsertSetupCell: (state, action: { code: string }) => {
-    const { code } = action;
+  addSetupCellIfDoesntExist: (state, action: { code?: string }) => {
+    let { code } = action;
+    if (code == null) {
+      code = "# Initialization code that runs before all other cells";
+    }
 
     // First check if setup cell already exists
     if (SETUP_CELL_ID in state.cellData) {
-      // Update existing setup cell
-      return updateCellData({
-        state,
-        cellId: SETUP_CELL_ID,
-        cellReducer: (cell) => ({
-          ...cell,
-          code,
-          edited: code.trim() !== cell.lastCodeRun?.trim(),
-        }),
-      });
+      // Just focus on the existing setup cell
+      return {
+        ...state,
+        scrollKey: SETUP_CELL_ID,
+      };
     }
 
     return {
@@ -1365,6 +1363,7 @@ const {
         ...state.cellHandles,
         [SETUP_CELL_ID]: createRef(),
       },
+      scrollKey: SETUP_CELL_ID,
     };
   },
 });

package/src/core/cells/scrollCellIntoView.ts

@@ -1,10 +1,10 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 import type { RefObject } from "react";
-import type { CellHandle } from "@/components/editor/Cell";
 import {
   isAnyCellFocused,
   tryFocus,
 } from "@/components/editor/navigation/focus-utils";
+import type { CellHandle } from "@/components/editor/notebook-cell";
 import { retryWithTimeout } from "@/utils/timeout";
 import { Logger } from "../../utils/Logger";
 import { goToVariableDefinition } from "../codemirror/go-to-definition/commands";

package/src/core/codemirror/__tests__/setup.test.ts

@@ -67,6 +67,7 @@ function getOpts() {
     hotkeys: new OverridingHotkeyProvider({}),
     theme: "light",
     displayConfig: { reference_highlighting: false },
+    inlineAiTooltip: false,
   } as const;
 }
 

package/src/core/codemirror/cm.ts

@@ -46,7 +46,6 @@ import type {
   KeymapConfig,
   LSPConfig,
 } from "../config/config-schema";
-import { getFeatureFlag } from "../config/feature-flag";
 import type { HotkeyProvider } from "../hotkeys/hotkeys";
 import { store } from "../state/jotai";
 import { requestEditCompletion } from "./ai/request";
@@ -83,6 +82,7 @@ export interface CodeMirrorSetupOpts {
   lspConfig: LSPConfig;
   diagnosticsConfig: DiagnosticsConfig;
   displayConfig: Pick<DisplayConfig, "reference_highlighting">;
+  inlineAiTooltip: boolean;
 }
 
 function getPlaceholderType(opts: CodeMirrorSetupOpts) {
@@ -104,6 +104,7 @@ export const setupCodeMirror = (opts: CodeMirrorSetupOpts): Extension[] => {
     lspConfig,
     diagnosticsConfig,
     displayConfig,
+    inlineAiTooltip,
   } = opts;
   const placeholderType = getPlaceholderType(opts);
 
@@ -128,7 +129,7 @@ export const setupCodeMirror = (opts: CodeMirrorSetupOpts): Extension[] => {
     goToDefinitionBundle(),
     diagnosticsConfig?.enabled ? lintGutter() : [],
     // AI edit inline
-    enableAI && getFeatureFlag("inline_ai_tooltip")
+    enableAI && inlineAiTooltip
       ? [
           aiExtension({
             prompt: (req) => {

package/src/core/config/__tests__/config-schema.test.ts

@@ -45,6 +45,7 @@ test("default UserConfig - empty", () => {
   expect(defaultConfig).toMatchInlineSnapshot(`
     {
       "ai": {
+        "inline_tooltip": false,
         "mode": "manual",
         "models": {
           "custom_models": [],
@@ -110,6 +111,7 @@ test("default UserConfig - one level", () => {
   expect(defaultConfig).toMatchInlineSnapshot(`
     {
       "ai": {
+        "inline_tooltip": false,
         "mode": "manual",
         "models": {
           "custom_models": [],

package/src/core/config/config-schema.ts

@@ -152,6 +152,7 @@ export const UserConfigSchema = z
       .looseObject({
         rules: z.string().prefault(""),
         mode: z.enum(["manual", "ask"]).prefault("manual"),
+        inline_tooltip: z.boolean().prefault(false),
         open_ai: AiConfigSchema.optional(),
         anthropic: AiConfigSchema.optional(),
         google: AiConfigSchema.optional(),
@@ -216,6 +217,7 @@ export type KeymapConfig = UserConfig["keymap"];
 export type LSPConfig = UserConfig["language_servers"];
 export type DiagnosticsConfig = UserConfig["diagnostics"];
 export type DisplayConfig = UserConfig["display"];
+export type AiConfig = UserConfig["ai"];
 
 export const AppTitleSchema = z.string();
 export const SqlOutputSchema = z

package/src/core/config/feature-flag.tsx

@@ -7,7 +7,6 @@ import { getResolvedMarimoConfig } from "./config";
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ExperimentalFeatures {
   markdown: boolean; // Used in playground (community cloud)
-  inline_ai_tooltip: boolean;
   wasm_layouts: boolean; // Used in playground (community cloud)
   rtc_v2: boolean;
   performant_table_charts: boolean;
@@ -20,7 +19,6 @@ export interface ExperimentalFeatures {
 
 const defaultValues: ExperimentalFeatures = {
   markdown: true,
-  inline_ai_tooltip: import.meta.env.DEV,
   wasm_layouts: false,
   rtc_v2: false,
   performant_table_charts: false,

package/src/core/edit-app.tsx

@@ -15,7 +15,7 @@ import {
   useRunAllCells,
   useRunStaleCells,
 } from "../components/editor/cell/useRunCells";
-import { CellArray } from "../components/editor/renderers/CellArray";
+import { CellArray } from "../components/editor/renderers/cell-array";
 import { CellsRenderer } from "../components/editor/renderers/cells-renderer";
 import { useHotkey } from "../hooks/useHotkey";
 import {

package/src/core/network/CachingRequestRegistry.ts

@@ -56,9 +56,9 @@ export class CachingRequestRegistry<REQ, RES> {
 
     const promise = this.delegate.request(req);
     this.cache.set(key, promise);
-    return promise.catch((err) => {
+    return promise.catch((error) => {
       this.cache.delete(key);
-      throw err;
+      throw error;
     });
   }
 

package/src/stories/cell.stories.tsx

@@ -16,7 +16,7 @@ import type { CellConfig } from "@/core/network/types";
 import { WebSocketState } from "@/core/websocket/types";
 import { MultiColumn } from "@/utils/id-tree";
 import type { Milliseconds, Seconds } from "@/utils/time";
-import { Cell as EditorCell } from "../components/editor/Cell";
+import { Cell as EditorCell } from "../components/editor/notebook-cell";
 import { TooltipProvider } from "../components/ui/tooltip";
 import type { CellId } from "../core/cells/ids";
 

package/src/stories/layout/vertical/one-column.stories.tsx

@@ -13,7 +13,7 @@ import { resolveRequestClient } from "@/core/network/resolve";
 import { WebSocketState } from "@/core/websocket/types";
 import { MultiColumn } from "@/utils/id-tree";
 import type { Milliseconds, Seconds } from "@/utils/time";
-import { CellArray } from "../../../components/editor/renderers/CellArray";
+import { CellArray } from "../../../components/editor/renderers/cell-array";
 import { CellsRenderer } from "../../../components/editor/renderers/cells-renderer";
 import { TooltipProvider } from "../../../components/ui/tooltip";
 import type { CellId } from "../../../core/cells/ids";

package/src/utils/numbers.ts

@@ -1,5 +1,28 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
+import { Logger } from "./Logger";
+import { memoizeLastValue } from "./once";
+
+/**
+ * Browsers have a limit on the maximum number of fractional digits they can display.
+ * This function finds the maximum number of fractional digits that can be displayed for a given locale.
+ */
+export const maxFractionalDigits = memoizeLastValue((locale: string) => {
+  const options = [100, 20, 2, 0];
+  for (const option of options) {
+    try {
+      new Intl.NumberFormat(locale, {
+        minimumFractionDigits: 0,
+        maximumFractionDigits: option,
+      }).format(1);
+      return option;
+    } catch (e) {
+      Logger.error(e);
+    }
+  }
+  return 0;
+});
+
 export function prettyNumber(value: unknown, locale: string): string {
   if (value === undefined || value === null) {
     return "";
@@ -80,7 +103,7 @@ export function prettyScientificNumber(
   // Don't round
   return value.toLocaleString(locale, {
     minimumFractionDigits: 0,
-    maximumFractionDigits: 100,
+    maximumFractionDigits: maxFractionalDigits(locale),
   });
 }
 

package/dist/assets/__vite-browser-external-BeNtI_tJ.js

@@ -1 +0,0 @@
-import{__commonJSMin as e}from"./worker-DnuXpGWN.js";var t=e(((e,t)=>{t.exports={}}));export default t();