diff --git a/packages/devextreme-angular/src/server/render.ts b/packages/devextreme-angular/src/server/render.ts index 272acefd5cc9..1ea7b55f70ce 100644 --- a/packages/devextreme-angular/src/server/render.ts +++ b/packages/devextreme-angular/src/server/render.ts @@ -25,6 +25,9 @@ export class DxServerModule { temp.innerHTML = renderToString(el); const mainElement = temp.childNodes[0]; + if (!mainElement) { + return; + } const childString = mainElement.innerHTML; for (let i = 0; i < mainElement.attributes.length; i++) { diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 194eca2e53cb..a97a6967a661 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -439,7 +439,7 @@ class Draggable extends DOMComponent { } _stopAnimator() { - this._scrollAnimator.stop(); + this._scrollAnimator?.stop(); } _addWidgetPrefix(className?) {