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

fix(tabs): fix bottom line calculation #1482

Merged
merged 2 commits into from
Dec 26, 2024
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
5 changes: 5 additions & 0 deletions .changeset/tender-tips-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@alfalab/core-components-tabs': patch
---

Исправлен расчет положения нижней линии таба
10 changes: 9 additions & 1 deletion packages/tabs/src/components/primary-tablist/Component.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useRef } from 'react';
import React, { useCallback, useEffect, useRef } from 'react';
import { ResizeObserver as ResizeObserverPolyfill } from '@juggle/resize-observer';
import cn from 'classnames';

Expand Down Expand Up @@ -55,6 +55,13 @@ export const PrimaryTabList = ({
return fnUtils.noop;
}, [selectedTab]);

const handleTitleResize = useCallback(() => {
if (selectedTab && lineRef.current) {
lineRef.current.style.width = `${selectedTab.offsetWidth}px`;
lineRef.current.style.transform = `translateX(${selectedTab.offsetLeft}px)`;
}
}, [selectedTab]);

const renderContent = () => (
<div
role='tablist'
Expand All @@ -73,6 +80,7 @@ export const PrimaryTabList = ({
styles={styles}
showSkeleton={showSkeleton}
skeletonProps={skeletonProps}
onResize={handleTitleResize}
/>
)}
</KeyboardFocusable>
Expand Down
6 changes: 6 additions & 0 deletions packages/tabs/src/components/tabs/Component.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ Object.defineProperty(window, 'matchMedia', {
}),
});

global.ResizeObserver = jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
}));

const tabVariants: Array<
[typeof TabsMobile | typeof TabsDesktop | typeof TabsResponsive, TabsProps['view']]
> = [
Expand Down
29 changes: 27 additions & 2 deletions packages/tabs/src/components/title/Component.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { ButtonHTMLAttributes, forwardRef } from 'react';
import React, { ButtonHTMLAttributes, forwardRef, useEffect, useRef } from 'react';
import mergeRefs from 'react-merge-refs';
import cn from 'classnames';

import { Skeleton, SkeletonProps } from '@alfalab/core-components-skeleton';
Expand All @@ -12,6 +13,7 @@ type Props = TabListTitle &
isOption?: boolean;
showSkeleton?: boolean;
skeletonProps?: Omit<SkeletonProps, 'visible'>;
onResize?: () => void;
};

export const Title = forwardRef<HTMLButtonElement, Props>(
Expand All @@ -30,19 +32,42 @@ export const Title = forwardRef<HTMLButtonElement, Props>(
isOption = false,
showSkeleton = false,
skeletonProps,
onResize,
...restProps
},
ref,
) => {
const buttonRef = useRef<HTMLButtonElement | null>(null);

const titleClassName = {
[styles.content]: true,
[styles.focused]: focused,
};

useEffect(() => {
const resizeObserver = new ResizeObserver(() => {
if (onResize) {
onResize();
}
});

const button = buttonRef.current;

if (button) {
resizeObserver.observe(button);
}

return () => {
if (button) {
resizeObserver.unobserve(button);
}
};
}, [onResize]);

return hidden ? null : (
<button
{...restProps}
ref={ref}
ref={mergeRefs([ref, buttonRef])}
disabled={disabled || showSkeleton}
type='button'
id={String(id)}
Expand Down
6 changes: 6 additions & 0 deletions packages/tabs/src/hooks/use-tabs.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ import userEvent from '@testing-library/user-event';
import { TabsDesktop } from '../desktop';
import { Tab } from '../components/tab';

global.ResizeObserver = jest.fn().mockImplementation(() => ({
observe: jest.fn(),
unobserve: jest.fn(),
disconnect: jest.fn(),
}));

const renderTabs = async (props = { selectedId: 'tab-1' }) => {
const renderResult = render(
<TabsDesktop {...props}>
Expand Down
Loading