diff --git a/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/TablePlaceholder.tsx b/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/TablePlaceholder.tsx index 73fe5d720c6..756158748eb 100644 --- a/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/TablePlaceholder.tsx +++ b/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/TablePlaceholder.tsx @@ -17,11 +17,11 @@ const TableRow: FC = ({ columns, y, row }: RowProps) => { y={y} rx="2" ry="8" - width={column.width - 4} + width={column.totalWidth - 4} height="16" /> ); - columnOffset += column.width; + columnOffset += column.totalWidth; return el; })} diff --git a/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/index.tsx b/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/index.tsx index d69b5fefbbd..9e0ee0358fb 100644 --- a/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/index.tsx +++ b/packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/index.tsx @@ -10,8 +10,8 @@ const styles: CSSProperties = { zIndex: 1 }; -const DefaultLoadingComponent = () => { - return ; +const DefaultLoadingComponent = ({ style }) => { + return ; }; DefaultLoadingComponent.displayName = 'DefaultLoadingComponent'; diff --git a/packages/main/src/components/AnalyticalTable/hooks/useDragAndDrop.ts b/packages/main/src/components/AnalyticalTable/hooks/useDragAndDrop.ts index e21f7cf2493..a18ac9d36bf 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useDragAndDrop.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useDragAndDrop.ts @@ -12,7 +12,7 @@ export const useDragAndDrop = (props, setColumnOrder, columnOrder, resizeInfo, c const handleDragStart = useCallback( (e) => { - if (resizeInfo.isResizingColumn === e.currentTarget.dataset.columnId) { + if (resizeInfo.isResizingColumn) { e.preventDefault(); return; } diff --git a/packages/main/src/components/AnalyticalTable/hooks/useStyling.ts b/packages/main/src/components/AnalyticalTable/hooks/useStyling.ts index c45f9646636..9c4b1cbc3cb 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useStyling.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useStyling.ts @@ -32,7 +32,7 @@ const getHeaderProps = (columnProps, { instance, column }) => { const lastColumnId = instance.visibleColumns[instance.visibleColumns.length - 1].id; const isLastColumn = column.id === lastColumnId; const style: CSSProperties = { - width: column.width + width: column.totalWidth }; if (instance.state.isScrollable && isLastColumn) { diff --git a/packages/main/src/components/AnalyticalTable/index.tsx b/packages/main/src/components/AnalyticalTable/index.tsx index e87d001762f..54b1ed69fe7 100644 --- a/packages/main/src/components/AnalyticalTable/index.tsx +++ b/packages/main/src/components/AnalyticalTable/index.tsx @@ -386,7 +386,9 @@ const AnalyticalTable: FC = forwardRef((props: TableProps, ref: Ref< ); })} - {loading && busyIndicatorEnabled && props.data?.length > 0 && } + {loading && busyIndicatorEnabled && props.data?.length > 0 && ( + + )} {loading && props.data?.length === 0 && (