Skip to content

Scheduler - Add safety guards for Angular SSR and Draggable disposal #33425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleksei-semikozov wants to merge 1 commit into
base: 26_1
Choose a base branch
from
+4 −1
Open

Scheduler - Add safety guards for Angular SSR and Draggable disposal #33425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/devextreme-angular/src/server/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ export class DxServerModule {
temp.innerHTML = renderToString(el);

const mainElement = temp.childNodes[0];
if (!mainElement) {
Copy link

Copilot AI Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When renderToString(el) returns an empty string, this early return leaves container.innerHTML unchanged (potentially stale from a previous render). Consider clearing container.innerHTML (and returning) in this branch to align with renderIntoContainer's jsx === null handling and ensure consistent SSR output.

Suggested change
if (!mainElement) {
if (!mainElement) {
container.innerHTML = '';

Copilot uses AI. Check for mistakes.
return;
}
const childString = mainElement.innerHTML;

for (let i = 0; i < mainElement.attributes.length; i++) {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/m_draggable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ class Draggable extends DOMComponent<Draggable, Properties> {
}

_stopAnimator() {
this._scrollAnimator.stop();
this._scrollAnimator?.stop();
}

_addWidgetPrefix(className?) {
Expand Down
Loading