Skip to content

Fix/range slider align #1222

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

Open
wants to merge 4 commits into
base: main
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
102 changes: 16 additions & 86 deletions src/components/RangeSlider/RangeSlider.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest';
import { Flowbite, type CustomFlowbiteTheme } from '../Flowbite';
import { RangeSlider } from './RangeSlider';

describe('Components / Button', () => {
describe('Components / RangeSlider', () => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch & cleanup

describe('A11y', () => {
it('should have `role="progressbar"` by default', () => {
render(<RangeSlider />);
Expand Down Expand Up @@ -127,6 +127,13 @@ describe('Components / Button', () => {
render(<RangeSlider ref={ref} name="range_slider_name" />);
expect(ref.current?.name).toBe('range_slider_name');
});

it('should allow className as prop', () => {
const className = 'dummy-custom-class-name';

render(<RangeSlider className={className} />);
expect(rangeSlider()).toHaveClass(className);
});
});

describe('Rendering', () => {
Expand All @@ -140,47 +147,7 @@ describe('Components / Button', () => {
it('should use `base` classes', () => {
const theme: CustomFlowbiteTheme = {
rangeSlider: {
root: {
base: 'dummy-range-slider-base-classes',
},
},
};

render(
<Flowbite theme={{ theme }}>
<RangeSlider />
</Flowbite>,
);

expect(rangeSliderContainer()).toHaveClass('dummy-range-slider-base-classes');
});

it('should use `base` classes of field', () => {
const theme: CustomFlowbiteTheme = {
rangeSlider: {
field: {
base: 'dummy-range-slider-field-base-classes',
},
},
};

render(
<Flowbite theme={{ theme }}>
<RangeSlider />
</Flowbite>,
);

expect(rangeSliderContainer().childNodes[0]).toHaveClass('dummy-range-slider-field-base-classes');
});

it('should use `base` classes of input', () => {
const theme: CustomFlowbiteTheme = {
rangeSlider: {
field: {
input: {
base: 'dummy-range-slider-field-input-base-classes',
},
},
base: 'dummy-range-slider-field-input-base-classes',
},
};

Expand All @@ -193,15 +160,11 @@ describe('Components / Button', () => {
expect(rangeSlider()).toHaveClass('dummy-range-slider-field-input-base-classes');
});

it('should use `sizes` classes of input', () => {
it('should use `sizes` classes', () => {
const theme: CustomFlowbiteTheme = {
rangeSlider: {
field: {
input: {
sizes: {
lg: 'dummy-range-slider-field-input-sizes-lg-classes',
},
},
sizes: {
lg: 'dummy-range-slider-field-input-sizes-lg-classes',
},
},
};
Expand All @@ -219,50 +182,18 @@ describe('Components / Button', () => {
describe('Theme as a prop', () => {
it('should use `base` classes', () => {
const theme: CustomFlowbiteTheme['rangeSlider'] = {
root: {
base: 'dummy-range-slider-base-classes',
},
};

render(<RangeSlider theme={theme} />);

expect(rangeSliderContainer()).toHaveClass('dummy-range-slider-base-classes');
});

it('should use `base` classes of field', () => {
const theme: CustomFlowbiteTheme['rangeSlider'] = {
field: {
base: 'dummy-range-slider-field-base-classes',
},
};

render(<RangeSlider theme={theme} />);

expect(rangeSliderContainer().childNodes[0]).toHaveClass('dummy-range-slider-field-base-classes');
});

it('should use `base` classes of input', () => {
const theme: CustomFlowbiteTheme['rangeSlider'] = {
field: {
input: {
base: 'dummy-range-slider-field-input-base-classes',
},
},
base: 'dummy-range-slider-field-input-base-classes',
};

render(<RangeSlider theme={theme} />);

expect(rangeSlider()).toHaveClass('dummy-range-slider-field-input-base-classes');
});

it('should use `sizes` classes of input', () => {
it('should use `sizes` classes', () => {
const theme: CustomFlowbiteTheme['rangeSlider'] = {
field: {
input: {
sizes: {
lg: 'dummy-range-slider-field-input-sizes-lg-classes',
},
},
sizes: {
lg: 'dummy-range-slider-field-input-sizes-lg-classes',
},
};

Expand All @@ -273,6 +204,5 @@ describe('Components / Button', () => {
});
});

const rangeSliderContainer = () => screen.getByTestId('flowbite-range-slider');
const rangeSlider = (role = 'slider') => screen.getByRole(role);
const rangeSliders = (role = 'slider') => screen.getAllByRole(role);
2 changes: 1 addition & 1 deletion src/components/RangeSlider/RangeSlider.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default {
],
argTypes: {
sizing: {
options: Object.keys(theme.rangeSlider.field.input.sizes),
options: Object.keys(theme.rangeSlider.sizes),
control: { type: 'select' },
},
disabled: {
Expand Down
25 changes: 2 additions & 23 deletions src/components/RangeSlider/RangeSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,8 @@ import type { DeepPartial } from '../../types';
import type { FlowbiteTextInputSizes } from '../TextInput';

export interface FlowbiteRangeSliderTheme {
root: FlowbiteRangeSliderRootTheme;
field: FlowbiteRangeSliderFieldTheme;
}

export interface FlowbiteRangeSliderRootTheme {
base: string;
}

export interface FlowbiteRangeSliderFieldTheme {
base: string;
input: {
base: string;
sizes: FlowbiteTextInputSizes;
};
sizes: FlowbiteTextInputSizes;
}

export interface RangeSliderProps extends Omit<ComponentProps<'input'>, 'ref' | 'type'> {
Expand All @@ -34,16 +22,7 @@ export const RangeSlider = forwardRef<HTMLInputElement, RangeSliderProps>(

return (
<>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case, do we still need the fragment (<>)?

<div data-testid="flowbite-range-slider" className={twMerge(theme.root.base, className)}>
<div className={theme.field.base}>
<input
ref={ref}
type="range"
className={twMerge(theme.field.input.base, theme.field.input.sizes[sizing])}
{...props}
/>
</div>
</div>
<input ref={ref} type="range" className={twMerge(theme.base, theme.sizes[sizing], className)} {...props} />
</>
);
},
Expand Down
7 changes: 1 addition & 6 deletions src/components/RangeSlider/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
export { RangeSlider } from './RangeSlider';
export type {
FlowbiteRangeSliderFieldTheme,
FlowbiteRangeSliderRootTheme,
FlowbiteRangeSliderTheme,
RangeSliderProps,
} from './RangeSlider';
export type { FlowbiteRangeSliderTheme, RangeSliderProps } from './RangeSlider';
18 changes: 5 additions & 13 deletions src/components/RangeSlider/theme.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
import type { FlowbiteRangeSliderTheme } from './RangeSlider';

export const rangeSliderTheme: FlowbiteRangeSliderTheme = {
root: {
base: 'flex',
},
field: {
base: 'relative w-full',
input: {
base: 'w-full bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700',
sizes: {
sm: 'h-1 range-sm',
md: 'h-2',
lg: 'h-3 range-lg',
},
},
base: 'w-full bg-gray-200 rounded-lg appearance-none cursor-pointer dark:bg-gray-700',
sizes: {
sm: 'h-1 range-sm',
md: 'h-2',
lg: 'h-3 range-lg',
},
};