From 15a096b932d10c1fb2611a91331574268a56de7e Mon Sep 17 00:00:00 2001
From: yangyongming <yangyongming@kuaidihelp.com>
Date: Sat, 14 Sep 2024 13:57:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20swipe-aciton=E3=80=81accordion=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=94=AF=E4=BB=98=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-ui/package.json                 |  2 +-
 .../src/components/accordion/index.tsx        |  2 +-
 .../src/components/swipe-action/index.tsx     | 68 +++++++++++--------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/packages/taro-ui/package.json b/packages/taro-ui/package.json
index 7e31ca45..6f857ab8 100644
--- a/packages/taro-ui/package.json
+++ b/packages/taro-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro-ui3",
-  "version": "3.3.1-beta.0",
+  "version": "3.3.1-beta.1",
   "description": "UI KIT for Taro",
   "module": "dist/index.esm.js",
   "main": "dist/index.js",
diff --git a/packages/taro-ui/src/components/accordion/index.tsx b/packages/taro-ui/src/components/accordion/index.tsx
index f9ec5da7..fc8e5089 100644
--- a/packages/taro-ui/src/components/accordion/index.tsx
+++ b/packages/taro-ui/src/components/accordion/index.tsx
@@ -39,7 +39,7 @@ export default class AtAccordion extends React.Component<
   private getSelectorStr(type: string): string {
     const { componentId } = this.state
     const { parentSelector } = this.props
-    return (parentSelector ? `${parentSelector} >>> ` : '') + `#${type}-${componentId}`
+    return (parentSelector && process.env.TARO_ENV === 'weapp' ? `${parentSelector} >>> ` : '') + `#${type}-${componentId}`
   }
 
   private toggleWithAnimation(): void {
diff --git a/packages/taro-ui/src/components/swipe-action/index.tsx b/packages/taro-ui/src/components/swipe-action/index.tsx
index 3e595cf1..844127e1 100644
--- a/packages/taro-ui/src/components/swipe-action/index.tsx
+++ b/packages/taro-ui/src/components/swipe-action/index.tsx
@@ -20,6 +20,7 @@ export default class AtSwipeAction extends React.Component<
   public static propTypes: InferProps<AtSwipeActionProps>
 
   private moveX: number
+  private delayTime: NodeJS.Timeout
 
   public constructor(props: AtSwipeActionProps) {
     super(props)
@@ -53,6 +54,7 @@ export default class AtSwipeAction extends React.Component<
     const { _isOpened, maxOffsetSize } = this.state
 
     if (isOpened !== _isOpened) {
+      clearTimeout(this.delayTime);
       this.moveX = isOpened ? 0 : maxOffsetSize
       this._reset(!!isOpened) // TODO: Check behavior
     }
@@ -64,7 +66,7 @@ export default class AtSwipeAction extends React.Component<
   private getSelectorStr(type: string): string {
     const { componentId } = this.state
     const { parentSelector } = this.props
-    return (parentSelector ? `${parentSelector} >>> ` : '') + `#${type}-${componentId}`
+    return (parentSelector && process.env.TARO_ENV === 'weapp' ? `${parentSelector} >>> ` : '') + `#${type}-${componentId}`
   }
 
   /**
@@ -102,29 +104,32 @@ export default class AtSwipeAction extends React.Component<
     })
   }
 
-  private _reset(isOpened: boolean): void {
+  private _reset(isOpened: boolean, then: () => void = () => { }): void {
     this.setState({
       offsetSize: this.moveX
     }, () => {
-      if (isOpened) {
-        const { maxOffsetSize } = this.state
-        if (process.env.TARO_ENV === 'jd') {
-          this.setState({
-            _isOpened: true,
-            offsetSize: -maxOffsetSize + 0.01
-          })
+      this.moveX = 0;
+      Taro.nextTick(() => {
+        if (isOpened) {
+          const { maxOffsetSize } = this.state
+          if (process.env.TARO_ENV === 'jd') {
+            this.setState({
+              _isOpened: true,
+              offsetSize: -maxOffsetSize + 0.01
+            }, then)
+          } else {
+            this.setState({
+              _isOpened: true,
+              offsetSize: -maxOffsetSize
+            }, then)
+          }
         } else {
           this.setState({
-            _isOpened: true,
-            offsetSize: -maxOffsetSize
-          })
+            offsetSize: 0,
+            _isOpened: false
+          }, then)
         }
-      } else {
-        this.setState({
-          offsetSize: 0,
-          _isOpened: false
-        })
-      }
+      })
     })
   }
 
@@ -153,20 +158,26 @@ export default class AtSwipeAction extends React.Component<
       onClick(item, index, event)
     }
     if (autoClose) {
-      this._reset(false) // TODO: Check behavior
-      this.handleClosed(event)
+      this._reset(false, () => {
+        this.handleClosed(event)
+      }) // TODO: Check behavior
     }
   }
 
   onTouchEnd = e => {
-    const { maxOffsetSize } = this.state
-    if (Math.abs(this.moveX) < maxOffsetSize / 2) {
-      this._reset(false)
-      this.handleClosed(e)
-    } else {
-      this._reset(true)
-      this.handleOpened(e)
-    }
+    clearTimeout(this.delayTime);
+    this.delayTime = setTimeout(() => {
+      const { maxOffsetSize } = this.state
+      if (Math.abs(this.moveX) < maxOffsetSize / 2) {
+        this._reset(false, () => {
+          this.handleClosed(e)
+        })
+      } else {
+        this._reset(true, () => {
+          this.handleOpened(e)
+        })
+      }
+    }, 10);
   }
 
   onChange = e => {
@@ -175,7 +186,6 @@ export default class AtSwipeAction extends React.Component<
 
   public render(): JSX.Element {
     const { componentId, maxOffsetSize, eleWidth, offsetSize } = this.state
-
     const { options, disabled } = this.props
     const rootClass = classNames('at-swipe-action', this.props.className)