Fix stickiness

twentyhq · Dec 19, 2024 · 81a20c8 · 81a20c8
1 parent 822e4e5
commit 81a20c8
Show file tree

Hide file tree

Showing 7 changed files with 93 additions and 45 deletions.
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
@@ -97,7 +97,7 @@ export const RecordTable = () => {
             )}
             <RecordTableStickyEffect />
             {isAggregateQueryEnabled && !hasRecordGroups && (
-              <RecordTableFooter />
+              <RecordTableFooter endOfTableSticky />
             )}
           </StyledTable>
           <DragSelect

diff --git a/...ty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/...ty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
@@ -1,22 +1,17 @@
 import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
 import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
-import { RecordTableFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableFooter';
 import { RecordTablePendingRecordGroupRow } from '@/object-record/record-table/record-table-row/components/RecordTablePendingRecordGroupRow';
 import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow';
 import { RecordTableRecordGroupSectionAddNew } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew';
 import { RecordTableRecordGroupSectionLoadMore } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore';
 import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState';
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useMemo } from 'react';
 import { isDefined } from '~/utils/isDefined';
 
 export const RecordTableRecordGroupRows = () => {
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    'IS_AGGREGATE_QUERY_ENABLED',
-  );
   const currentRecordGroupId = useCurrentRecordGroupId();
 
   const allRecordIds = useRecoilComponentValueV2(
@@ -63,12 +58,6 @@ export const RecordTableRecordGroupRows = () => {
       })}
       <RecordTablePendingRecordGroupRow />
       <RecordTableRecordGroupSectionAddNew />
-      {isAggregateQueryEnabled && (
-        <RecordTableFooter
-          key={currentRecordGroupId}
-          currentRecordGroupId={currentRecordGroupId}
-        />
-      )}
       <RecordTableRecordGroupSectionLoadMore />
     </>
   );

diff --git a/...ules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx b/...ules/object-record/record-table/record-table-body/components/RecordTableBodyDroppable.tsx
@@ -15,6 +15,7 @@ export const RecordTableBodyDroppable = ({
   isDropDisabled,
 }: RecordTableBodyDroppableProps) => {
   const [v4Persistable] = useState(v4());
+  const recordTableBodyId = `record-table-body${recordGroupId ? '-' + recordGroupId : ''}`;
 
   return (
     <Droppable
@@ -23,7 +24,7 @@ export const RecordTableBodyDroppable = ({
     >
       {(provided) => (
         <RecordTableBody
-          id="record-table-body"
+          id={recordTableBodyId}
           ref={provided.innerRef}
           // eslint-disable-next-line react/jsx-props-no-spreading
           {...provided.droppableProps}

diff --git a/...s/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/...s/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
@@ -6,12 +6,17 @@ import { RecordTableRecordGroupRows } from '@/object-record/record-table/compone
 import { RecordTableBodyDroppable } from '@/object-record/record-table/record-table-body/components/RecordTableBodyDroppable';
 import { RecordTableBodyLoading } from '@/object-record/record-table/record-table-body/components/RecordTableBodyLoading';
 import { RecordTableBodyRecordGroupDragDropContextProvider } from '@/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider';
+import { RecordTableFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableFooter';
 import { RecordTableRecordGroupEmptyRow } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupEmptyRow';
 import { RecordTableRecordGroupSection } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection';
 import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 
 export const RecordTableRecordGroupsBody = () => {
+  const isAggregateQueryEnabled = useIsFeatureEnabled(
+    'IS_AGGREGATE_QUERY_ENABLED',
+  );
   const allRecordIds = useRecoilComponentValueV2(
     recordIndexAllRecordIdsComponentSelector,
   );
@@ -29,21 +34,31 @@ export const RecordTableRecordGroupsBody = () => {
   }
 
   return (
-    <RecordTableBodyRecordGroupDragDropContextProvider>
-      {visibleRecordGroupIds.map((recordGroupId, index) => (
-        <RecordTableRecordGroupBodyContextProvider
-          key={recordGroupId}
-          recordGroupId={recordGroupId}
-        >
-          <RecordGroupContext.Provider value={{ recordGroupId }}>
-            <RecordTableBodyDroppable recordGroupId={recordGroupId}>
-              {index > 0 && <RecordTableRecordGroupEmptyRow />}
-              <RecordTableRecordGroupSection />
-              <RecordTableRecordGroupRows />
-            </RecordTableBodyDroppable>
-          </RecordGroupContext.Provider>
-        </RecordTableRecordGroupBodyContextProvider>
-      ))}
-    </RecordTableBodyRecordGroupDragDropContextProvider>
+    <>
+      <RecordTableBodyRecordGroupDragDropContextProvider>
+        {visibleRecordGroupIds.map((recordGroupId, index) => (
+          <>
+            <RecordTableRecordGroupBodyContextProvider
+              key={recordGroupId}
+              recordGroupId={recordGroupId}
+            >
+              <RecordGroupContext.Provider value={{ recordGroupId }}>
+                <RecordTableBodyDroppable recordGroupId={recordGroupId}>
+                  {index > 0 && <RecordTableRecordGroupEmptyRow />}
+                  <RecordTableRecordGroupSection />
+                  <RecordTableRecordGroupRows />
+                </RecordTableBodyDroppable>
+                {isAggregateQueryEnabled && (
+                  <RecordTableFooter
+                    key={recordGroupId}
+                    currentRecordGroupId={recordGroupId}
+                  />
+                )}
+              </RecordGroupContext.Provider>
+            </RecordTableRecordGroupBodyContextProvider>
+          </>
+        ))}
+      </RecordTableBodyRecordGroupDragDropContextProvider>
+    </>
   );
 };
diff --git a/...c/modules/object-record/record-table/record-table-footer/components/RecordTableFooter.tsx b/...c/modules/object-record/record-table/record-table-footer/components/RecordTableFooter.tsx
@@ -1,14 +1,12 @@
 import styled from '@emotion/styled';
 import { MOBILE_VIEWPORT } from 'twenty-ui';
 
-import { TABLE_CELL_CHECKBOX_MIN_WIDTH } from '@/object-record/record-table/record-table-cell/components/RecordTableCellCheckbox';
-import { TABLE_CELL_GRIP_WIDTH } from '@/object-record/record-table/record-table-cell/components/RecordTableCellGrip';
 import { RecordTableFooterCell } from '@/object-record/record-table/record-table-footer/components/RecordTableFooterCell';
 import { FIRST_TH_WIDTH } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 
-const StyledTableFoot = styled.thead`
+const StyledTableFoot = styled.thead<{ endOfTableSticky?: boolean }>`
   cursor: pointer;
 
   th:nth-of-type(1) {
@@ -62,27 +60,21 @@ const StyledTableFoot = styled.thead`
 
   tr {
     position: sticky;
-    bottom: 0;
     z-index: 5;
-  }
-
-  &.first-columns-sticky {
-    th:nth-of-type(1),
-    th:nth-of-type(2),
-    th:nth-of-type(3) {
-      z-index: 10;
-    }
+    ${({ endOfTableSticky }) => endOfTableSticky && `bottom: 0;`}
   }
 `;
 
-const StyledDiv = styled.div`
-  width: calc(${TABLE_CELL_GRIP_WIDTH} + ${TABLE_CELL_CHECKBOX_MIN_WIDTH});
+const StyledTh = styled.th`
+  background-color: ${({ theme }) => theme.background.primary};
 `;
 
 export const RecordTableFooter = ({
   currentRecordGroupId,
+  endOfTableSticky,
 }: {
   currentRecordGroupId?: string;
+  endOfTableSticky?: boolean;
 }) => {
   const visibleTableColumns = useRecoilComponentValueV2(
     visibleTableColumnsComponentSelector,
@@ -92,10 +84,11 @@ export const RecordTableFooter = ({
     <StyledTableFoot
       id={`record-table-footer${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`}
       data-select-disable
+      endOfTableSticky={endOfTableSticky}
     >
       <tr>
-        <th />
-        <StyledDiv />
+        <StyledTh />
+        <StyledTh />
         {visibleTableColumns.map((column, index) => (
           <RecordTableFooterCell
             key={`${column.fieldMetadataId}${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`}

diff --git a/...ect-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx b/...ect-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
@@ -9,6 +9,7 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s
 import { RecordGroupDefinitionType } from '@/object-record/record-group/types/RecordGroupDefinition';
 import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
 import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd';
+import { RecordTableRecordGroupStickyEffect } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect';
 import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2';
@@ -107,6 +108,7 @@ export const RecordTableRecordGroupSection = () => {
           weight="medium"
         />
         <StyledTotalRow>{recordIdsByGroup.length}</StyledTotalRow>
+        <RecordTableRecordGroupStickyEffect />
       </StyledRecordGroupSection>
       <StyledEmptyTd colSpan={visibleColumns.length - 1} />
       <StyledEmptyTd />

diff --git a/...ecord/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx b/...ecord/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect.tsx
@@ -0,0 +1,48 @@
+import { useEffect } from 'react';
+
+import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
+import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState';
+import { scrollWrapperScrollLeftComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollLeftComponentState';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+
+export const RecordTableRecordGroupStickyEffect = () => {
+  const scrollLeft = useRecoilComponentValueV2(
+    scrollWrapperScrollLeftComponentState,
+  );
+
+  const setIsRecordTableScrolledLeft = useSetRecoilComponentStateV2(
+    isRecordTableScrolledLeftComponentState,
+  );
+
+  const currentRecordGroupId = useCurrentRecordGroupId();
+
+  useEffect(() => {
+    setIsRecordTableScrolledLeft(scrollLeft === 0);
+    if (scrollLeft > 0) {
+      document
+        .getElementById(
+          `record-table-footer${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`,
+        )
+        ?.classList.add('first-columns-sticky');
+      document
+        .getElementById(
+          `record-table-body${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`,
+        )
+        ?.classList.add('first-columns-sticky');
+    } else {
+      document
+        .getElementById(
+          `record-table-footer${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`,
+        )
+        ?.classList.remove('first-columns-sticky');
+      document
+        .getElementById(
+          `record-table-body${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`,
+        )
+        ?.classList.remove('first-columns-sticky');
+    }
+  }, [currentRecordGroupId, scrollLeft, setIsRecordTableScrolledLeft]);
+
+  return <></>;
+};