From 2adb2fcf673f1077e5bbe8a3b7ac6e78e4d4c1a4 Mon Sep 17 00:00:00 2001 From: dolymood Date: Mon, 1 Jun 2020 15:06:49 +0800 Subject: [PATCH] fix(image-preview): bounce when zooming 707 --- src/common/bscroll/constants.js | 2 +- src/components/image-preview/image-preview.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/bscroll/constants.js b/src/common/bscroll/constants.js index 6279924f..ae1ea245 100644 --- a/src/common/bscroll/constants.js +++ b/src/common/bscroll/constants.js @@ -7,7 +7,7 @@ function getUseTransition() { const version = getIOSVersion(ua) if (!version) return useTransition - if (version.major >= 13 && version.minor >= 4) { + if (version.major >= 13 && version.minor >= 3) { useTransition = false } } diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue index f15aa134..b55774c7 100644 --- a/src/components/image-preview/image-preview.vue +++ b/src/components/image-preview/image-preview.vue @@ -49,6 +49,7 @@ import visibilityMixin from '../../common/mixins/visibility' import popupMixin from '../../common/mixins/popup' import { isAndroid } from '../../common/helpers/env' + import { USE_TRANSITION } from '../../common/bscroll/constants' const COMPONENT_NAME = 'cube-image-preview' const EVENT_CHANGE = 'change' @@ -91,11 +92,12 @@ left: true, right: true }, - useTransition: !isAndroid, + useTransition: isAndroid ? false : USE_TRANSITION, probeType: 3, preventDefault: this.preventDefault }, scrollOptions: { + useTransition: USE_TRANSITION, HWCompositing: isAndroid, observeDOM: false, zoom: true, -- GitLab