Add launcher from bottom toolbar and keyboard shortcut

Author: manzt

frontend/src/components/editor/actions/useNotebookActions.tsx

@@ -29,6 +29,7 @@ import {
   KeyboardIcon,
   LayoutTemplateIcon,
   LinkIcon,
+  MapIcon,
   MessagesSquareIcon,
   PanelLeftIcon,
   PowerSquareIcon,
@@ -95,8 +96,8 @@ const NOOP_HANDLER = (event?: Event) => {
 export function useNotebookActions() {
   const filename = useFilename();
   const { openModal, closeModal } = useImperativeModal();
-  const { toggleApplication } = useChromeActions();
-  const { selectedPanel } = useChromeState();
+  const { toggleApplication, toggleMinimap } = useChromeActions();
+  const { selectedPanel, isMinimapOpen } = useChromeState();
   const [viewState] = useAtom(viewStateAtom);
   const kioskMode = useAtomValue(kioskModeAtom);
   const hideAllMarkdownCode = useHideAllMarkdownCode();
@@ -286,6 +287,11 @@ export function useNotebookActions() {
         };
       }),
     },
+    {
+      icon: <MapIcon size={14} strokeWidth={1.5} />,
+      label: isMinimapOpen ? "Hide minimap" : "Show minimap",
+      handle: () => toggleMinimap(),
+    },
 
     {
       icon: <PresentationIcon size={14} strokeWidth={1.5} />,

frontend/src/components/editor/chrome/state.ts

@@ -10,6 +10,7 @@ export interface ChromeState {
   selectedPanel: PanelType | undefined;
   isSidebarOpen: boolean;
   isTerminalOpen: boolean;
+  isMinimapOpen: boolean;
 }
 
 const KEY = "marimo:sidebar";
@@ -21,6 +22,7 @@ const storage = new ZodLocalStorage<ChromeState>(
       .transform((v) => v as PanelType),
     isSidebarOpen: z.boolean(),
     isTerminalOpen: z.boolean(),
+    isMinimapOpen: z.boolean(),
   }),
   initialState,
 );
@@ -30,6 +32,7 @@ function initialState(): ChromeState {
     selectedPanel: "variables", // initial panel
     isSidebarOpen: false,
     isTerminalOpen: false,
+    isMinimapOpen: false,
   };
 }
 
@@ -71,6 +74,14 @@ const {
       ...state,
       isTerminalOpen: isOpen,
     }),
+    toggleMinimap: (state) => ({
+      ...state,
+      isMinimapOpen: !state.isMinimapOpen,
+    }),
+    setIsMinimapOpen: (state, isOpen: boolean) => ({
+      ...state,
+      isMinimapOpen: isOpen,
+    }),
   },
   [(_prevState, newState) => storage.set(KEY, newState)],
 );

frontend/src/components/editor/chrome/wrapper/footer-items/minimap-status.tsx

@@ -0,0 +1,21 @@
+/* Copyright 2024 Marimo. All rights reserved. */
+
+import { MapIcon } from "lucide-react";
+import { useChromeActions, useChromeState } from "../../state";
+import { FooterItem } from "../footer-item";
+
+export const MinimapStatusIcon: React.FC = () => {
+  const { isMinimapOpen } = useChromeState();
+  const { toggleMinimap } = useChromeActions();
+
+  return (
+    <FooterItem
+      tooltip="Toggle Minimap"
+      selected={isMinimapOpen}
+      onClick={() => toggleMinimap()}
+      data-testid="footer-minimap"
+    >
+      <MapIcon className="h-4 w-4" />
+    </FooterItem>
+  );
+};

frontend/src/components/editor/chrome/wrapper/footer.tsx

@@ -17,6 +17,7 @@ import { AIStatusIcon } from "./footer-items/ai-status";
 import { BackendConnection } from "./footer-items/backend-status";
 import { CopilotStatusIcon } from "./footer-items/copilot-status";
 import { MachineStats } from "./footer-items/machine-stats";
+import { MinimapStatusIcon } from "./footer-items/minimap-status";
 import { RTCStatus } from "./footer-items/rtc-status";
 import { RuntimeSettings } from "./footer-items/runtime-settings";
 
@@ -78,6 +79,7 @@ export const Footer: React.FC = () => {
 
       <div className="flex items-center flex-shrink-0 min-w-0">
         <MachineStats />
+        <MinimapStatusIcon />
         <AIStatusIcon />
         <CopilotStatusIcon />
         <RTCStatus />

frontend/src/components/editor/chrome/wrapper/minimap.tsx

@@ -1,13 +1,16 @@
 /* Copyright 2024 Marimo. All rights reserved. */
 
 import { useAtomValue } from "jotai";
-import React from "react";
+import { XIcon } from "lucide-react";
+import * as React from "react";
+import { Button } from "@/components/ui/button";
 import { useCellActions, useNotebook } from "@/core/cells/cells";
 import { cellFocusAtom, useCellFocusActions } from "@/core/cells/focus";
 import type { CellId } from "@/core/cells/ids";
 import { useVariables } from "@/core/variables/state";
 import type { VariableName } from "@/core/variables/types";
 import { cn } from "@/utils/cn";
+import { useChromeActions, useChromeState } from "../state";
 import {
   type CellGraph,
   cellGraphsAtom,
@@ -122,13 +125,14 @@ const MinimapCell: React.FC<MinimapCellProps> = (props) => {
   );
 };
 
-export const Minimap: React.FC<{ className?: string }> = ({ className }) => {
+const MinimapInternal: React.FC<{
+  open: boolean;
+  setOpen: (update: boolean) => void;
+}> = ({ open, setOpen }) => {
   const notebook = useNotebook();
-
   const cellPositions: Record<CellId, number> = Object.fromEntries(
     notebook.cellIds.inOrderIds.map((id, idx) => [id, idx]),
   );
-
   const columnBoundaries: number[] = [];
   let cellCount = 0;
   for (const [idx, column] of notebook.cellIds.getColumns().entries()) {
@@ -137,16 +141,24 @@ export const Minimap: React.FC<{ className?: string }> = ({ className }) => {
     }
     cellCount += column.inOrderIds.length;
   }
-
   return (
     <div
       className={cn(
-        "fixed top-14 right-4 z-50 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 rounded-lg border shadow-lg w-64 flex flex-col max-h-[75vh]",
-        className,
+        "fixed top-14 right-5 z-50 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 rounded-lg border shadow-lg w-64 flex flex-col max-h-[58vh]",
+        "motion-safe:transition-transform motion-safe:duration-200 motion-safe:ease-in-out",
+        open ? "translate-x-0" : "translate-x-[calc(100%+20px)]",
       )}
     >
       <div className="flex items-center justify-between p-4 border-b">
         <span className="text-sm font-semibold">Minimap</span>
+        <Button
+          variant="ghost"
+          size="icon"
+          className="h-6 w-6"
+          onClick={() => setOpen(false)}
+        >
+          <XIcon className="h-4 w-4" />
+        </Button>
       </div>
       <div className="overflow-y-auto overflow-x-hidden flex-1 scrollbar-none">
         <div className="py-3 pl-3 pr-4 relative min-h-full">
@@ -173,6 +185,12 @@ export const Minimap: React.FC<{ className?: string }> = ({ className }) => {
   );
 };
 
+export const Minimap: React.FC = () => {
+  const { setIsMinimapOpen } = useChromeActions();
+  const { isMinimapOpen } = useChromeState();
+  return <MinimapInternal open={isMinimapOpen} setOpen={setIsMinimapOpen} />;
+};
+
 function codePreview(code: string): string | undefined {
   return code.split("\n")[0].trim() || undefined;
 }