From 6f7c8f2a20114bfcd317203c20837da79412234a Mon Sep 17 00:00:00 2001 From: Laurent Nguyen Date: Thu, 29 Feb 2024 17:22:05 +0100 Subject: [PATCH] Improvement in width size. Add Load More --- .../Tabs/DocumentsTabV2/DocumentsTabV2.tsx | 12 ++++++--- .../DocumentsTableComponent.tsx | 27 +++++++++---------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx index 22663ccde..e3309ee86 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx @@ -443,12 +443,15 @@ const DocumentsTabComponent: React.FunctionComponent<{ }); const tableContainerRef = useRef(null); - const [tableContainerHeightPx, setTableContainerHeightPx] = useState(undefined); + const [tableContainerSizePx, setTableContainerSizePx] = useState<{ height: number, width: number }>(undefined); useEffect(() => { if (!tableContainerRef.current) { return undefined; } - const resizeObserver = new ResizeObserver(() => setTableContainerHeightPx(tableContainerRef.current.offsetHeight)); + const resizeObserver = new ResizeObserver(() => setTableContainerSizePx({ + height: tableContainerRef.current.offsetHeight, + width: tableContainerRef.current.offsetWidth, + })); resizeObserver.observe(tableContainerRef.current); return () => resizeObserver.disconnect(); // clean up }, []); @@ -564,9 +567,10 @@ const DocumentsTabComponent: React.FunctionComponent<{ {/* doesn't like to be a flex child */}
-
{JSON.stringify(currentDocument, undefined, " ")}
diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx index 865bed62d..ab1db5c13 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx @@ -10,7 +10,7 @@ export type DocumentsTableComponentItem = { export interface IDocumentsTableComponentProps { items: DocumentsTableComponentItem[]; onSelectedItem: (index: number) => void; - height: number; + size: { height: number; width: number }; style?: React.CSSProperties; } @@ -25,7 +25,7 @@ const columns: TableColumnDefinition[] = [ }, renderCell: (item) => { return ( - {item.id} + {item.id} ); }, }), @@ -39,7 +39,7 @@ const columns: TableColumnDefinition[] = [ }, renderCell: (item) => { return ( - {item.type} + {item.type} ); }, }), @@ -56,7 +56,7 @@ interface ReactWindowRenderFnProps extends ListChildComponentProps { } export const DocumentsTableComponent: React.FC = ({ - items, onSelectedItem, style, height, + items, onSelectedItem, style, size, }: IDocumentsTableComponentProps) => { const { targetDocument } = useFluent(); const scrollbarWidth = useScrollbarWidth({ targetDocument }); @@ -66,11 +66,12 @@ export const DocumentsTableComponent: React.FC = const [columnSizingOptions, setColumnSizingOptions] = React.useState({ id: { idealWidth: 280, - minWidth: 273, + // minWidth: 273, }, type: { - minWidth: 110, - defaultWidth: 120, + defaultWidth: 100 + // minWidth: 110, + // defaultWidth: 120, }, }); @@ -94,8 +95,6 @@ export const DocumentsTableComponent: React.FC = aria-rowindex={index + 2} style={style} key={item.id} - // onClick={onClick} - // onKeyDown={onKeyDown} aria-selected={selected} appearance={appearance} > @@ -206,7 +205,7 @@ export const DocumentsTableComponent: React.FC = onKeyDown={toggleAllKeydown} checkboxIndicator={{ "aria-label": "Select all rows " }} /> - {columns.map((column, index) => ( + {columns.map((column, /* index */) => ( =
- + {RenderRow}