Skip to content

The open alternative to Salesforce, designed for AI.

Removed z-index dynamic logic for table (#18436)

Lucas Bordeau13e569eaac8c
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStyleWrapper.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStyleWrapper.tsx
index c0f4b0e69d7..ee38f68d64a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStyleWrapper.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStyleWrapper.tsx
@@ -1,4 +1,6 @@
import { type RecordField } from '@/object-record/record-field/types/RecordField';
+import { HorizontalScrollBoxShadowCSS } from '@/object-record/record-table/components/HorizontalScrollBoxShadowCSS';
+import { VerticalScrollBoxShadowCSS } from '@/object-record/record-table/components/VerticalScrollBoxShadowCSS';
import { RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnAddColumnButtonWidth';
import { RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnAddColumnButtonWidthClassName';
import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidth';
@@ -10,8 +12,6 @@ import { RECORD_TABLE_COLUMN_LAST_EMPTY_COLUMN_WIDTH_VARIABLE_NAME } from '@/obj
import { RECORD_TABLE_COLUMN_WITH_GROUP_LAST_EMPTY_COLUMN_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnWithGroupLastEmptyColumnWidthClassName';
import { RECORD_TABLE_COLUMN_WITH_GROUP_LAST_EMPTY_COLUMN_WIDTH_VARIABLE_NAME } from '@/object-record/record-table/constants/RecordTableColumnWithGroupLastEmptyColumnWidthVariableName';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
-import { HorizontalScrollBoxShadowCSS } from '@/object-record/record-table/components/HorizontalScrollBoxShadowCSS';
-import { VerticalScrollBoxShadowCSS } from '@/object-record/record-table/components/VerticalScrollBoxShadowCSS';
import { getRecordTableColumnFieldWidthClassName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthClassName';
import { getRecordTableColumnFieldWidthCSSVariableName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthCSSVariableName';
import { styled } from '@linaria/react';
@@ -95,8 +95,7 @@ const StyledTable = styled.div<{
}
div.header-cell:nth-of-type(3) {
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
right: 0;
background-color: ${themeCssVariables.background.primary};
@@ -129,16 +128,14 @@ const StyledTable = styled.div<{
div.table-cell-0-0 {
position: sticky;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
${HorizontalScrollBoxShadowCSS}
}
div.table-cell:nth-of-type(3) {
position: sticky;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
z-index: ${({ hasRecordGroups }) =>
hasRecordGroups
? TABLE_Z_INDEX.cell.withGroups.sticky
diff --git a/packages/twenty-front/src/modules/object-record/record-table/constants/TableZIndex.ts b/packages/twenty-front/src/modules/object-record/record-table/constants/TableZIndex.ts
index eea741f1c68..aef57160e42 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/constants/TableZIndex.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/constants/TableZIndex.ts
@@ -1,5 +1,6 @@
export const TABLE_Z_INDEX = {
base: 1,
+ hoverPortal: 4,
cell: {
withoutGroups: {
default: 3,
@@ -22,66 +23,10 @@ export const TABLE_Z_INDEX = {
headerColumnsNormal: 20,
},
},
- withoutGroupsCell0_0: {
- cell0_0HoveredWithoutScroll: 15,
- cell0_0Normal: 12,
- },
groupSection: {
stickyCell: 10,
normalCell: 8,
},
- withGroups: {
- noScrollAtAll: {
- hoverPortalCellOnFirstScrollableColumn: 16,
- hoverPortalCellOnNormalColumn: 14,
- hoverPortalCellOnLabelIdentifierColumn: 14,
- firstScrollableHeaderCell: 19,
- },
- scrolledBothVerticallyAndHorizontally: {
- hoverPortalCellOnNormalColumn: 9,
- hoverPortalCellOnFirstScrollableColumn: 9,
- hoverPortalCellOnLabelIdentifierColumn: 9,
- firstScrollableHeaderCell: 19,
- },
- scrolledHorizontallyOnly: {
- hoverPortalCellOnLabelIdentifierColumn: 9,
- hoverPortalCellOnNormalColumn: 9,
- hoverPortalCellOnFirstScrollableColumn: 9,
- firstScrollableHeaderCell: 19,
- },
- scrolledVerticallyOnly: {
- hoverPortalCellOnNormalColumn: 9,
- hoverPortalCellOnFirstScrollableColumn: 16,
- hoverPortalCellOnLabelIdentifierColumn: 9,
- firstScrollableHeaderCell: 19,
- },
- },
- withoutGroups: {
- noScrollAtAll: {
- hoverPortalCellOnFirstScrollableColumn: 17,
- hoverPortalCellOnNormalColumn: 17,
- hoverPortalCellOnLabelIdentifierColumn: 17,
- firstScrollableHeaderCell: 12,
- },
- scrolledBothVerticallyAndHorizontally: {
- hoverPortalCellOnNormalColumn: 2,
- hoverPortalCellOnFirstScrollableColumn: 2,
- hoverPortalCellOnLabelIdentifierColumn: 2,
- firstScrollableHeaderCell: 12,
- },
- scrolledHorizontallyOnly: {
- hoverPortalCellOnLabelIdentifierColumn: 17,
- hoverPortalCellOnNormalColumn: 11,
- hoverPortalCellOnFirstScrollableColumn: 11,
- firstScrollableHeaderCell: 10,
- },
- scrolledVerticallyOnly: {
- hoverPortalCellOnNormalColumn: 9,
- hoverPortalCellOnFirstScrollableColumn: 13,
- hoverPortalCellOnLabelIdentifierColumn: 13,
- firstScrollableHeaderCell: 14,
- },
- },
columnGrip: 30,
footer: {
tableWithGroups: {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyVirtualizedDraggableClone.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyVirtualizedDraggableClone.tsx
index ed668b5a87f..4447aadd38a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyVirtualizedDraggableClone.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyVirtualizedDraggableClone.tsx
@@ -1,5 +1,5 @@
-import { getRecordTableColumnWidthInlineStyles } from '@/object-record/record-table/components/RecordTableStyleWrapper';
import { HorizontalScrollBoxShadowCSS } from '@/object-record/record-table/components/HorizontalScrollBoxShadowCSS';
+import { getRecordTableColumnWidthInlineStyles } from '@/object-record/record-table/components/RecordTableStyleWrapper';
import { RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnAddColumnButtonWidth';
import { RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnAddColumnButtonWidthClassName';
import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidth';
@@ -26,12 +26,12 @@ import { useIsTableRowSecondaryDragged } from '@/object-record/record-table/reco
import { getRecordTableColumnFieldWidthClassName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthClassName';
import { recordIdByRealIndexComponentFamilySelector } from '@/object-record/record-table/virtualization/states/recordIdByRealIndexComponentFamilySelector';
import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';
-import { styled } from '@linaria/react';
import {
type DraggableProvided,
type DraggableRubric,
type DraggableStateSnapshot,
} from '@hello-pangea/dnd';
+import { styled } from '@linaria/react';
import { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -79,16 +79,14 @@ const StyledRowDraggableCloneCSSBridge = styled.div`
div.table-cell-0-0 {
position: sticky;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
${HorizontalScrollBoxShadowCSS}
}
div.table-cell:nth-of-type(3) {
position: sticky;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
z-index: ${TABLE_Z_INDEX.cell.withoutGroups.sticky};
${HorizontalScrollBoxShadowCSS}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx
index bd23a8c0415..acc09dfe0d1 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFirstRowFirstColumn.tsx
@@ -1,13 +1,8 @@
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
-import { isRecordTableScrolledVerticallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledVerticallyComponentState';
-import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState';
-import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';
import { getRecordTableColumnFieldWidthClassName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthClassName';
-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { styled } from '@linaria/react';
import { type DraggableProvidedDragHandleProps } from '@hello-pangea/dnd';
import { cx } from '@linaria/core';
+import { styled } from '@linaria/react';
import { useContext, type ReactNode } from 'react';
import { ThemeContext } from 'twenty-ui/theme-constants';
@@ -55,31 +50,7 @@ export const RecordTableCellFirstRowFirstColumn = ({
} & (Partial<DraggableProvidedDragHandleProps> | null)) => {
const { theme } = useContext(ThemeContext);
- const recordTableHoverPosition = useAtomComponentStateValue(
- recordTableHoverPositionComponentState,
- );
-
- const recordTableFocusPosition = useAtomComponentStateValue(
- recordTableFocusPositionComponentState,
- );
-
- const isFocusPortalOnThisCell =
- recordTableFocusPosition?.column === 0 &&
- recordTableFocusPosition.row === 0;
-
- const isHoveredPortalOnThisCell =
- recordTableHoverPosition?.column === 0 &&
- recordTableHoverPosition.row === 0;
-
- const [isRecordTableScrolledVertically] = useAtomComponentState(
- isRecordTableScrolledVerticallyComponentState,
- );
-
- const zIndex =
- !isRecordTableScrolledVertically &&
- (isHoveredPortalOnThisCell || isFocusPortalOnThisCell)
- ? TABLE_Z_INDEX.withoutGroupsCell0_0.cell0_0HoveredWithoutScroll
- : TABLE_Z_INDEX.withoutGroupsCell0_0.cell0_0Normal;
+ const zIndex = TABLE_Z_INDEX.cell.withoutGroups.sticky;
const tdBackgroundColor = isSelected
? theme.accent.quaternary
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx
index 31231be3e85..f3695cc2dc3 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortal.tsx
@@ -1,15 +1,10 @@
-import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-
-import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
import { RecordTableCellFocusedPortalContent } from '@/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent';
import { RecordTableCellPortalRootContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalRootContainer';
-import { isRecordTableScrolledHorizontallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledHorizontallyComponentState';
-import { isRecordTableScrolledVerticallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledVerticallyComponentState';
+import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper';
import { recordTableFocusPositionComponentState } from '@/object-record/record-table/states/recordTableFocusPositionComponentState';
import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
export const RecordTableCellFocusedPortal = () => {
@@ -17,18 +12,6 @@ export const RecordTableCellFocusedPortal = () => {
recordTableFocusPositionComponentState,
);
- const isRecordTableScrolledVertically = useAtomComponentStateValue(
- isRecordTableScrolledVerticallyComponentState,
- );
-
- const isRecordTableScrolledHorizontally = useAtomComponentStateValue(
- isRecordTableScrolledHorizontallyComponentState,
- );
-
- const hasRecordGroups = useAtomComponentSelectorValue(
- hasRecordGroupsComponentSelector,
- );
-
const recordTableHoverPosition = useAtomComponentStateValue(
recordTableHoverPositionComponentState,
);
@@ -43,106 +26,9 @@ export const RecordTableCellFocusedPortal = () => {
return null;
}
- const isOnFirstScrollableColumn = recordTableFocusPosition.column === 1;
- const isOnLabelIdentifierStickyColumn = recordTableFocusPosition.column === 0;
-
- const zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnFirstScrollableColumn;
-
- const zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnLabelIdentifierColumn;
-
- const zIndexForHoveredPortalOnNormalColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnNormalColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnNormalColumn;
-
- const zIndexForHoveredPortalWithoutGroups = isOnFirstScrollableColumn
- ? zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups
- : isOnLabelIdentifierStickyColumn
- ? zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithoutGroups
- : zIndexForHoveredPortalOnNormalColumnWithoutGroups;
-
- const zIndexForHoveredPortalOnFirstScrollableColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnFirstScrollableColumn;
-
- const zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnLabelIdentifierColumn;
-
- const zIndexForHoveredPortalOnNormalColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnNormalColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnNormalColumn;
-
- const zIndexForHoveredPortalWithGroups = isOnFirstScrollableColumn
- ? zIndexForHoveredPortalOnFirstScrollableColumnWithGroups
- : isOnLabelIdentifierStickyColumn
- ? zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithGroups
- : zIndexForHoveredPortalOnNormalColumnWithGroups;
-
- const zIndex = hasRecordGroups
- ? zIndexForHoveredPortalWithGroups
- : zIndexForHoveredPortalWithoutGroups;
-
return (
<RecordTableCellPortalWrapper position={recordTableFocusPosition}>
- <RecordTableCellPortalRootContainer zIndex={zIndex}>
+ <RecordTableCellPortalRootContainer zIndex={TABLE_Z_INDEX.hoverPortal}>
<RecordTableCellFocusedPortalContent />
</RecordTableCellPortalRootContainer>
</RecordTableCellPortalWrapper>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx
index 28091c52634..83ab668dfc6 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFocusedPortalContent.tsx
@@ -29,6 +29,7 @@ const StyledRecordTableCellFocusPortalContent = styled.div<{
height: ${RECORD_TABLE_ROW_HEIGHT}px;
outline: 1px solid ${themeCssVariables.color.blue8};
+ outline-offset: -1px;
user-select: none;
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx
index 196228c6b3d..9b34afaf131 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortal.tsx
@@ -1,14 +1,9 @@
-import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper';
-import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';
-import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-
-import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
import { RecordTableCellHoveredPortalContent } from '@/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent';
import { RecordTableCellPortalRootContainer } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalRootContainer';
-import { isRecordTableScrolledHorizontallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledHorizontallyComponentState';
-import { isRecordTableScrolledVerticallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledVerticallyComponentState';
+import { RecordTableCellPortalWrapper } from '@/object-record/record-table/record-table-cell/components/RecordTableCellPortalWrapper';
+import { recordTableHoverPositionComponentState } from '@/object-record/record-table/states/recordTableHoverPositionComponentState';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isDefined } from 'twenty-shared/utils';
export const RecordTableCellHoveredPortal = () => {
@@ -16,122 +11,13 @@ export const RecordTableCellHoveredPortal = () => {
recordTableHoverPositionComponentState,
);
- const isRecordTableScrolledVertically = useAtomComponentStateValue(
- isRecordTableScrolledVerticallyComponentState,
- );
-
- const isRecordTableScrolledHorizontally = useAtomComponentStateValue(
- isRecordTableScrolledHorizontallyComponentState,
- );
-
- const hasRecordGroups = useAtomComponentSelectorValue(
- hasRecordGroupsComponentSelector,
- );
-
if (!isDefined(recordTableHoverPosition)) {
return null;
}
- const isOnFirstScrollableColumn = recordTableHoverPosition.column === 1;
- const isOnLabelIdentifierStickyColumn = recordTableHoverPosition.column === 0;
-
- const zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnFirstScrollableColumn;
-
- const zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnLabelIdentifierColumn;
-
- const zIndexForHoveredPortalOnNormalColumnWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .hoverPortalCellOnNormalColumn
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll
- .hoverPortalCellOnNormalColumn;
-
- const zIndexForHoveredPortalWithoutGroups = isOnFirstScrollableColumn
- ? zIndexForHoveredPortalOnFirstScrollableColumnWithoutGroups
- : isOnLabelIdentifierStickyColumn
- ? zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithoutGroups
- : zIndexForHoveredPortalOnNormalColumnWithoutGroups;
-
- const zIndexForHoveredPortalOnFirstScrollableColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnFirstScrollableColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnFirstScrollableColumn;
-
- const zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnLabelIdentifierColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnLabelIdentifierColumn;
-
- const zIndexForHoveredPortalOnNormalColumnWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .hoverPortalCellOnNormalColumn
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .hoverPortalCellOnNormalColumn
- : TABLE_Z_INDEX.withGroups.noScrollAtAll
- .hoverPortalCellOnNormalColumn;
-
- const zIndexForHoveredPortalWithGroups = isOnFirstScrollableColumn
- ? zIndexForHoveredPortalOnFirstScrollableColumnWithGroups
- : isOnLabelIdentifierStickyColumn
- ? zIndexForHoveredPortalOnLabelIdentifierStickyColumnWithGroups
- : zIndexForHoveredPortalOnNormalColumnWithGroups;
-
- const zIndex = hasRecordGroups
- ? zIndexForHoveredPortalWithGroups
- : zIndexForHoveredPortalWithoutGroups;
-
return (
<RecordTableCellPortalWrapper position={recordTableHoverPosition}>
- <RecordTableCellPortalRootContainer zIndex={zIndex}>
+ <RecordTableCellPortalRootContainer zIndex={TABLE_Z_INDEX.hoverPortal}>
<RecordTableCellHoveredPortalContent />
</RecordTableCellPortalRootContainer>
</RecordTableCellPortalWrapper>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx
index 12743aba152..7834d8b8f01 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellHoveredPortalContent.tsx
@@ -43,6 +43,7 @@ const StyledRecordTableCellHoveredPortalContent = styled.div<{
: showInteractiveStyle
? `1px solid ${themeCssVariables.font.color.extraLight}`
: `1px solid ${themeCssVariables.border.color.medium}`};
+ outline-offset: -1px;
user-select: none;
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
index 1c1d63b3305..68b4128dd9d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
@@ -1,7 +1,6 @@
import { styled } from '@linaria/react';
import { RECORD_TABLE_COLUMN_ADD_COLUMN_BUTTON_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnAddColumnButtonWidth';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidth';
import { RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnDragAndDropWidth';
import { RECORD_TABLE_COLUMN_LAST_EMPTY_COLUMN_WIDTH_CLASS_NAME } from '@/object-record/record-table/constants/RecordTableColumnLastEmptyColumnWidthClassName';
@@ -10,13 +9,13 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
import { RecordTableAggregateFooterCell } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell';
import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterCellContext';
import { isDefined } from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledPlaceholderDragAndDropFooterCell = styled.div<{
isTableWithGroups: boolean;
}>`
background-color: ${themeCssVariables.background.primary};
- width: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ width: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
position: sticky;
left: 0px;
bottom: 0;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
index 5c3cccf5384..e4d7f2aceee 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderFirstScrollableCell.tsx
@@ -11,7 +11,6 @@ import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/s
import { isRecordTableRowActiveComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowActiveComponentFamilyState';
import { isRecordTableRowFocusActiveComponentState } from '@/object-record/record-table/states/isRecordTableRowFocusActiveComponentState';
import { isRecordTableRowFocusedComponentFamilyState } from '@/object-record/record-table/states/isRecordTableRowFocusedComponentFamilyState';
-import { isRecordTableScrolledHorizontallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledHorizontallyComponentState';
import { isRecordTableScrolledVerticallyComponentState } from '@/object-record/record-table/states/isRecordTableScrolledVerticallyComponentState';
import { resizedFieldMetadataIdComponentState } from '@/object-record/record-table/states/resizedFieldMetadataIdComponentState';
import { getRecordTableColumnFieldWidthClassName } from '@/object-record/record-table/utils/getRecordTableColumnFieldWidthClassName';
@@ -56,39 +55,13 @@ export const RecordTableHeaderFirstScrollableCell = () => {
isRecordTableScrolledVerticallyComponentState,
);
- const isRecordTableScrolledHorizontally = useAtomComponentStateValue(
- isRecordTableScrolledHorizontallyComponentState,
- );
-
const hasRecordGroups = useAtomComponentSelectorValue(
hasRecordGroupsComponentSelector,
);
- const zIndexWithGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledBothVerticallyAndHorizontally
- .firstScrollableHeaderCell
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withGroups.scrolledHorizontallyOnly
- .firstScrollableHeaderCell
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withGroups.scrolledVerticallyOnly
- .firstScrollableHeaderCell
- : TABLE_Z_INDEX.withGroups.noScrollAtAll.firstScrollableHeaderCell;
-
- const zIndexWithoutGroups =
- isRecordTableScrolledHorizontally && isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledBothVerticallyAndHorizontally
- .firstScrollableHeaderCell
- : isRecordTableScrolledHorizontally
- ? TABLE_Z_INDEX.withoutGroups.scrolledHorizontallyOnly
- .firstScrollableHeaderCell
- : isRecordTableScrolledVertically
- ? TABLE_Z_INDEX.withoutGroups.scrolledVerticallyOnly
- .firstScrollableHeaderCell
- : TABLE_Z_INDEX.withoutGroups.noScrollAtAll.firstScrollableHeaderCell;
-
- const zIndex = hasRecordGroups ? zIndexWithGroups : zIndexWithoutGroups;
+ const zIndex = hasRecordGroups
+ ? TABLE_Z_INDEX.headerColumns.withGroups.headerColumnsNormal
+ : TABLE_Z_INDEX.headerColumns.withoutGroups.headerColumnsNormal;
const shouldDisplayBorderBottom =
hasRecordGroups ||
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
index c37e338ed8f..d9feb2ace7e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
@@ -1,7 +1,6 @@
import { styled } from '@linaria/react';
import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { RECORD_TABLE_COLUMN_CHECKBOX_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnCheckboxWidth';
import { RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnDragAndDropWidth';
import { RECORD_TABLE_COLUMN_MIN_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnMinWidth';
@@ -18,6 +17,7 @@ import {
sumByProperty,
} from 'twenty-shared/utils';
import { type IconComponent } from 'twenty-ui/display';
+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useIsMobile } from 'twenty-ui/utilities';
const StyledFieldPlaceholderCell = styled.div<{ widthOfFields: number }>`
@@ -72,8 +72,7 @@ const StyledActionTextContainer = styled.div<{ width: number }>`
height: ${RECORD_TABLE_ROW_HEIGHT}px;
justify-content: start;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
position: sticky;
width: ${({ width }) => width}px;
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
index da4b1f20545..06ad870f197 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
@@ -82,8 +82,7 @@ const StyledRecordGroupSection = styled.div<{ width: number }>`
min-width: ${({ width }) => width}px;
position: sticky;
- left: ${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH +
- RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px;
+ left: ${`${RECORD_TABLE_COLUMN_DRAG_AND_DROP_WIDTH + RECORD_TABLE_COLUMN_CHECKBOX_WIDTH}px`};
z-index: ${TABLE_Z_INDEX.groupSection.stickyCell};
`;