From 3a803c95e70bd34121d1b910033678009c92226e Mon Sep 17 00:00:00 2001
From: Nikki Gonzales
 <38495263+nikkithelegendarypokemonster@users.noreply.github.com>
Date: Tue, 18 Jun 2024 18:14:52 +0800
Subject: [PATCH 1/2] TabPanel/Overview: Corrected classname appending in Vue
 template by adding wrapper div (#27552)

Signed-off-by: Nikki Gonzales <38495263+nikkithelegendarypokemonster@users.noreply.github.com>
---
 .../Demos/TabPanel/Overview/Vue/TabPanelItem.vue   | 14 ++++++++------
 .../demos/utils/visual-tests/matrix-test-helper.js |  3 ---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue b/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue
index d1e660664e0a..e83419ec7c39 100644
--- a/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue
+++ b/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue
@@ -1,10 +1,12 @@
 <template>
-  <div class="tabpanel-item">
-    <TaskItem
-      v-for="(task, index) in tasks"
-      :key="index"
-      :task="task"
-    />
+  <div>
+    <div class="tabpanel-item">
+      <TaskItem
+        v-for="(task, index) in tasks"
+        :key="index"
+        :task="task"
+      />
+    </div>
   </div>
 </template>
 
diff --git a/apps/demos/utils/visual-tests/matrix-test-helper.js b/apps/demos/utils/visual-tests/matrix-test-helper.js
index 8abbd7202449..c46b1b24485a 100644
--- a/apps/demos/utils/visual-tests/matrix-test-helper.js
+++ b/apps/demos/utils/visual-tests/matrix-test-helper.js
@@ -239,9 +239,6 @@ const SKIPPED_TESTS = {
     Drawer: [
       { demo: 'TopOrBottomPosition', themes: [THEME.material] },
     ],
-    TabPanel: [
-      { demo: 'Overview', themes: [THEME.material] },
-    ],
   },
   React: {
     Charts: [

From 4f88396307200a5261260ae5ee78e770b88a9be8 Mon Sep 17 00:00:00 2001
From: EugeniyKiyashko <EugeniyKiyashko@users.noreply.github.com>
Date: Tue, 18 Jun 2024 16:38:55 +0400
Subject: [PATCH 2/2] revert: Fix modules relative paths after moving Demos
 (#27563) (#27612)

---
 apps/demos/utils/bundle/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js
index 940bef0f9b8e..4e8f7184674d 100644
--- a/apps/demos/utils/bundle/index.js
+++ b/apps/demos/utils/bundle/index.js
@@ -9,6 +9,7 @@ const url = require('url');
 // https://stackoverflow.com/questions/42412965/how-to-load-named-exports-with-systemjs/47108328
 const prepareModulesToNamedImport = () => {
   const modules = [
+    'time_zone_utils.js',
     'localization.js',
     'viz/export.js',
     'viz/core/export.js',
@@ -22,9 +23,8 @@ const prepareModulesToNamedImport = () => {
   ];
 
   const paths = [
-    '../npm-scripts/npm-devextreme/cjs', // un-used / legacy?
-    'node_modules/devextreme/cjs',       // 24.1+ migrated from devextreme-demos, kept as is / likely un-used, but works ok in mono repo
-    '../../node_modules/devextreme/cjs', // 24.1+ wg / individual em modules are not discovered
+    '../npm-scripts/npm-devextreme/cjs',
+    'node_modules/devextreme/cjs',
   ];
 
   const esModuleExport = 'exports.__esModule = true;';