From 1a8ee3b2bea755532e8af187699aef9f7aceaafe Mon Sep 17 00:00:00 2001
From: shutao <shutao@dcloud.io>
Date: Fri, 1 Dec 2023 15:52:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20sticky-section.test.js=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9waitFor=E6=9D=A1=E4=BB=B6=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E5=87=86=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/sticky-section/sticky-section.test.js | 6 ++++++
 pages/component/sticky-section/sticky-section.uvue    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pages/component/sticky-section/sticky-section.test.js b/pages/component/sticky-section/sticky-section.test.js
index bf8d7b32..6487cb14 100644
--- a/pages/component/sticky-section/sticky-section.test.js
+++ b/pages/component/sticky-section/sticky-section.test.js
@@ -17,8 +17,14 @@ describe('component-native-sticky-section', () => {
       //滚动回顶部
       await page.callMethod('toTop')
       page.waitFor(100)
+      await page.setData({
+          scrolling: 'true'
+      })
       //跳转到id为C的StickyHeader位置
       await page.callMethod('gotoStickyHeader', 'C')
+      await page.waitFor(async () => {
+        return await page.data('scrolling') === false;
+      });
       const image = await program.screenshot();
       expect(image).toMatchImageSnapshot();
     })
diff --git a/pages/component/sticky-section/sticky-section.uvue b/pages/component/sticky-section/sticky-section.uvue
index 5cd10d01..dbc81c00 100644
--- a/pages/component/sticky-section/sticky-section.uvue
+++ b/pages/component/sticky-section/sticky-section.uvue
@@ -1,6 +1,6 @@
 <template>
   <list-view id="list-view" ref="list-view" show-scrollbar=false class="page" :scroll-into-view="scrollIntoView"
-  @scroll="onScroll" rebound="false">
+  @scroll="onScroll" @scrollend="onScrollEnd" rebound="false">
     <list-item style="padding: 10px; margin: 5px 0;align-items: center;" type = 20>
       <button @click="gotoStickyHeader('C')" size="mini">跳转到id为C的sticky-header位置上</button>
     </list-item>
@@ -25,7 +25,8 @@
       return {
         data: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'],
         sectionPadding: [0, 10, 0, 10] as Array<number>,
-        scrollIntoView: ""
+        scrollIntoView: "",
+        scrolling: false
       }
     },
     methods: {
@@ -42,6 +43,10 @@
         this.scrollIntoView = id
       },
       onScroll() {
+        this.scrolling = true
+      },
+      onScrollEnd() {
+        this.scrolling = false
         //滚动后重置scrollIntoView = ""
         if(this.scrollIntoView != "") {
           this.scrollIntoView = ""
-- 
GitLab