webdriverio 8.6.2 → 8.6.6

package/build/commands/element/scrollIntoView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrollIntoView.d.ts","sourceRoot":"","sources":["../../../src/commands/element/scrollIntoView.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,cAAc,CAChC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,GAAE,qBAAqB,GAAG,OAA+C,iBA6CnF"}
+{"version":3,"file":"scrollIntoView.d.ts","sourceRoot":"","sources":["../../../src/commands/element/scrollIntoView.ts"],"names":[],"mappings":"AAsBA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,cAAc,CAChC,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,GAAE,qBAAqB,GAAG,OAA+C,iBAmDnF"}

package/build/commands/element/scrollIntoView.js

@@ -38,33 +38,39 @@ export async function scrollIntoView(options = { block: 'start', inline: 'neares
     if (browser.isMobile) {
         return scrollIntoViewWeb.call(this, options);
     }
-    let deltaX = 0;
-    let deltaY = 0;
     /**
      * by default the WebDriver action scrolls the element just into the
      * viewport. In order to stay complaint with `Element.scrollIntoView()`
      * we need to adjust the values a bit.
      */
-    if (typeof options === 'boolean' || typeof options.block === 'string' || typeof options.inline === 'string') {
-        const htmlElem = await browser.$('html');
-        const viewport = await htmlElem.getSize();
-        const elemSize = await this.getSize();
-        if (options === true || options.block === 'start') {
-            deltaY += viewport.height - elemSize.height;
+    const elemRect = await browser.getElementRect(this.elementId);
+    const viewport = await browser.getWindowSize();
+    const deltaByOption = {
+        start: { y: elemRect.y, x: elemRect.x },
+        center: { y: elemRect.y - Math.round((viewport.height - elemRect.height) / 2), x: elemRect.x - Math.round((viewport.width - elemRect.width) / 2) },
+        end: { y: elemRect.y - (viewport.height - elemRect.height), x: elemRect.x - (viewport.width - elemRect.width) }
+    };
+    let [deltaX, deltaY] = [deltaByOption.start.x, deltaByOption.start.y];
+    if (options && typeof options !== 'boolean') {
+        const { block, inline } = options;
+        if (block === 'nearest') {
+            const nearestDistance = Math.min(...Object.values(deltaByOption).map(delta => Math.abs(delta.y)));
+            deltaY = Object.values(deltaByOption).find(delta => Math.abs(delta.y) === nearestDistance).y;
         }
-        else if (options.block === 'center') {
-            deltaY += Math.round((viewport.height - elemSize.height) / 2);
+        else if (block) {
+            deltaY = deltaByOption[block].y;
         }
-        if (options.inline === 'start') {
-            deltaX += viewport.height - elemSize.height;
+        if (inline === 'nearest') {
+            const nearestDistance = Math.min(...Object.values(deltaByOption).map(delta => Math.abs(delta.x)));
+            deltaX = Object.values(deltaByOption).find(delta => Math.abs(delta.x) === nearestDistance).x;
         }
-        else if (options.block === 'center') {
-            deltaX += Math.round((viewport.height - elemSize.height) / 2);
+        else if (inline) {
+            deltaX = deltaByOption[inline].x;
         }
     }
     try {
         return await browser.action('wheel')
-            .scroll({ origin: this, duration: 200, deltaY, deltaX })
+            .scroll({ duration: 200, deltaX, deltaY })
             .perform();
     }
     catch (err) {

package/build/utils/findStrategy.js

@@ -248,7 +248,7 @@ export const findStrategy = function (selector, isW3C, isMobile) {
                     ? `contains(@${attrName}, "${attrValue}")`
                     : `@${attrName}`);
             }
-            conditions.push(partial ? `contains(., "${query}")` : `normalize-space() = "${query}"`);
+            conditions.push(partial ? `contains(text(), "${query}")` : `normalize-space(text()) = "${query}"`);
             value = `.//${tag || '*'}[${conditions.join(' and ')}]`;
             break;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "8.6.2",
+  "version": "8.6.6",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -55,7 +55,8 @@
         "require": "./build/cjs/index.js"
       },
       "./build/cjs/index.js"
-    ]
+    ],
+    "./package.json": "./package.json"
   },
   "types": "./build/index.d.ts",
   "typeScriptVersion": "3.8.3",
@@ -67,30 +68,30 @@
   },
   "dependencies": {
     "@types/node": "^18.0.0",
-    "@wdio/config": "8.6.2",
-    "@wdio/logger": "8.1.0",
-    "@wdio/protocols": "8.5.7",
-    "@wdio/repl": "8.1.0",
+    "@wdio/config": "8.6.6",
+    "@wdio/logger": "8.6.6",
+    "@wdio/protocols": "8.6.6",
+    "@wdio/repl": "8.6.6",
     "@wdio/types": "8.4.0",
-    "@wdio/utils": "8.6.1",
+    "@wdio/utils": "8.6.6",
     "archiver": "^5.0.0",
     "aria-query": "^5.0.0",
     "css-shorthand-properties": "^1.1.1",
     "css-value": "^0.0.1",
-    "devtools": "8.6.2",
-    "devtools-protocol": "^0.0.1116775",
+    "devtools": "8.6.6",
+    "devtools-protocol": "^0.0.1119014",
     "grapheme-splitter": "^1.0.2",
     "import-meta-resolve": "^2.1.0",
     "is-plain-obj": "^4.1.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.zip": "^4.2.0",
     "minimatch": "^7.0.0",
-    "puppeteer-core": "19.7.4",
+    "puppeteer-core": "19.7.5",
     "query-selector-shadow-dom": "^1.0.0",
     "resq": "^1.9.1",
     "rgb2hex": "0.2.5",
     "serialize-error": "^8.0.0",
-    "webdriver": "8.6.2"
+    "webdriver": "8.6.6"
   },
-  "gitHead": "7d322b1b72a8af07e78b147a21ada220c4283eea"
+  "gitHead": "1bcac586be548a778d452e0b01c11e4097d743f4"
 }