From 74e19f55d17bc3ce0afe3525a1d0adc1cda262fd Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 2 Apr 2021 10:19:33 +0800
Subject: [PATCH] chore: adjust some code (#8446)

---
 src/address-edit/AddressEdit.tsx                           | 6 +++---
 src/swipe/Swipe.tsx                                        | 7 +++----
 .../{insert.spec.js.snap => insert.spec.tsx.snap}          | 0
 src/tab/test/{insert.spec.js => insert.spec.tsx}           | 5 +++--
 src/vue-tsx-shim.d.ts                                      | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)
 rename src/tab/test/__snapshots__/{insert.spec.js.snap => insert.spec.tsx.snap} (100%)
 rename src/tab/test/{insert.spec.js => insert.spec.tsx} (95%)

diff --git a/src/address-edit/AddressEdit.tsx b/src/address-edit/AddressEdit.tsx
index 5327e8a0a..75f4acf34 100644
--- a/src/address-edit/AddressEdit.tsx
+++ b/src/address-edit/AddressEdit.tsx
@@ -381,15 +381,15 @@ export default defineComponent({
               onBlur={onDetailBlur}
               onFocus={() => onFocus('addressDetail')}
               onInput={onChangeDetail}
-              onSelect-search={(event: Event) => emit('select-search', event)}
+              onSelectSearch={(event: Event) => emit('select-search', event)}
             />
             {props.showPostal && (
               <Field
                 v-show={!hideBottomFields.value}
                 v-model={data.postalCode}
                 type="tel"
-                maxlength="6"
                 label={t('postal')}
+                maxlength="6"
                 placeholder={t('postal')}
                 errorMessage={errorInfo.postalCode}
                 onFocus={() => onFocus('postalCode')}
@@ -402,9 +402,9 @@ export default defineComponent({
             <Button
               block
               round
-              loading={props.isSaving}
               type="danger"
               text={props.saveButtonText || t('save')}
+              loading={props.isSaving}
               onClick={onSave}
             />
             {props.showDelete && (
diff --git a/src/swipe/Swipe.tsx b/src/swipe/Swipe.tsx
index 1d9e0acfa..cd7b930a3 100644
--- a/src/swipe/Swipe.tsx
+++ b/src/swipe/Swipe.tsx
@@ -139,14 +139,14 @@ export default defineComponent({
     });
 
     const trackStyle = computed(() => {
-      const mainAxis = props.vertical ? 'height' : 'width';
-      const crossAxis = props.vertical ? 'width' : 'height';
       const style: CSSProperties = {
         transitionDuration: `${state.swiping ? 0 : props.duration}ms`,
         transform: `translate${props.vertical ? 'Y' : 'X'}(${state.offset}px)`,
       };
 
       if (size.value) {
+        const mainAxis = props.vertical ? 'height' : 'width';
+        const crossAxis = props.vertical ? 'width' : 'height';
         style[mainAxis] = `${trackSize.value}px`;
         style[crossAxis] = props[crossAxis] ? `${props[crossAxis]}px` : '';
       }
@@ -225,8 +225,7 @@ export default defineComponent({
 
       if (state.active <= -1) {
         move({ pace: count.value });
-      }
-      if (state.active >= count.value) {
+      } else if (state.active >= count.value) {
         move({ pace: -count.value });
       }
     };
diff --git a/src/tab/test/__snapshots__/insert.spec.js.snap b/src/tab/test/__snapshots__/insert.spec.tsx.snap
similarity index 100%
rename from src/tab/test/__snapshots__/insert.spec.js.snap
rename to src/tab/test/__snapshots__/insert.spec.tsx.snap
diff --git a/src/tab/test/insert.spec.js b/src/tab/test/insert.spec.tsx
similarity index 95%
rename from src/tab/test/insert.spec.js
rename to src/tab/test/insert.spec.tsx
index 14b02c87b..f1ad9071f 100644
--- a/src/tab/test/insert.spec.js
+++ b/src/tab/test/insert.spec.tsx
@@ -1,3 +1,4 @@
+import { defineComponent } from 'vue';
 import { mount, later } from '../../../test';
 import { Tab } from '..';
 import { Tabs } from '../../tabs';
@@ -64,11 +65,11 @@ test('should render correctly after inserting a tab with name', async () => {
 });
 
 test('should render Tab inside a component correctly', async () => {
-  const MyTab = {
+  const MyTab = defineComponent({
     render() {
       return <Tab title="2">2</Tab>;
     },
-  };
+  });
 
   const wrapper = mount({
     render() {
diff --git a/src/vue-tsx-shim.d.ts b/src/vue-tsx-shim.d.ts
index 018dbb541..6d38bd7fd 100644
--- a/src/vue-tsx-shim.d.ts
+++ b/src/vue-tsx-shim.d.ts
@@ -36,5 +36,6 @@ declare module 'vue' {
     onTouchmove?: EventHandler;
     onTouchstart?: EventHandler;
     onTouchcancel?: EventHandler;
+    onSelectSearch?: EventHandler;
   }
 }