From c3e2fec37a6f934a9acca50eecb50ae1b2c6e7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Thu, 23 May 2019 21:03:13 +0800
Subject: [PATCH] [bugfix] AddressList: select-disabled event not triggered

---
 packages/address-list/Item.tsx  | 8 ++++----
 packages/address-list/index.tsx | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/address-list/Item.tsx b/packages/address-list/Item.tsx
index aa3e332f5..da3f24cdf 100644
--- a/packages/address-list/Item.tsx
+++ b/packages/address-list/Item.tsx
@@ -38,7 +38,7 @@ function AddressItem(
   const { disabled, switchable } = props;
 
   function onSelect() {
-    if (props.switchable) {
+    if (switchable) {
       emit(ctx, 'select');
     }
   }
@@ -61,7 +61,7 @@ function AddressItem(
       <div class={bem('address')}>{data.address}</div>
     ];
 
-    return props.switchable ? (
+    return switchable && !disabled ? (
       <Radio name={data.id} iconSize={16} checkedColor={RED} onClick={onSelect}>
         {Info}
       </Radio>
@@ -72,9 +72,9 @@ function AddressItem(
 
   return (
     <Cell
-      class={bem({ disabled, unswitchable: !switchable })}
+      class={bem({ disabled })}
       valueClass={bem('value')}
-      isLink={!disabled && switchable}
+      clickable={switchable && !disabled}
       scopedSlots={{
         default: renderContent,
         'right-icon': renderRightIcon
diff --git a/packages/address-list/index.tsx b/packages/address-list/index.tsx
index dc98e281a..2a6204b4e 100644
--- a/packages/address-list/index.tsx
+++ b/packages/address-list/index.tsx
@@ -35,7 +35,7 @@ function AddressList(
         data={item}
         key={item.id}
         disabled={disabled}
-        switchable={props.switchable && !disabled}
+        switchable={props.switchable}
         onSelect={() => {
           emit(ctx, disabled ? 'select-disabled' : 'select', item, index);
         }}