From 8ac3f431899af10c5794b32753982da653690166 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 2 Feb 2021 19:58:15 +0800 Subject: [PATCH] fix(Swipe): active may outrange when initialize (#8061) --- src/image-preview/ImagePreview.js | 4 +--- src/swipe/index.js | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js index 1a2852136..0d4c73f75 100644 --- a/src/image-preview/ImagePreview.js +++ b/src/image-preview/ImagePreview.js @@ -81,12 +81,10 @@ export default createComponent({ const resize = () => { if (swipeRef.value) { - const { startPosition } = props; - swipeRef.value.state.active = +startPosition; - swipeRef.value.resize(); const rect = swipeRef.value.$el.getBoundingClientRect(); state.rootWidth = rect.width; state.rootHeight = rect.height; + swipeRef.value.resize(); } }; diff --git a/src/swipe/index.js b/src/swipe/index.js index a10c44d0e..c04b5fd25 100644 --- a/src/swipe/index.js +++ b/src/swipe/index.js @@ -244,6 +244,8 @@ export default createComponent({ const rect = useRect(root); + active = Math.min(children.length - 1, active); + state.rect = rect; state.swiping = true; state.active = active; @@ -381,8 +383,7 @@ export default createComponent({ watch( () => children.length, () => { - const active = Math.min(children.length - 1, state.active); - initialize(active); + initialize(state.active); } );