From e6bd26e0aaa3474ec4a0a9bc14eefe93b1dc6fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Sat, 1 Feb 2020 09:51:31 +0800 Subject: [PATCH] types(utils): improve isDate typing --- src/image-preview/ImagePreview.js | 3 ++- src/utils/validate/date.ts | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/image-preview/ImagePreview.js b/src/image-preview/ImagePreview.js index 3ed6cd8d3..59a22f176 100644 --- a/src/image-preview/ImagePreview.js +++ b/src/image-preview/ImagePreview.js @@ -214,7 +214,8 @@ export default createComponent({ if (this.zooming && touches.length === 2) { const distance = getDistance(touches); const scale = (this.startScale * distance) / this.startDistance; - this.scale = range(scale, +this.minZoom, +this.maxZoom); + + this.setScale(scale); } }, diff --git a/src/utils/validate/date.ts b/src/utils/validate/date.ts index 4e43e6889..d06fd6696 100644 --- a/src/utils/validate/date.ts +++ b/src/utils/validate/date.ts @@ -1,8 +1,8 @@ import { isNaN } from './number'; -export function isDate(date: Date): boolean { +export function isDate(val: Date): val is Date { return ( - Object.prototype.toString.call(date) === '[object Date]' && - !isNaN(date.getTime()) + Object.prototype.toString.call(val) === '[object Date]' && + !isNaN(val.getTime()) ); }