File tree 2 files changed +5
-13
lines changed
2 files changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -11,33 +11,27 @@ import { useSimpleRenderer } from './renderers/useSimpleRenderer.js';
11
11
12
12
export * from './generated/GridSortColumn.js' ;
13
13
14
+ /*
15
+ * The `headerRenderer` is not allowed for `vaadin-grid-sort-column`.
16
+ */
14
17
export type GridSortColumnProps < TItem > = Partial <
15
18
Omit < _GridSortColumnProps < TItem > , 'children' | 'footerRenderer' | 'headerRenderer' | 'renderer' >
16
19
> &
17
20
Readonly < {
18
21
children ?: ComponentType < GridBodyReactRendererProps < TItem > > | null ;
19
22
footerRenderer ?: ComponentType < GridEdgeReactRendererProps < TItem > > | null ;
20
- headerRenderer ?: ComponentType < GridEdgeReactRendererProps < TItem > > | null ;
21
23
renderer ?: ComponentType < GridBodyReactRendererProps < TItem > > | null ;
22
24
} > ;
23
25
24
26
function GridSortColumn < TItem = GridDefaultItem > (
25
27
props : GridSortColumnProps < TItem > ,
26
28
ref : ForwardedRef < GridSortColumnElement < TItem > > ,
27
29
) : ReactElement | null {
28
- const [ headerPortals , headerRenderer ] = useSimpleRenderer ( props . headerRenderer ) ;
29
30
const [ footerPortals , footerRenderer ] = useSimpleRenderer ( props . footerRenderer ) ;
30
31
const [ bodyPortals , bodyRenderer ] = useModelRenderer ( props . renderer ?? props . children ) ;
31
32
32
33
return (
33
- < _GridSortColumn < TItem >
34
- { ...props }
35
- footerRenderer = { footerRenderer }
36
- headerRenderer = { headerRenderer }
37
- ref = { ref }
38
- renderer = { bodyRenderer }
39
- >
40
- { headerPortals }
34
+ < _GridSortColumn < TItem > { ...props } footerRenderer = { footerRenderer } ref = { ref } renderer = { bodyRenderer } >
41
35
{ footerPortals }
42
36
{ bodyPortals }
43
37
</ _GridSortColumn >
Original file line number Diff line number Diff line change @@ -169,9 +169,7 @@ describe('Grid', () => {
169
169
it ( 'should render correctly' , async ( ) => {
170
170
render (
171
171
< Grid < Item > items = { items } >
172
- < GridSortColumn < Item > headerRenderer = { DefaultHeaderRenderer } footerRenderer = { DefaultFooterRenderer } >
173
- { DefaultBodyRenderer }
174
- </ GridSortColumn >
172
+ < GridSortColumn < Item > footerRenderer = { DefaultFooterRenderer } > { DefaultBodyRenderer } </ GridSortColumn >
175
173
</ Grid > ,
176
174
) ;
177
175
You can’t perform that action at this time.
0 commit comments