diff --git a/internal/version/VERSION b/internal/version/VERSION index 661dafd1..ad52154a 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2505071640 +v5.0.0-beta-2505071715 diff --git a/uixt/android_driver_adb.go b/uixt/android_driver_adb.go index 2c663fa4..725784f5 100644 --- a/uixt/android_driver_adb.go +++ b/uixt/android_driver_adb.go @@ -308,7 +308,7 @@ func (ad *ADBDriver) TapXY(x, y float64, opts ...option.ActionOption) error { func (ad *ADBDriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error { log.Info().Float64("x", x).Float64("y", y).Msg("ADBDriver.TapAbsXY") var err error - x, y, _, err = handlerTapAbsXY(ad, x, y, opts...) + x, y, err = handlerTapAbsXY(ad, x, y, opts...) if err != nil { return err } diff --git a/uixt/android_driver_uia2.go b/uixt/android_driver_uia2.go index 012e04ef..5d1179fc 100644 --- a/uixt/android_driver_uia2.go +++ b/uixt/android_driver_uia2.go @@ -298,12 +298,17 @@ func (ud *UIA2Driver) TapAbsXY(x, y float64, opts ...option.ActionOption) error // register(postHandler, new Tap("/wd/hub/session/:sessionId/appium/tap")) var err error - var duration float64 - x, y, duration, err = handlerTapAbsXY(ud, x, y, opts...) + x, y, err = handlerTapAbsXY(ud, x, y, opts...) if err != nil { return err } + actionOptions := option.NewActionOptions(opts...) + duration := 100.0 + if actionOptions.PressDuration > 0 { + duration = actionOptions.PressDuration * 1000 // convert to ms + } + data := map[string]interface{}{ "actions": []interface{}{ map[string]interface{}{ diff --git a/uixt/browser_driver.go b/uixt/browser_driver.go index 1e560639..07f1f49b 100644 --- a/uixt/browser_driver.go +++ b/uixt/browser_driver.go @@ -524,12 +524,17 @@ func (wd *BrowserDriver) Tap(x, y float64, options ...option.ActionOption) error func (wd *BrowserDriver) TapFloat(x, y float64, opts ...option.ActionOption) error { var err error - var duration float64 - x, y, duration, err = handlerTapAbsXY(wd, x, y, opts...) + x, y, err = handlerTapAbsXY(wd, x, y, opts...) if err != nil { return err } + actionOptions := option.NewActionOptions(opts...) + duration := 0.1 + if actionOptions.Duration > 0 { + duration = actionOptions.Duration + } + data := map[string]interface{}{ "x": x, "y": y, diff --git a/uixt/driver_handler.go b/uixt/driver_handler.go index fcc45a6a..f237d0e8 100644 --- a/uixt/driver_handler.go +++ b/uixt/driver_handler.go @@ -6,7 +6,7 @@ import ( ) func handlerTapAbsXY(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) ( - x, y, duration float64, err error) { + x, y float64, err error) { actionOptions := option.NewActionOptions(opts...) x, y = actionOptions.ApplyTapOffset(rawX, rawY) @@ -18,12 +18,7 @@ func handlerTapAbsXY(driver IDriver, rawX, rawY float64, opts ...option.ActionOp } } - duration = 100.0 - if actionOptions.PressDuration > 0 { - duration = actionOptions.PressDuration * 1000 // convert to ms - } - - return x, y, duration, nil + return x, y, nil } func handlerDoubleTap(driver IDriver, rawX, rawY float64, opts ...option.ActionOption) ( diff --git a/uixt/harmony_driver_hdc.go b/uixt/harmony_driver_hdc.go index af0d65e7..1a6a8644 100644 --- a/uixt/harmony_driver_hdc.go +++ b/uixt/harmony_driver_hdc.go @@ -156,7 +156,7 @@ func (hd *HDCDriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error { log.Info().Float64("x", x).Float64("y", y).Msg("HDCDriver.TapAbsXY") var err error - x, y, _, err = handlerTapAbsXY(hd, x, y, opts...) + x, y, err = handlerTapAbsXY(hd, x, y, opts...) if err != nil { return err } diff --git a/uixt/ios_driver_wda.go b/uixt/ios_driver_wda.go index 7ff4f514..c8912474 100644 --- a/uixt/ios_driver_wda.go +++ b/uixt/ios_driver_wda.go @@ -598,7 +598,7 @@ func (wd *WDADriver) TapAbsXY(x, y float64, opts ...option.ActionOption) error { y = wd.toScale(y) var err error - x, y, _, err = handlerTapAbsXY(wd, x, y, opts...) + x, y, err = handlerTapAbsXY(wd, x, y, opts...) if err != nil { return err }