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 src/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ export const BottomSheet = React.forwardRef<
const handleDrag = ({
args: [{ closeOnTap = false, isContentDragging = false } = {}] = [],
cancel,
canceled,
direction: [, direction],
down,
first,
Expand All @@ -486,6 +487,10 @@ export const BottomSheet = React.forwardRef<
tap,
velocity: [, velocity],
}) => {
if (canceled) {
return memo
}

const my = _my * -1

// Cancel the drag operation if the canDrag state changed
Expand Down
40 changes: 39 additions & 1 deletion test/bottom-sheet.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { StrictMode, useRef } from 'react'
import { describe, expect, it, vi } from 'vitest'
import { render, screen, waitFor, act } from '@testing-library/react'
import { render, screen, waitFor, act, fireEvent } from '@testing-library/react'
import { BottomSheet } from '../src'
import type { BottomSheetRef } from '../src'

Expand Down Expand Up @@ -80,6 +80,44 @@ describe('BottomSheet', () => {
expect(onDismiss).toHaveBeenCalledOnce()
})

it('dismisses once per backdrop tap', async () => {
const onDismiss = vi.fn()
render(
<BottomSheet open onDismiss={onDismiss}>
{content}
</BottomSheet>
)
await waitFor(() => expect(sheetState()).toBe('open'), { timeout: 4000 })

const backdrop = document.querySelector('[data-rsbs-backdrop]')!
const pointer = { pointerId: 1, buttons: 1, clientX: 10, clientY: 10 }
fireEvent.pointerDown(backdrop, pointer)
fireEvent.pointerUp(backdrop, { ...pointer, buttons: 0 })

await new Promise((resolve) => setTimeout(resolve, 50))
expect(onDismiss).toHaveBeenCalledOnce()
})

it('dismisses once per swipe down', async () => {
const onDismiss = vi.fn()
render(
<BottomSheet open onDismiss={onDismiss} header={<div>header</div>}>
{content}
</BottomSheet>
)
await waitFor(() => expect(sheetState()).toBe('open'), { timeout: 4000 })

const header = document.querySelector('[data-rsbs-header]')!
const pointer = { pointerId: 1, buttons: 1, clientX: 10 }
fireEvent.pointerDown(header, { ...pointer, clientY: 0 })
fireEvent.pointerMove(header, { ...pointer, clientY: 150 })
fireEvent.pointerMove(header, { ...pointer, clientY: 400 })
fireEvent.pointerUp(header, { ...pointer, buttons: 0, clientY: 400 })

await new Promise((resolve) => setTimeout(resolve, 50))
expect(onDismiss).toHaveBeenCalledOnce()
})

it('reports the current height through the ref', async () => {
let sheetRef: React.RefObject<BottomSheetRef | null>

Expand Down
Loading