@fluentui-react-native/tester 0.101.7 → 0.101.9

package/lib/E2E/common/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/E2E/common/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,uBAAuB,CAAC;AACrD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AACvD,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AACvD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAGjD,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,0BAAkB,SAAS;IACzB,kBAAkB,SAAS;IAC3B,iBAAiB,gBAAgB;IACjC,SAAS,cAAc;IACvB,SAAS,qBAAqB;IAC9B,iBAAiB,sBAAsB;IACvC,wBAAwB,6BAA6B;IACrD,WAAW,uBAAuB;CACnC;AAED,0BAAkB,cAAc;IAC9B,EAAE,MAAM;IACR,GAAG,MAAM;IACT,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAGD,0BAAkB,IAAI;IACpB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,SAAS,WAAW;IACpB,GAAG,WAAW;IACd,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,QAAQ,WAAW;IACnB,EAAE,WAAW;IACb,WAAW,WAAW;IACtB,KAAK,WAAW;IAChB,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,SAAS,WAAW;IACpB,MAAM,WAAW;IAEjB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,QAAQ,WAAW;IACnB,GAAG,WAAW;IACd,SAAS,WAAW;IACpB,QAAQ,WAAW;IACnB,OAAO,WAAW;IAClB,MAAM,WAAW;IAEjB,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,GAAG,WAAW;IACd,GAAG,WAAW;IACd,GAAG,WAAW;CACf"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/E2E/common/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,uBAAuB,CAAC;AACrD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AACvD,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AACvD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAGjD,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,0BAAkB,SAAS;IACzB,kBAAkB,SAAS;IAC3B,iBAAiB,gBAAgB;IACjC,mBAAmB,uCAAuC;IAC1D,SAAS,cAAc;IACvB,SAAS,qBAAqB;IAC9B,iBAAiB,sBAAsB;IACvC,wBAAwB,6BAA6B;IACrD,WAAW,uBAAuB;CACnC;AAED,0BAAkB,cAAc;IAC9B,EAAE,MAAM;IACR,GAAG,MAAM;IACT,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAGD,0BAAkB,IAAI;IACpB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,SAAS,WAAW;IACpB,GAAG,WAAW;IACd,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,QAAQ,WAAW;IACnB,EAAE,WAAW;IACb,WAAW,WAAW;IACtB,KAAK,WAAW;IAChB,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,SAAS,WAAW;IACpB,MAAM,WAAW;IAEjB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,QAAQ,WAAW;IACnB,GAAG,WAAW;IACd,SAAS,WAAW;IACpB,QAAQ,WAAW;IACnB,OAAO,WAAW;IAClB,MAAM,WAAW;IAEjB,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,GAAG,WAAW;IACd,GAAG,WAAW;IACd,GAAG,WAAW;CACf;AAED,0BAAkB,mBAAmB;IACnC,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB"}

package/lib-commonjs/E2E/Menu/pages/MenuPageObject.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="webdriverio/async" />
 import { BasePage } from '../../common/BasePage';
+import { ExpandCollapseState } from '../../common/consts';
 export declare const enum MenuComponentSelector {
     PrimaryComponent = 0,
     SecondaryComponent = 1,
@@ -10,12 +11,14 @@ declare class MenuPageObject extends BasePage {
     /**************** UI Element Interaction Methods ******************/
     /******************************************************************/
     didMenuOpen(): Promise<boolean>;
-    didMenuClose(): Promise<boolean>;
+    menuIsExpanded(): Promise<boolean>;
+    getMenuExpandCollapseState(): Promise<ExpandCollapseState>;
     getMenuItemAccessibilityLabel(componentSelector: MenuComponentSelector): Promise<string>;
     getMenuAccessibilityRole(): Promise<string>;
     getMenuItemAccessibilityRole(): Promise<string>;
     sendKey(menuComponentSelector: MenuComponentSelector, key: string): Promise<void>;
     getMenuComponentSelector(menuComponentSelector?: MenuComponentSelector): Promise<WebdriverIO.Element>;
+    resetTest(): Promise<void>;
     /*****************************************/
     /**************** Getters ****************/
     /*****************************************/
@@ -25,6 +28,7 @@ declare class MenuPageObject extends BasePage {
     get _secondaryComponent(): import("webdriverio").ChainablePromiseElement<WebdriverIO.Element>;
     get _tertiaryComponent(): import("webdriverio").ChainablePromiseElement<WebdriverIO.Element>;
     get _pageButton(): import("webdriverio").ChainablePromiseElement<WebdriverIO.Element>;
+    get _defocusButton(): import("webdriverio").ChainablePromiseElement<WebdriverIO.Element>;
 }
 declare const _default: MenuPageObject;
 export default _default;

package/lib-commonjs/E2E/Menu/pages/MenuPageObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MenuPageObject.d.ts","sourceRoot":"","sources":["../../../../src/E2E/Menu/pages/MenuPageObject.ts"],"names":[],"mappings":";AAUA,OAAO,EAAE,QAAQ,EAAM,MAAM,uBAAuB,CAAC;AAIrD,0BAAkB,qBAAqB;IACrC,gBAAgB,IAAA;IAChB,kBAAkB,IAAA;IAClB,iBAAiB,IAAA;CAClB;AAED,cAAM,cAAe,SAAQ,QAAQ;IACnC,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IAC9D,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAW/B,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAWhC,6BAA6B,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAaxF,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAK/C,OAAO,CAAC,qBAAqB,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjF,wBAAwB,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAO3G,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,IAAI,SAAS,uEAEZ;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,iBAAiB,uEAEpB;IAED,IAAI,mBAAmB,uEAEtB;IAED,IAAI,kBAAkB,uEAErB;IAED,IAAI,WAAW,uEAEd;CACF;;AAED,wBAAoC"}
+{"version":3,"file":"MenuPageObject.d.ts","sourceRoot":"","sources":["../../../../src/E2E/Menu/pages/MenuPageObject.ts"],"names":[],"mappings":";AASA,OAAO,EAAE,QAAQ,EAAM,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAQ,mBAAmB,EAAa,MAAM,qBAAqB,CAAC;AAI3E,0BAAkB,qBAAqB;IACrC,gBAAgB,IAAA;IAChB,kBAAkB,IAAA;IAClB,iBAAiB,IAAA;CAClB;AAED,cAAM,cAAe,SAAQ,QAAQ;IACnC,oEAAoE;IACpE,oEAAoE;IACpE,oEAAoE;IAC9D,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAU/B,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC,0BAA0B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI1D,6BAA6B,CAAC,iBAAiB,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxF,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAK/C,OAAO,CAAC,qBAAqB,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjF,wBAAwB,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAWrG,SAAS;IAQf,2CAA2C;IAC3C,2CAA2C;IAC3C,2CAA2C;IAC3C,IAAI,SAAS,uEAEZ;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,iBAAiB,uEAEpB;IAED,IAAI,mBAAmB,uEAEtB;IAED,IAAI,kBAAkB,uEAErB;IAED,IAAI,WAAW,uEAEd;IAED,IAAI,cAAc,uEAEjB;CACF;;AAED,wBAAoC"}

package/lib-commonjs/E2E/Menu/pages/MenuPageObject.js

@@ -13,54 +13,48 @@ var MenuPageObject = /** @class */ (function (_super) {
     /******************************************************************/
     MenuPageObject.prototype.didMenuOpen = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var callbackText;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, BasePage_1.By)(consts_1.MENU_ON_OPEN)];
+                    case 0: return [4 /*yield*/, browser.waitUntil(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.menuIsExpanded()];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        }); }); }, {
+                            timeout: this.waitForUiEvent,
+                            timeoutMsg: 'The Menu did not open.',
+                            interval: 1000,
+                        })];
                     case 1:
-                        callbackText = _a.sent();
-                        return [4 /*yield*/, browser.waitUntil(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, callbackText.isDisplayed()];
-                                    case 1: return [2 /*return*/, _a.sent()];
-                                }
-                            }); }); }, {
-                                timeout: this.waitForUiEvent,
-                                timeoutMsg: 'The Menu did not open.',
-                                interval: 1000,
-                            })];
-                    case 2:
                         _a.sent();
-                        return [4 /*yield*/, callbackText.isDisplayed()];
-                    case 3: return [2 /*return*/, _a.sent()];
+                        return [4 /*yield*/, this.menuIsExpanded()];
+                    case 2: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-    MenuPageObject.prototype.didMenuClose = function () {
+    MenuPageObject.prototype.menuIsExpanded = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var callbackText;
-            var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, BasePage_1.By)(consts_1.MENU_ON_CLOSE)];
-                    case 1:
-                        callbackText = _a.sent();
-                        return [4 /*yield*/, browser.waitUntil(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, callbackText.isDisplayed()];
-                                    case 1: return [2 /*return*/, _a.sent()];
-                                }
-                            }); }); }, {
-                                timeout: this.waitForUiEvent,
-                                timeoutMsg: 'The Menu did not close.',
-                                interval: 1000,
-                            })];
-                    case 2:
-                        _a.sent();
-                        return [4 /*yield*/, callbackText.isDisplayed()];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, this._secondaryComponent];
+                    case 1: return [4 /*yield*/, (_a.sent()).isDisplayed()];
+                    case 2: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    MenuPageObject.prototype.getMenuExpandCollapseState = function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.getElementAttribute;
+                        return [4 /*yield*/, this._primaryComponent];
+                    case 1: return [4 /*yield*/, _a.apply(this, [_b.sent(), "ExpandCollapse.ExpandCollapseState" /* ExpandCollapseState */])];
+                    case 2: return [2 /*return*/, (_b.sent())];
                 }
             });
         });
@@ -71,40 +65,38 @@ var MenuPageObject = /** @class */ (function (_super) {
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = componentSelector;
-                        switch (_a) {
-                            case 0 /* PrimaryComponent */: return [3 /*break*/, 1];
-                            case 1 /* SecondaryComponent */: return [3 /*break*/, 3];
-                            case 2 /* TertiaryComponent */: return [3 /*break*/, 5];
-                        }
-                        return [3 /*break*/, 7];
-                    case 1: return [4 /*yield*/, this._primaryComponent.getAttribute('Name')];
+                        _a = this.getElementAttribute;
+                        return [4 /*yield*/, this.getMenuComponentSelector(componentSelector)];
+                    case 1: return [4 /*yield*/, _a.apply(this, [_b.sent(), "Name" /* AccessibilityLabel */])];
                     case 2: return [2 /*return*/, _b.sent()];
-                    case 3: return [4 /*yield*/, this._secondaryComponent.getAttribute('Name')];
-                    case 4: return [2 /*return*/, _b.sent()];
-                    case 5: return [4 /*yield*/, this._tertiaryComponent.getAttribute('Name')];
-                    case 6: return [2 /*return*/, _b.sent()];
-                    case 7: return [2 /*return*/];
                 }
             });
         });
     };
     MenuPageObject.prototype.getMenuAccessibilityRole = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, BasePage_1.By)(consts_1.MENUPOPOVER_TEST_COMPONENT).getAttribute('ControlType')];
-                    case 1: return [2 /*return*/, _a.sent()];
+            var _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.getElementAttribute;
+                        return [4 /*yield*/, (0, BasePage_1.By)(consts_1.MENUPOPOVER_TEST_COMPONENT)];
+                    case 1: return [4 /*yield*/, _a.apply(this, [_b.sent(), "ControlType" /* AccessibilityRole */])];
+                    case 2: return [2 /*return*/, _b.sent()];
                 }
             });
         });
     };
     MenuPageObject.prototype.getMenuItemAccessibilityRole = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._secondaryComponent.getAttribute('ControlType')];
-                    case 1: return [2 /*return*/, _a.sent()];
+            var _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.getElementAttribute;
+                        return [4 /*yield*/, this._secondaryComponent];
+                    case 1: return [4 /*yield*/, _a.apply(this, [_b.sent(), "ControlType" /* AccessibilityRole */])];
+                    case 2: return [2 /*return*/, _b.sent()];
                 }
             });
         });
@@ -125,15 +117,43 @@ var MenuPageObject = /** @class */ (function (_super) {
     };
     /* Returns the correct WebDriverIO element from the Button Selector */
     MenuPageObject.prototype.getMenuComponentSelector = function (menuComponentSelector) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = menuComponentSelector;
+                        switch (_a) {
+                            case 1 /* SecondaryComponent */: return [3 /*break*/, 1];
+                            case 2 /* TertiaryComponent */: return [3 /*break*/, 3];
+                        }
+                        return [3 /*break*/, 5];
+                    case 1: return [4 /*yield*/, this._secondaryComponent];
+                    case 2: return [2 /*return*/, _b.sent()];
+                    case 3: return [4 /*yield*/, this._tertiaryComponent];
+                    case 4: return [2 /*return*/, _b.sent()];
+                    case 5: return [4 /*yield*/, this._primaryComponent];
+                    case 6: return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    };
+    MenuPageObject.prototype.resetTest = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!(menuComponentSelector == 0 /* PrimaryComponent */)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this._primaryComponent];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2: return [4 /*yield*/, this._primaryComponent];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, this.menuIsExpanded()];
+                    case 1:
+                        if (!_a.sent()) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.sendKey(0 /* PrimaryComponent */, "\uE00C" /* ESCAPE */)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, this._defocusButton];
+                    case 3: return [4 /*yield*/, (_a.sent()).click()];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -183,6 +203,13 @@ var MenuPageObject = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(MenuPageObject.prototype, "_defocusButton", {
+        get: function () {
+            return (0, BasePage_1.By)(consts_1.MENU_DEFOCUS_BUTTON);
+        },
+        enumerable: false,
+        configurable: true
+    });
     return MenuPageObject;
 }(BasePage_1.BasePage));
 exports.default = new MenuPageObject();

package/lib-commonjs/E2E/Menu/pages/MenuPageObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuPageObject.js","sourceRoot":"","sources":["../../../../src/E2E/Menu/pages/MenuPageObject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuPageObject.js","sourceRoot":"","sources":["../../../../src/E2E/Menu/pages/MenuPageObject.ts"],"names":[],"mappings":"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"}

package/lib-commonjs/E2E/Menu/specs/Menu.spec.win.js

@@ -69,6 +69,9 @@ describe('Menu Accessibility Testing', function () {
                     _a.sent();
                     return [4 /*yield*/, MenuPageObject_1.default.waitForPrimaryElementDisplayed(consts_1.PAGE_TIMEOUT)];
                 case 2:
+                    _a.sent();
+                    return [4 /*yield*/, MenuPageObject_1.default.resetTest()];
+                case 3:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -95,12 +98,6 @@ describe('Menu Accessibility Testing', function () {
             }
         });
     }); });
-    // TestID for Callouts aren't propagating, so this test is failing. Commenting out and creating task to investigate
-    // it('Menu - Validate accessibilityRole of menu is correct', async () => {
-    //   await expect(await MenuPageObject.didMenuOpen()).toBeTruthy();
-    //   await expect(await MenuPageObject.getMenuAccessibilityRole()).toEqual(MENU_A11Y_ROLE);
-    //   await expect(await MenuPageObject.didAssertPopup()).toBeFalsy(MenuPageObject.ERRORMESSAGE_ASSERT);
-    // });
     it('Menu - Do not set accessibilityLabel -> Default to MenuItem label', function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
         var _a, _b;
         return (0, tslib_1.__generator)(this, function (_c) {
@@ -122,6 +119,27 @@ describe('Menu Accessibility Testing', function () {
             }
         });
     }); });
+    it('Menu - Click menu -> ExpandCollapseState correctly changes', function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+        var _a, _b;
+        return (0, tslib_1.__generator)(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, MenuPageObject_1.default.clickComponent()];
+                case 1:
+                    _c.sent();
+                    _a = expect;
+                    return [4 /*yield*/, MenuPageObject_1.default.getMenuExpandCollapseState()];
+                case 2: return [4 /*yield*/, _a.apply(void 0, [_c.sent()]).toEqual("Expanded" /* EXPANDED */)];
+                case 3:
+                    _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, MenuPageObject_1.default.didAssertPopup()];
+                case 4: return [4 /*yield*/, _b.apply(void 0, [_c.sent()]).toBeFalsy(MenuPageObject_1.default.ERRORMESSAGE_ASSERT)];
+                case 5:
+                    _c.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 });
 describe('Menu Functional Testing', function () {
     /* Scrolls and waits for the Menu to be visible on the Test Page */
@@ -133,6 +151,9 @@ describe('Menu Functional Testing', function () {
                     _a.sent();
                     return [4 /*yield*/, MenuPageObject_1.default.waitForPrimaryElementDisplayed(consts_1.PAGE_TIMEOUT)];
                 case 2:
+                    _a.sent();
+                    return [4 /*yield*/, MenuPageObject_1.default.resetTest()];
+                case 3:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -188,7 +209,7 @@ describe('Menu Functional Testing', function () {
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, MenuPageObject_1.default.didMenuClose()];
+                    return [4 /*yield*/, MenuPageObject_1.default.didMenuOpen()];
                 case 2: return [4 /*yield*/, _a.apply(void 0, [_c.sent()]).toBeTruthy()];
                 case 3:
                     _c.sent();

package/lib-commonjs/E2E/Menu/specs/Menu.spec.win.js.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.spec.win.js","sourceRoot":"","sources":["../../../../src/E2E/Menu/specs/Menu.spec.win.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Menu.spec.win.js","sourceRoot":"","sources":["../../../../src/E2E/Menu/specs/Menu.spec.win.ts"],"names":[],"mappings":"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"}

package/lib-commonjs/E2E/common/consts.d.ts

@@ -15,6 +15,7 @@ export declare const PAGE_TIMEOUT = 15000;
 export declare const enum Attribute {
     AccessibilityLabel = "Name",
     AccessibilityRole = "ControlType",
+    ExpandCollapseState = "ExpandCollapse.ExpandCollapseState",
     IsEnabled = "IsEnabled",
     IsFocused = "HasKeyboardFocus",
     IsRequiredForForm = "IsRequiredForForm",
@@ -87,4 +88,8 @@ export declare const enum Keys {
     F11 = "\uE03B",
     F12 = "\uE03C"
 }
+export declare const enum ExpandCollapseState {
+    EXPANDED = "Expanded",
+    COLLAPSED = "Collapsed"
+}
 //# sourceMappingURL=consts.d.ts.map

package/lib-commonjs/E2E/common/consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/E2E/common/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,uBAAuB,CAAC;AACrD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AACvD,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AACvD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAGjD,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,0BAAkB,SAAS;IACzB,kBAAkB,SAAS;IAC3B,iBAAiB,gBAAgB;IACjC,SAAS,cAAc;IACvB,SAAS,qBAAqB;IAC9B,iBAAiB,sBAAsB;IACvC,wBAAwB,6BAA6B;IACrD,WAAW,uBAAuB;CACnC;AAED,0BAAkB,cAAc;IAC9B,EAAE,MAAM;IACR,GAAG,MAAM;IACT,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAGD,0BAAkB,IAAI;IACpB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,SAAS,WAAW;IACpB,GAAG,WAAW;IACd,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,QAAQ,WAAW;IACnB,EAAE,WAAW;IACb,WAAW,WAAW;IACtB,KAAK,WAAW;IAChB,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,SAAS,WAAW;IACpB,MAAM,WAAW;IAEjB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,QAAQ,WAAW;IACnB,GAAG,WAAW;IACd,SAAS,WAAW;IACpB,QAAQ,WAAW;IACnB,OAAO,WAAW;IAClB,MAAM,WAAW;IAEjB,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,GAAG,WAAW;IACd,GAAG,WAAW;IACd,GAAG,WAAW;CACf"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"","sources":["../../../src/E2E/common/consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,gBAAgB,uBAAuB,CAAC;AACrD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,cAAc,0BAA0B,CAAC;AACtD,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AACjD,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AACvD,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AACvD,eAAO,MAAM,cAAc,qBAAqB,CAAC;AAGjD,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,YAAY,QAAQ,CAAC;AAElC,0BAAkB,SAAS;IACzB,kBAAkB,SAAS;IAC3B,iBAAiB,gBAAgB;IACjC,mBAAmB,uCAAuC;IAC1D,SAAS,cAAc;IACvB,SAAS,qBAAqB;IAC9B,iBAAiB,sBAAsB;IACvC,wBAAwB,6BAA6B;IACrD,WAAW,uBAAuB;CACnC;AAED,0BAAkB,cAAc;IAC9B,EAAE,MAAM;IACR,GAAG,MAAM;IACT,IAAI,SAAS;IACb,KAAK,UAAU;CAChB;AAGD,0BAAkB,IAAI;IACpB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,GAAG,WAAW;IACd,KAAK,WAAW;IAChB,MAAM,WAAW;IACjB,KAAK,WAAW;IAChB,OAAO,WAAW;IAClB,SAAS,WAAW;IACpB,GAAG,WAAW;IACd,IAAI,WAAW;IACf,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,QAAQ,WAAW;IACnB,EAAE,WAAW;IACb,WAAW,WAAW;IACtB,KAAK,WAAW;IAChB,UAAU,WAAW;IACrB,IAAI,WAAW;IACf,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,SAAS,WAAW;IACpB,MAAM,WAAW;IAEjB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,OAAO,WAAW;IAClB,QAAQ,WAAW;IACnB,GAAG,WAAW;IACd,SAAS,WAAW;IACpB,QAAQ,WAAW;IACnB,OAAO,WAAW;IAClB,MAAM,WAAW;IAEjB,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,EAAE,WAAW;IACb,GAAG,WAAW;IACd,GAAG,WAAW;IACd,GAAG,WAAW;CACf;AAED,0BAAkB,mBAAmB;IACnC,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/tester",
-  "version": "0.101.7",
+  "version": "0.101.9",
   "description": "A test app to test FluentUI React Native Components during development",
   "license": "MIT",
   "author": "Microsoft <fluentuinativeowners@microsoft.com>",
@@ -36,40 +36,40 @@
     "directory": "apps/fluent-tester"
   },
   "dependencies": {
-    "@fluentui-react-native/android-theme": ">=0.12.8 <1.0.0",
-    "@fluentui-react-native/apple-theme": ">=0.16.2 <1.0.0",
-    "@fluentui-react-native/avatar": "^1.2.21",
-    "@fluentui-react-native/badge": ">=0.1.43 <1.0.0",
-    "@fluentui-react-native/button": ">=0.25.11 <1.0.0",
-    "@fluentui-react-native/default-theme": ">=0.16.4 <1.0.0",
-    "@fluentui-react-native/dropdown": ">=0.4.13 <1.0.0",
-    "@fluentui-react-native/experimental-activity-indicator": ">=0.6.11 <1.0.0",
-    "@fluentui-react-native/experimental-avatar": ">=0.16.15 <1.0.0",
-    "@fluentui-react-native/experimental-button": "0.16.38",
-    "@fluentui-react-native/experimental-checkbox": "0.12.28",
-    "@fluentui-react-native/experimental-expander": "0.4.13",
-    "@fluentui-react-native/experimental-menu-button": ">=0.4.44 <1.0.0",
+    "@fluentui-react-native/android-theme": ">=0.12.9 <1.0.0",
+    "@fluentui-react-native/apple-theme": ">=0.16.3 <1.0.0",
+    "@fluentui-react-native/avatar": "^1.2.22",
+    "@fluentui-react-native/badge": ">=0.1.44 <1.0.0",
+    "@fluentui-react-native/button": ">=0.25.12 <1.0.0",
+    "@fluentui-react-native/default-theme": ">=0.16.5 <1.0.0",
+    "@fluentui-react-native/dropdown": ">=0.4.14 <1.0.0",
+    "@fluentui-react-native/experimental-activity-indicator": ">=0.6.12 <1.0.0",
+    "@fluentui-react-native/experimental-avatar": ">=0.16.16 <1.0.0",
+    "@fluentui-react-native/experimental-button": "0.16.39",
+    "@fluentui-react-native/experimental-checkbox": "0.12.29",
+    "@fluentui-react-native/experimental-expander": "0.4.14",
+    "@fluentui-react-native/experimental-menu-button": ">=0.4.45 <1.0.0",
     "@fluentui-react-native/experimental-native-date-picker": ">=0.7.3 <1.0.0",
-    "@fluentui-react-native/experimental-radio-group": "^0.6.2",
-    "@fluentui-react-native/experimental-shadow": "0.2.29",
-    "@fluentui-react-native/experimental-shimmer": "0.7.12",
-    "@fluentui-react-native/experimental-tabs": "0.5.25",
-    "@fluentui-react-native/experimental-text": ">=0.11.13 <1.0.0",
-    "@fluentui-react-native/framework": ">=0.8.11 <1.0.0",
-    "@fluentui-react-native/icon": "0.13.16",
-    "@fluentui-react-native/interactive-hooks": ">=0.18.14 <1.0.0",
-    "@fluentui-react-native/menu": "^1.0.50",
+    "@fluentui-react-native/experimental-radio-group": "^0.6.3",
+    "@fluentui-react-native/experimental-shadow": "0.2.30",
+    "@fluentui-react-native/experimental-shimmer": "0.7.13",
+    "@fluentui-react-native/experimental-tabs": "0.5.26",
+    "@fluentui-react-native/experimental-text": ">=0.11.14 <1.0.0",
+    "@fluentui-react-native/framework": ">=0.8.12 <1.0.0",
+    "@fluentui-react-native/icon": "0.13.17",
+    "@fluentui-react-native/interactive-hooks": ">=0.18.15 <1.0.0",
+    "@fluentui-react-native/menu": "^1.0.51",
     "@fluentui-react-native/merge-props": ">=0.5.1 <1.0.0",
-    "@fluentui-react-native/notification": "0.17.23",
-    "@fluentui-react-native/stack": ">=0.7.15 <1.0.0",
-    "@fluentui-react-native/switch": "^0.6.16",
-    "@fluentui-react-native/text": ">=0.15.7 <1.0.0",
+    "@fluentui-react-native/notification": "0.17.24",
+    "@fluentui-react-native/stack": ">=0.7.16 <1.0.0",
+    "@fluentui-react-native/switch": "^0.6.17",
+    "@fluentui-react-native/text": ">=0.15.8 <1.0.0",
     "@fluentui-react-native/theme": ">=0.7.6 <1.0.0",
     "@fluentui-react-native/theme-types": ">=0.22.0 <1.0.0",
     "@fluentui-react-native/themed-stylesheet": "^1.4.1",
     "@fluentui-react-native/theming-utils": ">=0.16.2 <1.0.0",
-    "@fluentui-react-native/win32-theme": ">=0.21.8 <1.0.0",
-    "@fluentui/react-native": ">=0.32.37 <1.0.0",
+    "@fluentui-react-native/win32-theme": ">=0.22.0 <1.0.0",
+    "@fluentui/react-native": ">=0.32.38 <1.0.0",
     "@react-native-community/slider": "^4.2.0",
     "@react-native-menu/menu": "^0.1.2",
     "@react-native-picker/picker": "^2.2.1",

package/src/E2E/Menu/pages/MenuPageObject.ts

@@ -3,12 +3,12 @@ import {
   MENUTRIGGER_TEST_COMPONENT,
   MENUITEM_NO_A11Y_LABEL_COMPONENT,
   HOMEPAGE_MENU_BUTTON,
-  MENU_ON_OPEN,
-  MENU_ON_CLOSE,
   MENUITEM_TEST_COMPONENT,
   MENUPOPOVER_TEST_COMPONENT,
+  MENU_DEFOCUS_BUTTON,
 } from '../../../TestComponents/Menu/consts';
 import { BasePage, By } from '../../common/BasePage';
+import { Keys, ExpandCollapseState, Attribute } from '../../common/consts';
 
 /* This enum gives the spec file an EASY way to interact with SPECIFIC UI elements on the page.
  * The spec file should import this enum and use it when wanting to interact with different elements on the page. */
@@ -23,46 +23,33 @@ class MenuPageObject extends BasePage {
   /**************** UI Element Interaction Methods ******************/
   /******************************************************************/
   async didMenuOpen(): Promise<boolean> {
-    const callbackText = await By(MENU_ON_OPEN);
-    await browser.waitUntil(async () => await callbackText.isDisplayed(), {
+    await browser.waitUntil(async () => await this.menuIsExpanded(), {
       timeout: this.waitForUiEvent,
       timeoutMsg: 'The Menu did not open.',
       interval: 1000,
     });
 
-    return await callbackText.isDisplayed();
+    return await this.menuIsExpanded();
   }
 
-  async didMenuClose(): Promise<boolean> {
-    const callbackText = await By(MENU_ON_CLOSE);
-    await browser.waitUntil(async () => await callbackText.isDisplayed(), {
-      timeout: this.waitForUiEvent,
-      timeoutMsg: 'The Menu did not close.',
-      interval: 1000,
-    });
+  async menuIsExpanded(): Promise<boolean> {
+    return await (await this._secondaryComponent).isDisplayed();
+  }
 
-    return await callbackText.isDisplayed();
+  async getMenuExpandCollapseState(): Promise<ExpandCollapseState> {
+    return (await this.getElementAttribute(await this._primaryComponent, Attribute.ExpandCollapseState)) as ExpandCollapseState;
   }
 
   async getMenuItemAccessibilityLabel(componentSelector: MenuComponentSelector): Promise<string> {
-    switch (componentSelector) {
-      case MenuComponentSelector.PrimaryComponent:
-        return await this._primaryComponent.getAttribute('Name');
-
-      case MenuComponentSelector.SecondaryComponent:
-        return await this._secondaryComponent.getAttribute('Name');
-
-      case MenuComponentSelector.TertiaryComponent:
-        return await this._tertiaryComponent.getAttribute('Name');
-    }
+    return await this.getElementAttribute(await this.getMenuComponentSelector(componentSelector), Attribute.AccessibilityLabel);
   }
 
   async getMenuAccessibilityRole(): Promise<string> {
-    return await By(MENUPOPOVER_TEST_COMPONENT).getAttribute('ControlType');
+    return await this.getElementAttribute(await By(MENUPOPOVER_TEST_COMPONENT), Attribute.AccessibilityRole);
   }
 
   async getMenuItemAccessibilityRole(): Promise<string> {
-    return await this._secondaryComponent.getAttribute('ControlType');
+    return await this.getElementAttribute(await this._secondaryComponent, Attribute.AccessibilityRole);
   }
 
   /* Sends a Keyboarding command on a specific UI element */
@@ -72,10 +59,22 @@ class MenuPageObject extends BasePage {
 
   /* Returns the correct WebDriverIO element from the Button Selector */
   async getMenuComponentSelector(menuComponentSelector?: MenuComponentSelector): Promise<WebdriverIO.Element> {
-    if (menuComponentSelector == MenuComponentSelector.PrimaryComponent) {
-      return await this._primaryComponent;
+    switch (menuComponentSelector) {
+      case MenuComponentSelector.SecondaryComponent:
+        return await this._secondaryComponent;
+      case MenuComponentSelector.TertiaryComponent:
+        return await this._tertiaryComponent;
+      default:
+        return await this._primaryComponent;
+    }
+  }
+
+  async resetTest() {
+    // Both escape on the menu trigger to hard dismiss menu and click defocus to reset focus
+    if (await this.menuIsExpanded()) {
+      await this.sendKey(MenuComponentSelector.PrimaryComponent, Keys.ESCAPE);
+      await (await this._defocusButton).click();
     }
-    return await this._primaryComponent;
   }
 
   /*****************************************/
@@ -104,6 +103,10 @@ class MenuPageObject extends BasePage {
   get _pageButton() {
     return By(HOMEPAGE_MENU_BUTTON);
   }
+
+  get _defocusButton() {
+    return By(MENU_DEFOCUS_BUTTON);
+  }
 }
 
 export default new MenuPageObject();