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

Jump to bottom

[Slider][base][material][joy] Fix not draggable on the edge when disableSwap={true} #35998

Merged
merged 20 commits into from
Jun 27, 2023
Merged

[Slider][base][material][joy] Fix not draggable on the edge when disableSwap={true} #35998

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d691d05
[Slider] Fix Slider not draggable on disableSwap
sai6855 Jan 30, 2023
b7cd1bb
lint
sai6855 Jan 30, 2023
fd76a9f
slider base
sai6855 Feb 2, 2023
8e83e78
lint
sai6855 Feb 2, 2023
2e8d009
moved pointer-events logic to useSlider
sai6855 Feb 6, 2023
94285bd
logic change
sai6855 Feb 7, 2023
6464a96
prettier
sai6855 Feb 7, 2023
19e9e0c
trigger ci
sai6855 Feb 13, 2023
f4e556e
added comments
sai6855 Feb 20, 2023
649ac11
Merge branch 'master' into slider-drag
sai6855 Feb 22, 2023
9533d40
fixed merge conflict
sai6855 Feb 22, 2023
514cee9
Merge branch 'master' into slider-drag
sai6855 Feb 22, 2023
dc9f1c8
add thumbProps style
sai6855 Feb 22, 2023
d6776cf
Merge branch 'master' into slider-drag
sai6855 Apr 29, 2023
762983c
Merge branch 'master' into slider-drag
sai6855 Jun 21, 2023
9ab87f0
add getthumbstyle function to return value
sai6855 Jun 21, 2023
e2b6014
remove useless files
sai6855 Jun 21, 2023
0c1ec08
add comment
sai6855 Jun 21, 2023
d502130
prettier
sai6855 Jun 21, 2023
0bfb2eb
Merge branch 'master' into slider-drag
ZeeshanTamboli Jun 27, 2023
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: 3 additions & 1 deletion packages/mui-base/src/SliderUnstyled/SliderUnstyled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const SliderUnstyled = React.forwardRef(function SliderUnstyled<
...props,
marks: marksProp,
disabled,
disableSwap,
isRtl,
defaultValue,
max,
Expand Down Expand Up @@ -278,7 +279,8 @@ const SliderUnstyled = React.forwardRef(function SliderUnstyled<
})}
style={{
...style,
pointerEvents: disableSwap && active !== index ? 'none' : undefined,
Copy link
Member

Choose a reason for hiding this comment

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

Why is this logic not inside getThumbProps() of useSlider? It seems that we have to fix 3 different places at the same time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved logic to getThumbProps but couldn't correctly type thumbProps hence had to use @ts-ignore.

https://github.com/mui/material-ui/pull/35998/files#diff-10ce33fc17ee7c4c1c1ec9123c97682153eef706ec3eaf1162827687bae42869R285

// So the non active thumb doesn't show its label on hover.
pointerEvents: active !== -1 && active !== index ? 'none' : undefined,
...thumbProps.style,
ZeeshanTamboli marked this conversation as resolved.
Show resolved Hide resolved
}}
>
Expand Down
4 changes: 3 additions & 1 deletion packages/mui-joy/src/Slider/Slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ const Slider = React.forwardRef(function Slider(inProps, ref) {
classes: classesProp,
disabled,
defaultValue,
disableSwap,
isRtl,
max,
min,
Expand Down Expand Up @@ -613,7 +614,8 @@ const Slider = React.forwardRef(function Slider(inProps, ref) {
})}
style={{
...style,
pointerEvents: disableSwap && active !== index ? 'none' : undefined,
oliviertassinari marked this conversation as resolved.
Show resolved Hide resolved
// So the non active thumb doesn't show its label on hover.
pointerEvents: active !== -1 && active !== index ? 'none' : undefined,
...thumbProps.style,
}}
>
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-material/src/Slider/Slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,8 @@ const Slider = React.forwardRef(function Slider(inputProps, ref) {
})}
style={{
...style,
pointerEvents: disableSwap && active !== index ? 'none' : undefined,
// So the non active thumb doesn't show its label on hover.
pointerEvents: active !== -1 && active !== index ? 'none' : undefined,
...thumbProps.style,
}}
>
Expand Down