From 56cd169a0e72f954f8ae004d2bb6bca76fae1fca Mon Sep 17 00:00:00 2001
From: Cyrus Goh <hello@cyrusgoh.com>
Date: Mon, 3 Feb 2025 08:30:16 -0800
Subject: [PATCH] Canvas: Inline add components (#6529)

* selected component index null directly

* inline add component

* fix spacing

* granular events handling for triggering contextmenu

* shared menu items

* remove dup contextmenu in blank canvas

* remove add component menu

* lint

* remove unused

* re-add ml-2 to canvas filters

* Revert "remove add component menu"

This reverts commit d7a17659dc459a2a2b38b39cf481f8462c13c90e.

* add component
---
 .../src/features/canvas/BlankCanvas.svelte    | 64 +++---------------
 web-common/src/features/canvas/Canvas.svelte  | 66 +++++++++++++++----
 .../canvas/CanvasDashboardPreview.svelte      | 15 +----
 .../canvas/components/AddComponentMenu.svelte | 18 +----
 .../canvas/components/menu-items.svelte       | 22 +++++++
 .../canvas/filters/CanvasFilters.svelte       |  7 +-
 .../workspaces/CanvasWorkspace.svelte         |  8 +--
 7 files changed, 95 insertions(+), 105 deletions(-)
 create mode 100644 web-common/src/features/canvas/components/menu-items.svelte

diff --git a/web-common/src/features/canvas/BlankCanvas.svelte b/web-common/src/features/canvas/BlankCanvas.svelte
index 7613ae1840d..4eb6888b1a8 100644
--- a/web-common/src/features/canvas/BlankCanvas.svelte
+++ b/web-common/src/features/canvas/BlankCanvas.svelte
@@ -1,36 +1,5 @@
 <script lang="ts">
   import { PlusCircleIcon } from "lucide-svelte";
-  import {
-    ContextMenu,
-    ContextMenuContent,
-    ContextMenuItem,
-    ContextMenuTrigger,
-  } from "@rilldata/web-common/components/context-menu";
-  import type { CanvasComponentType } from "./components/types";
-  import type { ComponentType, SvelteComponent } from "svelte";
-  import ChartIcon from "./icons/ChartIcon.svelte";
-  import TableIcon from "./icons/TableIcon.svelte";
-  import TextIcon from "./icons/TextIcon.svelte";
-  import BigNumberIcon from "./icons/BigNumberIcon.svelte";
-  import { createEventDispatcher } from "svelte";
-
-  const dispatch = createEventDispatcher();
-
-  const menuItems: {
-    id: CanvasComponentType;
-    label: string;
-    icon: ComponentType<SvelteComponent>;
-  }[] = [
-    { id: "bar_chart", label: "Chart", icon: ChartIcon },
-    { id: "table", label: "Table", icon: TableIcon },
-    { id: "markdown", label: "Text", icon: TextIcon },
-    { id: "kpi", label: "KPI", icon: BigNumberIcon },
-    { id: "image", label: "Image", icon: ChartIcon },
-  ];
-
-  function handleAddComponent(componentType: CanvasComponentType) {
-    dispatch("add", { type: componentType });
-  }
 
   function handleButtonClick(event: MouseEvent) {
     const contextMenuEvent = new MouseEvent("contextmenu", {
@@ -43,31 +12,14 @@
 </script>
 
 <div class="size-full p-4 bg-white">
-  <ContextMenu>
-    <ContextMenuTrigger>
-      <button
-        type="button"
-        class="blank-canvas-button flex flex-col items-center gap-2 p-8 rounded-[6px] border border-slate-200 w-full"
-        on:click={handleButtonClick}
-      >
-        <PlusCircleIcon class="w-6 h-6 text-slate-500" />
-        <span class="text-sm font-medium text-slate-500">Add a component</span>
-      </button>
-    </ContextMenuTrigger>
-    <ContextMenuContent>
-      {#each menuItems as item}
-        <ContextMenuItem
-          on:click={() => handleAddComponent(item.id)}
-          class="text-gray-700 text-xs"
-        >
-          <div class="flex flex-row gap-x-2">
-            <svelte:component this={item.icon} />
-            <span class="text-gray-700 text-xs font-normal">{item.label}</span>
-          </div>
-        </ContextMenuItem>
-      {/each}
-    </ContextMenuContent>
-  </ContextMenu>
+  <button
+    type="button"
+    class="blank-canvas-button flex flex-col items-center gap-2 p-8 rounded-[6px] border border-slate-200 w-full"
+    on:click={handleButtonClick}
+  >
+    <PlusCircleIcon class="w-6 h-6 text-slate-500" />
+    <span class="text-sm font-medium text-slate-500">Add a component</span>
+  </button>
 </div>
 
 <style lang="postcss">
diff --git a/web-common/src/features/canvas/Canvas.svelte b/web-common/src/features/canvas/Canvas.svelte
index eb5b7f08cb4..5928386ffb5 100644
--- a/web-common/src/features/canvas/Canvas.svelte
+++ b/web-common/src/features/canvas/Canvas.svelte
@@ -12,6 +12,13 @@
   import type { CanvasComponentType } from "./components/types";
   import BlankCanvas from "./BlankCanvas.svelte";
   import CanvasFilters from "@rilldata/web-common/features/canvas/filters/CanvasFilters.svelte";
+  import {
+    ContextMenu,
+    ContextMenuContent,
+    ContextMenuItem,
+    ContextMenuTrigger,
+  } from "@rilldata/web-common/components/context-menu";
+  import { menuItems } from "./components/menu-items.svelte";
 
   export let fileArtifact: FileArtifact;
 
@@ -177,6 +184,22 @@
   async function handleAdd(e: CustomEvent<{ type: CanvasComponentType }>) {
     await addComponent(e.detail.type);
   }
+
+  function handleContextMenu(
+    event: CustomEvent<{ originalEvent: MouseEvent }>,
+  ) {
+    const target = event.detail.originalEvent.target as HTMLElement;
+    const gridStackEl = target.closest(".grid-stack-item");
+
+    // Prevent context menu if clicking on a grid item
+    if (gridStackEl) {
+      event.detail.originalEvent.preventDefault();
+      event.detail.originalEvent.stopPropagation();
+      event.preventDefault();
+      event.stopPropagation();
+      return false;
+    }
+  }
 </script>
 
 {#if filtersEnabled}
@@ -188,17 +211,38 @@
   </div>
 {/if}
 
-{#if items.length === 0}
-  <BlankCanvas on:add={handleAdd} />
-{:else}
-  <CanvasDashboardPreview
-    {items}
-    {spec}
-    activeIndex={$selectedIndex}
-    on:update={handleUpdate}
-    on:delete={handleDelete}
-  />
-{/if}
+<ContextMenu>
+  <ContextMenuTrigger
+    class="h-full w-full block"
+    on:contextmenu={handleContextMenu}
+  >
+    {#if items.length === 0}
+      <BlankCanvas />
+    {:else}
+      <CanvasDashboardPreview
+        {items}
+        {spec}
+        activeIndex={$selectedIndex}
+        on:update={handleUpdate}
+        on:delete={handleDelete}
+      />
+    {/if}
+  </ContextMenuTrigger>
+  <ContextMenuContent>
+    {#each menuItems as item}
+      <ContextMenuItem
+        on:click={() =>
+          handleAdd(new CustomEvent("add", { detail: { type: item.id } }))}
+        class="text-gray-700 text-xs"
+      >
+        <div class="flex flex-row gap-x-2">
+          <svelte:component this={item.icon} />
+          <span class="text-gray-700 text-xs font-normal">{item.label}</span>
+        </div>
+      </ContextMenuItem>
+    {/each}
+  </ContextMenuContent>
+</ContextMenu>
 
 <svelte:window
   on:keydown={async (e) => {
diff --git a/web-common/src/features/canvas/CanvasDashboardPreview.svelte b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
index ae58548212e..04ab181e621 100644
--- a/web-common/src/features/canvas/CanvasDashboardPreview.svelte
+++ b/web-common/src/features/canvas/CanvasDashboardPreview.svelte
@@ -107,8 +107,7 @@
   }
 
   function handleDeselect() {
-    activeIndex = null;
-    canvasEntity.setSelectedComponentIndex(activeIndex);
+    canvasEntity.setSelectedComponentIndex(null);
   }
 
   function handleClickOutside(event: Event) {
@@ -121,21 +120,11 @@
 
     // Only deselect if click is inside canvas or dashboard-theme-boundary but outside grid-stack
     if ((canvasEl || dashboardThemeBoundaryEl) && !gridStackEl) {
-      activeIndex = null;
-      canvasEntity.setSelectedComponentIndex(activeIndex);
+      canvasEntity.setSelectedComponentIndex(null);
     }
   }
 </script>
 
-<!-- {#if showFilterBar}
-  <div
-    id="header"
-    class="border-b w-fit min-w-full flex flex-col bg-slate-50 slide"
-  >
-    <CanvasFilters />
-  </div>
-{/if} -->
-
 <CanvasDashboardWrapper bind:contentRect height={maxBottom}>
   <div bind:this={gridContainer} use:clickOutside={[null, handleClickOutside]}>
     <SvelteGridStack
diff --git a/web-common/src/features/canvas/components/AddComponentMenu.svelte b/web-common/src/features/canvas/components/AddComponentMenu.svelte
index 35fa202f39f..08e44e014be 100644
--- a/web-common/src/features/canvas/components/AddComponentMenu.svelte
+++ b/web-common/src/features/canvas/components/AddComponentMenu.svelte
@@ -3,27 +3,11 @@
   import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu";
   import type { CanvasComponentType } from "@rilldata/web-common/features/canvas/components/types";
   import { ChevronDown, Plus } from "lucide-svelte";
-  import type { ComponentType, SvelteComponent } from "svelte";
-  import ChartIcon from "../icons/ChartIcon.svelte";
-  import TableIcon from "../icons/TableIcon.svelte";
-  import TextIcon from "../icons/TextIcon.svelte";
-  import BigNumberIcon from "../icons/BigNumberIcon.svelte";
+  import { menuItems } from "./menu-items.svelte";
 
   export let addComponent: (componentType: CanvasComponentType) => void;
 
   let open = false;
-
-  const menuItems: {
-    id: CanvasComponentType;
-    label: string;
-    icon: ComponentType<SvelteComponent>;
-  }[] = [
-    { id: "bar_chart", label: "Chart", icon: ChartIcon },
-    { id: "table", label: "Table", icon: TableIcon },
-    { id: "markdown", label: "Text", icon: TextIcon },
-    { id: "kpi", label: "KPI", icon: BigNumberIcon },
-    { id: "image", label: "Image", icon: ChartIcon },
-  ];
 </script>
 
 <DropdownMenu.Root bind:open typeahead={false}>
diff --git a/web-common/src/features/canvas/components/menu-items.svelte b/web-common/src/features/canvas/components/menu-items.svelte
new file mode 100644
index 00000000000..e05a4fa1e6f
--- /dev/null
+++ b/web-common/src/features/canvas/components/menu-items.svelte
@@ -0,0 +1,22 @@
+<script lang="ts" context="module">
+  import type { CanvasComponentType } from "./types";
+  import ChartIcon from "../icons/ChartIcon.svelte";
+  import TableIcon from "../icons/TableIcon.svelte";
+  import TextIcon from "../icons/TextIcon.svelte";
+  import BigNumberIcon from "../icons/BigNumberIcon.svelte";
+  import type { ComponentType, SvelteComponent } from "svelte";
+
+  export type MenuItem = {
+    id: CanvasComponentType;
+    label: string;
+    icon: ComponentType<SvelteComponent>;
+  };
+
+  export const menuItems: MenuItem[] = [
+    { id: "bar_chart", label: "Chart", icon: ChartIcon },
+    { id: "table", label: "Table", icon: TableIcon },
+    { id: "markdown", label: "Text", icon: TextIcon },
+    { id: "kpi", label: "KPI", icon: BigNumberIcon },
+    { id: "image", label: "Image", icon: ChartIcon },
+  ];
+</script>
diff --git a/web-common/src/features/canvas/filters/CanvasFilters.svelte b/web-common/src/features/canvas/filters/CanvasFilters.svelte
index 7616c5618e5..ccd54826a4f 100644
--- a/web-common/src/features/canvas/filters/CanvasFilters.svelte
+++ b/web-common/src/features/canvas/filters/CanvasFilters.svelte
@@ -90,8 +90,8 @@
   }
 </script>
 
-<div class="flex flex-col gap-y-2 w-full h-20 justify-center ml-2">
-  <div class="flex flex-row flex-wrap gap-x-2 gap-y-1.5 items-center">
+<div class="flex flex-col gap-y-2 w-full h-20 justify-center">
+  <div class="flex flex-row flex-wrap gap-x-2 gap-y-1.5 items-center ml-2">
     <Calendar size="16px" />
     <CanvasSuperPill
       allTimeRange={$allTimeRange}
@@ -108,8 +108,7 @@
       selectedComparisonTimeRange={$selectedComparisonTimeRange}
     />
   </div>
-
-  <div class="relative flex flex-row gap-x-2 gap-y-2 items-start">
+  <div class="relative flex flex-row gap-x-2 gap-y-2 items-start ml-2">
     {#if !readOnly}
       <Filter size="16px" className="ui-copy-icon flex-none mt-[5px]" />
     {/if}
diff --git a/web-common/src/features/workspaces/CanvasWorkspace.svelte b/web-common/src/features/workspaces/CanvasWorkspace.svelte
index e59efdb2244..1a424bb78c0 100644
--- a/web-common/src/features/workspaces/CanvasWorkspace.svelte
+++ b/web-common/src/features/workspaces/CanvasWorkspace.svelte
@@ -4,8 +4,6 @@
   import Canvas from "@rilldata/web-common/features/canvas/Canvas.svelte";
   import CanvasEditor from "@rilldata/web-common/features/canvas/CanvasEditor.svelte";
   import CanvasThemeProvider from "@rilldata/web-common/features/canvas/CanvasThemeProvider.svelte";
-  import AddComponentMenu from "@rilldata/web-common/features/canvas/components/AddComponentMenu.svelte";
-  import type { CanvasComponentType } from "@rilldata/web-common/features/canvas/components/types";
   import { getComponentRegistry } from "@rilldata/web-common/features/canvas/components/util";
   import VisualCanvasEditing from "@rilldata/web-common/features/canvas/inspector/VisualCanvasEditing.svelte";
   import { useDefaultMetrics } from "@rilldata/web-common/features/canvas/selector";
@@ -27,9 +25,11 @@
   import WorkspaceEditorContainer from "@rilldata/web-common/layout/workspace/WorkspaceEditorContainer.svelte";
   import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import { parseDocument } from "yaml";
   import PreviewButton from "../explores/PreviewButton.svelte";
-  import { findNextAvailablePosition } from "@rilldata/web-common/features/canvas/util";
+  import type { CanvasComponentType } from "../canvas/components/types";
+  import { parseDocument } from "yaml";
+  import { findNextAvailablePosition } from "../canvas/util";
+  import AddComponentMenu from "../canvas/components/AddComponentMenu.svelte";
 
   export let fileArtifact: FileArtifact;