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

fix: <Select/> when !multiple || !box #1613

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: <Select/> when !multiple || !box #1613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4878dc8
fix: `<Select/>` when `!multiple || !box``
bigmistqke Aug 16, 2023
4839f66
fix: add `shouldDragSelect` to dependencies
bigmistqke Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/web/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useThree } from '@react-three/fiber'
import * as React from 'react'
import * as THREE from 'three'
import { SelectionBox } from 'three-stdlib'
import { useThree } from '@react-three/fiber'
import shallow from 'zustand/shallow'

const context = React.createContext<THREE.Object3D[]>([])
Expand Down Expand Up @@ -35,7 +35,6 @@ export function Select({
...props
}: Props) {
const [downed, down] = React.useState(false)
const { setEvents, camera, raycaster, gl, controls, size, get } = useThree()
const [hovered, hover] = React.useState(false)
const [active, dispatch] = React.useReducer(
(state, { object, shift }: { object?: THREE.Object3D | THREE.Object3D[]; shift?: boolean }): THREE.Object3D[] => {
Expand All @@ -47,19 +46,23 @@ export function Select({
},
[]
)
React.useEffect(() => {
if (downed) onChange?.(active)
else onChangePointerUp?.(active)
}, [active, downed])
const ref = React.useRef<THREE.Group>(null!)
const { setEvents, camera, raycaster, gl, controls, size, get } = useThree()
const shouldDragSelect = box && multiple

const onPointerMissed = React.useCallback((e) => !hovered && dispatch({}), [hovered])
const onClick = React.useCallback((e) => {
e.stopPropagation()
dispatch({ object: customFilter([e.object])[0], shift: multiple && e.shiftKey })
}, [])
const onPointerMissed = React.useCallback((e) => !hovered && dispatch({}), [hovered])

const ref = React.useRef<THREE.Group>(null!)
React.useEffect(() => {
if (!box || !multiple) return
if (downed) onChange?.(active)
else onChangePointerUp?.(active)
}, [active, downed])

React.useEffect(() => {
if (!shouldDragSelect) return

const selBox = new SelectionBox(camera, ref.current as unknown as THREE.Scene)

Expand Down Expand Up @@ -153,7 +156,7 @@ export function Select({
document.removeEventListener('pointermove', pointerMove)
document.removeEventListener('pointerup', pointerUp)
}
}, [size.width, size.height, raycaster, camera, controls, gl])
}, [shouldDragSelect, size.width, size.height, raycaster, camera, controls, gl])

return (
<group
Expand All @@ -162,6 +165,8 @@ export function Select({
onPointerOver={() => hover(true)}
onPointerOut={() => hover(false)}
onPointerMissed={onPointerMissed}
onPointerDown={!shouldDragSelect ? () => down(true) : undefined}
onPointerUp={!shouldDragSelect ? () => down(false) : undefined}
{...props}
>
<context.Provider value={active}>{children}</context.Provider>
Expand Down