Skip to content
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

[data grid] Remove minFirstColumn from GetHeadersParams interface #14450

Merged
merged 9 commits into from
Sep 18, 2024
Merged

[data grid] Remove minFirstColumn from GetHeadersParams interface #14450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13274e8
CleanUp:Remove minFirstColumn
k-rajat19 Sep 2, 2024
25dc914
ci: run (empty commit)
romgrk Sep 17, 2024
1584ee3
Merge branch 'master' into min-first-column
k-rajat19 Sep 17, 2024
a99857b
Merge branch 'min-first-column' of github.com:k-rajat19/mui-x into mi…
romgrk Sep 17, 2024
ddf538f
ci: run (empty commit)
romgrk Sep 17, 2024
a689a8b
Merge branch 'master' into min-first-column
k-rajat19 Sep 17, 2024
31519fe
run ci
k-rajat19 Sep 17, 2024
b585bfa
Merge branch 'min-first-column' of github.com:k-rajat19/mui-x into mi…
romgrk Sep 18, 2024
f1b5e14
ci: run (empty commit)
romgrk Sep 18, 2024
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
3 changes: 0 additions & 3 deletions packages/x-data-grid-pro/src/hooks/features/columnHeaders/useGridColumnHeaders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,19 +166,16 @@ export const useGridColumnHeaders = (props: UseGridColumnHeadersProps) => {
getColumnFilters({
position: GridPinnedColumnPosition.LEFT,
renderContext: leftRenderContext,
minFirstColumn: leftRenderContext.firstColumnIndex,
maxLastColumn: leftRenderContext.lastColumnIndex,
})}
{getColumnFilters({
renderContext,
minFirstColumn: pinnedColumns.left.length,
maxLastColumn: visibleColumns.length - pinnedColumns.right.length,
})}
{rightRenderContext &&
getColumnFilters({
position: GridPinnedColumnPosition.RIGHT,
renderContext: rightRenderContext,
minFirstColumn: rightRenderContext.firstColumnIndex,
maxLastColumn: rightRenderContext.lastColumnIndex,
})}
</GridColumnHeaderRow>
Expand Down
13 changes: 2 additions & 11 deletions packages/x-data-grid/src/hooks/features/columnHeaders/useGridColumnHeaders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export interface UseGridColumnHeadersProps {
export interface GetHeadersParams {
position?: GridPinnedColumnPosition;
renderContext?: GridColumnsRenderContext;
minFirstColumn?: number;
maxLastColumn?: number;
}

Expand Down Expand Up @@ -158,11 +157,8 @@ export const useGridColumnHeaders = (props: UseGridColumnHeadersProps) => {

// Helper for computation common between getColumnHeaders and getColumnGroupHeaders
const getColumnsToRender = (params?: GetHeadersParams) => {
const {
renderContext: currentContext = renderContext,
// TODO: `minFirstColumn` is not used anymore, could be refactored out.
maxLastColumn = visibleColumns.length,
} = params || {};
const { renderContext: currentContext = renderContext, maxLastColumn = visibleColumns.length } =
params || {};

const firstColumnToRender = currentContext.firstColumnIndex;
const lastColumnToRender = !hasVirtualization ? maxLastColumn : currentContext.lastColumnIndex;
Expand Down Expand Up @@ -334,22 +330,19 @@ export const useGridColumnHeaders = (props: UseGridColumnHeadersProps) => {
{
position: GridPinnedColumnPosition.LEFT,
renderContext: leftRenderContext,
minFirstColumn: leftRenderContext.firstColumnIndex,
maxLastColumn: leftRenderContext.lastColumnIndex,
},
{ disableReorder: true },
)}
{getColumnHeaders({
renderContext,
minFirstColumn: pinnedColumns.left.length,
maxLastColumn: visibleColumns.length - pinnedColumns.right.length,
})}
{rightRenderContext &&
getColumnHeaders(
{
position: GridPinnedColumnPosition.RIGHT,
renderContext: rightRenderContext,
minFirstColumn: rightRenderContext.firstColumnIndex,
maxLastColumn: rightRenderContext.lastColumnIndex,
},
{
Expand Down Expand Up @@ -499,7 +492,6 @@ export const useGridColumnHeaders = (props: UseGridColumnHeadersProps) => {
params: {
position: GridPinnedColumnPosition.LEFT,
renderContext: leftRenderContext,
minFirstColumn: leftRenderContext.firstColumnIndex,
maxLastColumn: leftRenderContext.lastColumnIndex,
},
})}
Expand All @@ -510,7 +502,6 @@ export const useGridColumnHeaders = (props: UseGridColumnHeadersProps) => {
params: {
position: GridPinnedColumnPosition.RIGHT,
renderContext: rightRenderContext,
minFirstColumn: rightRenderContext.firstColumnIndex,
maxLastColumn: rightRenderContext.lastColumnIndex,
},
})}
Expand Down
Loading