From c4125b5a938601ebda9340a21be0f62bfbaa8cb4 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Mon, 17 Apr 2023 13:37:03 +0100
Subject: [PATCH] Update text cells, number cells, long form field cells and
 relationship cells to respect row height

---
 .../components/sheet/cells/HeaderCell.svelte  |  1 +
 .../sheet/cells/LongFormCell.svelte           | 12 +++--
 .../sheet/cells/RelationshipCell.svelte       | 14 +++---
 .../components/sheet/cells/SheetCell.svelte   |  7 ++-
 .../components/sheet/cells/TextCell.svelte    | 46 ++++++++++++++++---
 .../sheet/controls/RowHeightButton.svelte     | 12 +++--
 .../src/components/sheet/layout/Sheet.svelte  |  7 +--
 .../sheet/layout/StickyColumn.svelte          |  2 +-
 .../src/components/sheet/lib/constants.js     |  5 +-
 .../src/components/sheet/stores/ui.js         | 16 +++++++
 10 files changed, 94 insertions(+), 28 deletions(-)

diff --git a/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte b/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
index 0d3d74c979..64ef8c3be8 100644
--- a/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/HeaderCell.svelte
@@ -111,6 +111,7 @@
     width={column.width}
     left={column.left}
     defaultHeight
+    center
   >
     <Icon
       size="S"
diff --git a/packages/frontend-core/src/components/sheet/cells/LongFormCell.svelte b/packages/frontend-core/src/components/sheet/cells/LongFormCell.svelte
index 083607ff12..cbb7a15edd 100644
--- a/packages/frontend-core/src/components/sheet/cells/LongFormCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/LongFormCell.svelte
@@ -56,6 +56,7 @@
     value={value || ""}
     on:change={handleChange}
     on:wheel|stopPropagation
+    spellcheck="false"
   />
 {:else}
   <div class="long-form-cell" on:click={editable ? open : null} class:editable>
@@ -68,19 +69,21 @@
 <style>
   .long-form-cell {
     flex: 1 1 auto;
-    padding: 0 var(--cell-padding);
+    padding: var(--cell-padding);
     align-self: stretch;
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     overflow: hidden;
   }
   .long-form-cell.editable:hover {
     cursor: text;
   }
   .value {
+    display: -webkit-box;
+    -webkit-line-clamp: var(--content-lines);
+    -webkit-box-orient: vertical;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    line-height: 19px;
   }
   textarea {
     padding: var(--cell-padding);
@@ -98,6 +101,7 @@
     z-index: 1;
     border-radius: 2px;
     resize: none;
+    line-height: 19px;
   }
   textarea.invertX {
     left: auto;
diff --git a/packages/frontend-core/src/components/sheet/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/sheet/cells/RelationshipCell.svelte
index 60bf9208df..e1e92c31ec 100644
--- a/packages/frontend-core/src/components/sheet/cells/RelationshipCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/RelationshipCell.svelte
@@ -289,7 +289,7 @@
     min-height: var(--row-height);
     max-height: var(--row-height);
     overflow: hidden;
-    --max-relationship-height: 94px;
+    --max-relationship-height: 92px;
   }
   .wrapper.focused {
     position: absolute;
@@ -330,15 +330,15 @@
     justify-content: flex-start;
     align-items: flex-start;
     flex: 1 1 auto;
-    gap: var(--cell-spacing);
-    grid-row-gap: 7px;
+    grid-column-gap: var(--cell-spacing);
+    grid-row-gap: var(--cell-padding);
     overflow: hidden;
-    padding: 7px var(--cell-padding);
+    padding: var(--cell-padding);
     flex-wrap: wrap;
   }
   .badge {
     flex: 0 0 auto;
-    padding: 2px var(--cell-padding);
+    padding: 0 var(--cell-padding);
     background: var(--color);
     border-radius: var(--cell-padding);
     user-select: none;
@@ -348,6 +348,7 @@
     display: flex;
     align-items: center;
     gap: var(--cell-spacing);
+    height: 20px;
   }
   .focused .badge span:hover {
     cursor: pointer;
@@ -368,8 +369,7 @@
     position: absolute;
     top: 100%;
     left: 0;
-    min-width: 100%;
-    max-width: calc(100% + var(--max-cell-render-width-overflow));
+    width: 100%;
     height: calc(
       var(--max-cell-render-height) + var(--row-height) -
         var(--max-relationship-height)
diff --git a/packages/frontend-core/src/components/sheet/cells/SheetCell.svelte b/packages/frontend-core/src/components/sheet/cells/SheetCell.svelte
index 006e238234..5b9cb4ee51 100644
--- a/packages/frontend-core/src/components/sheet/cells/SheetCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/SheetCell.svelte
@@ -7,6 +7,7 @@
   export let error = null
   export let rowIdx
   export let defaultHeight = false
+  export let center = false
 
   $: style = getStyle(width, selectedUser)
 
@@ -25,6 +26,7 @@
   class:highlighted
   class:focused
   class:error
+  class:center
   class:default-height={defaultHeight}
   class:selected-other={selectedUser != null}
   on:focus
@@ -57,7 +59,7 @@
     display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    align-items: center;
+    align-items: flex-start;
     color: var(--spectrum-global-color-gray-800);
     font-size: var(--cell-font-size);
     gap: var(--cell-spacing);
@@ -69,6 +71,9 @@
   .cell.default-height {
     height: var(--default-row-height);
   }
+  .cell.center {
+    align-items: center;
+  }
 
   /* Cell border */
   .cell.focused:after,
diff --git a/packages/frontend-core/src/components/sheet/cells/TextCell.svelte b/packages/frontend-core/src/components/sheet/cells/TextCell.svelte
index b14c57d28d..88ba6b8e21 100644
--- a/packages/frontend-core/src/components/sheet/cells/TextCell.svelte
+++ b/packages/frontend-core/src/components/sheet/cells/TextCell.svelte
@@ -48,23 +48,42 @@
     on:change={handleChange}
   />
 {:else}
-  <div class="text-cell">
-    {value || ""}
+  <div class="text-cell" class:number={type === "number"}>
+    <div class="value">
+      {value || ""}
+    </div>
   </div>
 {/if}
 
 <style>
   .text-cell {
-    padding: 0 var(--cell-padding);
+    flex: 1 1 auto;
+    padding: var(--cell-padding);
+    align-self: stretch;
+    display: flex;
+    align-items: flex-start;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  }
+  .text-cell.editable:hover {
+    cursor: text;
+  }
+  .text-cell.number {
+    justify-content: flex-end;
+  }
+  .value {
+    display: -webkit-box;
+    -webkit-line-clamp: var(--content-lines);
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    line-height: 19px;
+  }
+  .number .value {
+    -webkit-line-clamp: 1;
   }
   input {
     flex: 1 1 auto;
     border: none;
-    padding: 0;
-    margin: 0 var(--cell-padding);
+    padding: var(--cell-padding);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -76,4 +95,17 @@
   input:focus {
     outline: none;
   }
+  input[type="number"] {
+    text-align: right;
+  }
+
+  /* Hide arrows for number fields */
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+  input[type="number"] {
+    -moz-appearance: textfield;
+  }
 </style>
diff --git a/packages/frontend-core/src/components/sheet/controls/RowHeightButton.svelte b/packages/frontend-core/src/components/sheet/controls/RowHeightButton.svelte
index 023ee17664..e6e9103afc 100644
--- a/packages/frontend-core/src/components/sheet/controls/RowHeightButton.svelte
+++ b/packages/frontend-core/src/components/sheet/controls/RowHeightButton.svelte
@@ -1,21 +1,25 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Popover } from "@budibase/bbui"
-  import { DefaultRowHeight } from "../lib/constants"
+  import {
+    LargeRowHeight,
+    MediumRowHeight,
+    SmallRowHeight,
+  } from "../lib/constants"
 
   const { rowHeight, loaded } = getContext("sheet")
   const sizeOptions = [
     {
       label: "Small",
-      size: DefaultRowHeight,
+      size: SmallRowHeight,
     },
     {
       label: "Medium",
-      size: 65,
+      size: MediumRowHeight,
     },
     {
       label: "Large",
-      size: 94,
+      size: LargeRowHeight,
     },
   ]
 
diff --git a/packages/frontend-core/src/components/sheet/layout/Sheet.svelte b/packages/frontend-core/src/components/sheet/layout/Sheet.svelte
index c070d3b972..f1161653c6 100644
--- a/packages/frontend-core/src/components/sheet/layout/Sheet.svelte
+++ b/packages/frontend-core/src/components/sheet/layout/Sheet.svelte
@@ -62,7 +62,8 @@
   context = attachStores(context)
 
   // Reference some stores for local use
-  const { isResizing, isReordering, ui, loaded, rowHeight } = context
+  const { isResizing, isReordering, ui, loaded, rowHeight, contentLines } =
+    context
 
   // Keep stores up to date
   $: tableIdStore.set(tableId)
@@ -90,7 +91,7 @@
   id="sheet-{rand}"
   class:is-resizing={$isResizing}
   class:is-reordering={$isReordering}
-  style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px;"
+  style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};"
 >
   <div class="controls">
     <div class="controls-left">
@@ -145,7 +146,7 @@
     /* Variables */
     --cell-background: var(--spectrum-global-color-gray-50);
     --cell-background-hover: var(--spectrum-global-color-gray-100);
-    --cell-padding: 10px;
+    --cell-padding: 8px;
     --cell-spacing: 4px;
     --cell-border: 1px solid var(--spectrum-global-color-gray-200);
     --cell-font-size: 14px;
diff --git a/packages/frontend-core/src/components/sheet/layout/StickyColumn.svelte b/packages/frontend-core/src/components/sheet/layout/StickyColumn.svelte
index fc03b2b55b..edadb4987f 100644
--- a/packages/frontend-core/src/components/sheet/layout/StickyColumn.svelte
+++ b/packages/frontend-core/src/components/sheet/layout/StickyColumn.svelte
@@ -58,7 +58,7 @@
   class:scrolled={$scrollLeft > 0}
 >
   <div class="header row">
-    <SheetCell width={GutterWidth} defaultHeight>
+    <SheetCell width={GutterWidth} defaultHeight center>
       <div class="gutter">
         <div class="checkbox visible">
           {#if $config.allowDeleteRows}
diff --git a/packages/frontend-core/src/components/sheet/lib/constants.js b/packages/frontend-core/src/components/sheet/lib/constants.js
index fa38bc662a..e156a2e9a6 100644
--- a/packages/frontend-core/src/components/sheet/lib/constants.js
+++ b/packages/frontend-core/src/components/sheet/lib/constants.js
@@ -6,4 +6,7 @@ export const GutterWidth = 72
 export const DefaultColumnWidth = 200
 export const DefaultRelationshipColumnWidth = 360
 export const MinColumnWidth = 100
-export const DefaultRowHeight = 36
+export const SmallRowHeight = 36
+export const MediumRowHeight = 64
+export const LargeRowHeight = 92
+export const DefaultRowHeight = SmallRowHeight
diff --git a/packages/frontend-core/src/components/sheet/stores/ui.js b/packages/frontend-core/src/components/sheet/stores/ui.js
index aeafa00da3..26d2bb036b 100644
--- a/packages/frontend-core/src/components/sheet/stores/ui.js
+++ b/packages/frontend-core/src/components/sheet/stores/ui.js
@@ -1,4 +1,9 @@
 import { writable, get, derived } from "svelte/store"
+import {
+  LargeRowHeight,
+  MediumRowHeight,
+  SmallRowHeight,
+} from "../lib/constants"
 
 export const createStores = () => {
   const focusedCellId = writable(null)
@@ -35,6 +40,7 @@ export const deriveStores = context => {
     hoveredRowId,
     enrichedRows,
     rowLookupMap,
+    rowHeight,
   } = context
 
   // Derive the row that contains the selected cell
@@ -62,8 +68,18 @@ export const deriveStores = context => {
     hoveredRowId.set(null)
   }
 
+  const contentLines = derived(rowHeight, $rowHeight => {
+    if ($rowHeight === LargeRowHeight) {
+      return 4
+    } else if ($rowHeight === MediumRowHeight) {
+      return 2
+    }
+    return 1
+  })
+
   return {
     focusedRow,
+    contentLines,
     ui: {
       actions: {
         blur,