Skip to content

fix: require click to activate scroll-to-adjust on sliders #182

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

Open
nnhhoang wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −10
Open

fix: require click to activate scroll-to-adjust on sliders #182

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
41 changes: 31 additions & 10 deletions packages/editor/src/components/ui/controls/slider-control.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function SliderControl({
}: SliderControlProps) {
const [isEditing, setIsEditing] = useState(false)
const [isDragging, setIsDragging] = useState(false)
const [isHovered, setIsHovered] = useState(false)
const [isFocused, setIsFocused] = useState(false)
const [inputValue, setInputValue] = useState(value.toFixed(precision))

// Track the original value and bounds when dragging starts
Expand Down Expand Up @@ -58,7 +58,7 @@ export function SliderControl({

useEffect(() => {
const container = containerRef.current
if (!container) return
if (!container || !isFocused) return

const handleWheel = (e: WheelEvent) => {
if (isEditing) return
Expand All @@ -80,12 +80,26 @@ export function SliderControl({

container.addEventListener('wheel', handleWheel, { passive: false })
return () => container.removeEventListener('wheel', handleWheel)
}, [isEditing, step, clamp, onChange, precision])
}, [isFocused, isEditing, step, clamp, onChange, precision])

// Unfocus when clicking outside or pressing Escape
useEffect(() => {
if (!isHovered || isEditing) return
if (!isFocused) return

const handlePointerDownOutside = (e: PointerEvent) => {
if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
setIsFocused(false)
}
}

const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
setIsFocused(false)
return
}

if (isEditing) return

let direction = 0
if (e.key === 'ArrowUp') direction = 1
else if (e.key === 'ArrowDown') direction = -1
Expand All @@ -105,9 +119,13 @@ export function SliderControl({
}
}

window.addEventListener('pointerdown', handlePointerDownOutside)
window.addEventListener('keydown', handleKeyDown)
return () => window.removeEventListener('keydown', handleKeyDown)
}, [isHovered, isEditing, step, clamp, onChange, precision])
return () => {
window.removeEventListener('pointerdown', handlePointerDownOutside)
window.removeEventListener('keydown', handleKeyDown)
}
}, [isFocused, isEditing, step, clamp, onChange, precision])

const handlePointerDown = useCallback(
(e: React.PointerEvent) => {
Expand Down Expand Up @@ -238,12 +256,15 @@ export function SliderControl({
return (
<div
className={cn(
'group relative flex h-12 w-full items-center rounded-lg border border-border/50 px-3 text-sm transition-colors',
isDragging ? 'bg-[#3e3e3e]' : 'bg-[#2C2C2E] hover:bg-[#3e3e3e]',
'group relative flex h-12 w-full items-center rounded-lg border px-3 text-sm transition-colors',
isDragging
? 'border-border/50 bg-[#3e3e3e]'
: isFocused
? 'border-primary/50 bg-[#3e3e3e]'
: 'border-border/50 bg-[#2C2C2E] hover:bg-[#3e3e3e]',
className,
)}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
onClick={() => setIsFocused(true)}
ref={containerRef}
>
{/* Reset button that appears when dragged away from start */}
Expand Down