Skip to content

Commit 1089fb8

Browse files
authored
fix: match latest ag grid template (#1115)
* fix: match latest ag grid template * fix: avoid auto-format from AG Grid in column header
1 parent 3d80cb7 commit 1089fb8

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

client/src/webview/DataViewer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const DataViewer = () => {
4646
cacheBlockSize={100}
4747
columnDefs={columns}
4848
defaultColDef={{
49-
resizable: true,
49+
sortable: false,
5050
}}
5151
infiniteInitialRowCount={100}
5252
maxBlocksInCache={10}

client/src/webview/columnHeaderTemplate.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ const getIconForColumnType = (type: string) => {
2121
}
2222
};
2323

24-
// Taken from https://www.ag-grid.com/javascript-data-grid/column-headers/#header-templates
24+
// Taken from https://www.ag-grid.com/react-data-grid/column-headers/#provided-component
2525
const columnHeaderTemplate = (columnType: string) => `
2626
<div class="ag-cell-label-container" role="presentation">
27-
<span ref="eMenu" class="ag-header-icon ag-header-cell-menu-button" aria-hidden="true"></span>
28-
<div ref="eLabel" class="ag-header-cell-label" role="presentation">
27+
<span data-ref="eMenu" class="ag-header-icon ag-header-cell-menu-button" aria-hidden="true"></span>
28+
<div data-ref="eLabel" class="ag-header-cell-label" role="presentation">
2929
<span class="header-icon ${getIconForColumnType(columnType)}"></span>
30-
<span ref="eText" class="ag-header-cell-text"></span>
31-
<span ref="eFilter" class="ag-header-icon ag-header-label-icon ag-filter-icon" aria-hidden="true"></span>
32-
<span ref="eSortOrder" class="ag-header-icon ag-header-label-icon ag-sort-order" aria-hidden="true"></span>
33-
<span ref="eSortAsc" class="ag-header-icon ag-header-label-icon ag-sort-ascending-icon" aria-hidden="true"></span>
34-
<span ref="eSortDesc" class="ag-header-icon ag-header-label-icon ag-sort-descending-icon" aria-hidden="true"></span>
35-
<span ref="eSortNone" class="ag-header-icon ag-header-label-icon ag-sort-none-icon" aria-hidden="true"></span>
30+
<span data-ref="eText" class="ag-header-cell-text"></span>
31+
<span data-ref="eFilter" class="ag-header-icon ag-header-label-icon ag-filter-icon" aria-hidden="true"></span>
32+
<span data-ref="eSortOrder" class="ag-header-icon ag-header-label-icon ag-sort-order" aria-hidden="true"></span>
33+
<span data-ref="eSortAsc" class="ag-header-icon ag-header-label-icon ag-sort-ascending-icon" aria-hidden="true"></span>
34+
<span data-ref="eSortDesc" class="ag-header-icon ag-header-label-icon ag-sort-descending-icon" aria-hidden="true"></span>
35+
<span data-ref="eSortNone" class="ag-header-icon ag-header-label-icon ag-sort-none-icon" aria-hidden="true"></span>
3636
</div>
3737
</div>
3838
`;

client/src/webview/useDataViewer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const fetchColumns = (): Promise<Column[]> => {
8888
};
8989

9090
const useDataViewer = () => {
91-
const [columns, setColumns] = useState([]);
91+
const [columns, setColumns] = useState<ColDef[]>([]);
9292

9393
const onGridReady = useCallback(
9494
(event: GridReadyEvent) => {
@@ -128,6 +128,7 @@ const useDataViewer = () => {
128128
fetchColumns().then((columnsData) => {
129129
const columns: ColDef[] = columnsData.map((column) => ({
130130
field: column.name,
131+
headerName: column.name,
131132
headerComponentParams: {
132133
template: columnHeaderTemplate(column.type),
133134
},

0 commit comments

Comments
 (0)