@redhat-developer/page-objects 1.11.0 → 1.12.0

package/out/components/WebviewMixin.d.ts

@@ -24,7 +24,7 @@ type Constructor<T = object> = new (...args: any[]) => T;
  * The interface that a class is required to have in order to use the Webview mixin.
  */
 interface WebviewMixable extends AbstractElement {
-    getViewToSwitchTo(handle: string): Promise<WebElement | undefined>;
+    getViewToSwitchTo(): Promise<WebElement | undefined>;
 }
 /**
  * The interface that is exposed by applying this mixin.

package/out/components/WebviewMixin.js

@@ -63,7 +63,7 @@ function default_1(Base) {
             if (!this.handle) {
                 this.handle = await this.getDriver().getWindowHandle();
             }
-            const view = await this.getViewToSwitchTo(this.handle);
+            const view = await this.getViewToSwitchTo();
             if (!view) {
                 return;
             }

package/out/components/bottomBar/WebviewView.d.ts

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { WebElement } from 'selenium-webdriver';
+import { Locator, WebElement } from 'selenium-webdriver';
 import { AbstractElement } from '../AbstractElement';
 /**
  * Page object representing a user-contributed panel implemented using a Webview.
  */
 declare class WebviewViewBase extends AbstractElement {
-    constructor();
-    getViewToSwitchTo(handle: string): Promise<WebElement | undefined>;
+    constructor(base?: Locator | WebElement, enclosingItem?: WebElement | Locator);
+    getViewToSwitchTo(): Promise<WebElement | undefined>;
 }
 export declare const WebviewView: new (...args: any[]) => WebviewViewBase & import("../WebviewMixin").WebviewMixinType;
 export type WebviewView = InstanceType<typeof WebviewView>;

package/out/components/bottomBar/WebviewView.js

@@ -22,16 +22,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebviewView = void 0;
 const AbstractElement_1 = require("../AbstractElement");
 const WebviewMixin_1 = __importDefault(require("../WebviewMixin"));
+const locators_1 = require("../../locators/locators");
 /**
  * Page object representing a user-contributed panel implemented using a Webview.
  */
 class WebviewViewBase extends AbstractElement_1.AbstractElement {
-    constructor() {
-        super(WebviewViewBase.locators.Workbench.constructor);
+    constructor(base = WebviewViewBase.locators.Workbench.constructor, enclosingItem) {
+        super(base, enclosingItem);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async getViewToSwitchTo(handle) {
-        return await this.getDriver().findElement(WebviewViewBase.locators.WebviewView.iframe);
+    async getViewToSwitchTo() {
+        const frames = await this.getDriver().findElements(WebviewViewBase.locators.WebView.iframe);
+        return (0, locators_1.findBestContainingElement)(await this.getRect(), frames);
     }
 }
 exports.WebviewView = (0, WebviewMixin_1.default)(WebviewViewBase);

package/out/components/editor/WebView.d.ts

@@ -20,7 +20,7 @@ import { Editor } from './Editor';
  * Page object representing an open editor containing a web view
  */
 declare class WebViewBase extends Editor {
-    getViewToSwitchTo(handle: string): Promise<WebElement | undefined>;
+    getViewToSwitchTo(): Promise<WebElement | undefined>;
 }
 export declare const WebView: new (...args: any[]) => WebViewBase & import("../WebviewMixin").WebviewMixinType;
 export type WebView = InstanceType<typeof WebView>;

package/out/components/editor/WebView.js

@@ -22,21 +22,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebView = void 0;
 const WebviewMixin_1 = __importDefault(require("../WebviewMixin"));
 const Editor_1 = require("./Editor");
+const locators_1 = require("../../locators/locators");
 /**
  * Page object representing an open editor containing a web view
  */
 class WebViewBase extends Editor_1.Editor {
-    async getViewToSwitchTo(handle) {
-        const handles = await this.getDriver().getAllWindowHandles();
-        for (const handle of handles) {
-            await this.getDriver().switchTo().window(handle);
-            if ((await this.getDriver().getTitle()).includes('Virtual Document')) {
-                await this.getDriver().switchTo().frame(0);
-                return;
-            }
-        }
-        await this.getDriver().switchTo().window(handle);
-        return await this.getDriver().findElement(WebViewBase.locators.WebView.iframe);
+    async getViewToSwitchTo() {
+        const frames = await this.getDriver().findElements(WebViewBase.locators.WebView.iframe);
+        return (0, locators_1.findBestContainingElement)(await this.getRect(), frames);
     }
 }
 exports.WebView = (0, WebviewMixin_1.default)(WebViewBase);

package/out/components/sidebar/ViewSection.js

@@ -100,9 +100,10 @@ class ViewSection extends AbstractElement_1.AbstractElement {
      * @returns Promise resolving to array of ViewPanelAction objects
      */
     async getActions() {
+        await this.getDriver().actions().move({ origin: this }).perform(); // move mouse to bring auto-hided buttons visible
         const actions = await this.findElement(ViewSection.locators.ViewSection.actions).findElements(ViewSection.locators.ViewSection.button);
         return Promise.all(actions.map(async (action) => {
-            const dropdown = await action.getAttribute('aria-haspopup');
+            const dropdown = (await action.getAttribute('aria-haspopup')) || (await action.getAttribute('aria-expanded'));
             if (dropdown) {
                 return new ViewPanelActionDropdown(action, this);
             }

package/out/locators/locators.d.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { By, WebElement } from 'selenium-webdriver';
+import { By, IRectangle, WebElement } from 'selenium-webdriver';
 import { PartialDeep } from 'type-fest';
 import { ViewSection } from '../components/sidebar/ViewSection';
 type WebElementFunction<E extends WebElement, T> = (element: E) => T | PromiseLike<T>;
@@ -214,8 +214,6 @@ export interface Locators {
     WebView: {
         iframe: By;
         activeFrame: By;
-        container: (id: string) => By;
-        attribute: string;
     };
     ExtensionEditorView: {
         constructor: By;
@@ -554,4 +552,5 @@ export declare function hasNotClass(klass: string, locator?: By): (el: WebElemen
 export declare function hasElement(locatorSelector: (l: Locators) => By): (el: WebElement, locators: Locators) => Promise<boolean>;
 export declare function fromAttribute(attribute: string, locator?: By): (el: WebElement) => Promise<string>;
 export declare function fromText(locator?: By): (el: WebElement) => Promise<string>;
+export declare function findBestContainingElement(container: IRectangle, testElements: WebElement[]): Promise<WebElement | undefined>;
 export {};

package/out/locators/locators.js

@@ -22,6 +22,7 @@ exports.hasNotClass = hasNotClass;
 exports.hasElement = hasElement;
 exports.fromAttribute = fromAttribute;
 exports.fromText = fromText;
+exports.findBestContainingElement = findBestContainingElement;
 function hasAttribute(attr, value, locator) {
     return async (el) => {
         el = locator ? await el.findElement(locator) : el;
@@ -64,4 +65,24 @@ function fromText(locator) {
         return await el.getText();
     };
 }
+async function findBestContainingElement(container, testElements) {
+    const areas = await Promise.all(testElements.map(async (value) => {
+        const rect = await value.getRect();
+        const ax = Math.max(container.x, rect.x);
+        const ay = Math.max(container.y, rect.y);
+        const bx = Math.min(container.x + container.width, rect.x + rect.width);
+        const by = Math.min(container.y + container.height, rect.y + rect.height);
+        return (bx - ax) * (by - ay);
+    }));
+    let bestIdx = -1;
+    for (let i = 0; i < testElements.length; i++) {
+        if (areas[i] < 0) {
+            continue;
+        }
+        if (bestIdx === -1 || areas[i] > areas[bestIdx]) {
+            bestIdx = i;
+        }
+    }
+    return bestIdx === -1 ? undefined : testElements[bestIdx];
+}
 //# sourceMappingURL=locators.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redhat-developer/page-objects",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Page Object API implementation for a VS Code editor used by ExTester framework.",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -41,11 +41,11 @@
     "clone-deep": "^4.0.1",
     "compare-versions": "^6.1.1",
     "fs-extra": "^11.3.0",
-    "type-fest": "^4.35.0"
+    "type-fest": "^4.39.1"
   },
   "peerDependencies": {
     "selenium-webdriver": ">=4.6.1",
     "typescript": ">=4.6.2"
   },
-  "gitHead": "bf17db769fb699fe9a47325ff6e0c94dc821ae0f"
+  "gitHead": "006642fd809f6b11cc662ed0f190295efff61602"
 }