From febf17e5460a8a76830727b254c7120a00aa0c09 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Thu, 11 Jun 2020 16:39:46 +0800
Subject: [PATCH] fix(NoticeBar): incorrect ellipsis

---
 src/notice-bar/index.js                              | 2 +-
 src/notice-bar/test/__snapshots__/demo.spec.js.snap  | 6 +++---
 src/notice-bar/test/__snapshots__/index.spec.js.snap | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/notice-bar/index.js b/src/notice-bar/index.js
index 122377c52..e6d7167b2 100644
--- a/src/notice-bar/index.js
+++ b/src/notice-bar/index.js
@@ -166,7 +166,7 @@ export default createComponent({
             ref="content"
             class={[
               bem('content'),
-              { 'van-ellipsis': !this.scrollable && !this.wrapable },
+              { 'van-ellipsis': this.scrollable === false && !this.wrapable },
             ]}
             style={contentStyle}
             onTransitionend={this.onTransitionEnd}
diff --git a/src/notice-bar/test/__snapshots__/demo.spec.js.snap b/src/notice-bar/test/__snapshots__/demo.spec.js.snap
index 99bc1d903..f28b3b021 100644
--- a/src/notice-bar/test/__snapshots__/demo.spec.js.snap
+++ b/src/notice-bar/test/__snapshots__/demo.spec.js.snap
@@ -32,13 +32,13 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div role="alert" class="van-notice-bar">
       <div role="marquee" class="van-notice-bar__wrap">
-        <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
+        <div class="van-notice-bar__content" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
       </div><i class="van-icon van-icon-cross van-notice-bar__right-icon">
         <!----></i>
     </div>
     <div role="alert" class="van-notice-bar">
       <div role="marquee" class="van-notice-bar__wrap">
-        <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
+        <div class="van-notice-bar__content" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
       </div><i class="van-icon van-icon-arrow van-notice-bar__right-icon">
         <!----></i>
     </div>
@@ -47,7 +47,7 @@ exports[`renders demo correctly 1`] = `
     <div role="alert" class="van-notice-bar" style="color: rgb(25, 137, 250); background: rgb(236, 249, 255);"><i class="van-icon van-icon-info-o van-notice-bar__left-icon">
         <!----></i>
       <div role="marquee" class="van-notice-bar__wrap">
-        <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
+        <div class="van-notice-bar__content" style="transition-duration: 0s;">技术是开发它的人的共同灵魂。</div>
       </div>
     </div>
   </div>
diff --git a/src/notice-bar/test/__snapshots__/index.spec.js.snap b/src/notice-bar/test/__snapshots__/index.spec.js.snap
index 1c2915a0f..97f9e8e95 100644
--- a/src/notice-bar/test/__snapshots__/index.spec.js.snap
+++ b/src/notice-bar/test/__snapshots__/index.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`icon slot 1`] = `
 <div role="alert" class="van-notice-bar">Custom Left Icon<div role="marquee" class="van-notice-bar__wrap">
-    <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 0s;">
+    <div class="van-notice-bar__content" style="transition-duration: 0s;">
       Content
     </div>
   </div>Custom Right Icon</div>
@@ -11,7 +11,7 @@ exports[`icon slot 1`] = `
 exports[`should not scroll when content width > wrap width  1`] = `
 <div role="alert" class="van-notice-bar">
   <div role="marquee" class="van-notice-bar__wrap">
-    <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 0s;">foo</div>
+    <div class="van-notice-bar__content" style="transition-duration: 0s;">foo</div>
   </div>
 </div>
 `;
@@ -19,7 +19,7 @@ exports[`should not scroll when content width > wrap width  1`] = `
 exports[`should scroll when content width > wrap width  1`] = `
 <div role="alert" class="van-notice-bar">
   <div role="marquee" class="van-notice-bar__wrap">
-    <div class="van-notice-bar__content van-ellipsis" style="transition-duration: 2s; transform: translateX(-100px);">foo</div>
+    <div class="van-notice-bar__content" style="transition-duration: 2s; transform: translateX(-100px);">foo</div>
   </div>
 </div>
 `;