@sprucelabs/heartwood-view-controllers 111.1.34 → 111.1.35

package/build/esm/tests/utilities/buttonAssert.d.ts

@@ -1,4 +1,4 @@
-import { Button, Card, FormViewController, Navigation, ViewController } from '../../types/heartwood.types';
+import { Button, Card, FormViewController, Navigation, SkillViewController, ViewController } from '../../types/heartwood.types';
 import BigFormViewController from '../../viewControllers/BigForm.vc';
 import ButtonBarViewController from '../../viewControllers/ButtonBar.vc';
 import ButtonGroupViewController from '../../viewControllers/ButtonGroup.vc';
@@ -20,7 +20,7 @@ declare const buttonAssert: {
     buttonIsSelected(vc: ViewController<Card>, id: string): void;
 };
 export default buttonAssert;
-export declare function pluckButtons(vc: ViewController<Card> | ViewController<Navigation> | FormViewController<any> | BigFormViewController<any>, ids: string[]): {
+export declare function pluckButtons(vc: ViewController<Card> | ViewController<Navigation> | FormViewController<any> | BigFormViewController<any> | SkillViewController, ids: string[]): {
     found: string[];
     missing: string[];
     foundButtons: Button[];

package/build/esm/tests/utilities/buttonAssert.js

@@ -114,9 +114,26 @@ const buttonAssert = {
 };
 export default buttonAssert;
 export function pluckButtons(vc, ids) {
-    var _a, _b, _c, _d;
+    var _a;
     assertOptions({ vc, ids }, ['vc', 'ids']);
     const model = renderUtil.render(vc);
+    //@ts-ignore
+    if (model.layouts) {
+        const sv = model;
+        for (const layout of (_a = sv.layouts) !== null && _a !== void 0 ? _a : []) {
+            const cards = layout === null || layout === void 0 ? void 0 : layout.cards;
+            for (const card of cards !== null && cards !== void 0 ? cards : []) {
+                const results = pluckButtonsFromViewModel(card, ids);
+                if (results.found.length > 0) {
+                    return results;
+                }
+            }
+        }
+    }
+    return pluckButtonsFromViewModel(model, ids);
+}
+function pluckButtonsFromViewModel(model, ids) {
+    var _a, _b, _c, _d;
     const buttons = [
         //@ts-ignore
         ...((_d = (_b = (_a = model.criticalError) === null || _a === void 0 ? void 0 : _a.buttons) !== null && _b !== void 0 ? _b : (_c = model.footer) === null || _c === void 0 ? void 0 : _c.buttons) !== null && _d !== void 0 ? _d : []),

package/build/esm/tests/utilities/interactor.js

@@ -66,7 +66,7 @@ const interactor = {
     },
     clickButton(vc, buttonId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const match = pluckButtonFromCard(vc, buttonId);
+            const match = pluckButtonFromView(vc, buttonId);
             yield this.click(match);
         });
     },
@@ -86,7 +86,7 @@ const interactor = {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             assertOptions({ vc, buttonId }, ['vc', 'buttonId']);
-            const button = pluckButtonFromCard(vc, buttonId);
+            const button = pluckButtonFromView(vc, buttonId);
             assert.isTrue(button.shouldShowHintIcon, `Make sure have 'shouldShowHintIcon' set to true in your button: '${buttonId}'`);
             assert.isFunction(button.onClickHintIcon, `You gotta set 'onClickHintIcon' on your button with the id: '${(_a = button.id) !== null && _a !== void 0 ? _a : '***missing***'}'`);
             return (_b = button.onClickHintIcon) === null || _b === void 0 ? void 0 : _b.call(button);
@@ -412,7 +412,7 @@ const interactor = {
     },
 };
 export default interactor;
-function pluckButtonFromCard(vc, buttonId) {
+function pluckButtonFromView(vc, buttonId) {
     const { foundButtons } = pluckButtons(vc, [buttonId]);
     const match = foundButtons[0];
     assert.isTruthy(match, `Could not find a button in '${getVcName(vc)}' with the id '${buttonId}'`);

package/build/tests/utilities/buttonAssert.d.ts

@@ -1,4 +1,4 @@
-import { Button, Card, FormViewController, Navigation, ViewController } from '../../types/heartwood.types';
+import { Button, Card, FormViewController, Navigation, SkillViewController, ViewController } from '../../types/heartwood.types';
 import BigFormViewController from '../../viewControllers/BigForm.vc';
 import ButtonBarViewController from '../../viewControllers/ButtonBar.vc';
 import ButtonGroupViewController from '../../viewControllers/ButtonGroup.vc';
@@ -20,7 +20,7 @@ declare const buttonAssert: {
     buttonIsSelected(vc: ViewController<Card>, id: string): void;
 };
 export default buttonAssert;
-export declare function pluckButtons(vc: ViewController<Card> | ViewController<Navigation> | FormViewController<any> | BigFormViewController<any>, ids: string[]): {
+export declare function pluckButtons(vc: ViewController<Card> | ViewController<Navigation> | FormViewController<any> | BigFormViewController<any> | SkillViewController, ids: string[]): {
     found: string[];
     missing: string[];
     foundButtons: Button[];

package/build/tests/utilities/buttonAssert.js

@@ -116,6 +116,22 @@ exports.default = buttonAssert;
 function pluckButtons(vc, ids) {
     (0, schema_1.assertOptions)({ vc, ids }, ['vc', 'ids']);
     const model = render_utility_1.default.render(vc);
+    //@ts-ignore
+    if (model.layouts) {
+        const sv = model;
+        for (const layout of sv.layouts ?? []) {
+            const cards = layout?.cards;
+            for (const card of cards ?? []) {
+                const results = pluckButtonsFromViewModel(card, ids);
+                if (results.found.length > 0) {
+                    return results;
+                }
+            }
+        }
+    }
+    return pluckButtonsFromViewModel(model, ids);
+}
+function pluckButtonsFromViewModel(model, ids) {
     const buttons = [
         //@ts-ignore
         ...(model.criticalError?.buttons ?? model.footer?.buttons ?? []),

package/build/tests/utilities/interactor.js

@@ -59,7 +59,7 @@ const interactor = {
         });
     },
     async clickButton(vc, buttonId) {
-        const match = pluckButtonFromCard(vc, buttonId);
+        const match = pluckButtonFromView(vc, buttonId);
         await this.click(match);
     },
     async clickButtonInGroup(buttonGroupVc, buttonIdOrIdx) {
@@ -74,7 +74,7 @@ const interactor = {
     },
     async clickButtonHint(vc, buttonId) {
         (0, schema_1.assertOptions)({ vc, buttonId }, ['vc', 'buttonId']);
-        const button = pluckButtonFromCard(vc, buttonId);
+        const button = pluckButtonFromView(vc, buttonId);
         test_utils_1.assert.isTrue(button.shouldShowHintIcon, `Make sure have 'shouldShowHintIcon' set to true in your button: '${buttonId}'`);
         test_utils_1.assert.isFunction(button.onClickHintIcon, `You gotta set 'onClickHintIcon' on your button with the id: '${button.id ?? '***missing***'}'`);
         return button.onClickHintIcon?.();
@@ -330,7 +330,7 @@ const interactor = {
     },
 };
 exports.default = interactor;
-function pluckButtonFromCard(vc, buttonId) {
+function pluckButtonFromView(vc, buttonId) {
     const { foundButtons } = (0, buttonAssert_1.pluckButtons)(vc, [buttonId]);
     const match = foundButtons[0];
     test_utils_1.assert.isTruthy(match, `Could not find a button in '${(0, assertSupport_1.getVcName)(vc)}' with the id '${buttonId}'`);

package/package.json

@@ -13,7 +13,7 @@
   "sideEffects": false,
   "license": "MIT",
   "description": "All the power of Heartwood in one, convenient package.",
-  "version": "111.1.34",
+  "version": "111.1.35",
   "skill": {
     "namespace": "HeartwoodViewControllers",
     "commandOverrides": {