feat: add elementStatus (#27)

macacajs · Sep 14, 2023 · 4d75567 · 4d75567
1 parent cadba4b
commit 4d75567
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/lib/controllers.js b/lib/controllers.js
@@ -171,7 +171,6 @@ controllers.setFrame = async function(frame) {
   logger.debug(`Entering into web frame: '${result.WINDOW}'`);
   this.frame = result.WINDOW;
   return null;
-
 };
 
 /**
@@ -182,6 +181,14 @@ controllers.setFrame = async function(frame) {
  */
 controllers.click = async function(elementId) {
   const element = this.elements[elementId];
+  if (!element) {
+    logger.error('click Element is not found');
+    return null;
+  }
+  if (!element.isVisible()) {
+    logger.error('click Element is not visible');
+    return null;
+  }
   await element.click({
     timeout: 1E3,
   });

diff --git a/lib/next-actions.js b/lib/next-actions.js
@@ -1,3 +1,4 @@
+const logger = require('./logger');
 const nextActions = {};
 
 nextActions.fileChooser = async function(filePath) {
@@ -16,4 +17,19 @@ nextActions.mouse = async function({ type, args }) {
   return true;
 };
 
+nextActions.elementStatus = async function(elementId) {
+  const element = this.elements[elementId];
+  if (!element) {
+    logger.error('click Element is not found');
+    return null;
+  }
+  return {
+    disabled: await element.isDisabled(),
+    editable: await element.isEditable(),
+    enabled: await element.isEnabled(),
+    hidden: await element.isHidden(),
+    visible: await element.isVisible(),
+  };
+};
+
 module.exports = nextActions;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-playwright",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Macaca Playwright driver",
   "keywords": [
     "playwright",

diff --git a/test/macaca-playwright.test.js b/test/macaca-playwright.test.js
@@ -76,6 +76,16 @@ describe('test/macaca-playwright.test.js', function() {
       assert.equal(res, true);
     });
 
+    it('elementStatus', async () => {
+      const button = await driver.findElement('id', 'input');
+      res = await driver.elementStatus(button.ELEMENT);
+      assert(res.disabled === false);
+      assert(res.editable === true);
+      assert(res.enabled === true);
+      assert(res.hidden === false);
+      assert(res.visible === true);
+    });
+
     it('getRect', async () => {
       const button = await driver.findElement('id', 'input');
       res = await driver.getRect(button.ELEMENT);