[type] getCurrentPages (#626)

dist/field/index.js

@@ -1,10 +1,7 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
     field: true,
-
     classes: ['input-class'],
-
     props: {
         icon: String,
         label: String,
@@ -53,12 +50,10 @@ VantComponent({
             value: '90px'
         }
     },
-
     data: {
         focused: false,
         showClear: false
     },
-
     computed: {
         inputClass() {
             const { data } = this;
@@ -70,7 +65,6 @@ VantComponent({
             });
         }
     },
-
     methods: {
         onInput(event) {
             const { value = '' } = event.detail || {};
@@ -81,36 +75,28 @@ VantComponent({
                 showClear: this.getShowClear({ value })
             });
         },
-
+        onFocus() {
-    onFocus(event) {
+            this.$emit('focus');
-      this.$emit('focus', event);
             this.setData({
                 focused: true,
                 showClear: this.getShowClear({ focused: true })
             });
         },
-
+        onBlur() {
-    onBlur(event) {
             this.focused = false;
-      this.$emit('blur', event);
+            this.$emit('blur');
             this.setData({
                 focused: false,
                 showClear: this.getShowClear({ focused: false })
             });
         },
-
         onClickIcon() {
             this.$emit('click-icon');
         },
-
         getShowClear(options) {
             const { focused = this.data.focused, value = this.data.value } = options;
-
+            return (this.data.clearable && focused && value !== '' && !this.data.readonly);
-      return (
-        this.data.clearable && focused && value !== '' && !this.data.readonly
-      );
         },
-
         onClear() {
             this.setData({
                 value: '',
@@ -119,7 +105,6 @@ VantComponent({
             this.$emit('input', '');
             this.$emit('change', '');
         },
-
         onConfirm() {
             this.$emit('confirm', this.data.value);
         }

dist/icon/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
     props: {
         info: null,
@@ -11,7 +10,6 @@ VantComponent({
             value: 'van-icon'
         }
     },
-
     methods: {
         onClick() {
             this.$emit('click');

dist/loading/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-
 VantComponent({
     props: {
         size: {

dist/mixins/basic.js

@@ -1,22 +1,18 @@
 import { classNames } from '../common/class-names';
-
 export const basic = Behavior({
     methods: {
         classNames,
-
         $emit() {
             this.triggerEvent.apply(this, arguments);
         },
-
         getRect(selector, all) {
-      return new Promise((resolve, reject) => {
+            return new Promise(resolve => {
                 wx.createSelectorQuery()
                     .in(this)[all ? 'selectAll' : 'select'](selector)
                     .boundingClientRect(rect => {
                     if (all && Array.isArray(rect) && rect.length) {
                         resolve(rect);
                     }
-
                     if (!all && rect) {
                         resolve(rect);
                     }

dist/mixins/observer/behavior.js

@@ -3,33 +3,26 @@ export const behavior = Behavior({
         if (!this.$options) {
             return;
         }
-
         const cache = {};
         const { setData } = this;
         const { computed } = this.$options();
         const keys = Object.keys(computed);
-
         const calcComputed = () => {
             const needUpdate = {};
             keys.forEach(key => {
                 const value = computed[key].call(this);
-
                 if (cache[key] !== value) {
                     cache[key] = needUpdate[key] = value;
                 }
             });
-
             return needUpdate;
         };
-
         Object.defineProperty(this, 'setData', { writable: true });
-
         this.setData = (data, callback) => {
             data && setData.call(this, data, callback);
             setData.call(this, calcComputed());
         };
     },
-
     attached() {
         this.setData();
     }

dist/mixins/observer/index.js

@@ -1,12 +1,10 @@
 import { behavior } from './behavior';
 import { observeProps } from './props';
-
 export function observe(sfc, options) {
     if (sfc.computed) {
         options.behaviors.push(behavior);
         options.methods = options.methods || {};
         options.methods.$options = () => sfc;
-
         if (options.properties) {
             observeProps(options.properties);
         }

dist/mixins/observer/props.js

@@ -2,15 +2,13 @@ export function observeProps(props) {
     if (!props) {
         return;
     }
-
     Object.keys(props).forEach(key => {
         let prop = props[key];
         if (prop === null || !prop.type) {
             prop = { type: prop };
         }
-
         let { observer } = prop;
-    prop.observer = function() {
+        prop.observer = function () {
             if (observer) {
                 if (typeof observer === 'string') {
                     observer = this[observer];
@@ -19,7 +17,6 @@ export function observeProps(props) {
             }
             this.setData();
         };
-
         props[key] = prop;
     });
 }

packages/field/index.ts

@@ -60,7 +60,7 @@ VantComponent({
   },
 
   computed: {
-    inputClass() {
+    inputClass(): string {
       const { data } = this;
       return this.classNames('input-class', 'van-field__input', {
         'van-field--error': data.error,
@@ -72,7 +72,7 @@ VantComponent({
   },
 
   methods: {
-    onInput(event) {
+    onInput(event: Weapp.Event) {
       const { value = '' } = event.detail || {};
       this.$emit('input', value);
       this.$emit('change', value);
@@ -82,17 +82,17 @@ VantComponent({
       });
     },
 
-    onFocus(event) {
+    onFocus() {
-      this.$emit('focus', event);
+      this.$emit('focus');
       this.setData({
         focused: true,
         showClear: this.getShowClear({ focused: true })
       });
     },
 
-    onBlur(event) {
+    onBlur() {
       this.focused = false;
-      this.$emit('blur', event);
+      this.$emit('blur');
       this.setData({
         focused: false,
         showClear: this.getShowClear({ focused: false })
@@ -103,7 +103,7 @@ VantComponent({
       this.$emit('click-icon');
     },
 
-    getShowClear(options) {
+    getShowClear(options): boolean {
       const { focused = this.data.focused, value = this.data.value } = options;
 
       return (

packages/mixins/basic.ts

@@ -9,7 +9,7 @@ export const basic = Behavior({
     },
 
     getRect(selector, all) {
-      return new Promise((resolve, reject) => {
+      return new Promise(resolve => {
         wx.createSelectorQuery()
           .in(this)[all ? 'selectAll' : 'select'](selector)
           .boundingClientRect(rect => {

types/weapp.d.ts

@@ -1,10 +1,15 @@
-declare function Component(options: any): void;
+type BehaviorOptions = {
+  [key: string]: any & ThisType<any>
+};
 
-interface wx {
+type WX = {
   [key: string]: any
 }
 
-declare const wx: wx;
+declare const wx: WX;
+declare function Behavior(options: BehaviorOptions): void;
+declare function Component(options: any): void;
+declare function getCurrentPages(): Weapp.Page[];
 
 declare namespace Weapp {
   interface Component {
@@ -38,4 +43,8 @@ declare namespace Weapp {
     touches: Array<Touch>;
     changedTouches: Array<Touch>;
   }
+
+  interface Page {
+    selectComponent(selector: string): Component
+  }
 }