Skip to content

Commit

Permalink
chore: 简化代码
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-huxiyang committed Jul 5, 2024
1 parent c93a5db commit 262b479
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
16 changes: 7 additions & 9 deletions src/packages/drag/drag.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const Drag: FunctionComponent<
}

const touchStart = (e: React.TouchEvent<HTMLDivElement>) => {
onDragStart && onDragStart()
onDragStart?.()
const touches = e.touches[0]
axisCache.current = { x: touches.clientX, y: touches.clientY }
transformCache.current = { x: translateX.current, y: translateY.current }
Expand All @@ -99,10 +99,9 @@ export const Drag: FunctionComponent<
const y = touch.clientY - axisCache.current.y
translateX.current = x + transformCache.current.x
translateY.current = y + transformCache.current.y
onDrag &&
onDrag({
offset: [translateX.current, translateY.current],
})
onDrag?.({
offset: [translateX.current, translateY.current],
})
// 边界判断
if (translateX.current < boundaryState.left) {
translateX.current = boundaryState.left
Expand All @@ -124,10 +123,9 @@ export const Drag: FunctionComponent<
}

const touchEnd = (e: React.TouchEvent) => {
onDragEnd &&
onDragEnd({
offset: [translateX.current, translateY.current],
})
onDragEnd?.({
offset: [translateX.current, translateY.current],
})
if (direction !== 'y' && attract && dragRef.current) {
if (translateX.current < middleLine.current) {
translateX.current = boundaryState.left
Expand Down
6 changes: 3 additions & 3 deletions src/packages/drag/drag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ export const Drag: FunctionComponent<
offset: [x, y],
first,
} = state
onDragStart && first && onDragStart()
onDrag && onDrag({ offset: [x, y] })
onDragEnd && last && onDragEnd({ offset: [x, y] })
first && onDragStart?.()
onDrag?.({ offset: [x, y] })
last && onDragEnd?.({ offset: [x, y] })
api.start({ x, y, immediate: down })
if (last) {
if (direction !== 'y' && attract) {
Expand Down

0 comments on commit 262b479

Please sign in to comment.