mirror of
https://github.com/roleypoly/roleypoly.git
synced 2025-04-25 03:49:11 +00:00
fix(design-system): redo tab view to be based on index instead of title
This commit is contained in:
parent
878f94ea93
commit
cdafaa90db
2 changed files with 22 additions and 15 deletions
|
@ -12,13 +12,16 @@ export default {
|
|||
};
|
||||
|
||||
export const ManyTabs = ({ tabCount }) => {
|
||||
const tabs = [...'0'.repeat(tabCount)].reduce(
|
||||
(acc, _, idx) => ({
|
||||
...acc,
|
||||
[`Tab ${idx + 1}`]: <Tab>{() => <div>tab {idx + 1}</div>}</Tab>,
|
||||
}),
|
||||
{}
|
||||
);
|
||||
const tabs = [...'0'.repeat(tabCount)].map((_, i) => (
|
||||
<Tab title={`tab ${i}`}>
|
||||
{() => (
|
||||
<>
|
||||
<h1>tab {i}</h1>
|
||||
<p>hello!!!!!</p>
|
||||
</>
|
||||
)}
|
||||
</Tab>
|
||||
));
|
||||
|
||||
return <TabView>{tabs}</TabView>;
|
||||
};
|
||||
|
|
|
@ -2,8 +2,8 @@ import * as React from 'react';
|
|||
import { TabTitleRow, TabContent, TabViewStyled, TabTitle } from './TabView.styled';
|
||||
|
||||
export type TabViewProps = {
|
||||
children: { [title: string]: React.ReactNode };
|
||||
initialTab?: string;
|
||||
children: React.ReactNode[];
|
||||
initialTab?: number;
|
||||
};
|
||||
|
||||
type TabProps = {
|
||||
|
@ -12,15 +12,19 @@ type TabProps = {
|
|||
};
|
||||
|
||||
export const TabView = (props: TabViewProps) => {
|
||||
const tabNames = Object.keys(props.children);
|
||||
const tabNames = React.Children.map(props.children, (child) => {
|
||||
if (!React.isValidElement(child)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return child.props.title;
|
||||
});
|
||||
|
||||
if (tabNames.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const [currentTab, setCurrentTab] = React.useState<keyof TabViewProps['children']>(
|
||||
props.initialTab ?? tabNames[0]
|
||||
);
|
||||
const [currentTab, setCurrentTab] = React.useState<number>(props.initialTab ?? 0);
|
||||
|
||||
return (
|
||||
<TabViewStyled>
|
||||
|
@ -28,7 +32,7 @@ export const TabView = (props: TabViewProps) => {
|
|||
{tabNames.map((tabName, idx) => (
|
||||
<TabTitle
|
||||
selected={currentTab === tabName}
|
||||
onClick={() => setCurrentTab(tabName)}
|
||||
onClick={() => setCurrentTab(idx)}
|
||||
key={`tab${tabName}${idx}`}
|
||||
>
|
||||
{tabName}
|
||||
|
@ -37,7 +41,7 @@ export const TabView = (props: TabViewProps) => {
|
|||
</TabTitleRow>
|
||||
<TabContent>
|
||||
{props.children[currentTab] || (
|
||||
<i onLoad={() => setCurrentTab(tabNames[0])}>
|
||||
<i onLoad={() => setCurrentTab(0)}>
|
||||
Tabs were misconfigured, resetting to zero.
|
||||
</i>
|
||||
)}
|
||||
|
|
Loading…
Add table
Reference in a new issue