admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: view group wrong cursor (#9119)

Browse Source 
Wrong cursor was shown on `Load more` and `Add new` row in view group
mode
This commit is contained in:
Jérémy M
2024-12-18 12:54:09 +01:00
committed by GitHub
parent 3b48920314
commit ae044c2fc8
1 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
View File

@ -7,6 +7,7 @@ import { RecordTableTr } from '@/object-record/record-table/record-table-row/com
import { combineRefs } from '~/utils/combineRefs'; import { combineRefs } from '~/utils/combineRefs';
type RecordTableDraggableTrProps = { type RecordTableDraggableTrProps = {
className?: string;
draggableId: DraggableId; draggableId: DraggableId;
draggableIndex: number; draggableIndex: number;
isDragDisabled?: boolean; isDragDisabled?: boolean;
@ -17,47 +18,60 @@ type RecordTableDraggableTrProps = {
export const RecordTableDraggableTr = forwardRef< export const RecordTableDraggableTr = forwardRef<
HTMLTableRowElement, HTMLTableRowElement,
RecordTableDraggableTrProps RecordTableDraggableTrProps
>(({ draggableId, draggableIndex, isDragDisabled, onClick, children }, ref) => { >(
const theme = useTheme(); (
{
className,
draggableId,
draggableIndex,
isDragDisabled,
onClick,
children,
},
ref,
) => {
const theme = useTheme();
return ( return (
<Draggable <Draggable
draggableId={draggableId} draggableId={draggableId}
index={draggableIndex} index={draggableIndex}
isDragDisabled={isDragDisabled} isDragDisabled={isDragDisabled}
> >
{(draggableProvided, draggableSnapshot) => ( {(draggableProvided, draggableSnapshot) => (
<RecordTableTr <RecordTableTr
ref={combineRefs<HTMLTableRowElement>( ref={combineRefs<HTMLTableRowElement>(
ref, ref,
draggableProvided.innerRef, draggableProvided.innerRef,
)} )}
// eslint-disable-next-line react/jsx-props-no-spreading className={className}
{...draggableProvided.draggableProps} // eslint-disable-next-line react/jsx-props-no-spreading
style={{ {...draggableProvided.draggableProps}
...draggableProvided.draggableProps.style, style={{
background: draggableSnapshot.isDragging ...draggableProvided.draggableProps.style,
? theme.background.transparent.light background: draggableSnapshot.isDragging
: 'none', ? theme.background.transparent.light
borderColor: draggableSnapshot.isDragging : 'none',
? `${theme.border.color.medium}` borderColor: draggableSnapshot.isDragging
: 'transparent', ? `${theme.border.color.medium}`
}} : 'transparent',
isDragging={draggableSnapshot.isDragging}
data-testid={`row-id-${draggableId}`}
data-selectable-id={draggableId}
onClick={onClick}
>
<RecordTableRowDraggableContextProvider
value={{
isDragging: draggableSnapshot.isDragging,
dragHandleProps: draggableProvided.dragHandleProps,
}} }}
isDragging={draggableSnapshot.isDragging}
data-testid={`row-id-${draggableId}`}
data-selectable-id={draggableId}
onClick={onClick}
> >
{children} <RecordTableRowDraggableContextProvider
</RecordTableRowDraggableContextProvider> value={{
</RecordTableTr> isDragging: draggableSnapshot.isDragging,
)} dragHandleProps: draggableProvided.dragHandleProps,
</Draggable> }}
); >
}); {children}
</RecordTableRowDraggableContextProvider>
</RecordTableTr>
)}
</Draggable>
);
},
);