From 1022aa6dcee3658e6c0536487e33596a0efe01ee Mon Sep 17 00:00:00 2001
From: Vasily Strelyaev <Vasily.Strelyaev@devexpress.com>
Date: Tue, 10 Sep 2024 15:53:22 +0300
Subject: [PATCH] add a unit test

---
 packages/devextreme-react/build.config.js     |  2 +-
 .../src/core/__tests__/component.test.tsx     | 26 +++++++++++++++++++
 .../core/__tests__/template-manager.test.tsx  | 24 ++++++++---------
 .../src/core/__tests__/test-component.tsx     |  1 +
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/packages/devextreme-react/build.config.js b/packages/devextreme-react/build.config.js
index f46a5765e583..5e6a2190c025 100644
--- a/packages/devextreme-react/build.config.js
+++ b/packages/devextreme-react/build.config.js
@@ -1,7 +1,7 @@
 
 module.exports = {
   src: './src/**/*.{ts,tsx}',
-  testSrc: './src/**/__tests__/*.*',
+  testSrc: './src/**/__tests__/**/*.*',
   npm: {
     dist: './npm/',
     package: 'package.json',
diff --git a/packages/devextreme-react/src/core/__tests__/component.test.tsx b/packages/devextreme-react/src/core/__tests__/component.test.tsx
index 22e42a11c702..f76512cd7cb4 100644
--- a/packages/devextreme-react/src/core/__tests__/component.test.tsx
+++ b/packages/devextreme-react/src/core/__tests__/component.test.tsx
@@ -394,4 +394,30 @@ describe('disposing', () => {
 
     expect(Widget.option.mock.calls.length).toBe(0);
   });
+
+  it('saves and restores focus state after dispose', async () => {
+    let firstRender = true;
+  
+    WidgetClass.mockImplementation((container: HTMLElement) => {
+      const input = document.createElement('input');
+
+      container.appendChild(input);
+
+      if (firstRender) {
+        input.focus();
+      }
+
+      firstRender = false;
+
+      return Widget;
+    })
+
+    testingLib.render(
+      <React.StrictMode>
+        <TestComponent />
+      </React.StrictMode>
+    );
+
+    expect(Widget.focus).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/packages/devextreme-react/src/core/__tests__/template-manager.test.tsx b/packages/devextreme-react/src/core/__tests__/template-manager.test.tsx
index e51c34f17fa9..ee7b75ad4dc2 100644
--- a/packages/devextreme-react/src/core/__tests__/template-manager.test.tsx
+++ b/packages/devextreme-react/src/core/__tests__/template-manager.test.tsx
@@ -93,7 +93,7 @@ describe('Template Manager', () => {
         <div className='children-template-container'></div>
         <div className='render-template-container'></div>
         <div className='component-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -120,7 +120,7 @@ describe('Template Manager', () => {
         <div className='children-template-container'></div>
         <div className='render-template-container'></div>
         <div className='component-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -175,7 +175,7 @@ describe('Template Manager', () => {
     render(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -216,7 +216,7 @@ describe('Template Manager', () => {
       <React.Fragment>
         <div className='render-template-container'></div>
         <div className='component-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined}/>
       </React.Fragment>
     );
 
@@ -269,7 +269,7 @@ describe('Template Manager', () => {
       <React.Fragment>
         <div className='render-template-container'></div>
         <div className='component-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -318,7 +318,7 @@ describe('Template Manager', () => {
       <React.Fragment>
         <div className='render-template-container'></div>
         <div className='component-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -371,7 +371,7 @@ describe('Template Manager', () => {
     render(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -422,7 +422,7 @@ describe('Template Manager', () => {
     render(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -475,7 +475,7 @@ describe('Template Manager', () => {
       <React.Fragment>
         <div className='render-template-container'></div>
         <div className='other-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -555,7 +555,7 @@ describe('Template Manager', () => {
     const { rerender } = render(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -575,7 +575,7 @@ describe('Template Manager', () => {
     rerender(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
@@ -594,7 +594,7 @@ describe('Template Manager', () => {
     rerender(
       <React.Fragment>
         <div className='render-template-container'></div>
-        <TemplateManager init={init} />
+        <TemplateManager init={init} onTemplatesRendered={() => undefined} />
       </React.Fragment>
     );
 
diff --git a/packages/devextreme-react/src/core/__tests__/test-component.tsx b/packages/devextreme-react/src/core/__tests__/test-component.tsx
index b5b63ca4a8a5..ceadc08fc2ea 100644
--- a/packages/devextreme-react/src/core/__tests__/test-component.tsx
+++ b/packages/devextreme-react/src/core/__tests__/test-component.tsx
@@ -34,6 +34,7 @@ const Widget = {
   clearExtensions: jest.fn(),
   dispose: jest.fn(),
   skipOptionsRollBack: false,
+  focus: jest.fn(),
 };
 
 const WidgetClass = jest.fn<typeof Widget, any>(() => Widget);