File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
devextreme-angular/src/server
devextreme/js/__internal/grids/new/grid_core Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -41,6 +41,11 @@ export class DxServerModule {
4141 jsx ,
4242 container ,
4343 ) => {
44+ if ( jsx === null ) {
45+ container . innerHTML = '' ;
46+ return ;
47+ }
48+
4449 container . innerHTML = renderToString ( jsx ) ;
4550 } ,
4651 } ) ;
Original file line number Diff line number Diff line change 55import { extend } from '@js/core/utils/extend' ;
66import Widget from '@js/ui/widget/ui.widget' ;
77import { DIContext } from '@ts/core/di/index' ;
8+ import { infernoRenderer } from '@ts/core/m_inferno_renderer' ;
89import { SearchView } from '@ts/grids/new/grid_core/search/view' ;
9- import { render } from 'inferno' ;
1010
1111import * as ColumnChooserModule from './column_chooser/index' ;
1212import { CompatibilityColumnsController } from './columns_controller/compatibility' ;
@@ -167,7 +167,7 @@ export class GridCoreNewBase<
167167
168168 protected _clean ( ) : void {
169169 this . renderSubscription ?.( ) ;
170- render ( null , this . $element ( ) . get ( 0 ) ) ;
170+ infernoRenderer . renderIntoContainer ( null , this . $element ( ) . get ( 0 ) , true ) ;
171171 // @ts -expect-error
172172 super . _clean ( ) ;
173173 }
You can’t perform that action at this time.
0 commit comments