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.

Sign up for GitHub

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 more info #264

Merged
merged 1 commit into from
Jul 30, 2024
Merged

feat: support more info #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/ColorPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ const ColorPicker = forwardRef<HTMLDivElement, ColorPickerProps>(

// Slider change
const onHueChange = (hue: number) => {
handleChange(getHueColor(hue), 'hue');
handleChange(getHueColor(hue), { type: 'hue', value: hue });
};

const onAlphaChange = (alpha: number) => {
handleChange(getAlphaColor(alpha), 'alpha');
handleChange(getAlphaColor(alpha), { type: 'alpha', value: alpha });
};

// Complete
Expand Down
10 changes: 8 additions & 2 deletions src/interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ export interface BaseColorPickerProps {
color?: Color;
prefixCls?: string;
disabled?: boolean;
onChange?: (color: Color, type?: HsbaColorType) => void;
onChangeComplete?: (value: Color, type?: HsbaColorType) => void;
onChange?: (
color: Color,
info?: { type?: HsbaColorType; value?: number },
) => void;
onChangeComplete?: (
value: Color,
info?: { type?: HsbaColorType; value?: number },
) => void;
}
17 changes: 14 additions & 3 deletions tests/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ describe('ColorPicker', () => {
height: 100,
}),
});

let changeInfo: any;
const onChange = vi.fn();
const Demo = () => {
const [value, setValue] = useState(new Color('#163cff'));
Expand All @@ -445,11 +447,13 @@ describe('ColorPicker', () => {
<div className="pick-color">{value.toHsbString()}</div>
<ColorPicker
color={value}
onChange={(color, type) => {
onChange(color, type);
onChange={(color, info) => {
changeInfo = info;

onChange(color, info);

let passedColor = color;
if (type !== 'alpha') {
if (info.type !== 'alpha') {
// bad case, color should be immutable
passedColor = new Color(color.setA(1));
}
Expand All @@ -464,6 +468,7 @@ describe('ColorPicker', () => {
expect(container.querySelector('.pick-color').innerHTML).toBe(
'hsb(230, 91%, 100%)',
);

doMouseMove(
container.querySelector('.rc-color-picker-slider-alpha'),
100,
Expand All @@ -472,10 +477,14 @@ describe('ColorPicker', () => {
expect(container.querySelector('.pick-color').innerHTML).toBe(
'hsba(215, 91%, 100%, 0)',
);
expect(changeInfo).toEqual({ type: 'alpha', value: 0 });

doMouseMove(container.querySelector('.rc-color-picker-slider-hue'), 0, 50);
expect(container.querySelector('.pick-color').innerHTML).toBe(
'hsb(180, 91%, 100%)',
);
expect(changeInfo).toEqual({ type: 'hue', value: 180 });

doMouseMove(
container.querySelector('.rc-color-picker-slider-hue'),
50,
Expand All @@ -484,6 +493,8 @@ describe('ColorPicker', () => {
expect(container.querySelector('.pick-color').innerHTML).toBe(
'hsb(0, 91%, 100%)',
);
expect(changeInfo).toEqual({ type: 'hue', value: 0 });

spy.mockRestore();
});
});
Loading