@sprucelabs/heartwood-view-controllers 112.1.1 → 112.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,6 +12,7 @@ export { default as CardViewControllerImpl } from './viewControllers/card/Card.v
12
12
  export { default as ConfirmViewController } from './viewControllers/Confirm.vc';
13
13
  export { default as DialogViewController } from './viewControllers/Dialog.vc';
14
14
  export { default as LockScreenSkillViewController } from './skillViewControllers/LockScreen.svc';
15
+ export * from './skillViewControllers/LockScreen.svc';
15
16
  export { default as NavigationViewController } from './viewControllers/navigation/Navigation.vc';
16
17
  export { default as ListViewController } from './viewControllers/list/List.vc';
17
18
  export { default as ListRowViewController } from './viewControllers/list/ListRow.vc';
@@ -12,6 +12,7 @@ export { default as CardViewControllerImpl } from './viewControllers/card/Card.v
12
12
  export { default as ConfirmViewController } from './viewControllers/Confirm.vc.js';
13
13
  export { default as DialogViewController } from './viewControllers/Dialog.vc.js';
14
14
  export { default as LockScreenSkillViewController } from './skillViewControllers/LockScreen.svc.js';
15
+ export * from './skillViewControllers/LockScreen.svc.js';
15
16
  export { default as NavigationViewController } from './viewControllers/navigation/Navigation.vc.js';
16
17
  export { default as ListViewController } from './viewControllers/list/List.vc.js';
17
18
  export { default as ListRowViewController } from './viewControllers/list/ListRow.vc.js';
@@ -4,8 +4,9 @@ export default class LockScreenSkillViewController extends AbstractSkillViewCont
4
4
  private skillViewController?;
5
5
  private hideHandler?;
6
6
  private isVisible;
7
- constructor(options: ViewControllerOptions & LockScreen);
8
- setHideHindler(hideHandler: HideDialogHandler): void;
7
+ private model;
8
+ constructor(options: ViewControllerOptions & LockScreenSkillViewControllerOptions);
9
+ setHideHandler(hideHandler: HideDialogHandler): void;
9
10
  hide(): Promise<void>;
10
11
  getSkillViewVc(): SkillViewController<Record<string, any>, import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.SkillView> | undefined;
11
12
  getIsVisible(): boolean;
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
+ import removeUniversalViewOptions from '../utilities/removeUniversalViewOptions.js';
10
11
  import AbstractSkillViewController from './Abstract.svc.js';
11
12
  export default class LockScreenSkillViewController extends AbstractSkillViewController {
12
13
  constructor(options) {
@@ -14,8 +15,9 @@ export default class LockScreenSkillViewController extends AbstractSkillViewCont
14
15
  this.isVisible = true;
15
16
  const { controller } = options;
16
17
  this.skillViewController = controller;
18
+ this.model = removeUniversalViewOptions(options);
17
19
  }
18
- setHideHindler(hideHandler) {
20
+ setHideHandler(hideHandler) {
19
21
  this.hideHandler = hideHandler;
20
22
  }
21
23
  hide() {
@@ -33,9 +35,6 @@ export default class LockScreenSkillViewController extends AbstractSkillViewCont
33
35
  }
34
36
  render() {
35
37
  var _a;
36
- return {
37
- controller: this,
38
- skillViewController: (_a = this.skillViewController) !== null && _a !== void 0 ? _a : this,
39
- };
38
+ return Object.assign(Object.assign({}, this.model), { controller: this, skillViewController: (_a = this.skillViewController) !== null && _a !== void 0 ? _a : this });
40
39
  }
41
40
  }
@@ -923,6 +923,22 @@ const vcAssert = {
923
923
  else if (vc instanceof LockScreenSkillViewController) {
924
924
  vc = vc.getSkillViewVc();
925
925
  }
926
+ assert.isTruthy(vc, `ViewController missing. It may help to check your ViewController's render method to ensure you're properly returning a controller. Here are a few examples of how to do this:
927
+
928
+ 1. Rendering a SubView:
929
+
930
+ public render() {
931
+ return this.cardVc.render()
932
+ }
933
+
934
+ 3. Rendering as yourself (e.g. in a SkillViewController):
935
+
936
+ public render() {
937
+ return {
938
+ controller: this
939
+ }
940
+ }
941
+ `);
926
942
  const model = renderUtil.render(vc);
927
943
  assert.isTruthy(model.controller, `Your view controller does not return a controller. Make sure you return 'controller:this' from render() or that you're rending a built in view with 'render() { return this.cardVc.render() }'.`);
928
944
  try {
package/build/index.d.ts CHANGED
@@ -12,6 +12,7 @@ export { default as CardViewControllerImpl } from './viewControllers/card/Card.v
12
12
  export { default as ConfirmViewController } from './viewControllers/Confirm.vc';
13
13
  export { default as DialogViewController } from './viewControllers/Dialog.vc';
14
14
  export { default as LockScreenSkillViewController } from './skillViewControllers/LockScreen.svc';
15
+ export * from './skillViewControllers/LockScreen.svc';
15
16
  export { default as NavigationViewController } from './viewControllers/navigation/Navigation.vc';
16
17
  export { default as ListViewController } from './viewControllers/list/List.vc';
17
18
  export { default as ListRowViewController } from './viewControllers/list/ListRow.vc';
package/build/index.js CHANGED
@@ -43,6 +43,7 @@ var Dialog_vc_1 = require("./viewControllers/Dialog.vc");
43
43
  Object.defineProperty(exports, "DialogViewController", { enumerable: true, get: function () { return __importDefault(Dialog_vc_1).default; } });
44
44
  var LockScreen_svc_1 = require("./skillViewControllers/LockScreen.svc");
45
45
  Object.defineProperty(exports, "LockScreenSkillViewController", { enumerable: true, get: function () { return __importDefault(LockScreen_svc_1).default; } });
46
+ __exportStar(require("./skillViewControllers/LockScreen.svc"), exports);
46
47
  var Navigation_vc_1 = require("./viewControllers/navigation/Navigation.vc");
47
48
  Object.defineProperty(exports, "NavigationViewController", { enumerable: true, get: function () { return __importDefault(Navigation_vc_1).default; } });
48
49
  var List_vc_1 = require("./viewControllers/list/List.vc");
@@ -4,8 +4,9 @@ export default class LockScreenSkillViewController extends AbstractSkillViewCont
4
4
  private skillViewController?;
5
5
  private hideHandler?;
6
6
  private isVisible;
7
- constructor(options: ViewControllerOptions & LockScreen);
8
- setHideHindler(hideHandler: HideDialogHandler): void;
7
+ private model;
8
+ constructor(options: ViewControllerOptions & LockScreenSkillViewControllerOptions);
9
+ setHideHandler(hideHandler: HideDialogHandler): void;
9
10
  hide(): Promise<void>;
10
11
  getSkillViewVc(): SkillViewController<Record<string, any>, import("@sprucelabs/mercury-types").SpruceSchemas.HeartwoodViewControllers.v2021_02_11.SkillView> | undefined;
11
12
  getIsVisible(): boolean;
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ const removeUniversalViewOptions_1 = __importDefault(require("../utilities/removeUniversalViewOptions"));
6
7
  const Abstract_svc_1 = __importDefault(require("./Abstract.svc"));
7
8
  class LockScreenSkillViewController extends Abstract_svc_1.default {
8
9
  constructor(options) {
@@ -10,8 +11,9 @@ class LockScreenSkillViewController extends Abstract_svc_1.default {
10
11
  this.isVisible = true;
11
12
  const { controller } = options;
12
13
  this.skillViewController = controller;
14
+ this.model = (0, removeUniversalViewOptions_1.default)(options);
13
15
  }
14
- setHideHindler(hideHandler) {
16
+ setHideHandler(hideHandler) {
15
17
  this.hideHandler = hideHandler;
16
18
  }
17
19
  async hide() {
@@ -26,6 +28,7 @@ class LockScreenSkillViewController extends Abstract_svc_1.default {
26
28
  }
27
29
  render() {
28
30
  return {
31
+ ...this.model,
29
32
  controller: this,
30
33
  skillViewController: this.skillViewController ?? this,
31
34
  };
@@ -875,6 +875,22 @@ const vcAssert = {
875
875
  else if (vc instanceof LockScreen_svc_1.default) {
876
876
  vc = vc.getSkillViewVc();
877
877
  }
878
+ test_utils_1.assert.isTruthy(vc, `ViewController missing. It may help to check your ViewController's render method to ensure you're properly returning a controller. Here are a few examples of how to do this:
879
+
880
+ 1. Rendering a SubView:
881
+
882
+ public render() {
883
+ return this.cardVc.render()
884
+ }
885
+
886
+ 3. Rendering as yourself (e.g. in a SkillViewController):
887
+
888
+ public render() {
889
+ return {
890
+ controller: this
891
+ }
892
+ }
893
+ `);
878
894
  const model = render_utility_1.default.render(vc);
879
895
  test_utils_1.assert.isTruthy(model.controller, `Your view controller does not return a controller. Make sure you return 'controller:this' from render() or that you're rending a built in view with 'render() { return this.cardVc.render() }'.`);
880
896
  try {
package/package.json CHANGED
@@ -13,7 +13,7 @@
13
13
  "sideEffects": false,
14
14
  "license": "MIT",
15
15
  "description": "All the power of Heartwood in one, convenient package.",
16
- "version": "112.1.1",
16
+ "version": "112.1.2",
17
17
  "skill": {
18
18
  "namespace": "HeartwoodViewControllers",
19
19
  "commandOverrides": {