@vived/app 4.15.1 → 4.17.0

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.
Files changed (26) hide show
  1. package/lib/Components/FramedScreen/Entities/FramedScreenContainer.js +1 -1
  2. package/lib/Components/StateMachine/Controller/clickRestoreScene.d.ts +2 -0
  3. package/lib/Components/StateMachine/Controller/clickRestoreScene.js +14 -0
  4. package/lib/Components/StateMachine/Controller/index.d.ts +1 -0
  5. package/lib/Components/StateMachine/Controller/index.js +13 -0
  6. package/lib/Components/StateMachine/Entities/StateMachineEntity.d.ts +2 -0
  7. package/lib/Components/StateMachine/Entities/StateMachineEntity.js +10 -0
  8. package/lib/Components/StateMachine/Mocks/MockStateMachine.d.ts +4 -1
  9. package/lib/Components/StateMachine/Mocks/MockStateMachine.js +7 -1
  10. package/lib/Components/StateMachine/index.d.ts +1 -0
  11. package/lib/Components/StateMachine/index.js +1 -0
  12. package/lib/Components/ThemeColors/Controllers/getOnPrimaryColor.d.ts +3 -0
  13. package/lib/Components/ThemeColors/Controllers/getOnPrimaryColor.js +16 -0
  14. package/lib/Components/ThemeColors/Controllers/getOnSurfaceColor.d.ts +3 -0
  15. package/lib/Components/ThemeColors/Controllers/getOnSurfaceColor.js +16 -0
  16. package/lib/Components/ThemeColors/Controllers/getPrimaryColor.d.ts +3 -0
  17. package/lib/Components/ThemeColors/Controllers/getPrimaryColor.js +16 -0
  18. package/lib/Components/ThemeColors/Controllers/getSurfaceColor.d.ts +3 -0
  19. package/lib/Components/ThemeColors/Controllers/getSurfaceColor.js +16 -0
  20. package/lib/Components/ThemeColors/Controllers/getSurfaceContainerColor.d.ts +3 -0
  21. package/lib/Components/ThemeColors/Controllers/getSurfaceContainerColor.js +16 -0
  22. package/lib/Components/ThemeColors/Controllers/index.d.ts +5 -0
  23. package/lib/Components/ThemeColors/Controllers/index.js +17 -0
  24. package/lib/Components/ThemeColors/index.d.ts +1 -0
  25. package/lib/Components/ThemeColors/index.js +1 -0
  26. package/package.json +1 -1
@@ -17,7 +17,7 @@ class FramedScreenContainerImp extends FramedScreenContainer {
17
17
  super(appObject, FramedScreenContainer.type);
18
18
  this.memoizedPos = new Entities_1.MemoizedVector2(ValueObjects_1.Vector2.Zero(), this.notifyOnChange);
19
19
  this.memoizedSize = new Entities_1.MemoizedVector2(ValueObjects_1.Vector2.Zero(), this.notifyOnChange);
20
- this.memoizedShow = new Entities_1.MemoizedBoolean(true, this.notifyOnChange);
20
+ this.memoizedShow = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
21
21
  }
22
22
  get id() {
23
23
  return this.appObject.id;
@@ -0,0 +1,2 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ export declare function clickRestoreScene(appObjects: AppObjectRepo): void;
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.clickRestoreScene = void 0;
4
+ const Entities_1 = require("../Entities");
5
+ function clickRestoreScene(appObjects) {
6
+ const entity = Entities_1.StateMachineEntity.get(appObjects);
7
+ if (entity) {
8
+ entity.restoreLastState();
9
+ }
10
+ else {
11
+ appObjects.submitError("clickRestoreScene", "Unable to find StateMachineEntity");
12
+ }
13
+ }
14
+ exports.clickRestoreScene = clickRestoreScene;
@@ -0,0 +1 @@
1
+ export * from "./clickRestoreScene";
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
+ };
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ __exportStar(require("./clickRestoreScene"), exports);
@@ -19,10 +19,12 @@ export interface SerializedSystem {
19
19
  }
20
20
  export declare abstract class StateMachineEntity extends AppObjectEntity {
21
21
  static readonly type = "StateMachineEntity";
22
+ abstract restoreDurationS: number;
22
23
  abstract transitionEaseFunction: (normalizedTime: number) => number;
23
24
  abstract getSerializedStates(): SerializedStates;
24
25
  abstract setSerializedStates(state: SerializedStates, transitionTime: number): void;
25
26
  abstract applySerializedStatesString: (state: string, duration?: number) => void;
27
+ abstract restoreLastState(): void;
26
28
  abstract setDefaultState(transitionTime: number): void;
27
29
  abstract registerSerializedSystem(serializedSystem: SerializedSystem): void;
28
30
  static get: (appObjects: AppObjectRepo) => StateMachineEntity | undefined;
@@ -17,6 +17,7 @@ class StateMachineImp extends StateMachineEntity {
17
17
  super(appObject, StateMachineEntity.type);
18
18
  this.serializedSystems = new Map();
19
19
  this.serilizationVersion = 2;
20
+ this.restoreDurationS = 1;
20
21
  this.transitionEaseFunction = (normalizedTime) => {
21
22
  return normalizedTime; // default to a linear function
22
23
  };
@@ -81,6 +82,7 @@ class StateMachineImp extends StateMachineEntity {
81
82
  system.applySystemState(systemState.state, systemState.seriliziationVersion, duration);
82
83
  }
83
84
  });
85
+ this.lastState = states;
84
86
  this.notifyOnChange();
85
87
  return;
86
88
  }
@@ -97,4 +99,12 @@ class StateMachineImp extends StateMachineEntity {
97
99
  this.notifyOnChange();
98
100
  };
99
101
  }
102
+ restoreLastState() {
103
+ if (this.lastState) {
104
+ this.setSerializedStates(this.lastState, this.restoreDurationS);
105
+ }
106
+ else {
107
+ this.setDefaultState(this.restoreDurationS);
108
+ }
109
+ }
100
110
  }
@@ -1,7 +1,9 @@
1
1
  /// <reference types="jest" />
2
- import { AppObject } from "../../../AppObject";
2
+ import { AppObject, AppObjectRepo } from "../../../AppObject";
3
3
  import { StateMachineEntity } from "../Entities";
4
4
  export declare class MockStateMachine extends StateMachineEntity {
5
+ restoreDurationS: number;
6
+ restoreLastState: jest.Mock<any, any>;
5
7
  transitionEaseFunction: jest.Mock<any, any>;
6
8
  getSerializedStates: jest.Mock<any, any>;
7
9
  setSerializedStates: jest.Mock<any, any>;
@@ -10,3 +12,4 @@ export declare class MockStateMachine extends StateMachineEntity {
10
12
  registerSerializedSystem: jest.Mock<any, any>;
11
13
  constructor(appObject: AppObject);
12
14
  }
15
+ export declare function makeMockStateMachine(appObjects: AppObjectRepo): MockStateMachine;
@@ -1,10 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MockStateMachine = void 0;
3
+ exports.makeMockStateMachine = exports.MockStateMachine = void 0;
4
4
  const Entities_1 = require("../Entities");
5
5
  class MockStateMachine extends Entities_1.StateMachineEntity {
6
6
  constructor(appObject) {
7
7
  super(appObject, Entities_1.StateMachineEntity.type);
8
+ this.restoreDurationS = 1;
9
+ this.restoreLastState = jest.fn();
8
10
  this.transitionEaseFunction = jest.fn();
9
11
  this.getSerializedStates = jest.fn();
10
12
  this.setSerializedStates = jest.fn();
@@ -14,3 +16,7 @@ class MockStateMachine extends Entities_1.StateMachineEntity {
14
16
  }
15
17
  }
16
18
  exports.MockStateMachine = MockStateMachine;
19
+ function makeMockStateMachine(appObjects) {
20
+ return new MockStateMachine(appObjects.getOrCreate("MockStateMachine"));
21
+ }
22
+ exports.makeMockStateMachine = makeMockStateMachine;
@@ -1,2 +1,3 @@
1
+ export * from "./Controller";
1
2
  export * from "./Entities";
2
3
  export * from "./Mocks";
@@ -10,5 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
+ __exportStar(require("./Controller"), exports);
13
14
  __exportStar(require("./Entities"), exports);
14
15
  __exportStar(require("./Mocks"), exports);
@@ -0,0 +1,3 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ import { Color } from "../../../ValueObjects";
3
+ export declare function getOnPrimaryColor(appObjects: AppObjectRepo): Color;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getOnPrimaryColor = void 0;
4
+ const ValueObjects_1 = require("../../../ValueObjects");
5
+ const Entities_1 = require("../Entities");
6
+ function getOnPrimaryColor(appObjects) {
7
+ const theme = Entities_1.ThemeColors.get(appObjects);
8
+ if (theme) {
9
+ return theme.getColorForType(Entities_1.ThemeColorType.onPrimary);
10
+ }
11
+ else {
12
+ appObjects.submitError("getOnPrimaryColor", "Unable to find ThemeColors");
13
+ return ValueObjects_1.Color.RGB(0, 0, 0);
14
+ }
15
+ }
16
+ exports.getOnPrimaryColor = getOnPrimaryColor;
@@ -0,0 +1,3 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ import { Color } from "../../../ValueObjects";
3
+ export declare function getOnSurfaceColor(appObjects: AppObjectRepo): Color;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getOnSurfaceColor = void 0;
4
+ const ValueObjects_1 = require("../../../ValueObjects");
5
+ const Entities_1 = require("../Entities");
6
+ function getOnSurfaceColor(appObjects) {
7
+ const theme = Entities_1.ThemeColors.get(appObjects);
8
+ if (theme) {
9
+ return theme.getColorForType(Entities_1.ThemeColorType.onSurface);
10
+ }
11
+ else {
12
+ appObjects.submitError("getOnSurfaceColor", "Unable to find ThemeColors");
13
+ return ValueObjects_1.Color.RGB(0, 0, 0);
14
+ }
15
+ }
16
+ exports.getOnSurfaceColor = getOnSurfaceColor;
@@ -0,0 +1,3 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ import { Color } from "../../../ValueObjects";
3
+ export declare function getPrimaryColor(appObjects: AppObjectRepo): Color;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getPrimaryColor = void 0;
4
+ const ValueObjects_1 = require("../../../ValueObjects");
5
+ const Entities_1 = require("../Entities");
6
+ function getPrimaryColor(appObjects) {
7
+ const theme = Entities_1.ThemeColors.get(appObjects);
8
+ if (theme) {
9
+ return theme.getColorForType(Entities_1.ThemeColorType.primary);
10
+ }
11
+ else {
12
+ appObjects.submitError("getPrimaryColor", "Unable to find ThemeColors");
13
+ return ValueObjects_1.Color.RGB(0, 0, 0);
14
+ }
15
+ }
16
+ exports.getPrimaryColor = getPrimaryColor;
@@ -0,0 +1,3 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ import { Color } from "../../../ValueObjects";
3
+ export declare function getSurfaceColor(appObjects: AppObjectRepo): Color;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getSurfaceColor = void 0;
4
+ const ValueObjects_1 = require("../../../ValueObjects");
5
+ const Entities_1 = require("../Entities");
6
+ function getSurfaceColor(appObjects) {
7
+ const theme = Entities_1.ThemeColors.get(appObjects);
8
+ if (theme) {
9
+ return theme.getColorForType(Entities_1.ThemeColorType.surface);
10
+ }
11
+ else {
12
+ appObjects.submitError("getSurfaceColor", "Unable to find ThemeColors");
13
+ return ValueObjects_1.Color.RGB(0, 0, 0);
14
+ }
15
+ }
16
+ exports.getSurfaceColor = getSurfaceColor;
@@ -0,0 +1,3 @@
1
+ import { AppObjectRepo } from "../../../AppObject";
2
+ import { Color } from "../../../ValueObjects";
3
+ export declare function getSurfaceContainerColor(appObjects: AppObjectRepo): Color;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getSurfaceContainerColor = void 0;
4
+ const ValueObjects_1 = require("../../../ValueObjects");
5
+ const Entities_1 = require("../Entities");
6
+ function getSurfaceContainerColor(appObjects) {
7
+ const theme = Entities_1.ThemeColors.get(appObjects);
8
+ if (theme) {
9
+ return theme.getColorForType(Entities_1.ThemeColorType.surfaceContainer);
10
+ }
11
+ else {
12
+ appObjects.submitError("getSurfaceColor", "Unable to find ThemeColors");
13
+ return ValueObjects_1.Color.RGB(0, 0, 0);
14
+ }
15
+ }
16
+ exports.getSurfaceContainerColor = getSurfaceContainerColor;
@@ -0,0 +1,5 @@
1
+ export * from "./getOnPrimaryColor";
2
+ export * from "./getOnSurfaceColor";
3
+ export * from "./getPrimaryColor";
4
+ export * from "./getSurfaceColor";
5
+ export * from "./getSurfaceContainerColor";
@@ -0,0 +1,17 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
+ };
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ __exportStar(require("./getOnPrimaryColor"), exports);
14
+ __exportStar(require("./getOnSurfaceColor"), exports);
15
+ __exportStar(require("./getPrimaryColor"), exports);
16
+ __exportStar(require("./getSurfaceColor"), exports);
17
+ __exportStar(require("./getSurfaceContainerColor"), exports);
@@ -1,2 +1,3 @@
1
+ export * from "./Controllers";
1
2
  export * from "./Entities";
2
3
  export * from "./PM";
@@ -10,5 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
10
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
+ __exportStar(require("./Controllers"), exports);
13
14
  __exportStar(require("./Entities"), exports);
14
15
  __exportStar(require("./PM"), exports);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vived/app",
3
- "version": "4.15.1",
3
+ "version": "4.17.0",
4
4
  "description": "Public package for the VIVED Learning App system",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",