Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export const DataGrid = forwardRef<DataGridRef, DataGridProps>(function DataGrid
{
headerElement,
getHeaderWidth,
getHeaderMinWidth,
headerText,
getHeaderOrder,
getHeaderResizable,
Expand Down Expand Up @@ -110,12 +111,13 @@ export const DataGrid = forwardRef<DataGridRef, DataGridProps>(function DataGrid
.fill(null as any)
.map((_, i): ColumnOrColumnGroup<IInnerRow, unknown> => {
const width = getHeaderWidth?.(i) ?? 'max-content';
const minWidth = getHeaderMinWidth?.(i) ?? 26;
return {
key: getColumnKey?.(i) ?? String(i),
name: '',
resizable: getHeaderResizable?.(i) ?? true,
width,
minWidth: 26,
minWidth,
editable: row => getCellEditable?.(row.idx, i) ?? false,
frozen: getHeaderPinned?.(i),
renderHeaderCell: mapRenderHeaderCell(i),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface IDataGridHeaderCellContext {
headerText?: IGridReactiveValue<string, [colIdx: number]>;
getHeaderOrder?: () => number[];
getHeaderWidth?: (colIdx: number) => number | string | null;
getHeaderMinWidth?: (colIdx: number) => number | null;
getHeaderResizable?: (colIdx: number) => boolean;
getHeaderHeight?: () => number;
getHeaderPinned?: (colIdx: number) => boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ export interface TableProps {
loadMore: () => void;
}

const MENU_COLUMN_INDEX = 1;
const MENU_COLUMN_MIN_WIDTH = 16 + 16 + 16 + 8 + 24;

export const Table = observer<TableProps>(function Table({ objects, hasNextPage, loadMore }) {
const styles = useS(classes);
const navTreeResource = useService(NavTreeResource);
Expand Down Expand Up @@ -112,6 +115,15 @@ export const Table = observer<TableProps>(function Table({ objects, hasNextPage,
if (colIdx === 0) {
return 40;
}

return null;
}

function getHeaderMinWidth(colIdx: number) {
if (colIdx === MENU_COLUMN_INDEX) {
return MENU_COLUMN_MIN_WIDTH;
}

return null;
}

Expand Down Expand Up @@ -142,6 +154,7 @@ export const Table = observer<TableProps>(function Table({ objects, hasNextPage,
cell={cell}
cellTooltip={cellTooltip}
getHeaderWidth={getHeaderWidth}
getHeaderMinWidth={getHeaderMinWidth}
getHeaderResizable={getHeaderResizable}
columnCount={columnCount}
headerText={headerText}
Expand Down
Loading