diff --git a/build/compiler.js b/build/compiler.js index c12ae872..6bd93e5b 100644 --- a/build/compiler.js +++ b/build/compiler.js @@ -33,6 +33,9 @@ gulp.task('compile-ts', () => gulp .src([src + '/**/*.ts']) .pipe(tsProject()) + .on('error', (err) => { + console.log(err); + }) .pipe(gulp.dest(dist)) ); gulp.task('compile-json', () => copy('json')); diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js index 5c908d0d..f522c157 100644 --- a/dist/action-sheet/index.js +++ b/dist/action-sheet/index.js @@ -1,43 +1,39 @@ -import { create } from '../common/create'; - -create({ - props: { - show: Boolean, - title: String, - cancelText: String, - zIndex: { - type: Number, - value: 100 +import { VantComponent } from '../common/component'; +VantComponent({ + props: { + show: Boolean, + title: String, + cancelText: String, + zIndex: { + type: Number, + value: 100 + }, + actions: { + type: Array, + value: [] + }, + overlay: { + type: Boolean, + value: true + }, + closeOnClickOverlay: { + type: Boolean, + value: true + } }, - actions: { - type: Array, - value: [] - }, - overlay: { - type: Boolean, - value: true - }, - closeOnClickOverlay: { - type: Boolean, - value: true + methods: { + onSelect(event) { + const { index } = event.currentTarget.dataset; + const item = this.data.actions[index]; + if (item && !item.disabled && !item.loading) { + this.$emit('select', item); + } + }, + onCancel() { + this.$emit('cancel'); + }, + onClose() { + this.$emit('close'); + } } - }, - - methods: { - onSelect(event) { - const { index } = event.currentTarget.dataset; - const item = this.data.actions[index]; - if (item && !item.disabled && !item.loading) { - this.$emit('select', item); - } - }, - - onCancel() { - this.$emit('cancel'); - }, - - onClose() { - this.$emit('close'); - } - } }); diff --git a/dist/area/index.js b/dist/area/index.js index 12cee4e3..465e218f 100644 --- a/dist/area/index.js +++ b/dist/area/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { value: { type: String, diff --git a/dist/badge-group/index.js b/dist/badge-group/index.js index 77e57af1..cc1f4ec1 100644 --- a/dist/badge-group/index.js +++ b/dist/badge-group/index.js @@ -1,60 +1,49 @@ -import { create } from '../common/create'; - -create({ - relations: { - '../badge/index': { - type: 'descendant', - - linked(target) { - this.data.badges.push(target); - this.setActive(); - }, - - unlinked(target) { - this.data.badges = this.data.badges.filter(item => item !== target); - this.setActive(); - } +import { VantComponent } from '../common/component'; +VantComponent({ + relations: { + '../badge/index': { + type: 'descendant', + linked(target) { + this.data.badges.push(target); + this.setActive(); + }, + unlinked(target) { + this.data.badges = this.data.badges.filter(item => item !== target); + this.setActive(); + } + } + }, + props: { + active: { + type: Number, + value: 0, + observer: 'setActive' + } + }, + data: { + badges: [] + }, + beforeCreate() { + this.currentActive = -1; + }, + methods: { + setActive(badge) { + let { active } = this.data; + const { badges } = this.data; + if (badge) { + active = badges.indexOf(badge); + } + if (active === this.currentActive) { + return; + } + if (this.currentActive !== -1 && badges[this.currentActive]) { + this.$emit('change', active); + badges[this.currentActive].setActive(false); + } + if (badges[active]) { + badges[active].setActive(true); + this.currentActive = active; + } + } } - }, - - props: { - active: { - type: Number, - value: 0, - observer: 'setActive' - } - }, - - data: { - badges: [] - }, - - created() { - this.currentActive = -1; - }, - - methods: { - setActive(badge) { - let { active } = this.data; - const { badges } = this.data; - - if (badge) { - active = badges.indexOf(badge); - } - - if (active === this.currentActive) { - return; - } - - if (this.currentActive !== -1 && badges[this.currentActive]) { - this.$emit('change', active); - badges[this.currentActive].setActive(false); - } - - if (badges[active]) { - badges[active].setActive(true); - this.currentActive = active; - } - } - } }); diff --git a/dist/badge/index.js b/dist/badge/index.js index f724a2e6..4a9ee17d 100644 --- a/dist/badge/index.js +++ b/dist/badge/index.js @@ -1,27 +1,23 @@ -import { create } from '../common/create'; - -create({ - relations: { - '../badge-group/index': { - type: 'ancestor' - } - }, - - props: { - info: Number, - title: String - }, - - methods: { - onClick() { - const group = this.getRelationNodes('../badge-group/index')[0]; - if (group) { - group.setActive(this); - } +import { VantComponent } from '../common/component'; +VantComponent({ + relations: { + '../badge-group/index': { + type: 'ancestor' + } }, - - setActive(active) { - this.setData({ active }); + props: { + info: Number, + title: String + }, + methods: { + onClick() { + const group = this.getRelationNodes('../badge-group/index')[0]; + if (group) { + group.setActive(this); + } + }, + setActive(active) { + this.setData({ active }); + } } - } }); diff --git a/dist/button/index.js b/dist/button/index.js index a7f0a165..8f14ac3b 100644 --- a/dist/button/index.js +++ b/dist/button/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; -create({ +VantComponent({ mixins: [button], props: { diff --git a/dist/card/index.js b/dist/card/index.js index b5a82b38..ad517d83 100644 --- a/dist/card/index.js +++ b/dist/card/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'thumb-class', 'title-class', diff --git a/dist/cell-group/index.js b/dist/cell-group/index.js index b05225f3..9be167a5 100644 --- a/dist/cell-group/index.js +++ b/dist/cell-group/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { border: { type: Boolean, diff --git a/dist/cell/index.js b/dist/cell/index.js index 99afc390..5ff50c0e 100644 --- a/dist/cell/index.js +++ b/dist/cell/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'title-class', 'label-class', diff --git a/dist/col/index.js b/dist/col/index.js index b6e6ae14..54461c2c 100644 --- a/dist/col/index.js +++ b/dist/col/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../row/index': { type: 'ancestor' diff --git a/dist/common/component.js b/dist/common/component.js new file mode 100644 index 00000000..6828a079 --- /dev/null +++ b/dist/common/component.js @@ -0,0 +1,48 @@ +import { basic } from '../mixins/basic'; +import { observe } from '../mixins/observer/index'; +function VantComponent(sfc) { + const options = {}; + // map props to properties + if (sfc.props) { + options.properties = sfc.props; + } + // map mixins to behaviors + if (sfc.mixins) { + options.behaviors = sfc.mixins; + } + // copy methods + if (sfc.methods) { + options.methods = sfc.methods; + } + if (sfc.beforeCreate) { + options.created = sfc.beforeCreate; + } + if (sfc.created) { + options.attached = sfc.created; + } + if (sfc.mounted) { + options.ready = sfc.mounted; + } + if (sfc.destroyed) { + options.detached = sfc.destroyed; + } + // map classes to externalClasses + options.externalClasses = sfc.classes || []; + // add default externalClasses + options.externalClasses.push('custom-class'); + // add default behaviors + options.behaviors = sfc.mixins || []; + options.behaviors.push(basic); + // add default options + options.options = { + multipleSlots: true, + addGlobalClass: true + }; + // map field to form-field behavior + if (sfc.field) { + options.behaviors.push('wx://form-field'); + } + observe(sfc, options); + Component(options); +} +export { VantComponent }; diff --git a/dist/common/create.js b/dist/common/create.js deleted file mode 100644 index 6d76447b..00000000 --- a/dist/common/create.js +++ /dev/null @@ -1,40 +0,0 @@ -import { basic } from '../mixins/basic'; -import { observe } from '../mixins/observer/index'; - -export function create(sfc) { - // map props to properties - if (sfc.props) { - sfc.properties = sfc.props; - delete sfc.props; - } - - // map mixins to behaviors - if (sfc.mixins) { - sfc.behaviors = sfc.mixins; - delete sfc.mixins; - } - - // map classes to externalClasses - sfc.externalClasses = sfc.classes || []; - delete sfc.classes; - - // add default externalClasses - sfc.externalClasses.push('custom-class'); - - // add default behaviors - sfc.behaviors = sfc.behaviors || []; - sfc.behaviors.push(basic); - - // add default options - sfc.options = sfc.options || {}; - sfc.options.multipleSlots = true; - sfc.options.addGlobalClass = true; - - // map field to form-field behavior - if (sfc.field) { - sfc.behaviors.push('wx://form-field'); - } - - observe(sfc); - Component(sfc); -}; diff --git a/dist/dialog/index.js b/dist/dialog/index.js index 7739bccc..e3665f74 100644 --- a/dist/dialog/index.js +++ b/dist/dialog/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { title: String, message: String, diff --git a/dist/field/index.js b/dist/field/index.js index 4fb39fa2..0556c795 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['input-class'], diff --git a/dist/icon/index.js b/dist/icon/index.js index ba24cbba..e239c4b7 100644 --- a/dist/icon/index.js +++ b/dist/icon/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { info: null, name: String, diff --git a/dist/loading/index.js b/dist/loading/index.js index c514f400..889c31f3 100644 --- a/dist/loading/index.js +++ b/dist/loading/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { size: { type: String, diff --git a/dist/mixins/observer/index.js b/dist/mixins/observer/index.js index 0cba0aec..55ea4c89 100644 --- a/dist/mixins/observer/index.js +++ b/dist/mixins/observer/index.js @@ -1,14 +1,14 @@ import { behavior } from './behavior'; import { observeProps } from './props'; -export function observe(sfc) { +export function observe(sfc, options) { if (sfc.computed) { - sfc.behaviors.push(behavior); - sfc.methods = sfc.methods || {}; - sfc.methods.$options = () => sfc; + options.behaviors.push(behavior); + options.methods = options.methods || {}; + options.methods.$options = () => sfc; - if (sfc.properties) { - observeProps(sfc.properties); + if (options.properties) { + observeProps(options.properties); } } } diff --git a/dist/nav-bar/index.js b/dist/nav-bar/index.js index 6d3b7987..e8f11cea 100644 --- a/dist/nav-bar/index.js +++ b/dist/nav-bar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: ['title-class'], props: { diff --git a/dist/notice-bar/index.js b/dist/notice-bar/index.js index b01addee..caebae21 100644 --- a/dist/notice-bar/index.js +++ b/dist/notice-bar/index.js @@ -1,9 +1,9 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; const FONT_COLOR = '#f60'; const BG_COLOR = '#fff7cc'; -create({ +VantComponent({ props: { text: { type: String, diff --git a/dist/notify/index.js b/dist/notify/index.js index 6de5caf6..f573772d 100644 --- a/dist/notify/index.js +++ b/dist/notify/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { text: String, color: { diff --git a/dist/overlay/index.js b/dist/overlay/index.js index 68b3b4fe..5d6c871f 100644 --- a/dist/overlay/index.js +++ b/dist/overlay/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { show: Boolean, mask: Boolean, @@ -14,6 +14,9 @@ create({ methods: { onClick() { this.$emit('click'); - } + }, + + // for prevent touchmove + noop() {} } }); diff --git a/dist/overlay/index.wxml b/dist/overlay/index.wxml index 906fda2a..630afac6 100644 --- a/dist/overlay/index.wxml +++ b/dist/overlay/index.wxml @@ -3,5 +3,5 @@ custom-class="van-overlay" custom-style="z-index: {{ zIndex }}; {{ mask ? 'background-color: rgba(0, 0, 0, .7);' : '' }}; {{ customStyle }}" bind:tap="onClick" - catch:touchmove + catch:touchmove="noop" /> diff --git a/dist/panel/index.js b/dist/panel/index.js index 6442827b..3e9b4ba7 100644 --- a/dist/panel/index.js +++ b/dist/panel/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: ['footer-class'], props: { diff --git a/dist/popup/index.js b/dist/popup/index.js index f580f834..3eafdaad 100644 --- a/dist/popup/index.js +++ b/dist/popup/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { transition } from '../mixins/transition'; -create({ +VantComponent({ mixins: [transition(false)], props: { diff --git a/dist/progress/index.js b/dist/progress/index.js index 0bbb7b84..7f621405 100644 --- a/dist/progress/index.js +++ b/dist/progress/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { inactive: { type: Boolean, diff --git a/dist/row/index.js b/dist/row/index.js index 9b7ec8cb..c6e98264 100644 --- a/dist/row/index.js +++ b/dist/row/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../col/index': { type: 'descendant', diff --git a/dist/search/index.js b/dist/search/index.js index 45467436..ebcee417 100644 --- a/dist/search/index.js +++ b/dist/search/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['cancel-class'], diff --git a/dist/slider/index.js b/dist/slider/index.js index 18bd1ec8..821ed1cb 100644 --- a/dist/slider/index.js +++ b/dist/slider/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { touch } from '../mixins/touch'; -create({ +VantComponent({ mixins: [touch], props: { diff --git a/dist/stepper/index.js b/dist/stepper/index.js index 158f6e0a..fadddb6a 100644 --- a/dist/stepper/index.js +++ b/dist/stepper/index.js @@ -1,10 +1,10 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; // Note that the bitwise operators and shift operators operate on 32-bit ints // so in that case, the max safe integer is 2^31-1, or 2147483647 const MAX = 2147483647; -create({ +VantComponent({ field: true, classes: [ diff --git a/dist/steps/index.js b/dist/steps/index.js index 777a3175..4ecb0f05 100644 --- a/dist/steps/index.js +++ b/dist/steps/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { icon: String, steps: { diff --git a/dist/submit-bar/index.js b/dist/submit-bar/index.js index f9466aa8..00857608 100644 --- a/dist/submit-bar/index.js +++ b/dist/submit-bar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'price-class', 'button-class' diff --git a/dist/switch-cell/index.js b/dist/switch-cell/index.js index b6fa11fd..b6926e05 100644 --- a/dist/switch-cell/index.js +++ b/dist/switch-cell/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, props: { diff --git a/dist/switch/index.js b/dist/switch/index.js index 07867866..9bc5f527 100644 --- a/dist/switch/index.js +++ b/dist/switch/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['node-class'], diff --git a/dist/tab/index.js b/dist/tab/index.js index 64564a7d..c28b9646 100644 --- a/dist/tab/index.js +++ b/dist/tab/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { disabled: { type: Boolean, diff --git a/dist/tabbar-item/index.js b/dist/tabbar-item/index.js index ca2fb7d5..09618d32 100644 --- a/dist/tabbar-item/index.js +++ b/dist/tabbar-item/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { info: null, icon: String, diff --git a/dist/tabbar/index.js b/dist/tabbar/index.js index 2a9be4fe..90603dd2 100644 --- a/dist/tabbar/index.js +++ b/dist/tabbar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { active: { type: Number, diff --git a/dist/tabs/index.js b/dist/tabs/index.js index 9443ae58..4d9c32a6 100644 --- a/dist/tabs/index.js +++ b/dist/tabs/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../tab/index': { type: 'descendant', diff --git a/dist/tag/index.js b/dist/tag/index.js index 40a74c60..05d41648 100644 --- a/dist/tag/index.js +++ b/dist/tag/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { type: String, mark: Boolean, diff --git a/dist/toast/index.js b/dist/toast/index.js index ca772164..4b0c3890 100644 --- a/dist/toast/index.js +++ b/dist/toast/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { show: Boolean, mask: Boolean, @@ -29,6 +29,9 @@ create({ this.setData({ show: false }); - } + }, + + // for prevent touchmove + noop() {} } }); diff --git a/dist/toast/index.wxml b/dist/toast/index.wxml index 5df591d8..5b1e9a6f 100644 --- a/dist/toast/index.wxml +++ b/dist/toast/index.wxml @@ -10,7 +10,7 @@ > {{ message }} diff --git a/dist/transition/index.js b/dist/transition/index.js index d41bcb2b..ca5a8288 100644 --- a/dist/transition/index.js +++ b/dist/transition/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { transition } from '../mixins/transition'; -create({ +VantComponent({ mixins: [transition(true)], props: { diff --git a/dist/tree-select/index.js b/dist/tree-select/index.js index f43c4128..62bb2adc 100644 --- a/dist/tree-select/index.js +++ b/dist/tree-select/index.js @@ -1,8 +1,8 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; const ITEM_HEIGHT = 44; -create({ +VantComponent({ props: { items: { type: Array, diff --git a/packages/action-sheet/index.js b/packages/action-sheet/index.ts similarity index 86% rename from packages/action-sheet/index.js rename to packages/action-sheet/index.ts index 5c908d0d..e43735a1 100644 --- a/packages/action-sheet/index.js +++ b/packages/action-sheet/index.ts @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { show: Boolean, title: String, @@ -24,7 +24,7 @@ create({ }, methods: { - onSelect(event) { + onSelect(event: Weapp.Event) { const { index } = event.currentTarget.dataset; const item = this.data.actions[index]; if (item && !item.disabled && !item.loading) { diff --git a/packages/area/index.js b/packages/area/index.js index 12cee4e3..465e218f 100644 --- a/packages/area/index.js +++ b/packages/area/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { value: { type: String, diff --git a/packages/badge-group/index.js b/packages/badge-group/index.ts similarity index 92% rename from packages/badge-group/index.js rename to packages/badge-group/index.ts index 77e57af1..b35902f3 100644 --- a/packages/badge-group/index.js +++ b/packages/badge-group/index.ts @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../badge/index': { type: 'descendant', @@ -29,7 +29,7 @@ create({ badges: [] }, - created() { + beforeCreate() { this.currentActive = -1; }, diff --git a/packages/badge/index.js b/packages/badge/index.ts similarity index 84% rename from packages/badge/index.js rename to packages/badge/index.ts index f724a2e6..adcd8816 100644 --- a/packages/badge/index.js +++ b/packages/badge/index.ts @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../badge-group/index': { type: 'ancestor' diff --git a/packages/button/index.js b/packages/button/index.js index a7f0a165..8f14ac3b 100644 --- a/packages/button/index.js +++ b/packages/button/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { button } from '../mixins/button'; -create({ +VantComponent({ mixins: [button], props: { diff --git a/packages/card/index.js b/packages/card/index.js index b5a82b38..ad517d83 100644 --- a/packages/card/index.js +++ b/packages/card/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'thumb-class', 'title-class', diff --git a/packages/cell-group/index.js b/packages/cell-group/index.js index b05225f3..9be167a5 100644 --- a/packages/cell-group/index.js +++ b/packages/cell-group/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { border: { type: Boolean, diff --git a/packages/cell/index.js b/packages/cell/index.js index 99afc390..5ff50c0e 100644 --- a/packages/cell/index.js +++ b/packages/cell/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'title-class', 'label-class', diff --git a/packages/col/index.js b/packages/col/index.js index b6e6ae14..54461c2c 100644 --- a/packages/col/index.js +++ b/packages/col/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../row/index': { type: 'ancestor' diff --git a/packages/common/component.ts b/packages/common/component.ts new file mode 100644 index 00000000..bd5ae06b --- /dev/null +++ b/packages/common/component.ts @@ -0,0 +1,74 @@ +import { basic } from '../mixins/basic'; +import { observe } from '../mixins/observer/index'; +import { + VantComponentOptions, + CombinedComponentInstance +} from '../../types/index'; + +function VantComponent( + sfc: VantComponentOptions< + Props, + Data, + Methods, + CombinedComponentInstance + > +): void { + const options: any = {}; + + // map props to properties + if (sfc.props) { + options.properties = sfc.props; + } + + // map mixins to behaviors + if (sfc.mixins) { + options.behaviors = sfc.mixins; + } + + // copy methods + if (sfc.methods) { + options.methods = sfc.methods; + } + + if (sfc.beforeCreate) { + options.created = sfc.beforeCreate; + } + + if (sfc.created) { + options.attached = sfc.created; + } + + if (sfc.mounted) { + options.ready = sfc.mounted; + } + + if (sfc.destroyed) { + options.detached = sfc.destroyed; + } + + // map classes to externalClasses + options.externalClasses = sfc.classes || []; + + // add default externalClasses + options.externalClasses.push('custom-class'); + + // add default behaviors + options.behaviors = sfc.mixins || []; + options.behaviors.push(basic); + + // add default options + options.options = { + multipleSlots: true, + addGlobalClass: true + }; + + // map field to form-field behavior + if (sfc.field) { + options.behaviors.push('wx://form-field'); + } + + observe(sfc, options); + Component(options); +} + +export { VantComponent }; diff --git a/packages/common/create.js b/packages/common/create.js deleted file mode 100644 index 6d76447b..00000000 --- a/packages/common/create.js +++ /dev/null @@ -1,40 +0,0 @@ -import { basic } from '../mixins/basic'; -import { observe } from '../mixins/observer/index'; - -export function create(sfc) { - // map props to properties - if (sfc.props) { - sfc.properties = sfc.props; - delete sfc.props; - } - - // map mixins to behaviors - if (sfc.mixins) { - sfc.behaviors = sfc.mixins; - delete sfc.mixins; - } - - // map classes to externalClasses - sfc.externalClasses = sfc.classes || []; - delete sfc.classes; - - // add default externalClasses - sfc.externalClasses.push('custom-class'); - - // add default behaviors - sfc.behaviors = sfc.behaviors || []; - sfc.behaviors.push(basic); - - // add default options - sfc.options = sfc.options || {}; - sfc.options.multipleSlots = true; - sfc.options.addGlobalClass = true; - - // map field to form-field behavior - if (sfc.field) { - sfc.behaviors.push('wx://form-field'); - } - - observe(sfc); - Component(sfc); -}; diff --git a/packages/dialog/index.js b/packages/dialog/index.js index 7739bccc..e3665f74 100644 --- a/packages/dialog/index.js +++ b/packages/dialog/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { title: String, message: String, diff --git a/packages/field/index.js b/packages/field/index.js index 4fb39fa2..0556c795 100644 --- a/packages/field/index.js +++ b/packages/field/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['input-class'], diff --git a/packages/icon/index.js b/packages/icon/index.js index ba24cbba..e239c4b7 100644 --- a/packages/icon/index.js +++ b/packages/icon/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { info: null, name: String, diff --git a/packages/loading/index.js b/packages/loading/index.js index c514f400..889c31f3 100644 --- a/packages/loading/index.js +++ b/packages/loading/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { size: { type: String, diff --git a/packages/mixins/observer/index.js b/packages/mixins/observer/index.js index 0cba0aec..55ea4c89 100644 --- a/packages/mixins/observer/index.js +++ b/packages/mixins/observer/index.js @@ -1,14 +1,14 @@ import { behavior } from './behavior'; import { observeProps } from './props'; -export function observe(sfc) { +export function observe(sfc, options) { if (sfc.computed) { - sfc.behaviors.push(behavior); - sfc.methods = sfc.methods || {}; - sfc.methods.$options = () => sfc; + options.behaviors.push(behavior); + options.methods = options.methods || {}; + options.methods.$options = () => sfc; - if (sfc.properties) { - observeProps(sfc.properties); + if (options.properties) { + observeProps(options.properties); } } } diff --git a/packages/nav-bar/index.js b/packages/nav-bar/index.js index 6d3b7987..e8f11cea 100644 --- a/packages/nav-bar/index.js +++ b/packages/nav-bar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: ['title-class'], props: { diff --git a/packages/notice-bar/index.js b/packages/notice-bar/index.js index b01addee..caebae21 100644 --- a/packages/notice-bar/index.js +++ b/packages/notice-bar/index.js @@ -1,9 +1,9 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; const FONT_COLOR = '#f60'; const BG_COLOR = '#fff7cc'; -create({ +VantComponent({ props: { text: { type: String, diff --git a/packages/notify/index.js b/packages/notify/index.js index 6de5caf6..f573772d 100644 --- a/packages/notify/index.js +++ b/packages/notify/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { text: String, color: { diff --git a/packages/overlay/index.js b/packages/overlay/index.js index 794cf1e4..5d6c871f 100644 --- a/packages/overlay/index.js +++ b/packages/overlay/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { show: Boolean, mask: Boolean, diff --git a/packages/panel/index.js b/packages/panel/index.js index 6442827b..3e9b4ba7 100644 --- a/packages/panel/index.js +++ b/packages/panel/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: ['footer-class'], props: { diff --git a/packages/popup/index.js b/packages/popup/index.js index f580f834..3eafdaad 100644 --- a/packages/popup/index.js +++ b/packages/popup/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { transition } from '../mixins/transition'; -create({ +VantComponent({ mixins: [transition(false)], props: { diff --git a/packages/progress/index.js b/packages/progress/index.js index 0bbb7b84..7f621405 100644 --- a/packages/progress/index.js +++ b/packages/progress/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { inactive: { type: Boolean, diff --git a/packages/row/index.js b/packages/row/index.js index 9b7ec8cb..c6e98264 100644 --- a/packages/row/index.js +++ b/packages/row/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../col/index': { type: 'descendant', diff --git a/packages/search/index.js b/packages/search/index.js index 45467436..ebcee417 100644 --- a/packages/search/index.js +++ b/packages/search/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['cancel-class'], diff --git a/packages/slider/index.js b/packages/slider/index.js index 18bd1ec8..821ed1cb 100644 --- a/packages/slider/index.js +++ b/packages/slider/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { touch } from '../mixins/touch'; -create({ +VantComponent({ mixins: [touch], props: { diff --git a/packages/stepper/index.js b/packages/stepper/index.js index 158f6e0a..fadddb6a 100644 --- a/packages/stepper/index.js +++ b/packages/stepper/index.js @@ -1,10 +1,10 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; // Note that the bitwise operators and shift operators operate on 32-bit ints // so in that case, the max safe integer is 2^31-1, or 2147483647 const MAX = 2147483647; -create({ +VantComponent({ field: true, classes: [ diff --git a/packages/steps/index.js b/packages/steps/index.js index 777a3175..4ecb0f05 100644 --- a/packages/steps/index.js +++ b/packages/steps/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { icon: String, steps: { diff --git a/packages/submit-bar/index.js b/packages/submit-bar/index.js index f9466aa8..00857608 100644 --- a/packages/submit-bar/index.js +++ b/packages/submit-bar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ classes: [ 'price-class', 'button-class' diff --git a/packages/switch-cell/index.js b/packages/switch-cell/index.js index b6fa11fd..b6926e05 100644 --- a/packages/switch-cell/index.js +++ b/packages/switch-cell/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, props: { diff --git a/packages/switch/index.js b/packages/switch/index.js index 07867866..9bc5f527 100644 --- a/packages/switch/index.js +++ b/packages/switch/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ field: true, classes: ['node-class'], diff --git a/packages/tab/index.js b/packages/tab/index.js index 64564a7d..c28b9646 100644 --- a/packages/tab/index.js +++ b/packages/tab/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { disabled: { type: Boolean, diff --git a/packages/tabbar-item/index.js b/packages/tabbar-item/index.js index ca2fb7d5..09618d32 100644 --- a/packages/tabbar-item/index.js +++ b/packages/tabbar-item/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { info: null, icon: String, diff --git a/packages/tabbar/index.js b/packages/tabbar/index.js index 2a9be4fe..90603dd2 100644 --- a/packages/tabbar/index.js +++ b/packages/tabbar/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { active: { type: Number, diff --git a/packages/tabs/index.js b/packages/tabs/index.js index 9443ae58..4d9c32a6 100644 --- a/packages/tabs/index.js +++ b/packages/tabs/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ relations: { '../tab/index': { type: 'descendant', diff --git a/packages/tag/index.js b/packages/tag/index.js index 40a74c60..05d41648 100644 --- a/packages/tag/index.js +++ b/packages/tag/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { type: String, mark: Boolean, diff --git a/packages/toast/index.js b/packages/toast/index.js index 9c0d9e89..4b0c3890 100644 --- a/packages/toast/index.js +++ b/packages/toast/index.js @@ -1,6 +1,6 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; -create({ +VantComponent({ props: { show: Boolean, mask: Boolean, diff --git a/packages/transition/index.js b/packages/transition/index.js index d41bcb2b..ca5a8288 100644 --- a/packages/transition/index.js +++ b/packages/transition/index.js @@ -1,7 +1,7 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; import { transition } from '../mixins/transition'; -create({ +VantComponent({ mixins: [transition(true)], props: { diff --git a/packages/tree-select/index.js b/packages/tree-select/index.js index f43c4128..62bb2adc 100644 --- a/packages/tree-select/index.js +++ b/packages/tree-select/index.js @@ -1,8 +1,8 @@ -import { create } from '../common/create'; +import { VantComponent } from '../common/component'; const ITEM_HEIGHT = 44; -create({ +VantComponent({ props: { items: { type: Array, diff --git a/tsconfig.json b/tsconfig.json index 8402fd67..cbd06868 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,7 @@ { "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "removeComments": true, + "target": "es6", "noImplicitThis": true, "noImplicitUseStrict": true }, diff --git a/types/index.d.ts b/types/index.d.ts index 741855a5..84d06175 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,10 +1,11 @@ +/// import { Vue } from './vue'; -import { Weapp } from './weapp'; +type Mixins = any[]; +type ExternalClasses = string[]; type LooseObject = { [key: string]: any; }; -type Mixins = any[]; type Relations = { [key: string]: { type: string; @@ -12,13 +13,13 @@ type Relations = { unlinked?: (this: Instance, target?: any) => void; } }; -type ExternalClasses = string[]; - - +type RecordProps = { + [K in keyof T]: any +} export type CombinedComponentInstance = Vue & LooseObject & - Weapp.Component & { data: Data & Props } & Methods; + Weapp.Component & { data: Data & RecordProps } & Methods; export type VantComponentOptions = { data?: Data; diff --git a/types/weapp.d.ts b/types/weapp.d.ts index 8d20432a..92c675b8 100644 --- a/types/weapp.d.ts +++ b/types/weapp.d.ts @@ -36,7 +36,3 @@ declare namespace Weapp { detail: any; } } - -export { - Weapp -};