Skip to content

feat: added option to freeze columns #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2024
Merged

feat: added option to freeze columns #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 141 additions & 18 deletions src/DataTable/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
defaultSortColumn,
} = useColumns(columns, onColumnOrderChange, defaultSortFieldId, defaultSortAsc);

const freezedColumns = React.useMemo(() => {
const index = tableColumns.findIndex(column => column.freeze);
return tableColumns.slice(0, index + 1);
}, [tableColumns]);

const [
{
rowsPerPage,
Expand Down Expand Up @@ -448,16 +453,138 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
{subHeaderComponent}
</Subheader>
)}

<ResponsiveWrapper
responsive={responsive}
fixedHeader={fixedHeader}
fixedHeaderScrollHeight={fixedHeaderScrollHeight}
{...wrapperProps}
>
<Wrapper>
{progressPending && !persistTableHead && <ProgressWrapper>{progressComponent}</ProgressWrapper>}

<div style={{ position: 'relative' }}>
<ResponsiveWrapper
responsive={responsive}
fixedHeader={fixedHeader}
fixedHeaderScrollHeight={fixedHeaderScrollHeight}
{...wrapperProps}
>
<Wrapper>
{progressPending && !persistTableHead && <ProgressWrapper>{progressComponent}</ProgressWrapper>}

<Table disabled={disabled} className="rdt_Table" role="table">
{showTableHead() && (
<Head className="rdt_TableHead" role="rowgroup" fixedHeader={fixedHeader}>
<HeadRow className="rdt_TableHeadRow" role="row" dense={dense}>
{keepExpandableFirst ? (
<>
{expandableHeaderCol}
{selectableHeaderCol}
</>
) : (
<>
{selectableHeaderCol}
{expandableHeaderCol}
</>
)}

{tableColumns.map(column => (
<Column
key={column.id}
column={column}
selectedColumn={selectedColumn}
disabled={progressPending || sortedData.length === 0}
pagination={pagination}
paginationServer={paginationServer}
persistSelectedOnSort={persistSelectedOnSort}
selectableRowsVisibleOnly={selectableRowsVisibleOnly}
sortDirection={sortDirection}
sortIcon={sortIcon}
sortServer={sortServer}
onSort={handleSort}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDragEnd={handleDragEnd}
onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave}
draggingColumnId={draggingColumnId}
currentSortColumnId={currentSortColumnId}
currentSortDirection={currentSortDirection}
/>
))}
</HeadRow>
</Head>
)}

{!sortedData.length && !progressPending && <NoData>{noDataComponent}</NoData>}

{progressPending && persistTableHead && <ProgressWrapper>{progressComponent}</ProgressWrapper>}

{!progressPending && sortedData.length > 0 && (
<Body className="rdt_TableBody" role="rowgroup">
{tableRows.map((row, i) => {
const key = prop(row as TableRow, keyField) as string | number;
const id = isEmpty(key) ? i : key;
const selected = isRowSelected(row, selectedRows, keyField);
const expanded = isRowExpanded(row, expandedRows, keyField);
const expanderExpander = !!(expandableRows && expandableRowExpanded && expandableRowExpanded(row));
const expanderDisabled = !!(expandableRows && expandableRowDisabled && expandableRowDisabled(row));

return (
<Row
id={id}
key={id}
keyField={keyField}
data-row-id={id}
columns={tableColumns}
row={row}
rowCount={sortedData.length}
rowIndex={i}
selectableRows={selectableRows}
expandableRows={expandableRows}
expandableIcon={expandableIcon}
highlightOnHover={highlightOnHover}
pointerOnHover={pointerOnHover}
dense={dense}
expandOnRowClicked={expandOnRowClicked}
expandOnRowDoubleClicked={expandOnRowDoubleClicked}
expandableRowsComponent={expandableRowsComponent}
expandableRowsComponentProps={expandableRowsComponentProps}
expandableRowsHideExpander={expandableRowsHideExpander}
defaultExpanderDisabled={expanderDisabled}
defaultExpanded={expanderExpander}
expandableInheritConditionalStyles={expandableInheritConditionalStyles}
conditionalRowStyles={conditionalRowStyles}
selected={selected}
expanded={expanded}
selectableRowsHighlight={selectableRowsHighlight}
selectableRowsComponent={selectableRowsComponent}
selectableRowsComponentProps={selectableRowsComponentProps}
selectableRowDisabled={selectableRowDisabled}
expandableRowDisabled={expandableRowDisabled}
selectableRowsSingle={selectableRowsSingle}
expandableRowsSingle={expandableRowsSingle}
striped={striped}
keepExpandableFirst={keepExpandableFirst}
onRowExpandToggled={onRowExpandToggled}
onRowClicked={handleRowClicked}
onRowDoubleClicked={handleRowDoubleClicked}
onSelectedRow={handleSelectedRow}
onExpandedRow={handleExpandedRow}
draggingColumnId={draggingColumnId}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDragEnd={handleDragEnd}
onDragEnter={handleDragEnter}
onDragLeave={handleDragLeave}
/>
);
})}
</Body>
)}
</Table>
{footer && <div>{footer}</div>}
</Wrapper>
</ResponsiveWrapper>

<div
style={{
position: 'absolute',
top: 0,
left: 0,
}}
>
<Table disabled={disabled} className="rdt_Table" role="table">
{showTableHead() && (
<Head className="rdt_TableHead" role="rowgroup" fixedHeader={fixedHeader}>
Expand All @@ -474,7 +601,7 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
</>
)}

{tableColumns.map(column => (
{freezedColumns.slice(0, 3).map(column => (
<Column
key={column.id}
column={column}
Expand Down Expand Up @@ -502,10 +629,6 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
</Head>
)}

{!sortedData.length && !progressPending && <NoData>{noDataComponent}</NoData>}

{progressPending && persistTableHead && <ProgressWrapper>{progressComponent}</ProgressWrapper>}

{!progressPending && sortedData.length > 0 && (
<Body className="rdt_TableBody" role="rowgroup">
{tableRows.map((row, i) => {
Expand All @@ -522,7 +645,7 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
key={id}
keyField={keyField}
data-row-id={id}
columns={tableColumns}
columns={freezedColumns}
row={row}
rowCount={sortedData.length}
rowIndex={i}
Expand Down Expand Up @@ -570,8 +693,8 @@ function DataTable<T>(props: TableProps<T>): JSX.Element {
)}
</Table>
{footer && <div>{footer}</div>}
</Wrapper>
</ResponsiveWrapper>
</div>
</div>

{enabledPagination && (
<div>
Expand Down
1 change: 1 addition & 0 deletions src/DataTable/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export interface TableColumn<T> extends TableColumnBase {
format?: Format<T> | undefined;
selector?: Selector<T>;
sortFunction?: ColumnSortFunction<T>;
freeze?: boolean;
}

export interface ConditionalStyles<T> {
Expand Down