From fae897f4685947872d3cc8d2ad2d77842bea6e32 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 2 Sep 2024 09:31:19 +0100
Subject: [PATCH] Allow button groups to be collapsed

---
 .../bbui/src/Actions/position_dropdown.js     |   2 +-
 packages/bbui/src/Button/Button.svelte        |   2 +
 .../data/table/[tableId]/index.svelte         |   2 +-
 packages/client/manifest.json                 |  48 +++++++-
 .../src/components/app/ButtonGroup.svelte     | 108 ++++++++++++------
 .../src/components/grid/cells/GridCell.svelte |   7 +-
 .../grid/layout/ButtonColumn.svelte           |   4 +-
 7 files changed, 129 insertions(+), 44 deletions(-)

diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js
index 7a852f1b46..e95c7dd1b6 100644
--- a/packages/bbui/src/Actions/position_dropdown.js
+++ b/packages/bbui/src/Actions/position_dropdown.js
@@ -246,7 +246,7 @@ export default function positionDropdown(element, opts) {
   }
 
   // Apply initial styles which don't need to change
-  element.style.position = "absolute"
+  element.style.position = "fixed"
   element.style.zIndex = "9999"
 
   // Set up a scroll listener
diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index 9e49d84d44..7971c0ea8d 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -17,6 +17,7 @@
   export let tooltip = undefined
   export let newStyles = true
   export let id
+  export let ref
 
   const dispatch = createEventDispatcher()
 </script>
@@ -25,6 +26,7 @@
   <button
     {id}
     {type}
+    bind:this={ref}
     class:spectrum-Button--cta={cta}
     class:spectrum-Button--primary={primary}
     class:spectrum-Button--secondary={secondary}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index c71f20c9a8..a157aef463 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -60,7 +60,7 @@
   $: darkMode = !currentTheme.includes("light")
   $: buttons = [
     {
-      text: "Actions",
+      text: "Action",
       type: "cta",
       icon: "ChevronDown",
       onClick: async (e, row, refresh) => {
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index b1552a974a..70479530c4 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -447,6 +447,18 @@
         "section": true,
         "name": "Layout",
         "settings": [
+          {
+            "type": "boolean",
+            "label": "Collapse",
+            "key": "collapsed"
+          },
+          {
+            "type": "text",
+            "label": "Collapsed text",
+            "key": "collapsedText",
+            "dependsOn": "collapsed",
+            "placeholder": "Action"
+          },
           {
             "type": "select",
             "label": "Direction",
@@ -467,7 +479,11 @@
                 "barTitle": "Row layout"
               }
             ],
-            "defaultValue": "row"
+            "defaultValue": "row",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           },
           {
             "type": "select",
@@ -501,7 +517,11 @@
                 "barTitle": "Align stretched horizontally"
               }
             ],
-            "defaultValue": "left"
+            "defaultValue": "left",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           },
           {
             "type": "select",
@@ -535,7 +555,11 @@
                 "barTitle": "Align stretched vertically"
               }
             ],
-            "defaultValue": "top"
+            "defaultValue": "top",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           },
           {
             "type": "select",
@@ -557,7 +581,11 @@
                 "barTitle": "Grow container"
               }
             ],
-            "defaultValue": "shrink"
+            "defaultValue": "shrink",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           },
           {
             "type": "select",
@@ -583,7 +611,11 @@
                 "value": "L"
               }
             ],
-            "defaultValue": "M"
+            "defaultValue": "M",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           },
           {
             "type": "boolean",
@@ -591,7 +623,11 @@
             "key": "wrap",
             "showInBar": true,
             "barIcon": "ModernGridView",
-            "barTitle": "Wrap"
+            "barTitle": "Wrap",
+            "dependsOn": {
+              "setting": "collapsed",
+              "invert": true
+            }
           }
         ]
       }
diff --git a/packages/client/src/components/app/ButtonGroup.svelte b/packages/client/src/components/app/ButtonGroup.svelte
index b3523cdd21..2917d1524b 100644
--- a/packages/client/src/components/app/ButtonGroup.svelte
+++ b/packages/client/src/components/app/ButtonGroup.svelte
@@ -1,44 +1,86 @@
 <script>
   import BlockComponent from "../BlockComponent.svelte"
   import Block from "../Block.svelte"
+  import { Button, Popover, Menu, MenuItem } from "@budibase/bbui"
+  import { getContext } from "svelte"
 
   export let buttons = []
   export let direction = "row"
   export let hAlign = "left"
   export let vAlign = "top"
   export let gap = "S"
+  export let collapsed = false
+  export let collapsedText = "Action"
+
+  const { styleable, enrichButtonActions } = getContext("sdk")
+  const component = getContext("component")
+  const context = getContext("context")
+
+  let popover
+  let anchor
+
+  const handleCollapsedClick = async button => {
+    const fn = enrichButtonActions(button.onClick, $context)
+    await fn?.()
+    popover.hide()
+  }
 </script>
 
-<Block>
-  <BlockComponent
-    type="container"
-    props={{
-      direction,
-      hAlign,
-      vAlign,
-      gap,
-      wrap: true,
-    }}
-    styles={{
-      normal: {
-        height: "100%",
-      },
-    }}
-  >
-    {#each buttons as { text, type, quiet, disabled, onClick, size, icon, gap }}
-      <BlockComponent
-        type="button"
-        props={{
-          text: text || "Button",
-          onClick,
-          type,
-          quiet,
-          disabled,
-          icon,
-          gap,
-          size: size || "M",
-        }}
-      />
-    {/each}
-  </BlockComponent>
-</Block>
+{#if collapsed}
+  <div use:styleable={$component.styles}>
+    <Button
+      bind:ref={anchor}
+      on:click={() => popover?.show()}
+      icon="ChevronDown"
+      cta
+    >
+      {collapsedText || "Action"}
+    </Button>
+  </div>
+  <Popover bind:this={popover} align="left" {anchor}>
+    <Menu>
+      {#each buttons as button}
+        <MenuItem
+          on:click={() => handleCollapsedClick(button)}
+          disabled={button.disabled}
+        >
+          {button.text || "Button"}
+        </MenuItem>
+      {/each}
+    </Menu>
+  </Popover>
+{:else}
+  <Block>
+    <BlockComponent
+      type="container"
+      props={{
+        direction,
+        hAlign,
+        vAlign,
+        gap,
+        wrap: true,
+      }}
+      styles={{
+        normal: {
+          height: "100%",
+        },
+      }}
+    >
+      {#each buttons as { text, type, quiet, disabled, onClick, size, icon, gap }}
+        <BlockComponent
+          type="button"
+          props={{
+            text: text || "Button",
+            onClick,
+            type,
+            quiet,
+            disabled,
+            icon,
+            gap,
+            size: size || "M",
+          }}
+        />
+      {/each}
+    </BlockComponent>
+  </Block>
+{/if}
diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte
index 7b5deccb35..68f98648b4 100644
--- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte
@@ -16,7 +16,12 @@
   $: style = getStyle(width, selectedUser, metadata)
 
   const getStyle = (width, selectedUser, metadata) => {
-    let style = width === "auto" ? "width: auto;" : `flex: 0 0 ${width}px;`
+    let style
+    if (width === "auto" || width === "100%") {
+      style = `width: ${width};`
+    } else {
+      style = `flex: 0 0 ${width}px;`
+    }
     if (selectedUser) {
       style += `--user-color :${selectedUser.color};`
     }
diff --git a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
index bb8dd30b93..22a7e0d688 100644
--- a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
+++ b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
@@ -45,7 +45,7 @@
   onMount(() => {
     const observer = new ResizeObserver(entries => {
       const width = entries?.[0]?.contentRect?.width ?? 0
-      buttonColumnWidth.set(Math.floor(width) - 1)
+      buttonColumnWidth.set(width)
     })
     observer.observe(container)
   })
@@ -113,7 +113,7 @@
           on:mouseleave={$isDragging ? null : () => ($hoveredRowId = null)}
         >
           <GridCell
-            width={$buttonColumnWidth}
+            width="100%"
             highlighted={$hoveredRowId === BlankRowID}
             on:click={() => dispatch("add-row-inline")}
           />