File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed
packages/core/src/internal/data-grid-dnd Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 50
50
"@storybook/react" : " ^7.6.12" ,
51
51
"@storybook/react-vite" : " ^7.6.12" ,
52
52
"@storybook/react-webpack5" : " ^7.6.12" ,
53
- "@testing-library/react" : " ^12.1.2" ,
53
+ "@testing-library/dom" : " ^10.1.0" ,
54
+ "@testing-library/react" : " ^16.0.0" ,
54
55
"@testing-library/react-hooks" : " ^8.0.1" ,
55
56
"@testing-library/user-event" : " ^14.5.1" ,
56
57
"@types/cheerio" : " ^0.22.30" ,
85
86
"marked" : " ^4.0.10" ,
86
87
"mini-css-extract-plugin" : " ^2.6.1" ,
87
88
"prettier" : " ^3.0.2" ,
88
- "react" : " ^16.12.0 || 17.x " ,
89
- "react-dom" : " ^16.12.0 || 17.x " ,
89
+ "react" : " ^18.3.1 " ,
90
+ "react-dom" : " ^18.3.1 " ,
90
91
"react-laag" : " ^2.0.3" ,
91
92
"react-responsive-carousel" : " ^3.2.7" ,
92
93
"react-syntax-highlighter" : " ^15.4.5" ,
94
+ "react-test-renderer" : " ^18.3.1" ,
93
95
"resolve-typescript-plugin" : " ^2.0.1" ,
94
96
"storybook" : " ^7.6.12" ,
95
97
"tsc-esm-fix" : " ^2.7.8" ,
Original file line number Diff line number Diff line change @@ -252,7 +252,7 @@ const DataGridDnd: React.FunctionComponent<DataGridDndProps> = p => {
252
252
}
253
253
254
254
clearAll ( ) ;
255
- if ( dragCol !== undefined && dropCol !== undefined ) {
255
+ if ( dragCol !== undefined && dropCol !== undefined && onColumnProposeMove ?. ( dragCol , dropCol ) !== false ) {
256
256
onColumnMoved ?.( dragCol , dropCol ) ;
257
257
}
258
258
if ( dragRow !== undefined && dropRow !== undefined ) {
@@ -277,6 +277,7 @@ const DataGridDnd: React.FunctionComponent<DataGridDndProps> = p => {
277
277
onColumnMoved ,
278
278
onRowMoved ,
279
279
clearAll ,
280
+ onColumnProposeMove ,
280
281
]
281
282
) ;
282
283
You can’t perform that action at this time.
0 commit comments