Skip to content

Commit 552e388

Browse files
authored
CardView - fix SSR (DevExpress#29675)
1 parent cac2431 commit 552e388

File tree

2 files changed

+7
-2
lines changed
  • packages
    • devextreme-angular/src/server
    • devextreme/js/__internal/grids/new/grid_core

2 files changed

+7
-2
lines changed

packages/devextreme-angular/src/server/render.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff 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
});

packages/devextreme/js/__internal/grids/new/grid_core/widget.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import { extend } from '@js/core/utils/extend';
66
import Widget from '@js/ui/widget/ui.widget';
77
import { DIContext } from '@ts/core/di/index';
8+
import { infernoRenderer } from '@ts/core/m_inferno_renderer';
89
import { SearchView } from '@ts/grids/new/grid_core/search/view';
9-
import { render } from 'inferno';
1010

1111
import * as ColumnChooserModule from './column_chooser/index';
1212
import { 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
}

0 commit comments

Comments
 (0)