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
5 changes: 5 additions & 0 deletions .changeset/silver-geese-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"reshaped": patch
---

Fix Slider to trigger `onChangeCommit` when changing values via keyboard interactions.
14 changes: 12 additions & 2 deletions packages/reshaped/src/components/Slider/SliderControlled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,19 @@ const SliderControlled: React.FC<T.ControlledProps & T.DefaultProps> = (props) =
// @ts-ignore
if (options.commit) onChangeCommitRef.current?.(args);

// Keyboard changes should commit immediately
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (options.native && !draggingId) onChangeCommitRef.current?.(args);

// Manually controlled resolving of single/range handlers
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (options.native) onChangeRef.current?.(args);

triggerChangeEvent(minInputRef.current!, value.toString());
},
[maxValue, name, minName, maxName, range, onChangeCommitRef, onChangeRef]
[range, maxValue, name, minName, maxName, draggingId, onChangeCommitRef, onChangeRef]
);

const handleMaxChange: T.ThumbProps["onChange"] = React.useCallback(
Expand All @@ -159,14 +164,19 @@ const SliderControlled: React.FC<T.ControlledProps & T.DefaultProps> = (props) =
// @ts-ignore
if (options.commit) onChangeCommitRef.current?.(args);

// Keyboard changes should commit immediately
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (options.native && !draggingId) onChangeCommitRef.current?.(args);

// Manually controlled resolving of single/range handlers
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
if (options.native) onChangeRef.current?.(args);

triggerChangeEvent(maxInputRef.current!, value.toString());
},
[minValue, name, minName, maxName, range, onChangeRef, onChangeCommitRef]
[range, minValue, name, minName, maxName, onChangeCommitRef, draggingId, onChangeRef]
);

const handleMouseDown = ({ nativeEvent }: React.MouseEvent | React.TouchEvent) => {
Expand Down
25 changes: 25 additions & 0 deletions packages/reshaped/src/components/Slider/tests/Slider.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ export const defaultValue: StoryObj<{

expect(args.handleChange).toHaveBeenCalledTimes(1);
expect(args.handleChange).toHaveBeenCalledWith({ value: 51, name: "test-name" });

expect(args.handleChangeCommit).toHaveBeenCalledTimes(1);
expect(args.handleChangeCommit).toHaveBeenCalledWith({ value: 51, name: "test-name" });

expect(input).toHaveValue("51");
},
};
Expand Down Expand Up @@ -240,6 +244,10 @@ export const value: StoryObj<{

expect(args.handleChange).toHaveBeenCalledTimes(1);
expect(args.handleChange).toHaveBeenCalledWith({ value: 51, name: "test-name" });

expect(args.handleChangeCommit).toHaveBeenCalledTimes(1);
expect(args.handleChangeCommit).toHaveBeenCalledWith({ value: 51, name: "test-name" });

expect(input).toHaveValue("50");
},
};
Expand Down Expand Up @@ -282,6 +290,15 @@ export const rangeDefaultValue: StoryObj<{
maxName: "test-name",
});

expect(args.handleChangeCommit).toHaveBeenCalledTimes(1);
expect(args.handleChangeCommit).toHaveBeenCalledWith({
minValue: 51,
maxValue: 70,
name: "test-name",
minName: "test-name",
maxName: "test-name",
});

expect(minInput).toHaveValue("51");
expect(maxInput).toHaveValue("70");
},
Expand Down Expand Up @@ -325,6 +342,14 @@ export const rangeValue: StoryObj<{
maxName: "test-name-max",
});

expect(args.handleChangeCommit).toHaveBeenCalledTimes(1);
expect(args.handleChangeCommit).toHaveBeenCalledWith({
minValue: 51,
maxValue: 70,
minName: "test-name-min",
maxName: "test-name-max",
});

expect(minInput).toHaveValue("50");
expect(maxInput).toHaveValue("70");
},
Expand Down