From b98aef53fddd86d9fab98629333b6e29d4fa1924 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Fri, 10 Feb 2023 16:33:18 +0100
Subject: [PATCH] :children_crossing: (results) Remove useless scrollbars and
 make header sticky

Closes #297
---
 .../results/components/ResultsTable/Cell.tsx  |   4 +-
 .../ResultsTable/ColumnsSettingsButton.tsx    | 114 +++++++++---------
 .../components/ResultsTable/HeaderRow.tsx     |  18 ++-
 .../components/ResultsTable/ResultsTable.tsx  |  19 +--
 .../results/components/ResultsTable/Row.tsx   |   1 +
 .../results/components/ResultsTable/index.tsx |   2 +-
 .../components/ResultsTableContainer.tsx      |  13 +-
 7 files changed, 90 insertions(+), 81 deletions(-)

diff --git a/apps/builder/src/features/results/components/ResultsTable/Cell.tsx b/apps/builder/src/features/results/components/ResultsTable/Cell.tsx
index 6e9609a8e..11da707c5 100644
--- a/apps/builder/src/features/results/components/ResultsTable/Cell.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/Cell.tsx
@@ -8,6 +8,7 @@ type Props = {
   cell: CellProps<TableData, unknown>
   size: number
   isExpandButtonVisible: boolean
+  rowIndex: number
   cellIndex: number
   isSelected: boolean
   onExpandButtonClick: () => void
@@ -17,6 +18,7 @@ const Cell = ({
   cell,
   size,
   isExpandButtonVisible,
+  rowIndex,
   cellIndex,
   onExpandButtonClick,
 }: Props) => {
@@ -25,7 +27,7 @@ const Cell = ({
       key={cell.id}
       px="4"
       py="2"
-      border="1px"
+      borderWidth={rowIndex === 0 ? '0 1px 1px 1px' : '1px'}
       borderColor={useColorModeValue('gray.200', 'gray.700')}
       whiteSpace="nowrap"
       wordBreak="normal"
diff --git a/apps/builder/src/features/results/components/ResultsTable/ColumnsSettingsButton.tsx b/apps/builder/src/features/results/components/ResultsTable/ColumnsSettingsButton.tsx
index 50a0bebde..25dae657d 100644
--- a/apps/builder/src/features/results/components/ResultsTable/ColumnsSettingsButton.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/ColumnsSettingsButton.tsx
@@ -96,66 +96,68 @@ export const ColumnSettingsButton = ({
       <PopoverTrigger>
         <Button leftIcon={<ToolIcon />}>Columns</Button>
       </PopoverTrigger>
-      <PopoverContent w="400px">
-        <PopoverBody
-          as={Stack}
-          spacing="4"
-          p="4"
-          maxH="450px"
-          overflowY="scroll"
-        >
-          <Stack>
-            <Text fontWeight="semibold" fontSize="sm">
-              Shown in table:
-            </Text>
-            <DndContext
-              sensors={sensors}
-              collisionDetection={closestCenter}
-              onDragStart={handleDragStart}
-              onDragEnd={handleDragEnd}
-            >
-              <SortableContext
-                items={columnOrder}
-                strategy={verticalListSortingStrategy}
-              >
-                {visibleHeaders.map((header) => (
-                  <SortableColumns
-                    key={header.id}
-                    header={header}
-                    onEyeClick={onEyeClick}
-                  />
-                ))}
-              </SortableContext>
-              <Portal>
-                <DragOverlay dropAnimation={{ duration: 0 }}>
-                  {draggingColumnId ? <Flex /> : null}
-                </DragOverlay>
-              </Portal>
-            </DndContext>
-          </Stack>
-          {hiddenHeaders.length > 0 && (
+      <Portal>
+        <PopoverContent w="400px">
+          <PopoverBody
+            as={Stack}
+            spacing="4"
+            p="4"
+            maxH="450px"
+            overflowY="scroll"
+          >
             <Stack>
               <Text fontWeight="semibold" fontSize="sm">
-                Hidden in table:
+                Shown in table:
               </Text>
-              {hiddenHeaders.map((header) => (
-                <Flex key={header.id} justify="space-between">
-                  <HStack>
-                    <HeaderIcon header={header} />
-                    <Text>{header.label}</Text>
-                  </HStack>
-                  <IconButton
-                    icon={<EyeOffIcon />}
-                    size="sm"
-                    aria-label={'Hide column'}
-                    onClick={onEyeClick(header.id)}
-                  />
-                </Flex>
-              ))}
+              <DndContext
+                sensors={sensors}
+                collisionDetection={closestCenter}
+                onDragStart={handleDragStart}
+                onDragEnd={handleDragEnd}
+              >
+                <SortableContext
+                  items={columnOrder}
+                  strategy={verticalListSortingStrategy}
+                >
+                  {visibleHeaders.map((header) => (
+                    <SortableColumns
+                      key={header.id}
+                      header={header}
+                      onEyeClick={onEyeClick}
+                    />
+                  ))}
+                </SortableContext>
+                <Portal>
+                  <DragOverlay dropAnimation={{ duration: 0 }}>
+                    {draggingColumnId ? <Flex /> : null}
+                  </DragOverlay>
+                </Portal>
+              </DndContext>
             </Stack>
-          )}
-        </PopoverBody>
-      </PopoverContent>
+            {hiddenHeaders.length > 0 && (
+              <Stack>
+                <Text fontWeight="semibold" fontSize="sm">
+                  Hidden in table:
+                </Text>
+                {hiddenHeaders.map((header) => (
+                  <Flex key={header.id} justify="space-between">
+                    <HStack>
+                      <HeaderIcon header={header} />
+                      <Text>{header.label}</Text>
+                    </HStack>
+                    <IconButton
+                      icon={<EyeOffIcon />}
+                      size="sm"
+                      aria-label={'Hide column'}
+                      onClick={onEyeClick(header.id)}
+                    />
+                  </Flex>
+                ))}
+              </Stack>
+            )}
+          </PopoverBody>
+        </PopoverContent>
+      </Portal>
     </Popover>
   )
 }
diff --git a/apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx b/apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx
index ee3337f19..c908ff95f 100644
--- a/apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx
@@ -1,3 +1,4 @@
+import { colors } from '@/lib/theme'
 import { Box, BoxProps, chakra, useColorModeValue } from '@chakra-ui/react'
 import { flexRender, HeaderGroup } from '@tanstack/react-table'
 import React from 'react'
@@ -5,10 +6,13 @@ import { TableData } from '../../types'
 
 type Props = {
   headerGroup: HeaderGroup<TableData>
+  isTableScrolled: boolean
 }
 
-export const HeaderRow = ({ headerGroup }: Props) => {
-  const borderColor = useColorModeValue('gray.200', 'gray.700')
+export const HeaderRow = ({ headerGroup, isTableScrolled }: Props) => {
+  const borderColor = useColorModeValue(colors.gray[200], colors.gray[700])
+  const backgroundColor = useColorModeValue('white', colors.gray[900])
+
   return (
     <tr key={headerGroup.id}>
       {headerGroup.headers.map((header) => {
@@ -16,14 +20,18 @@ export const HeaderRow = ({ headerGroup }: Props) => {
           <chakra.th
             key={header.id}
             px="4"
-            py="2"
-            pos="relative"
-            border="1px"
+            py="3"
+            borderX="1px"
             borderColor={borderColor}
+            backgroundColor={isTableScrolled ? backgroundColor : undefined}
+            zIndex={10}
+            pos="sticky"
+            top="0"
             fontWeight="normal"
             whiteSpace="nowrap"
             wordBreak="normal"
             colSpan={header.colSpan}
+            shadow={`inset 0 1px 0 ${borderColor}, inset 0 -1px 0 ${borderColor}; `}
             style={{
               minWidth: header.getSize(),
               maxWidth: header.getSize(),
diff --git a/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx b/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx
index e859700cc..fa7e4780d 100644
--- a/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx
@@ -50,6 +50,7 @@ export const ResultsTable = ({
   const background = useColorModeValue('white', colors.gray[900])
   const { updateTypebot } = useTypebot()
   const [rowSelection, setRowSelection] = useState<Record<string, boolean>>({})
+  const [isTableScrolled, setIsTableScrolled] = useState(false)
   const bottomElement = useRef<HTMLDivElement | null>(null)
   const tableWrapper = useRef<HTMLDivElement | null>(null)
 
@@ -197,13 +198,7 @@ export const ResultsTable = ({
   }
 
   return (
-    <Stack
-      maxW="1600px"
-      px="4"
-      overflow="scroll"
-      spacing={6}
-      ref={tableWrapper}
-    >
+    <Stack maxW="1600px" px="4" overflowY="hidden" spacing={6}>
       <Flex w="full" justifyContent="flex-end">
         <ResultsActionButtons
           selectedResultsId={Object.keys(rowSelection)}
@@ -219,6 +214,7 @@ export const ResultsTable = ({
         />
       </Flex>
       <Box
+        ref={tableWrapper}
         overflow="scroll"
         rounded="md"
         data-testid="results-table"
@@ -227,11 +223,18 @@ export const ResultsTable = ({
         backgroundRepeat="no-repeat"
         backgroundSize="30px 100%, 30px 100%, 15px 100%, 15px 100%"
         backgroundAttachment="local, local, scroll, scroll"
+        onScroll={(e) =>
+          setIsTableScrolled((e.target as HTMLElement).scrollTop > 0)
+        }
       >
         <chakra.table rounded="md">
           <thead>
             {instance.getHeaderGroups().map((headerGroup) => (
-              <HeaderRow key={headerGroup.id} headerGroup={headerGroup} />
+              <HeaderRow
+                key={headerGroup.id}
+                headerGroup={headerGroup}
+                isTableScrolled={isTableScrolled}
+              />
             ))}
           </thead>
 
diff --git a/apps/builder/src/features/results/components/ResultsTable/Row.tsx b/apps/builder/src/features/results/components/ResultsTable/Row.tsx
index 393c2b8b8..c5075a9e8 100644
--- a/apps/builder/src/features/results/components/ResultsTable/Row.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/Row.tsx
@@ -38,6 +38,7 @@ export const Row = ({
           cell={cell}
           size={cell.column.getSize()}
           isExpandButtonVisible={isExpandButtonVisible}
+          rowIndex={row.index}
           cellIndex={cellIndex}
           onExpandButtonClick={onExpandButtonClick}
           isSelected={isSelected}
diff --git a/apps/builder/src/features/results/components/ResultsTable/index.tsx b/apps/builder/src/features/results/components/ResultsTable/index.tsx
index 256ba146b..e1a3eb1f4 100644
--- a/apps/builder/src/features/results/components/ResultsTable/index.tsx
+++ b/apps/builder/src/features/results/components/ResultsTable/index.tsx
@@ -1 +1 @@
-export { ResultsTable as SubmissionsTable } from './ResultsTable'
+export { ResultsTable } from './ResultsTable'
diff --git a/apps/builder/src/features/results/components/ResultsTableContainer.tsx b/apps/builder/src/features/results/components/ResultsTableContainer.tsx
index d8075de42..22a261d36 100644
--- a/apps/builder/src/features/results/components/ResultsTableContainer.tsx
+++ b/apps/builder/src/features/results/components/ResultsTableContainer.tsx
@@ -4,7 +4,7 @@ import { LogsModal } from './LogsModal'
 import { useTypebot } from '@/features/editor'
 import { useResults } from '../ResultsProvider'
 import { ResultModal } from './ResultModal'
-import { SubmissionsTable } from './ResultsTable'
+import { ResultsTable } from './ResultsTable'
 
 export const ResultsTableContainer = () => {
   const {
@@ -35,14 +35,7 @@ export const ResultsTableContainer = () => {
     setExpandedResultIndex(index)
 
   return (
-    <Stack
-      pb="28"
-      px={['4', '0']}
-      spacing="4"
-      maxW="1600px"
-      overflow="scroll"
-      w="full"
-    >
+    <Stack pb="28" px={['4', '0']} spacing="4" maxW="1600px" w="full">
       {publishedTypebot && (
         <LogsModal
           typebotId={publishedTypebot?.typebotId}
@@ -56,7 +49,7 @@ export const ResultsTableContainer = () => {
       />
 
       {typebot && (
-        <SubmissionsTable
+        <ResultsTable
           preferences={typebot.resultsTablePreferences ?? undefined}
           resultHeader={resultHeader}
           data={tableData}