From 0477c0e2e6f2f2132077577d22796efaa231071f Mon Sep 17 00:00:00 2001
From: ShuGang Zhou <zhousg1007@qq.com>
Date: Sun, 24 Sep 2023 15:04:08 +0800
Subject: [PATCH] fix(FloatingPanel): dragging down causes the page to move
 (#12314)

---
 packages/vant/src/floating-panel/FloatingPanel.tsx | 2 +-
 packages/vant/src/floating-panel/README.md         | 2 +-
 packages/vant/src/floating-panel/README.zh-CN.md   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/vant/src/floating-panel/FloatingPanel.tsx b/packages/vant/src/floating-panel/FloatingPanel.tsx
index da3cafd57..725bff038 100644
--- a/packages/vant/src/floating-panel/FloatingPanel.tsx
+++ b/packages/vant/src/floating-panel/FloatingPanel.tsx
@@ -143,7 +143,7 @@ export default defineComponent({
       { immediate: true },
     );
 
-    useLockScroll(rootRef, () => props.lockScroll);
+    useLockScroll(rootRef, () => props.lockScroll || dragging.value);
 
     // useEventListener will set passive to `false` to eliminate the warning of Chrome
     useEventListener('touchmove', onTouchmove, { target: rootRef });
diff --git a/packages/vant/src/floating-panel/README.md b/packages/vant/src/floating-panel/README.md
index 184900732..7a15aa931 100644
--- a/packages/vant/src/floating-panel/README.md
+++ b/packages/vant/src/floating-panel/README.md
@@ -88,7 +88,7 @@ By default, both the header and content areas of FloatingPanel can be dragged, b
 | anchors | Setting custom anchors, unit `px` | _number[]_ | `[100, window.innerWidth * 0.6]` |
 | duration | Transition duration, unit second | _number \| string_ | `0.3` |
 | content-draggable | Allow dragging content | _boolean_ | `true` |
-| lock-scroll `v4.6.4` | Whether to lock background scroll | _boolean_ | `false` |
+| lock-scroll `v4.6.4` | When not dragging, Whether to lock background scroll | _boolean_ | `false` |
 | safe-area-inset-bottom | Whether to enable bottom safe area adaptation | _boolean_ | `true` |
 
 ### Events
diff --git a/packages/vant/src/floating-panel/README.zh-CN.md b/packages/vant/src/floating-panel/README.zh-CN.md
index 7f0fbead0..c8d65b57f 100644
--- a/packages/vant/src/floating-panel/README.zh-CN.md
+++ b/packages/vant/src/floating-panel/README.zh-CN.md
@@ -88,7 +88,7 @@ export default {
 | anchors | 设置自定义锚点, 单位 `px` | _number[]_ | `[100, window.innerWidth * 0.6]` |
 | duration | 动画时长，单位秒，设置为 0 可以禁用动画 | _number \| string_ | `0.3` |
 | content-draggable | 允许拖拽内容容器 | _boolean_ | `true` |
-| lock-scroll `v4.6.4` | 是否锁定背景滚动 | _boolean_ | `false` |
+| lock-scroll `v4.6.4` | 当不拖拽时，是否锁定背景滚动 | _boolean_ | `false` |
 | safe-area-inset-bottom | 是否开启[底部安全区适配](#/zh-CN/advanced-usage#di-bu-an-quan-qu-gua-pei) | _boolean_ | `true` |
 
 ### Events