diff --git a/src/action-sheet/test/__snapshots__/index.spec.js.snap b/src/action-sheet/test/__snapshots__/index.spec.js.snap index 233851d5e..d662348fc 100644 --- a/src/action-sheet/test/__snapshots__/index.spec.js.snap +++ b/src/action-sheet/test/__snapshots__/index.spec.js.snap @@ -2,7 +2,7 @@ exports[`callback events 1`] = `
`; diff --git a/src/button/test/__snapshots__/index.spec.js.snap b/src/button/test/__snapshots__/index.spec.js.snap index f7aeee6e4..4053eed33 100644 --- a/src/button/test/__snapshots__/index.spec.js.snap +++ b/src/button/test/__snapshots__/index.spec.js.snap @@ -2,6 +2,6 @@ exports[`loading size 1`] = ` `; diff --git a/src/image-preview/test/__snapshots__/index.spec.js.snap b/src/image-preview/test/__snapshots__/index.spec.js.snap index 33286063b..9708d5c6f 100644 --- a/src/image-preview/test/__snapshots__/index.spec.js.snap +++ b/src/image-preview/test/__snapshots__/index.spec.js.snap @@ -26,21 +26,21 @@ exports[`lazy-load prop 1`] = `
-
+
-
+
-
+
@@ -57,21 +57,21 @@ exports[`render image 1`] = `
-
+
-
+
-
+
@@ -96,21 +96,21 @@ exports[`zoom 1`] = `
-
+
-
+
-
+
diff --git a/src/image/test/__snapshots__/demo.spec.js.snap b/src/image/test/__snapshots__/demo.spec.js.snap index 6ee6f957d..9885d6156 100644 --- a/src/image/test/__snapshots__/demo.spec.js.snap +++ b/src/image/test/__snapshots__/demo.spec.js.snap @@ -100,7 +100,7 @@ exports[`renders demo correctly 1`] = `
-
+
自定义提示
diff --git a/src/list/test/__snapshots__/demo.spec.js.snap b/src/list/test/__snapshots__/demo.spec.js.snap index 124aee301..bf71907e7 100644 --- a/src/list/test/__snapshots__/demo.spec.js.snap +++ b/src/list/test/__snapshots__/demo.spec.js.snap @@ -17,7 +17,7 @@ exports[`renders demo correctly 1`] = `
-
加载中...
+
加载中...
diff --git a/src/loading/index.less b/src/loading/index.less index 17f86f4d5..fdb5555e5 100644 --- a/src/loading/index.less +++ b/src/loading/index.less @@ -13,6 +13,7 @@ max-width: 100%; height: 30px; max-height: 100%; + color: @loading-spinner-color; vertical-align: middle; animation: van-rotate 0.8s linear infinite; diff --git a/src/loading/index.tsx b/src/loading/index.tsx index 10b720fd6..37bbc2d11 100644 --- a/src/loading/index.tsx +++ b/src/loading/index.tsx @@ -1,5 +1,4 @@ import { createNamespace, addUnit } from '../utils'; -import { GRAY } from '../utils/constant'; import { inherit } from '../utils/functional'; // Types @@ -74,16 +73,13 @@ function Loading( } Loading.props = { + color: String, size: [Number, String], vertical: Boolean, textSize: [Number, String], type: { type: String, default: 'circular' - }, - color: { - type: String, - default: GRAY } }; diff --git a/src/loading/test/__snapshots__/demo.spec.js.snap b/src/loading/test/__snapshots__/demo.spec.js.snap index fa20d2cc0..48dc67138 100644 --- a/src/loading/test/__snapshots__/demo.spec.js.snap +++ b/src/loading/test/__snapshots__/demo.spec.js.snap @@ -3,20 +3,20 @@ exports[`renders demo correctly 1`] = `
-
-
+
+
-
+
加载中...
-
+
加载中...
diff --git a/src/loading/test/__snapshots__/index.spec.js.snap b/src/loading/test/__snapshots__/index.spec.js.snap index 82d65103e..925bda61e 100644 --- a/src/loading/test/__snapshots__/index.spec.js.snap +++ b/src/loading/test/__snapshots__/index.spec.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`size prop 1`] = `
`; +exports[`size prop 1`] = `
`; -exports[`text-size prop 1`] = `
Text
`; +exports[`text-size prop 1`] = `
Text
`; diff --git a/src/pull-refresh/test/__snapshots__/index.spec.js.snap b/src/pull-refresh/test/__snapshots__/index.spec.js.snap index e53870a81..022ebe0d5 100644 --- a/src/pull-refresh/test/__snapshots__/index.spec.js.snap +++ b/src/pull-refresh/test/__snapshots__/index.spec.js.snap @@ -24,7 +24,7 @@ exports[`change head content when pulling down 3`] = `
-
加载中...
+
加载中...
@@ -34,7 +34,7 @@ exports[`change head content when pulling down 4`] = `
-
加载中...
+
加载中...
diff --git a/src/style/var.less b/src/style/var.less index 75cac5d91..3fc2b4b0a 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -366,6 +366,7 @@ // Loading @loading-text-color: @gray-dark; @loading-text-font-size: @font-size-md; +@loading-spinner-color: @gray; // NavBar @nav-bar-height: 46px;