From b5ea04eb1000bca5a79b573647bb6c4b360099a7 Mon Sep 17 00:00:00 2001 From: zhongnan Date: Thu, 17 Dec 2020 19:45:48 +0800 Subject: [PATCH] perf(tags): remove useless code --- packages/circle/index.ts | 5 +++-- packages/common/utils.ts | 11 +---------- packages/common/validator.ts | 2 +- packages/datetime-picker/index.ts | 2 +- packages/dropdown-menu/index.ts | 4 ++-- packages/index-bar/index.ts | 4 ++-- packages/mixins/transition.ts | 3 ++- packages/notify/index.ts | 3 ++- packages/picker-column/index.ts | 3 ++- packages/stepper/index.ts | 2 +- packages/tabs/index.ts | 3 ++- packages/toast/toast.ts | 2 +- 12 files changed, 20 insertions(+), 24 deletions(-) diff --git a/packages/circle/index.ts b/packages/circle/index.ts index 0a9f4f2f..c412f3d2 100644 --- a/packages/circle/index.ts +++ b/packages/circle/index.ts @@ -1,7 +1,8 @@ import { VantComponent } from '../common/component'; -import { isObj } from '../common/utils'; import { BLUE, WHITE } from '../common/color'; import { adaptor } from './canvas'; +import { isObj } from '../common/validator'; +import { getSystemInfoSync } from '../common/utils'; function format(rate) { return Math.min(Math.max(rate, 0), 100); @@ -74,7 +75,7 @@ VantComponent({ return Promise.resolve(ctx); } - const dpr = wx.getSystemInfoSync().pixelRatio; + const dpr = getSystemInfoSync().pixelRatio; return new Promise((resolve) => { wx.createSelectorQuery() diff --git a/packages/common/utils.ts b/packages/common/utils.ts index 7fd71c52..d211da5e 100644 --- a/packages/common/utils.ts +++ b/packages/common/utils.ts @@ -1,15 +1,6 @@ -import { isNumber, isPlainObject, isPromise } from './validator'; +import { isDef, isNumber, isPlainObject, isPromise } from './validator'; import { canIUseGroupSetData } from './version'; -export function isDef(value: any): boolean { - return value !== undefined && value !== null; -} - -export function isObj(x: any): boolean { - const type = typeof x; - return x !== null && (type === 'object' || type === 'function'); -} - export function range(num: number, min: number, max: number) { return Math.min(Math.max(num, min), max); } diff --git a/packages/common/validator.ts b/packages/common/validator.ts index f7089750..82646a04 100644 --- a/packages/common/validator.ts +++ b/packages/common/validator.ts @@ -10,7 +10,7 @@ export function isPromise(val: unknown): val is Promise { return isPlainObject(val) && isFunction(val.then) && isFunction(val.catch); } -export function isDef(value: any): boolean { +export function isDef(value: unknown): boolean { return value !== undefined && value !== null; } diff --git a/packages/datetime-picker/index.ts b/packages/datetime-picker/index.ts index b9f9daaf..804dde1d 100644 --- a/packages/datetime-picker/index.ts +++ b/packages/datetime-picker/index.ts @@ -1,5 +1,5 @@ import { VantComponent } from '../common/component'; -import { isDef } from '../common/utils'; +import { isDef } from '../common/validator'; import { pickerProps } from '../picker/shared'; const currentYear = new Date().getFullYear(); diff --git a/packages/dropdown-menu/index.ts b/packages/dropdown-menu/index.ts index 8c4fe3c2..d37e2f8d 100644 --- a/packages/dropdown-menu/index.ts +++ b/packages/dropdown-menu/index.ts @@ -1,5 +1,5 @@ import { VantComponent } from '../common/component'; -import { addUnit, getRect } from '../common/utils'; +import { addUnit, getRect, getSystemInfoSync } from '../common/utils'; type TrivialInstance = WechatMiniprogram.Component.TrivialInstance; let ARRAY: TrivialInstance[] = []; @@ -59,7 +59,7 @@ VantComponent({ }, beforeCreate() { - const { windowHeight } = wx.getSystemInfoSync(); + const { windowHeight } = getSystemInfoSync(); this.windowHeight = windowHeight; ARRAY.push(this); }, diff --git a/packages/index-bar/index.ts b/packages/index-bar/index.ts index fd816452..40bbc1ae 100644 --- a/packages/index-bar/index.ts +++ b/packages/index-bar/index.ts @@ -97,7 +97,7 @@ VantComponent({ return Promise.all( this.children.map( (anchor: WechatMiniprogram.Component.TrivialInstance) => - getRect.call(anchor, '.van-index-anchor-wrapper').then((rect) => { + getRect(anchor, '.van-index-anchor-wrapper').then((rect) => { Object.assign(anchor, { height: rect.height, top: rect.top + this.scrollTop, @@ -140,7 +140,7 @@ VantComponent({ }, getAnchorRect(anchor) { - return getRect.call(anchor, '.van-index-anchor-wrapper').then((rect) => ({ + return getRect(anchor, '.van-index-anchor-wrapper').then((rect) => ({ height: rect.height, top: rect.top, })); diff --git a/packages/mixins/transition.ts b/packages/mixins/transition.ts index 49bb8883..0dec1972 100644 --- a/packages/mixins/transition.ts +++ b/packages/mixins/transition.ts @@ -1,5 +1,6 @@ // @ts-nocheck -import { isObj, requestAnimationFrame } from '../common/utils'; +import { requestAnimationFrame } from '../common/utils'; +import { isObj } from '../common/validator'; const getClassNames = (name: string) => ({ enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`, diff --git a/packages/notify/index.ts b/packages/notify/index.ts index 2179d4cd..6534d086 100644 --- a/packages/notify/index.ts +++ b/packages/notify/index.ts @@ -1,5 +1,6 @@ import { VantComponent } from '../common/component'; import { WHITE } from '../common/color'; +import { getSystemInfoSync } from '../common/utils'; VantComponent({ props: { @@ -33,7 +34,7 @@ VantComponent({ }, created() { - const { statusBarHeight } = wx.getSystemInfoSync(); + const { statusBarHeight } = getSystemInfoSync(); this.setData({ statusBarHeight }); }, diff --git a/packages/picker-column/index.ts b/packages/picker-column/index.ts index 23e8e487..092ee276 100644 --- a/packages/picker-column/index.ts +++ b/packages/picker-column/index.ts @@ -1,5 +1,6 @@ import { VantComponent } from '../common/component'; -import { isObj, range } from '../common/utils'; +import { range } from '../common/utils'; +import { isObj } from '../common/validator'; const DEFAULT_DURATION = 200; diff --git a/packages/stepper/index.ts b/packages/stepper/index.ts index ad95ac72..f762ae77 100644 --- a/packages/stepper/index.ts +++ b/packages/stepper/index.ts @@ -1,5 +1,5 @@ import { VantComponent } from '../common/component'; -import { isDef } from '../common/utils'; +import { isDef } from '../common/validator'; const LONG_PRESS_START_TIME = 600; const LONG_PRESS_INTERVAL = 200; diff --git a/packages/tabs/index.ts b/packages/tabs/index.ts index 6c885d8d..072a48d6 100644 --- a/packages/tabs/index.ts +++ b/packages/tabs/index.ts @@ -1,6 +1,7 @@ import { VantComponent } from '../common/component'; import { touch } from '../mixins/touch'; -import { getAllRect, getRect, groupSetData, isDef } from '../common/utils'; +import { getAllRect, getRect, groupSetData } from '../common/utils'; +import { isDef } from '../common/validator'; type TrivialInstance = WechatMiniprogram.Component.TrivialInstance; diff --git a/packages/toast/toast.ts b/packages/toast/toast.ts index ecce1541..39207f8e 100644 --- a/packages/toast/toast.ts +++ b/packages/toast/toast.ts @@ -1,4 +1,4 @@ -import { isObj } from '../common/utils'; +import { isObj } from '../common/validator'; type ToastMessage = string | number;