From f37fb01c4d5ccc1f9fd1e843074c14cda8b77fec Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 1 Sep 2021 11:07:06 +0800
Subject: [PATCH] fix(AddressEdit): remove unused finish button (#9364)

---
 src/address-edit/AddressEditDetail.tsx | 18 ++----------------
 src/address-edit/README.md             |  2 --
 src/address-edit/README.zh-CN.md       |  2 --
 src/address-edit/index.less            |  7 -------
 src/address-edit/var.less              |  2 --
 src/locale/lang/de-DE-formal.ts        |  1 -
 src/locale/lang/de-DE.ts               |  1 -
 src/locale/lang/en-US.ts               |  1 -
 src/locale/lang/es-ES.ts               |  1 -
 src/locale/lang/fr-FR.ts               |  1 -
 src/locale/lang/ja-JP.ts               |  1 -
 src/locale/lang/nb-NO.ts               |  1 -
 src/locale/lang/ro-RO.ts               |  1 -
 src/locale/lang/ru-RU.ts               |  1 -
 src/locale/lang/th-TH.ts               |  1 -
 src/locale/lang/tr-TR.ts               |  1 -
 src/locale/lang/zh-CN.ts               |  1 -
 src/locale/lang/zh-HK.ts               |  1 -
 src/locale/lang/zh-TW.ts               |  1 -
 src/utils/test/index.spec.ts           |  6 +-----
 src/utils/validate.ts                  |  4 ----
 21 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/src/address-edit/AddressEditDetail.tsx b/src/address-edit/AddressEditDetail.tsx
index efecefb98..4095519e8 100644
--- a/src/address-edit/AddressEditDetail.tsx
+++ b/src/address-edit/AddressEditDetail.tsx
@@ -1,7 +1,7 @@
 import { PropType, ref, defineComponent } from 'vue';
 
 // Utils
-import { isAndroid, createNamespace } from '../utils';
+import { createNamespace } from '../utils';
 
 // Components
 import { Cell } from '../cell';
@@ -12,7 +12,6 @@ import type { AddressEditSearchItem } from './types';
 import type { FieldInstance } from '../field/types';
 
 const [name, bem, t] = createNamespace('address-edit-detail');
-const android = isAndroid();
 
 export default defineComponent({
   name,
@@ -41,18 +40,6 @@ export default defineComponent({
       emit('input', `${express.address || ''} ${express.name || ''}`.trim());
     };
 
-    const onFinish = () => field.value?.blur();
-
-    const renderFinish = () => {
-      if (props.value && props.focused && android) {
-        return (
-          <div class={bem('finish')} onClick={onFinish}>
-            {t('complete')}
-          </div>
-        );
-      }
-    };
-
     const renderSearchTitle = (express: AddressEditSearchItem) => {
       if (express.name) {
         const text = express.name.replace(
@@ -95,15 +82,14 @@ export default defineComponent({
         return (
           <>
             <Field
-              v-slots={{ icon: renderFinish }}
               autosize
+              clearable
               ref={field}
               class={bem()}
               rows={props.detailRows}
               type="textarea"
               label={t('label')}
               border={!showSearchResult()}
-              clearable={!android}
               maxlength={props.detailMaxlength}
               modelValue={props.value}
               placeholder={t('placeholder')}
diff --git a/src/address-edit/README.md b/src/address-edit/README.md
index fa716b370..8faaca6fc 100644
--- a/src/address-edit/README.md
+++ b/src/address-edit/README.md
@@ -186,5 +186,3 @@ The component provides the following CSS variables, which can be used to customi
 | --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
 | --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
 | --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
-| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
-| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md
index d119a914c..a7660aa6b 100644
--- a/src/address-edit/README.zh-CN.md
+++ b/src/address-edit/README.zh-CN.md
@@ -188,5 +188,3 @@ addressEditRef.value?.setAddressDetail('');
 | --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
 | --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
 | --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
-| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
-| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
diff --git a/src/address-edit/index.less b/src/address-edit/index.less
index ce55a926b..7e7f94bc0 100644
--- a/src/address-edit/index.less
+++ b/src/address-edit/index.less
@@ -5,8 +5,6 @@
   --van-address-edit-buttons-padding: @address-edit-buttons-padding;
   --van-address-edit-button-margin-bottom: @address-edit-button-margin-bottom;
   --van-contact-edit-button-font-size: @address-edit-button-font-size;
-  --van-address-edit-detail-finish-color: @address-edit-detail-finish-color;
-  --van-address-edit-detail-finish-font-size: @address-edit-detail-finish-font-size;
 }
 
 .van-address-edit {
@@ -44,10 +42,5 @@
     &__keyword {
       color: var(--van-danger-color);
     }
-
-    &__finish {
-      color: var(--van-address-edit-detail-finish-color);
-      font-size: var(--van-address-edit-detail-finish-font-size);
-    }
   }
 }
diff --git a/src/address-edit/var.less b/src/address-edit/var.less
index 9ee8a0565..57d1d5417 100644
--- a/src/address-edit/var.less
+++ b/src/address-edit/var.less
@@ -4,5 +4,3 @@
 @address-edit-buttons-padding: var(--van-padding-xl) var(--van-padding-base);
 @address-edit-button-margin-bottom: var(--van-padding-sm);
 @address-edit-button-font-size: var(--van-font-size-lg);
-@address-edit-detail-finish-color: var(--van-primary-color);
-@address-edit-detail-finish-font-size: var(--van-font-size-sm);
diff --git a/src/locale/lang/de-DE-formal.ts b/src/locale/lang/de-DE-formal.ts
index 2654d43a2..7e8e5f4c3 100644
--- a/src/locale/lang/de-DE-formal.ts
+++ b/src/locale/lang/de-DE-formal.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Bestätigen',
   cancel: 'Abbrechen',
   delete: 'Löschen',
-  complete: 'Complete',
   loading: 'Laden...',
   nameEmpty: 'Bitte geben Sie den Name an',
   confirmDelete: 'Sind Sie sicher, dass Sie löschen möchten?',
diff --git a/src/locale/lang/de-DE.ts b/src/locale/lang/de-DE.ts
index 80cedeba1..b2a8f5122 100644
--- a/src/locale/lang/de-DE.ts
+++ b/src/locale/lang/de-DE.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Bestätigen',
   cancel: 'Abbrechen',
   delete: 'Löschen',
-  complete: 'Complete',
   loading: 'Laden...',
   nameEmpty: 'Bitte den Name angeben',
   confirmDelete: 'Bist du sicher, dass du löschen möchtest?',
diff --git a/src/locale/lang/en-US.ts b/src/locale/lang/en-US.ts
index 7c2382fde..45e48ce1d 100644
--- a/src/locale/lang/en-US.ts
+++ b/src/locale/lang/en-US.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Confirm',
   cancel: 'Cancel',
   delete: 'Delete',
-  complete: 'Complete',
   loading: 'Loading...',
   nameEmpty: 'Please fill in the name',
   confirmDelete: 'Are you sure you want to delete?',
diff --git a/src/locale/lang/es-ES.ts b/src/locale/lang/es-ES.ts
index 4dd4eaccb..a54ffba0e 100644
--- a/src/locale/lang/es-ES.ts
+++ b/src/locale/lang/es-ES.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Confirmar',
   cancel: 'Cancelar',
   delete: 'Eliminar',
-  complete: 'Completado',
   loading: 'Cargando...',
   nameEmpty: 'Por favor rellena el nombre',
   confirmDelete: 'Estás seguro de eliminarlo?',
diff --git a/src/locale/lang/fr-FR.ts b/src/locale/lang/fr-FR.ts
index 211f048f7..faafb5a2e 100644
--- a/src/locale/lang/fr-FR.ts
+++ b/src/locale/lang/fr-FR.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Confirmer',
   cancel: 'Annuler',
   delete: 'Suprimer',
-  complete: 'Terminé',
   loading: 'Chargement...',
   nameEmpty: 'Veuillez remplir le nom',
   confirmDelete: 'Êtes-vous sûr de vouloir supprimer?',
diff --git a/src/locale/lang/ja-JP.ts b/src/locale/lang/ja-JP.ts
index 7bcc65b38..ddad20c2e 100644
--- a/src/locale/lang/ja-JP.ts
+++ b/src/locale/lang/ja-JP.ts
@@ -5,7 +5,6 @@ export default {
   confirm: '確認',
   cancel: 'キャンセル',
   delete: '削除',
-  complete: '完了',
   loading: '読み込み中...',
   nameEmpty: '名前を入力してください',
   confirmDelete: '本当に削除しますか',
diff --git a/src/locale/lang/nb-NO.ts b/src/locale/lang/nb-NO.ts
index e9b4303c9..ca94a5a9e 100644
--- a/src/locale/lang/nb-NO.ts
+++ b/src/locale/lang/nb-NO.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Bekreft',
   cancel: 'Avbryt',
   delete: 'Slett',
-  complete: 'Fullfør',
   loading: 'Laster...',
   nameEmpty: 'Vennligst fyll inn navn',
   confirmDelete: 'Er du sikker på at du vil slette?',
diff --git a/src/locale/lang/ro-RO.ts b/src/locale/lang/ro-RO.ts
index cf0d97bd8..2ae12cd4b 100644
--- a/src/locale/lang/ro-RO.ts
+++ b/src/locale/lang/ro-RO.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Confirmă',
   cancel: 'Anulează',
   delete: 'Șterge',
-  complete: 'Finalizează',
   loading: 'Încărcare...',
   nameEmpty: 'Te rugăm să completezi numele',
   confirmDelete: 'Ești sigur ca vrei sa stergi?',
diff --git a/src/locale/lang/ru-RU.ts b/src/locale/lang/ru-RU.ts
index 5311736f1..53ee7a972 100644
--- a/src/locale/lang/ru-RU.ts
+++ b/src/locale/lang/ru-RU.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Подтвердить',
   cancel: 'Отмена',
   delete: 'Удалить',
-  complete: 'Завершить',
   loading: 'Загрузка...',
   nameEmpty: 'Пожалуйста укажите имя',
   confirmDelete: 'Вы уверены, что хотите удалить?',
diff --git a/src/locale/lang/th-TH.ts b/src/locale/lang/th-TH.ts
index 91906cd8b..e7f376c26 100644
--- a/src/locale/lang/th-TH.ts
+++ b/src/locale/lang/th-TH.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'ยืนยัน',
   cancel: 'ยกเลิก',
   delete: 'ลบ',
-  complete: 'ดำเนินการ',
   loading: 'กำลังโหลด...',
   nameEmpty: 'กรุณากรอกชื่อของคุณ',
   confirmDelete: 'คุณแน่ใจว่าต้องการลบ',
diff --git a/src/locale/lang/tr-TR.ts b/src/locale/lang/tr-TR.ts
index c8ad2657c..cb9020790 100644
--- a/src/locale/lang/tr-TR.ts
+++ b/src/locale/lang/tr-TR.ts
@@ -5,7 +5,6 @@ export default {
   confirm: 'Onayla',
   cancel: 'İptal',
   delete: 'Sil',
-  complete: 'Tamamla',
   loading: 'Yükleniyor...',
   nameEmpty: 'Lütfen isim giriniz',
   confirmDelete: 'Silmek istediğinize emin misiniz?',
diff --git a/src/locale/lang/zh-CN.ts b/src/locale/lang/zh-CN.ts
index 1b173d34e..8cd289bb5 100644
--- a/src/locale/lang/zh-CN.ts
+++ b/src/locale/lang/zh-CN.ts
@@ -5,7 +5,6 @@ export default {
   confirm: '确认',
   cancel: '取消',
   delete: '删除',
-  complete: '完成',
   loading: '加载中...',
   nameEmpty: '请填写姓名',
   confirmDelete: '确定要删除吗',
diff --git a/src/locale/lang/zh-HK.ts b/src/locale/lang/zh-HK.ts
index 731d61087..369cb994b 100644
--- a/src/locale/lang/zh-HK.ts
+++ b/src/locale/lang/zh-HK.ts
@@ -5,7 +5,6 @@ export default {
   confirm: '確認',
   cancel: '取消',
   delete: '刪除',
-  complete: '完成',
   loading: '加載中...',
   nameEmpty: '請填寫姓名',
   confirmDelete: '確定要刪除嗎',
diff --git a/src/locale/lang/zh-TW.ts b/src/locale/lang/zh-TW.ts
index f715ffff0..f92393a95 100644
--- a/src/locale/lang/zh-TW.ts
+++ b/src/locale/lang/zh-TW.ts
@@ -5,7 +5,6 @@ export default {
   confirm: '確認',
   cancel: '取消',
   delete: '刪除',
-  complete: '完成',
   loading: '載入中...',
   nameEmpty: '請填寫姓名',
   confirmDelete: '確定要刪除嗎',
diff --git a/src/utils/test/index.spec.ts b/src/utils/test/index.spec.ts
index b0710dd48..e678677da 100644
--- a/src/utils/test/index.spec.ts
+++ b/src/utils/test/index.spec.ts
@@ -1,7 +1,7 @@
 import { deepClone } from '../deep-clone';
 import { deepAssign } from '../deep-assign';
 import { get, noop } from '..';
-import { isDef, isMobile, isNumeric, isAndroid } from '../validate';
+import { isDef, isMobile, isNumeric } from '../validate';
 import { camelize } from '../format/string';
 import { formatNumber } from '../format/number';
 import { addUnit, unitToPx } from '../format/unit';
@@ -57,10 +57,6 @@ test('get', () => {
   expect(get({ a: { b: 2 } }, 'a.b.c')).toEqual('');
 });
 
-test('isAndroid', () => {
-  expect(isAndroid()).toBeFalsy();
-});
-
 test('isMobile', () => {
   expect(isMobile('13000000000')).toBeTruthy();
   expect(isMobile('+8613000000000')).toBeTruthy();
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
index 7f35a3c54..beca29cc1 100644
--- a/src/utils/validate.ts
+++ b/src/utils/validate.ts
@@ -35,10 +35,6 @@ export function isNumeric(val: string | number): val is string {
   return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
 }
 
-export function isAndroid(): boolean {
-  return inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false;
-}
-
 export function isIOS(): boolean {
   return inBrowser
     ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase())