From 878b33043119e562d44705e127f5265f1a0320ab Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sat, 19 Oct 2019 16:20:05 +0800
Subject: [PATCH] feat(Toast): add @toast-loading-icon-color var (#4782)

---
 src/style/var.less                              | 1 +
 src/toast/README.md                             | 4 ++--
 src/toast/README.zh-CN.md                       | 4 ++--
 src/toast/Toast.js                              | 2 +-
 src/toast/demo/index.vue                        | 2 +-
 src/toast/index.less                            | 4 ++++
 src/toast/test/__snapshots__/index.spec.js.snap | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/style/var.less b/src/style/var.less
index 5d997ed88..4cb0bcbb0 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -665,6 +665,7 @@
 @toast-max-width: 70%;
 @toast-font-size: @font-size-md;
 @toast-text-color: @white;
+@toast-loading-icon-color: @white;
 @toast-line-height: 20px;
 @toast-border-radius: @border-radius-md;
 @toast-background-color: rgba(@text-color, .88);
diff --git a/src/toast/README.md b/src/toast/README.md
index 27652a4b7..8c0f9ddc1 100644
--- a/src/toast/README.md
+++ b/src/toast/README.md
@@ -21,8 +21,8 @@ Toast('Some messages');
 
 ```javascript
 Toast.loading({
-  mask: true,
-  message: 'Loading...'
+  message: 'Loading...',
+  forbidClick: true
 });
 ```
 
diff --git a/src/toast/README.zh-CN.md b/src/toast/README.zh-CN.md
index 240a6c52b..5047dfa26 100644
--- a/src/toast/README.zh-CN.md
+++ b/src/toast/README.zh-CN.md
@@ -21,8 +21,8 @@ Toast('提示内容');
 
 ```js
 Toast.loading({
-  mask: true,
-  message: '加载中...'
+  message: '加载中...',
+  forbidClick: true
 });
 ```
 
diff --git a/src/toast/Toast.js b/src/toast/Toast.js
index 0e842cf43..fbd31541b 100644
--- a/src/toast/Toast.js
+++ b/src/toast/Toast.js
@@ -95,7 +95,7 @@ export default createComponent({
       }
 
       if (type === 'loading') {
-        return <Loading class={bem('loading')} color="white" type={loadingType} />;
+        return <Loading class={bem('loading')} type={loadingType} />;
       }
     }
 
diff --git a/src/toast/demo/index.vue b/src/toast/demo/index.vue
index 5a975d168..d302b75a4 100644
--- a/src/toast/demo/index.vue
+++ b/src/toast/demo/index.vue
@@ -106,7 +106,7 @@ export default {
 
   methods: {
     showLoadingToast() {
-      this.$toast.loading({ mask: true, message: this.$t('loading') });
+      this.$toast.loading({ forbidClick: true, message: this.$t('loading') });
     },
 
     showSuccessToast() {
diff --git a/src/toast/index.less b/src/toast/index.less
index 312e72517..5ee9b898a 100644
--- a/src/toast/index.less
+++ b/src/toast/index.less
@@ -61,6 +61,10 @@
 
   &__loading {
     padding: @padding-base;
+
+    .van-loading__spinner {
+      color: @toast-loading-icon-color;
+    }
   }
 
   &__text {
diff --git a/src/toast/test/__snapshots__/index.spec.js.snap b/src/toast/test/__snapshots__/index.spec.js.snap
index 14fe3a233..56be7321c 100644
--- a/src/toast/test/__snapshots__/index.spec.js.snap
+++ b/src/toast/test/__snapshots__/index.spec.js.snap
@@ -29,7 +29,7 @@ exports[`show html toast 1`] = `
 
 exports[`show loading toast 1`] = `
 <div class="van-toast van-toast--middle" style="z-index: 2003;" name="van-fade">
-  <div class="van-loading van-loading--circular van-toast__loading"><span class="van-loading__spinner van-loading__spinner--circular" style="color: white;"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+  <div class="van-loading van-loading--circular van-toast__loading"><span class="van-loading__spinner van-loading__spinner--circular"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
   <div class="van-toast__text">Message</div>
 </div>
 `;