From a1b08babfc8f319ee6f3b4f2ba389b8a0e6d527b Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Fri, 9 Oct 2020 20:45:26 +0800 Subject: [PATCH] chore(List): use tsx --- package.json | 2 +- src/list/{index.js => index.tsx} | 20 ++++++++++---------- yarn.lock | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) rename src/list/{index.js => index.tsx} (91%) diff --git a/package.json b/package.json index 68b9a8460..a586d4545 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "dependencies": { "@babel/runtime": "7.x", "@vant/icons": "1.3.1", - "@vant/use": "^0.0.8", + "@vant/use": "^0.0.9", "vue-lazyload": "1.2.3" }, "peerDependencies": { diff --git a/src/list/index.js b/src/list/index.tsx similarity index 91% rename from src/list/index.js rename to src/list/index.tsx index 65555d360..8384318e3 100644 --- a/src/list/index.js +++ b/src/list/index.tsx @@ -1,4 +1,4 @@ -import { ref, watch, nextTick, onUpdated, onMounted } from 'vue'; +import { ref, watch, nextTick, onUpdated, onMounted, PropType } from 'vue'; // Utils import { isHidden, createNamespace } from '../utils'; @@ -20,18 +20,18 @@ export default createComponent({ errorText: String, loadingText: String, finishedText: String, - immediateCheck: { - type: Boolean, - default: true, - }, offset: { type: [Number, String], default: 300, }, direction: { - type: String, + type: String as PropType<'up' | 'down'>, default: 'down', }, + immediateCheck: { + type: Boolean, + default: true, + }, }, emits: ['load', 'update:error', 'update:loading'], @@ -39,8 +39,8 @@ export default createComponent({ setup(props, { emit, slots }) { // use sync innerLoading state to avoid repeated loading in some edge cases const loading = ref(false); - const root = ref(); - const placeholder = ref(); + const root = ref(); + const placeholder = ref(); const scrollParent = useScrollParent(root); const check = () => { @@ -108,7 +108,7 @@ export default createComponent({ {slots.loading ? ( slots.loading() ) : ( - {props.loadingText || t('loading')} + {props.loadingText || t('loading')} )} ); @@ -118,7 +118,7 @@ export default createComponent({ watch([() => props.loading, () => props.finished], check); onUpdated(() => { - loading.value = props.loading; + loading.value = props.loading!; }); onMounted(() => { diff --git a/yarn.lock b/yarn.lock index 1d66ec93f..64736f3b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2212,10 +2212,10 @@ resolved "https://registry.yarnpkg.com/@vant/touch-emulator/-/touch-emulator-1.2.0.tgz#486300b23e57db9ce9231a04e0a0c621c68692d8" integrity sha512-sJ97zU85zOq51qoi7+CpBEcOyH3CitjP1KC7/GQwqaurUJni+EP7/F9n0HMnAh8GXMjgtgDBNJ5z48x+coNKYQ== -"@vant/use@^0.0.8": - version "0.0.8" - resolved "https://registry.npmjs.org/@vant/use/-/use-0.0.8.tgz#46b0e957c8e4250a7e94951f20cfa6fdbd550a41" - integrity sha512-NO8yBGhE1jF2xnhgSeEDZUFlKXHtPzVNhxLnzH74P1Kdh3XrrQO6p+1ZL8HF52YMT2F1OY6FpaBC/WZmK3Xmog== +"@vant/use@^0.0.9": + version "0.0.9" + resolved "https://registry.npmjs.org/@vant/use/-/use-0.0.9.tgz#938b41e8dd682f063450f45699111ab30dd279c1" + integrity sha512-P+/q3MqFCmoNStQU8qpPxDNtBLy9Q82xx05APm7ZqEhoJLPynK1u0giC1JeEvFoSTEJ3y4XxN+R7YqmpXnf/7Q== "@vue/babel-helper-vue-transform-on@^1.0.0-rc.2": version "1.0.0-rc.2"