From 37fab589ad35b11c26b0b97414c7d95c15ff74d9 Mon Sep 17 00:00:00 2001
From: fedepini <fpini95@gmail.com>
Date: Thu, 9 Jul 2026 17:00:29 +0200
Subject: [PATCH 1/2] feat: added tab persistence state in TabList

---
 src/widgets/TabList/TabList.tsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/widgets/TabList/TabList.tsx b/src/widgets/TabList/TabList.tsx
index 0e87dc87..d97c784c 100644
--- a/src/widgets/TabList/TabList.tsx
+++ b/src/widgets/TabList/TabList.tsx
@@ -1,6 +1,7 @@
 import type { TabsProps } from 'antd'
 import { Empty, Result, Tabs } from 'antd'
 import { useMemo } from 'react'
+import { useSearchParams } from 'react-router'
 
 import WidgetRenderer from '../../components/WidgetRenderer'
 import type { WidgetProps } from '../../types/Widget'
@@ -13,6 +14,7 @@ export type TabListWidgetData = WidgetType['spec']['widgetData']
 
 const TabList = ({ resourcesRefs, uid, widgetData }: WidgetProps<TabListWidgetData>) => {
   const { items } = widgetData
+  const [searchParams, setSearchParams] = useSearchParams()
 
   const tabItems = useMemo(() => {
     return items.reduce<NonNullable<TabsProps['items']>>((acc, { label, resourceRefId, title }, index) => {
@@ -40,11 +42,25 @@ const TabList = ({ resourcesRefs, uid, widgetData }: WidgetProps<TabListWidgetDa
     }, [])
   }, [items, resourcesRefs, uid])
 
+  const paramKey = `tab-${uid}`
+  const storedKey = searchParams.get(paramKey)
+  const activeKey = tabItems.some(({ key }) => key === storedKey) ? storedKey! : (tabItems[0]?.key ?? '')
+
+  const handleTabChange = (key: string) => {
+    setSearchParams(prev => {
+      const next = new URLSearchParams(prev)
+      next.set(paramKey, key)
+      return next
+    },
+    { replace: true }
+    )
+  }
+
   if (!items.length) {
     return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
   }
 
-  return <Tabs items={tabItems} key={uid} />
+  return <Tabs activeKey={activeKey} items={tabItems} key={uid} onChange={handleTabChange} />
 }
 
 export default TabList

From 4651fa34f4fd614490d087f141f0653a80415806 Mon Sep 17 00:00:00 2001
From: fedepini <fpini95@gmail.com>
Date: Thu, 9 Jul 2026 17:10:21 +0200
Subject: [PATCH 2/2] chore: updated CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 824fb3f8..0183d17c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Previous changes not listed in this document can be traced using Git history.
 
 ### Added
 
+- Added persistence of active tab in `TabList`
 - Added `externalNavigate` and `refresh` actions
 
 ## [1.0.26] - 2026-06-16