Skip to content

[patch] Fix issues in Tabs component #2387

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

Merged
Mil4n0r merged 2 commits into from
Feb 2, 2026
Merged

[patch] Fix issues in Tabs component #2387

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5042f37
Fix issues in Tabs component
PelayoFelgueroso Feb 2, 2026
ea19d7b
Merge branch 'master' into PelayoFelgueroso/tabs_fix
PelayoFelgueroso Feb 2, 2026
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
8 changes: 4 additions & 4 deletions packages/lib/src/tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const DxcTabs = ({ children, iconPosition = "left", margin, tabIndex = 0 }: Tabs
(child) => (child.props.active || child.props.defaultActive) && !child.props.disabled
);
const initialTab = activeChild ?? childrenArray.find((child) => !child.props.disabled);
return initialTab?.props.label ?? initialTab?.props.tabId ?? "";
return initialTab?.props.tabId ?? initialTab?.props.label ?? "";
});
const [innerFocusIndex, setInnerFocusIndex] = useState<number | null>(null);
const [scrollLeftEnabled, setScrollLeftEnabled] = useState(false);
Expand All @@ -110,7 +110,7 @@ const DxcTabs = ({ children, iconPosition = "left", margin, tabIndex = 0 }: Tabs
const focusedChild = innerFocusIndex != null ? childrenArray[innerFocusIndex] : null;
return {
activeTabId: activeTabId,
focusedTabId: isValidElement(focusedChild) ? (focusedChild.props.label ?? focusedChild.props.tabId) : "",
focusedTabId: isValidElement(focusedChild) ? (focusedChild.props.tabId ?? focusedChild.props.label) : "",
iconPosition,
isControlled: childrenArray.some((child) => typeof child.props.active !== "undefined"),
setActiveTabId: setActiveTabId,
Expand Down Expand Up @@ -146,7 +146,7 @@ const DxcTabs = ({ children, iconPosition = "left", margin, tabIndex = 0 }: Tabs
};

const handleOnKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
const activeTab = childrenArray.findIndex((child) => (child.props.label ?? child.props.tabId) === activeTabId);
const activeTab = childrenArray.findIndex((child) => (child.props.tabId ?? child.props.label) === activeTabId);
let index;
switch (event.key) {
case "Left":
Expand Down Expand Up @@ -231,7 +231,7 @@ const DxcTabs = ({ children, iconPosition = "left", margin, tabIndex = 0 }: Tabs
</Tabs>
</TabsContainer>
{Children.map(children, (child) =>
isTabElement(child) && child.props.tabId === activeTabId ? child.props.children : null
isTabElement(child) && (child.props.tabId ?? child.props.label) === activeTabId ? child.props.children : null
)}
</>
);
Expand Down