From b63430ac397c7582e27a618bea06cdd4efd0d20b Mon Sep 17 00:00:00 2001 From: web-padawan Date: Wed, 6 Dec 2023 11:48:02 +0200 Subject: [PATCH] fix: mark headerRenderer as unsupported for GridSortColumn --- src/GridSortColumn.tsx | 14 ++++---------- test/Grid.spec.tsx | 4 +--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/GridSortColumn.tsx b/src/GridSortColumn.tsx index 9c4eab70..30cc9db2 100644 --- a/src/GridSortColumn.tsx +++ b/src/GridSortColumn.tsx @@ -11,13 +11,15 @@ import { useSimpleRenderer } from './renderers/useSimpleRenderer.js'; export * from './generated/GridSortColumn.js'; +/* + * The `headerRenderer` is not allowed for `vaadin-grid-sort-column`. + */ export type GridSortColumnProps = Partial< Omit<_GridSortColumnProps, 'children' | 'footerRenderer' | 'headerRenderer' | 'renderer'> > & Readonly<{ children?: ComponentType> | null; footerRenderer?: ComponentType> | null; - headerRenderer?: ComponentType> | null; renderer?: ComponentType> | null; }>; @@ -25,19 +27,11 @@ function GridSortColumn( props: GridSortColumnProps, ref: ForwardedRef>, ): ReactElement | null { - const [headerPortals, headerRenderer] = useSimpleRenderer(props.headerRenderer); const [footerPortals, footerRenderer] = useSimpleRenderer(props.footerRenderer); const [bodyPortals, bodyRenderer] = useModelRenderer(props.renderer ?? props.children); return ( - <_GridSortColumn - {...props} - footerRenderer={footerRenderer} - headerRenderer={headerRenderer} - ref={ref} - renderer={bodyRenderer} - > - {headerPortals} + <_GridSortColumn {...props} footerRenderer={footerRenderer} ref={ref} renderer={bodyRenderer}> {footerPortals} {bodyPortals} diff --git a/test/Grid.spec.tsx b/test/Grid.spec.tsx index 4e170d37..7d933ff1 100644 --- a/test/Grid.spec.tsx +++ b/test/Grid.spec.tsx @@ -169,9 +169,7 @@ describe('Grid', () => { it('should render correctly', async () => { render( items={items}> - headerRenderer={DefaultHeaderRenderer} footerRenderer={DefaultFooterRenderer}> - {DefaultBodyRenderer} - + footerRenderer={DefaultFooterRenderer}>{DefaultBodyRenderer} , );