Skip to content

fix(drawer): [drawer] modify the problem that the before-close method is triggered upon page loading is solved #2364

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

Merged
merged 2 commits into from
Oct 24, 2024
Merged

fix(drawer): [drawer] modify the problem that the before-close method is triggered upon page loading is solved #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c71c1a
fix: modify bug
James-9696 Oct 23, 2024
b1371b6
fix: modify e2e-test
James-9696 Oct 23, 2024
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: 2 additions & 2 deletions examples/sites/demos/pc/app/drawer/before-close.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ test('拦截弹窗关闭', async ({ page }) => {
await page.goto('drawer#before-close')

const drawer = page.locator('.tiny-drawer__main')
const message = page.locator('.tiny-modal.type__message')
const message = page.locator('.tiny-modal__text')

await page.getByRole('button', { name: '点击展开 Drawer' }).click()
await expect(drawer).toBeVisible()

// 点击关闭按钮
await page.getByRole('button', { name: 'Close' }).click()
await expect(message.nth(1)).toContainText('close')
await expect(message).toContainText('close')
await expect(drawer).toBeVisible()

// 点击遮罩层
Expand Down
2 changes: 1 addition & 1 deletion packages/renderless/src/drawer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const computedHeight =

export const close =
({ api }: { api: IDrawerApi }) =>
(force = false) => {
(force = true) => {
api.handleClose('close', typeof force === 'boolean' ? force : false)
}

Expand Down
Loading