From 1b08bd211845c0b8a8450c6291cb125ab66f577a Mon Sep 17 00:00:00 2001
From: buyuxiang <347586493@qq.com>
Date: Wed, 6 Sep 2023 19:18:21 +0800
Subject: [PATCH] fix: swipeToTapTexts redundant identifiers

---
 hrp/pkg/uixt/swipe.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hrp/pkg/uixt/swipe.go b/hrp/pkg/uixt/swipe.go
index c1cc3bfb..9ed9d926 100644
--- a/hrp/pkg/uixt/swipe.go
+++ b/hrp/pkg/uixt/swipe.go
@@ -134,6 +134,9 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
 	}
 
 	options = append(options, WithMatchOne(true), WithRegex(true))
+	actionOptions := NewActionOptions(options...)
+	actionOptions.Identifier = ""
+	optionsWithoutIdentifier := actionOptions.Options()
 	var point PointF
 	findTexts := func(d *DriverExt) error {
 		var err error
@@ -145,7 +148,7 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
 		if err != nil {
 			return err
 		}
-		points, err := screenResult.Texts.FindTexts(texts, dExt.ParseActionOptions(options...)...)
+		points, err := screenResult.Texts.FindTexts(texts, dExt.ParseActionOptions(optionsWithoutIdentifier...)...)
 		if err != nil {
 			log.Error().Err(err).Msg("swipeToTapTexts failed")
 			// target texts not found, try to auto handle popup
@@ -165,8 +168,8 @@ func (dExt *DriverExt) swipeToTapTexts(texts []string, options ...ActionOption)
 		return d.TapAbsXY(point.X, point.Y, options...)
 	}
 
-	findAction := dExt.prepareSwipeAction(options...)
-	return dExt.LoopUntil(findAction, findTexts, foundTextAction, options...)
+	findAction := dExt.prepareSwipeAction(optionsWithoutIdentifier...)
+	return dExt.LoopUntil(findAction, findTexts, foundTextAction, optionsWithoutIdentifier...)
 }
 
 func (dExt *DriverExt) swipeToTapApp(appName string, options ...ActionOption) error {