Enhance click (#113)

* feat: click支持更多参数 --------- Co-authored-by: xudafeng <[email protected]>
macacajs · Sep 16, 2023 · a9d5eff · a9d5eff
1 parent 2c23fec
commit a9d5eff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-wd",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Macaca webdirver API for Node.js",
   "keywords": [
     "macaca",

diff --git a/wd/lib/commands.js b/wd/lib/commands.js
@@ -1616,11 +1616,15 @@ commands.getValue = function() {
  *
  * @jsonWire POST /session/:sessionId/element/:id/click
  */
-commands.clickElement = function(element) {
-  const cb = findCallback(arguments);
+commands.clickElement = function() {
+  const fargs = utils.varargs(arguments);
+  const cb = fargs.callback;
+  const element = fargs.all[0];
+  const params = fargs.all[1] || {};
   this._jsonWireCall({
     method: 'POST',
     relPath: '/element/' + element + '/click',
+    data: { clickOpts: params },
     cb: simpleCallback(cb)
   });
 };

diff --git a/wd/lib/element-commands.js b/wd/lib/element-commands.js
@@ -98,8 +98,11 @@ elementCommands.replaceKeys = function (keys, cb) {
  *
  * @jsonWire POST /session/:sessionId/element/:id/click
  */
-elementCommands.click = function (cb) {
-  commands.clickElement.apply(this.browser, [this, cb]);
+elementCommands.click = function () {
+  const fargs = utils.varargs(arguments);
+  const cb = fargs.callback;
+  const clickOpts = fargs.all[0] || {};
+  commands.clickElement.apply(this.browser, [this, clickOpts, cb]);
 };
 
 /**