-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reintroduce Slider component with tailwind
- Loading branch information
1 parent
8735133
commit 7bdf9bc
Showing
6 changed files
with
249 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { Meta, StoryObj } from '@storybook/react'; | ||
| import { Slider } from './index'; | ||
|
|
||
| const meta: Meta<typeof Slider> = { | ||
| component: Slider, | ||
| tags: ['autodocs', '!dev'], | ||
| }; | ||
|
|
||
| export default meta; | ||
|
|
||
| type Story = StoryObj<typeof Slider>; | ||
|
|
||
| export const Default: Story = { | ||
| args: { | ||
| min: 0, | ||
| max: 10, | ||
| step: 1, | ||
| defaultValue: 5, | ||
| leftLabel: 'label', | ||
| rightLabel: 'label', | ||
| showValue: true, | ||
| showFill: true, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { render, fireEvent } from '@testing-library/react'; | ||
| import { describe, expect, it, vi } from 'vitest'; | ||
| import { Slider } from '.'; | ||
|
|
||
| window.ResizeObserver = vi.fn().mockImplementation(() => ({ | ||
| disconnect: vi.fn(), | ||
| observe: vi.fn(), | ||
| unobserve: vi.fn(), | ||
| })); | ||
|
|
||
| describe('<Slider />', () => { | ||
| it('renders correctly', () => { | ||
| const { container } = render( | ||
| <Slider min={0} max={10} step={1} defaultValue={5} leftLabel='left' rightLabel='right' />, | ||
| ); | ||
|
|
||
| expect(container).toHaveTextContent('left'); | ||
| expect(container).toHaveTextContent('right'); | ||
| }); | ||
|
|
||
| it('handles onChange correctly', () => { | ||
| const onChange = vi.fn(); | ||
|
|
||
| const { container } = render( | ||
| <Slider min={0} max={10} step={1} defaultValue={5} onChange={onChange} />, | ||
| ); | ||
|
|
||
| const slider = container.querySelector('[role="slider"]')!; | ||
| fireEvent.focus(slider); | ||
| fireEvent.keyDown(slider, { key: 'ArrowRight' }); | ||
|
|
||
| expect(onChange).toHaveBeenCalledWith(6); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| import React, { useState } from 'react'; | ||
| import * as RadixSlider from '@radix-ui/react-slider'; | ||
| import { ThemeColor, getThemeColorClass } from '../utils/color'; | ||
| import cn from 'clsx'; | ||
|
|
||
| interface SliderProps { | ||
| min?: number; | ||
| max?: number; | ||
| step?: number; | ||
| defaultValue?: number; | ||
| onChange?: (value: number) => void; | ||
| leftLabel?: string; | ||
| rightLabel?: string; | ||
| showValue?: boolean; | ||
| valueDetails?: string; | ||
| focusedOutlineColor?: ThemeColor; | ||
| showTrackGaps?: boolean; | ||
| trackGapBackground?: ThemeColor; | ||
| showFill?: boolean; | ||
| fontSize?: string; | ||
| disabled?: boolean; | ||
| } | ||
|
|
||
| export const Slider: React.FC<SliderProps> = ({ | ||
| min = 0, | ||
| max = 100, | ||
| step = 1, | ||
| defaultValue = 0, | ||
| onChange, | ||
| leftLabel, | ||
| rightLabel, | ||
| showValue = true, | ||
| showFill = false, | ||
| showTrackGaps = true, | ||
| trackGapBackground = 'base.black', | ||
| focusedOutlineColor = 'action.neutralFocusOutline', | ||
| valueDetails, | ||
| fontSize = 'textXs', | ||
| disabled = false, | ||
| }) => { | ||
| const [value, setValue] = useState(defaultValue); | ||
| const handleValueChange = (newValue: number[]) => { | ||
| const updatedValue = newValue[0] ?? defaultValue; | ||
| setValue(updatedValue); | ||
| onChange?.(updatedValue); | ||
| }; | ||
|
|
||
| const totalSteps = (max - min) / step; | ||
|
|
||
| return ( | ||
| <div> | ||
| {(!!leftLabel || !!rightLabel) && ( | ||
| <div className='flex justify-between w-full mb-2'> | ||
| <div className={cn('text-text-secondary', `leading-[${fontSize}]`)}>{leftLabel}</div> | ||
| <div className={cn('text-text-secondary', `leading-[${fontSize}]`)}>{rightLabel}</div> | ||
| </div> | ||
| )} | ||
| <RadixSlider.Root | ||
| className='relative flex items-center w-full h-8' | ||
| min={min} | ||
| max={max} | ||
| step={step} | ||
| defaultValue={[defaultValue]} | ||
| onValueChange={handleValueChange} | ||
| disabled={disabled} | ||
| > | ||
| <RadixSlider.Track className='relative w-full h-2 bg-other-tonalFill10 rounded-full px-2'> | ||
| {showFill && ( | ||
| <RadixSlider.Range className='absolute h-full bg-primary-main rounded-full' /> | ||
| )} | ||
| <div className='relative'> | ||
| {showTrackGaps && | ||
| Array.from({ length: totalSteps + 1 }) | ||
| .map((_, i): number => (i / totalSteps) * 100) | ||
| .map(left => { | ||
| return ( | ||
| <div | ||
| key={left} | ||
| className={cn( | ||
| 'absolute w-1 h-2 -translate-x-1/2', | ||
| getThemeColorClass(trackGapBackground).bg, | ||
| )} | ||
| style={{ | ||
| left: `${left}%`, | ||
| }} | ||
| /> | ||
| ); | ||
| })} | ||
| </div> | ||
| </RadixSlider.Track> | ||
| <RadixSlider.Thumb | ||
| className={cn( | ||
| 'block w-4 h-4 rounded-full bg-neutral-contrast', | ||
| !disabled && 'cursor-grab hover:bg-neutral-contrast focus:outline focus:outline-2', | ||
| !disabled && `focus:${getThemeColorClass(focusedOutlineColor).outline}`, | ||
| disabled && | ||
| "after:content-[''] after:absolute after:inset-0 after:bg-action-disabledOverlay", | ||
| )} | ||
| /> | ||
| </RadixSlider.Root> | ||
| {showValue && ( | ||
| <div | ||
| className={cn( | ||
| 'flex mt-4 border border-tonalStroke text-text-primary p-4', | ||
| `leading-[${fontSize}]`, | ||
| )} | ||
| > | ||
| <div className='text-text-primary'>{value}</div> | ||
| {valueDetails && <div className='ml-2 text-text-secondary'>· {valueDetails}</div>} | ||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.