Skip to content
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.

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

feat: Support menuTab #339

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ React.render(
| key | string | - | corresponding to activeKey, should be unique |
| forceRender | boolean | false | forced render of content in tabs, not lazy render after clicking on tabs |
| tab | ReactNode | - | current tab's title corresponding to current tabPane |
| menuTab | ReactNode | - | Tab title in dropdown menu |
| closeIcon | ReactNode | - | Config close icon |

## Development
Expand Down
8 changes: 7 additions & 1 deletion examples/mix.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ function getTabPanes(count = 50) {
const tabs: React.ReactElement[] = [];
for (let i = 0; i < count; i += 1) {
tabs.push(
<TabPane key={i} tab={`Tab ${i}`} disabled={i === 3} closable={i === 5 ? false : undefined}>
<TabPane
key={i}
tab={`Tab ${i}`}
menuTab={i === 0 ? 'FIRST ONE!' : null}
disabled={i === 3}
closable={i === 5 ? false : undefined}
>
Content of {i}
</TabPane>,
);
Expand Down
6 changes: 3 additions & 3 deletions src/TabNavList/OperationNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function OperationNode(
aria-controls={id && `${id}-panel-${tab.key}`}
disabled={tab.disabled}
>
{tab.tab}
{tab.menuTab ?? tab.tab}
</MenuItem>
))}
</Menu>
Expand Down Expand Up @@ -149,8 +149,8 @@ function OperationNode(
}

const overlayClassName = classNames({
[`${dropdownPrefix}-rtl`]: rtl
})
[`${dropdownPrefix}-rtl`]: rtl,
});

const moreNode: React.ReactElement = mobile ? null : (
<Dropdown
Expand Down
1 change: 1 addition & 0 deletions src/TabPanelList/TabPane.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import classNames from 'classnames';

export interface TabPaneProps {
tab?: React.ReactNode;
menuTab?: React.ReactNode;
className?: string;
style?: React.CSSProperties;
disabled?: boolean;
Expand Down
3 changes: 2 additions & 1 deletion tests/common/util.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function getTransformY(wrapper: ReactWrapper) {
return Number(match[1]);
}

export function getTabs(props: TabsProps = null) {
export function getTabs(props: TabsProps = null, moreTabs?: React.ReactNode) {
return (
<Tabs {...props}>
<TabPane tab="light" key="light">
Expand All @@ -80,6 +80,7 @@ export function getTabs(props: TabsProps = null) {
<TabPane tab="miu" key="miu">
Miu
</TabPane>
{moreTabs}
</Tabs>
);
}
Expand Down
29 changes: 29 additions & 0 deletions tests/overflow.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,35 @@ describe('Tabs.Overflow', () => {
jest.useRealTimers();
});

it('menuTab', () => {
jest.useFakeTimers();
const wrapper = mount(
getTabs(
null,
<TabPane key="menu" tab="Menu" menuTab="Tab In Menu">
Test
</TabPane>,
),
);

triggerResize(wrapper);
act(() => {
jest.runAllTimers();
wrapper.update();
});

// Click to open
wrapper.find('.rc-tabs-nav-more').simulate('mouseenter');
jest.runAllTimers();
wrapper.update();
expect(
wrapper
.find('.rc-tabs-dropdown li')
.last()
.text(),
).toEqual('Tab In Menu');
});

[KeyCode.SPACE, KeyCode.ENTER].forEach(code => {
it(`keyboard with select keycode: ${code}`, () => {
jest.useFakeTimers();
Expand Down