Skip to content

Commit 2145f32

Browse files
committed
use correct instance property for useVisibleColumnsWidth hook + cleanup
1 parent d6697e6 commit 2145f32

File tree

8 files changed

+3349
-1795
lines changed

8 files changed

+3349
-1795
lines changed

packages/main/src/components/AnalyticalTable/AnayticalTable.jss.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ const styles = {
66
position: 'relative',
77
width: '100%',
88
maxWidth: '100%',
9-
//todo hidden was default
10-
// overflowY: 'hidden',
11-
overflowY: 'auto',
9+
overflowY: 'hidden',
1210
overflowX: 'auto',
1311
height: '100%',
1412
minHeight: '3rem',

packages/main/src/components/AnalyticalTable/ColumnHeader/ColumnHeaderContainer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ThemingParameters } from '@ui5/webcomponents-react-base';
1+
import { ThemingParameters } from '@ui5/webcomponents-react-base/lib/ThemingParameters';
22
import React, { useCallback } from 'react';
33
import { createUseStyles } from 'react-jss';
44
import { useVirtual } from 'react-virtual';
@@ -36,7 +36,6 @@ export const ColumnHeaderContainer = (props) => {
3636
onDragEnter,
3737
onDragEnd,
3838
dragOver,
39-
4039
tableRef,
4140
visibleColumnsWidth,
4241
overscanCountHorizontal,

packages/main/src/components/AnalyticalTable/ColumnHeader/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ export interface ColumnHeaderProps {
4141
isDraggable: boolean;
4242
role: string;
4343
isLastColumn: boolean;
44-
45-
//todo
46-
virtualColumn: any;
44+
virtualColumn: ColumnType;
4745
}
4846

4947
const styles = {
@@ -106,7 +104,6 @@ export const ColumnHeader: FC<ColumnHeaderProps> = (props: ColumnHeaderProps) =>
106104
isDraggable,
107105
dragOver,
108106
role,
109-
110107
virtualColumn
111108
} = props;
112109

packages/main/src/components/AnalyticalTable/virtualization/VirtualTableBody.tsx renamed to packages/main/src/components/AnalyticalTable/TableBody/VirtualTableBody.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import '@ui5/webcomponents-icons/dist/icons/navigation-down-arrow';
22
import '@ui5/webcomponents-icons/dist/icons/navigation-right-arrow';
3-
import { useConsolidatedRef } from '@ui5/webcomponents-react-base';
3+
import { useConsolidatedRef } from '@ui5/webcomponents-react-base/lib/useConsolidatedRef';
44
import React, { MutableRefObject, useCallback, useRef } from 'react';
55
import { useVirtual } from 'react-virtual';
66

packages/main/src/components/AnalyticalTable/VirtualTableBodyContainer.tsx renamed to packages/main/src/components/AnalyticalTable/TableBody/VirtualTableBodyContainer.tsx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { StyleClassHelper } from '@ui5/webcomponents-react-base';
1+
import { StyleClassHelper } from '@ui5/webcomponents-react-base/lib/StyleClassHelper';
22
import React, { useCallback, useEffect, useRef, useState } from 'react';
33
import { GlobalStyleClasses } from '@ui5/webcomponents-react/lib/GlobalStyleClasses';
44

@@ -12,7 +12,6 @@ export const VirtualTableBodyContainer = (props) => {
1212
infiniteScroll,
1313
infiniteScrollThreshold,
1414
onLoadMore,
15-
selectionMode,
1615
rows,
1716
internalRowHeight
1817
} = props;
@@ -29,7 +28,6 @@ export const VirtualTableBodyContainer = (props) => {
2928
const lastScrollTop = useRef(0);
3029
const firedInfiniteLoadEvents = useRef(new Set());
3130

32-
//todo test
3331
const onScroll = useCallback(
3432
(event) => {
3533
const scrollOffset = event.target.scrollTop;
@@ -61,20 +59,18 @@ export const VirtualTableBodyContainer = (props) => {
6159
);
6260

6361
return (
64-
<>
65-
<div
66-
className={classNames}
67-
ref={parentRef}
68-
onScroll={onScroll}
69-
style={{
70-
position: 'relative',
71-
overflowY: 'auto',
72-
height: `${tableBodyHeight}px`,
73-
width: `${totalColumnsWidth}px`
74-
}}
75-
>
76-
{isMounted && children}
77-
</div>
78-
</>
62+
<div
63+
className={classNames}
64+
ref={parentRef}
65+
onScroll={onScroll}
66+
style={{
67+
position: 'relative',
68+
overflowY: 'auto',
69+
height: `${tableBodyHeight}px`,
70+
width: `${totalColumnsWidth}px`
71+
}}
72+
>
73+
{isMounted && children}
74+
</div>
7975
);
8076
};

0 commit comments

Comments
 (0)