Skip to content
Merged
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
42 changes: 18 additions & 24 deletions src/TabNavList/TabNode.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import classNames from 'classnames';
import KeyCode from 'rc-util/lib/KeyCode';
import type { Tab, EditableConfig } from '../interface';
import * as React from 'react';
import type { EditableConfig, Tab } from '../interface';

export interface TabNodeProps {
id: string;
Expand All @@ -15,32 +15,25 @@ export interface TabNodeProps {
renderWrapper?: (node: React.ReactElement) => React.ReactElement;
removeAriaLabel?: string;
removeIcon?: React.ReactNode;
onRemove: () => void;
onFocus: React.FocusEventHandler;
style?: React.CSSProperties;
}

function TabNode(
{
prefixCls,
id,
active,
tab: { key, label, disabled, closeIcon },
closable,
renderWrapper,
removeAriaLabel,
editable,
onClick,
onRemove,
onFocus,
style,
}: TabNodeProps,
ref: React.Ref<HTMLDivElement>,
) {
function TabNode({
prefixCls,
id,
active,
tab: { key, label, disabled, closeIcon },
closable,
renderWrapper,
removeAriaLabel,
editable,
onClick,
onFocus,
style,
}: TabNodeProps) {
const tabPrefix = `${prefixCls}-tab`;

React.useEffect(() => onRemove, []);

const removable = editable && closable !== false && !disabled;

function onInternalClick(e: React.MouseEvent | React.KeyboardEvent) {
Expand All @@ -62,7 +55,8 @@ function TabNode(
const node: React.ReactElement = (
<div
key={key}
ref={ref}
// ref={ref}
data-node-key={key}
className={classNames(tabPrefix, {
[`${tabPrefix}-with-remove`]: removable,
[`${tabPrefix}-active`]: active,
Expand Down Expand Up @@ -116,4 +110,4 @@ function TabNode(
return renderWrapper ? renderWrapper(node) : node;
}

export default React.forwardRef(TabNode);
export default TabNode;
41 changes: 18 additions & 23 deletions src/TabNavList/index.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
import * as React from 'react';
import { useState, useRef, useEffect } from 'react';
import classNames from 'classnames';
import ResizeObserver from 'rc-resize-observer';
import raf from 'rc-util/lib/raf';
import { useComposeRef } from 'rc-util/lib/ref';
import ResizeObserver from 'rc-resize-observer';
import * as React from 'react';
import { useEffect, useRef, useState } from 'react';
import useOffsets from '../hooks/useOffsets';
import useRaf, { useRafState } from '../hooks/useRaf';
import TabNode from './TabNode';
import useSyncState from '../hooks/useSyncState';
import useTouchMove from '../hooks/useTouchMove';
import useVisibleRange from '../hooks/useVisibleRange';
import type {
TabSizeMap,
TabPosition,
RenderTabBar,
TabsLocale,
EditableConfig,
AnimatedConfig,
EditableConfig,
OnTabScroll,
TabBarExtraContent,
RenderTabBar,
SizeInfo,
TabBarExtraContent,
TabPosition,
TabSizeMap,
TabsLocale,
} from '../interface';
import useOffsets from '../hooks/useOffsets';
import useVisibleRange from '../hooks/useVisibleRange';
import OperationNode from './OperationNode';
import TabContext from '../TabContext';
import useTouchMove from '../hooks/useTouchMove';
import useRefs from '../hooks/useRefs';
import AddButton from './AddButton';
import useSyncState from '../hooks/useSyncState';
import { stringify } from '../util';
import AddButton from './AddButton';
import ExtraContent from './ExtraContent';
import OperationNode from './OperationNode';
import TabNode from './TabNode';

export interface TabNavListProps {
id: string;
Expand Down Expand Up @@ -88,7 +87,7 @@ function TabNavList(props: TabNavListProps, ref: React.Ref<HTMLDivElement>) {
const tabListRef = useRef<HTMLDivElement>();
const operationsRef = useRef<HTMLDivElement>();
const innerAddButtonRef = useRef<HTMLButtonElement>();
const [getBtnRef, removeBtnRef] = useRefs<HTMLDivElement>();
// const [getBtnRef, removeBtnRef] = useRefs<HTMLDivElement>();

const tabPositionTopOrBottom = tabPosition === 'top' || tabPosition === 'bottom';

Expand Down Expand Up @@ -287,13 +286,9 @@ function TabNavList(props: TabNavListProps, ref: React.Ref<HTMLDivElement>) {
active={key === activeKey}
renderWrapper={children}
removeAriaLabel={locale?.removeAriaLabel}
ref={getBtnRef(key)}
onClick={e => {
onTabClick(key, e);
}}
onRemove={() => {
removeBtnRef(key);
}}
onFocus={() => {
scrollToTab(key);
doLockAnimation();
Expand All @@ -315,7 +310,7 @@ function TabNavList(props: TabNavListProps, ref: React.Ref<HTMLDivElement>) {
setTabSizes(() => {
const newSizes: TabSizeMap = new Map();
tabs.forEach(({ key }) => {
const btnNode = getBtnRef(key).current;
const btnNode = tabListRef.current.querySelector<HTMLElement>(`[data-node-key="${key}"]`);
if (btnNode) {
newSizes.set(key, {
width: btnNode.offsetWidth,
Expand Down
22 changes: 0 additions & 22 deletions src/hooks/useRefs.ts

This file was deleted.

4 changes: 4 additions & 0 deletions tests/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ exports[`Tabs.Basic Normal 1`] = `
>
<div
class="rc-tabs-tab"
data-node-key="light"
>
<div
aria-controls="rc-tabs-test-panel-light"
Expand All @@ -31,6 +32,7 @@ exports[`Tabs.Basic Normal 1`] = `
</div>
<div
class="rc-tabs-tab rc-tabs-tab-active"
data-node-key="bamboo"
>
<div
aria-controls="rc-tabs-test-panel-bamboo"
Expand All @@ -45,6 +47,7 @@ exports[`Tabs.Basic Normal 1`] = `
</div>
<div
class="rc-tabs-tab"
data-node-key="cute"
>
<div
aria-controls="rc-tabs-test-panel-cute"
Expand Down Expand Up @@ -118,6 +121,7 @@ exports[`Tabs.Basic Skip invalidate children 1`] = `
>
<div
class="rc-tabs-tab rc-tabs-tab-active"
data-node-key="light"
>
<div
aria-controls="rc-tabs-test-panel-light"
Expand Down
30 changes: 29 additions & 1 deletion tests/index.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '@testing-library/dom';
import { fireEvent, render, screen } from '@testing-library/react';
import { act, fireEvent, render, screen } from '@testing-library/react';
import KeyCode from 'rc-util/lib/KeyCode';
import { spyElementPrototypes } from 'rc-util/lib/test/domHook';
import React from 'react';
Expand Down Expand Up @@ -123,6 +123,34 @@ describe('Tabs.Basic', () => {
render(getTabs({ items: null }));
});

it('strictMode should show correct ink bar', () => {
jest.useFakeTimers();

const { container } = render(
<React.StrictMode>
<Tabs
items={new Array(2).fill(0).map((_, index) => ({
label: `Tab ${index}`,
key: `${index}`,
children: `Content of Tab Pane ${index}`,
}))}
activeKey="0"
/>
</React.StrictMode>,
);

for (let i = 0; i < 10; i += 1) {
act(() => {
jest.runAllTimers();
});
}

expect(container.querySelector<HTMLElement>('.rc-tabs-ink-bar')).toHaveStyle({
width: '20px',
});
jest.useRealTimers();
});

it('same width in windows call resize', async () => {
const App = () => {
const [list, setList] = React.useState([
Expand Down