diff --git a/package.json b/package.json index 4e9ec2aa7..8a43ddfe0 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "dependencies": { "@babel/runtime": "7.x", "@vant/icons": "1.3.0", - "@vant/use": "^0.0.1-alpha.2", + "@vant/use": "^0.0.1", "vue-lazyload": "1.2.3" }, "peerDependencies": { diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js index 6d86046af..b0685dc34 100644 --- a/src/image-preview/ImagePreview.js +++ b/src/image-preview/ImagePreview.js @@ -5,7 +5,7 @@ import { bem, createComponent } from './shared'; import { callInterceptor } from '../utils/interceptor'; // Composition -import { useEventListener } from '@vant/use'; +import { useWindowSize } from '@vant/use'; import { usePublicApi } from '../composition/use-public-api'; // Components @@ -71,6 +71,7 @@ export default createComponent({ setup(props, { emit, slots }) { const swipeRef = ref(); + const windowSize = useWindowSize(); const state = reactive({ active: 0, @@ -177,11 +178,11 @@ export default createComponent({ }; usePublicApi({ swipeTo }); - useEventListener('resize', resize); - useEventListener('orientationchange', resize); onMounted(resize); + watch([windowSize.width, windowSize.height], resize); + watch(() => props.startPosition, setActive); watch( diff --git a/yarn.lock b/yarn.lock index ee5444069..955f996de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2156,10 +2156,10 @@ resolved "https://registry.yarnpkg.com/@vant/touch-emulator/-/touch-emulator-1.2.0.tgz#486300b23e57db9ce9231a04e0a0c621c68692d8" integrity sha512-sJ97zU85zOq51qoi7+CpBEcOyH3CitjP1KC7/GQwqaurUJni+EP7/F9n0HMnAh8GXMjgtgDBNJ5z48x+coNKYQ== -"@vant/use@^0.0.1-alpha.2": - version "0.0.1-alpha.2" - resolved "https://registry.npmjs.org/@vant/use/-/use-0.0.1-alpha.2.tgz#c7e3ffb948b871d2496ce1e32d0874c8ead4b69a" - integrity sha512-hOqjrvXgazw54bD1GZHXboKbcOc7jMZbDU3zFUOheSNviIvVBX0nuEqCdcQgvYzkr93zwQ2QAn27DA8BLCZsGw== +"@vant/use@^0.0.1": + version "0.0.1" + resolved "https://registry.npmjs.org/@vant/use/-/use-0.0.1.tgz#66ed5dd186e54a6ec1b48604bfd8c0f466d9d568" + integrity sha512-AQrKFoiC4sZqRI6mx4a4iHekcpcvNYcZDo/0/WTMejtjKygaKMlImmOR36JWYinhvQwjO6GnAgQDvuO/hNwCPA== "@vue/babel-helper-vue-transform-on@^1.0.0-rc.2": version "1.0.0-rc.2"