@flashist/appframework 0.0.258 → 0.0.260
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.
- package/app/AppModule.js +2 -2
- package/app/AppModule.js.map +1 -1
- package/app/commands/LoadAppConfigCommand.js +4 -4
- package/app/commands/LoadAppConfigCommand.js.map +1 -1
- package/app/commands/ParseStaticItemsConfigCommand.js +3 -3
- package/app/commands/ParseStaticItemsConfigCommand.js.map +1 -1
- package/app/managers/AppManager.js +5 -5
- package/app/managers/AppManager.js.map +1 -1
- package/debug/DebugModule.js +3 -3
- package/debug/DebugModule.js.map +1 -1
- package/device/DeviceModule.js +2 -2
- package/device/DeviceModule.js.map +1 -1
- package/display/views/button/SimpleButtonConfig.d.ts +2 -1
- package/display/views/button/SimpleButtonConfig.js.map +1 -1
- package/display/views/button/SimpleButtonView.d.ts +1 -0
- package/display/views/button/SimpleButtonView.js +7 -1
- package/display/views/button/SimpleButtonView.js.map +1 -1
- package/ecs/managers/ECSManager.js +2 -2
- package/ecs/managers/ECSManager.js.map +1 -1
- package/facade/Facade.js +2 -2
- package/facade/Facade.js.map +1 -1
- package/locales/commands/ParseLocaleConfigCommand.js +2 -2
- package/locales/commands/ParseLocaleConfigCommand.js.map +1 -1
- package/locales/commands/SetAppLocaleCommand.js +2 -2
- package/locales/commands/SetAppLocaleCommand.js.map +1 -1
- package/package.json +1 -1
- package/pages/PagesModule.js +2 -2
- package/pages/PagesModule.js.map +1 -1
- package/pages/commands/ChangePageCommand.js +2 -2
- package/pages/commands/ChangePageCommand.js.map +1 -1
- package/pages/views/BasePageView.js +2 -2
- package/pages/views/BasePageView.js.map +1 -1
- package/pages/views/PagesMediator.js +2 -2
- package/pages/views/PagesMediator.js.map +1 -1
- package/pages/views/PagesView.js +4 -4
- package/pages/views/PagesView.js.map +1 -1
- package/state/AppStateModule.d.ts +2 -2
- package/state/AppStateModule.js +4 -4
- package/state/AppStateModule.js.map +1 -1
- package/state/commands/WaitAppStateDataChangeCommand.d.ts +9 -0
- package/state/commands/WaitAppStateDataChangeCommand.js +29 -0
- package/state/commands/WaitAppStateDataChangeCommand.js.map +1 -0
- package/state/commands/index.d.ts +1 -1
- package/state/commands/index.js +1 -1
- package/state/commands/index.js.map +1 -1
- package/time/TimeModule.js +2 -2
- package/time/TimeModule.js.map +1 -1
- package/time/managers/TimeManager.js +3 -3
- package/time/managers/TimeManager.js.map +1 -1
package/app/AppModule.js
CHANGED
|
@@ -3,7 +3,7 @@ import { ObjectTools } from '@flashist/fcore';
|
|
|
3
3
|
import { BaseAppModule } from "../base/modules/BaseAppModule";
|
|
4
4
|
import { AppManager } from "./managers/AppManager";
|
|
5
5
|
import { AppModuleInitialState } from './data/state/AppModuleState';
|
|
6
|
-
import {
|
|
6
|
+
import { appStateStorage } from "../state/AppStateModule";
|
|
7
7
|
export class AppModule extends BaseAppModule {
|
|
8
8
|
constructor(debug) {
|
|
9
9
|
super();
|
|
@@ -15,7 +15,7 @@ export class AppModule extends BaseAppModule {
|
|
|
15
15
|
const initState = ObjectTools.clone(AppModuleInitialState);
|
|
16
16
|
ObjectTools.copyProps(initState, { app: { debug: this.debug } });
|
|
17
17
|
//
|
|
18
|
-
|
|
18
|
+
appStateStorage().initializeWith(initState);
|
|
19
19
|
serviceLocatorAdd(AppManager, { isSingleton: true, forceCreation: true });
|
|
20
20
|
}
|
|
21
21
|
}
|
package/app/AppModule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppModule.js","sourceRoot":"","sources":["../../src/app/AppModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AppModule.js","sourceRoot":"","sources":["../../src/app/AppModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAkB,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,OAAO,SAAU,SAAQ,aAAa;IAExC,YAAsB,KAAc;QAChC,KAAK,EAAE,CAAC;QADU,UAAK,GAAL,KAAK,CAAS;IAEpC,CAAC;IAED,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,kCAAkC;QAClC,MAAM,SAAS,GAAmB,WAAW,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3E,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAChE,EAAE;QACF,eAAe,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAE5C,iBAAiB,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;CACJ"}
|
|
@@ -2,7 +2,7 @@ import { CommandErrorCode } from "@flashist/fcore";
|
|
|
2
2
|
import { getInstance, LoadItemCommand, LoadItemsListCommand, LoadManager } from "@flashist/flibs";
|
|
3
3
|
import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
|
|
4
4
|
import { AppSettings } from "../AppSettings";
|
|
5
|
-
import {
|
|
5
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
6
6
|
export class LoadAppConfigCommand extends BaseAppCommand {
|
|
7
7
|
executeInternal() {
|
|
8
8
|
// const appConfigModel: AppConfigModel = getInstance(AppConfigModel);
|
|
@@ -13,11 +13,11 @@ export class LoadAppConfigCommand extends BaseAppCommand {
|
|
|
13
13
|
.execute()
|
|
14
14
|
.then((data) => {
|
|
15
15
|
console.log("LoadAppConfigCommand | executeInternal __ data: ", data);
|
|
16
|
-
|
|
16
|
+
appStateStorage().change()("app.config", data);
|
|
17
17
|
//
|
|
18
|
-
const deviceState =
|
|
18
|
+
const deviceState = appStateStorage().getMutableState();
|
|
19
19
|
//
|
|
20
|
-
const appState =
|
|
20
|
+
const appState = appStateStorage().getState();
|
|
21
21
|
const loadManager = getInstance(LoadManager);
|
|
22
22
|
loadManager.addSubstituteParams({
|
|
23
23
|
locale: deviceState.device.mainLocale
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoadAppConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/LoadAppConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACH,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"LoadAppConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/LoadAppConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EACH,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EACd,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAI7D,MAAM,OAAO,oBAAqB,SAAQ,cAAc;IAE1C,eAAe;QACrB,sEAAsE;QACtE,IAAI,eAAe,CACf;YACI,GAAG,EAAE,WAAW,CAAC,aAAa;YAC9B,EAAE,EAAE,WAAW,CAAC,aAAa;SAChC,CACJ;aACI,OAAO,EAAE;aACT,IAAI,CACD,CAAC,IAAS,EAAE,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,IAAI,CAAC,CAAC;YAEtE,eAAe,EAAE,CAAC,MAAM,EAAkB,CACtC,YAAY,EACZ,IAAI,CACP,CAAC;YAEF,EAAE;YACF,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC,eAAe,EAAqB,CAAC;YAC3E,EAAE;YACF,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAkB,CAAC;YAC9D,MAAM,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;YAC1D,WAAW,CAAC,mBAAmB,CAC3B;gBACI,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU;aACxC,CACJ,CAAC;YAEF,EAAE;YACF,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,mDAAmD;gBACnD,IAAI,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAY,CAAC;qBACrD,OAAO,EAAE,CAAC;YACnB,CAAC;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC,EACD,GAAG,EAAE;YACD,MAAM,SAAS,GAAW,uFAAuF,CAAC;YAClH,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACzB,KAAK,CAAC,SAAS,CAAC,CAAC;YAEjB,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC,CACJ,CAAC;IACV,CAAC;CAEJ"}
|
|
@@ -3,7 +3,7 @@ import { GenericObjectsByTypeModel, getInstance, LoadManager } from "@flashist/f
|
|
|
3
3
|
import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
|
|
4
4
|
import { ECSManager } from "../../ecs/managers/ECSManager";
|
|
5
5
|
import { AppSettings } from "../AppSettings";
|
|
6
|
-
import {
|
|
6
|
+
import { appStateStorage } from "../../state";
|
|
7
7
|
// import {IItemsConfigVO} from "../data/IItemsConfigVO";
|
|
8
8
|
export class ParseStaticItemsConfigCommand extends BaseAppCommand {
|
|
9
9
|
executeInternal() {
|
|
@@ -22,12 +22,12 @@ export class ParseStaticItemsConfigCommand extends BaseAppCommand {
|
|
|
22
22
|
genericObjectsByTypeModel.commitItems(staticItemsConfigFileItem.data.items);
|
|
23
23
|
}
|
|
24
24
|
if (staticItemsConfigFileItem.data.state) {
|
|
25
|
-
// Do this strange hack to initialize
|
|
25
|
+
// Do this strange hack to initialize AppStateStorage data from the loaded config,´
|
|
26
26
|
// we can't change ths state from the root, because the code doesn't allow it,
|
|
27
27
|
// also we need to provide a type to check, so we provide the type with all possible keys
|
|
28
28
|
const topLevelStateKeys = Object.keys(staticItemsConfigFileItem.data.state);
|
|
29
29
|
for (let singleTopLevelKey of topLevelStateKeys) {
|
|
30
|
-
|
|
30
|
+
appStateStorage().change()(singleTopLevelKey, staticItemsConfigFileItem.data.state[singleTopLevelKey]);
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseStaticItemsConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/ParseStaticItemsConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAoB,yBAAyB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAExG,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ParseStaticItemsConfigCommand.js","sourceRoot":"","sources":["../../../src/app/commands/ParseStaticItemsConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAoB,yBAAyB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAExG,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,yDAAyD;AAEzD,MAAM,OAAO,6BAA8B,SAAQ,cAAc;IAEnD,eAAe;QAErB,IAAI,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,yBAAyB,GAAqB,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QACzG,IAAI,yBAAyB,IAAI,yBAAyB,CAAC,IAAI,EAAE,CAAC;YAE9D,IAAI,yBAAyB,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,yBAAyB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAC1C,MAAM,UAAU,GAAe,WAAW,CAAC,UAAU,CAAC,CAAC;oBACvD,KAAK,IAAI,gBAAgB,IAAI,yBAAyB,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACnE,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;oBAC9C,CAAC;gBACL,CAAC;gBAED,IAAI,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACvC,MAAM,yBAAyB,GAA8B,WAAW,CAAC,yBAAyB,CAAC,CAAC;oBACpG,yBAAyB,CAAC,WAAW,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChF,CAAC;gBAED,IAAI,yBAAyB,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACvC,mFAAmF;oBACnF,8EAA8E;oBAC9E,yFAAyF;oBACzF,MAAM,iBAAiB,GAAa,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACtF,KAAK,IAAI,iBAAiB,IAAI,iBAAiB,EAAE,CAAC;wBAC9C,eAAe,EAAE,CAAC,MAAM,EAA0B,CAAC,iBAAiB,EAAE,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;oBACnI,CAAC;gBACL,CAAC;YACL,CAAC;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1B,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAC;YAC7F,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC;YAChD,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;IAEL,CAAC;CAEJ"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { getInstance } from "@flashist/flibs";
|
|
2
2
|
import { BaseAppManager } from "../../base/managers/BaseAppManager";
|
|
3
3
|
import { LocalStorageManager } from "../../local-storage/managers/LocalStorageManager";
|
|
4
|
-
import {
|
|
4
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
5
5
|
import { AppSettings } from "../AppSettings";
|
|
6
6
|
export class AppManager extends BaseAppManager {
|
|
7
7
|
construction(...args) {
|
|
8
8
|
super.construction(args);
|
|
9
9
|
this.storageManager = getInstance(LocalStorageManager);
|
|
10
|
-
this.appState =
|
|
10
|
+
this.appState = appStateStorage().getState();
|
|
11
11
|
const appModelStorageData = this.storageManager.getParam(AppSettings.storageParamId);
|
|
12
12
|
this.applyStorageData(appModelStorageData);
|
|
13
13
|
// this.appState.app.previousSessionTotalUsageTime = this.appState.app.totalUsageDuration;
|
|
@@ -21,7 +21,7 @@ export class AppManager extends BaseAppManager {
|
|
|
21
21
|
if (flashistGlobalVars === null || flashistGlobalVars === void 0 ? void 0 : flashistGlobalVars.openTime) {
|
|
22
22
|
sessionStartTimeFirstValue = flashistGlobalVars === null || flashistGlobalVars === void 0 ? void 0 : flashistGlobalVars.openTime;
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
appStateStorage().change()("app", {
|
|
25
25
|
previousSessionTotalUsageTime: this.appState.app.totalUsageDuration,
|
|
26
26
|
sessionStartTime: sessionStartTimeFirstValue,
|
|
27
27
|
appLaunchesCount: this.appState.app.appLaunchesCount + 1
|
|
@@ -42,7 +42,7 @@ export class AppManager extends BaseAppManager {
|
|
|
42
42
|
updateUsageTime() {
|
|
43
43
|
let sessionTimeDelta = Date.now() - this.appState.app.sessionStartTime;
|
|
44
44
|
// this.appState.app.totalUsageDuration = this.appState.app.previousSessionTotalUsageTime + sessionTimeDelta;
|
|
45
|
-
|
|
45
|
+
appStateStorage().change()("app", {
|
|
46
46
|
sessionDuration: sessionTimeDelta,
|
|
47
47
|
totalUsageDuration: this.appState.app.previousSessionTotalUsageTime + sessionTimeDelta
|
|
48
48
|
});
|
|
@@ -54,7 +54,7 @@ export class AppManager extends BaseAppManager {
|
|
|
54
54
|
}
|
|
55
55
|
// this.appState.app.appLaunchesCount = data.appLaunchesCount;
|
|
56
56
|
// this.appState.app.totalUsageDuration = data.totalUsageTime;
|
|
57
|
-
|
|
57
|
+
appStateStorage().change()("app", {
|
|
58
58
|
appLaunchesCount: data.appLaunchesCount,
|
|
59
59
|
totalUsageDuration: data.totalUsageTime
|
|
60
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AppManager.js","sourceRoot":"","sources":["../../../src/app/managers/AppManager.ts"],"names":[],"mappings":"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"}
|
package/debug/DebugModule.js
CHANGED
|
@@ -2,19 +2,19 @@ import { ConsoleCustomLoggerItem, Logger } from "@flashist/fcore";
|
|
|
2
2
|
import { FApp } from "@flashist/flibs";
|
|
3
3
|
import { FC } from "@flashist/fconsole";
|
|
4
4
|
import { BaseAppModule } from "../base/modules/BaseAppModule";
|
|
5
|
-
import {
|
|
5
|
+
import { appStateStorage } from "../state/AppStateModule";
|
|
6
6
|
import { DebugModuleInitialState } from "./data/state/DebugModuleState";
|
|
7
7
|
export class DebugModule extends BaseAppModule {
|
|
8
8
|
init() {
|
|
9
9
|
super.init();
|
|
10
|
-
|
|
10
|
+
appStateStorage().initializeWith(DebugModuleInitialState);
|
|
11
11
|
// Modules
|
|
12
12
|
// serviceLocatorAdd(DefaultDebugModuleConfigVO, { isSingleton: true });
|
|
13
13
|
}
|
|
14
14
|
activateCompleteHook() {
|
|
15
15
|
super.activateCompleteHook();
|
|
16
16
|
// const fConsoleConfig: IDebugModuleConfigVO = getInstance(DefaultDebugModuleConfigVO);
|
|
17
|
-
const appState =
|
|
17
|
+
const appState = appStateStorage().getState();
|
|
18
18
|
FC.startInit(FApp.instance.stage, appState.debug.fconsole);
|
|
19
19
|
Logger.addLoggerItem(new ConsoleCustomLoggerItem());
|
|
20
20
|
}
|
package/debug/DebugModule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DebugModule.js","sourceRoot":"","sources":["../../src/debug/DebugModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAkC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DebugModule.js","sourceRoot":"","sources":["../../src/debug/DebugModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,IAAI,EAAkC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAoB,MAAM,+BAA+B,CAAC;AAG1F,MAAM,OAAO,WAAY,SAAQ,aAAa;IAE1C,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,eAAe,EAAE,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;QAE1D,UAAU;QACV,wEAAwE;IAC5E,CAAC;IAED,oBAAoB;QAChB,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAE7B,wFAAwF;QACxF,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAoB,CAAA;QAC/D,EAAE,CAAC,SAAS,CACR,IAAI,CAAC,QAAQ,CAAC,KAAK,EACnB,QAAQ,CAAC,KAAK,CAAC,QAAsC,CACxD,CAAC;QAEF,MAAM,CAAC,aAAa,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;IACxD,CAAC;CACJ"}
|
package/device/DeviceModule.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { BaseAppModule } from "../base/modules/BaseAppModule";
|
|
2
|
-
import {
|
|
2
|
+
import { appStateStorage } from "../state/AppStateModule";
|
|
3
3
|
import { DeviceModuleInitialState } from "./data/state/DeviceModuleState";
|
|
4
4
|
export class DeviceModule extends BaseAppModule {
|
|
5
5
|
init() {
|
|
6
6
|
super.init();
|
|
7
|
-
|
|
7
|
+
appStateStorage().initializeWith(DeviceModuleInitialState);
|
|
8
8
|
// Modules
|
|
9
9
|
// serviceLocatorAdd(DeviceInfoModel, { isSingleton: true });
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../src/device/DeviceModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../src/device/DeviceModule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,MAAM,OAAO,YAAa,SAAQ,aAAa;IAE3C,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,eAAe,EAAE,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC;QAE3D,UAAU;QACV,6DAA6D;IACjE,CAAC;CACJ"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IFLabelConfig } from "@flashist/flibs";
|
|
1
|
+
import { DisplayObjectContainer, IFLabelConfig } from "@flashist/flibs";
|
|
2
2
|
import { SimpleButtonState } from "./SimpleButtonState";
|
|
3
3
|
export declare const SimpleButtonDefaultConfig: {
|
|
4
4
|
labelConfig: IFLabelConfig;
|
|
@@ -21,6 +21,7 @@ export interface ISingleButtonStateConfig {
|
|
|
21
21
|
alpha?: number;
|
|
22
22
|
icon?: string;
|
|
23
23
|
labelConfig?: IFLabelConfig;
|
|
24
|
+
externalView?: DisplayObjectContainer;
|
|
24
25
|
}
|
|
25
26
|
export type ISimpleButtonStatesConfig = {
|
|
26
27
|
[key in SimpleButtonState]?: ISingleButtonStateConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC,8CAA8C;IAC9C,yCAAyC;IACzC,oDAAoD;IACpD,WAAW,EAAE,IAAqB;IAElC,QAAQ,EAAE;QACN,8DAA8D;QAC9D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,CAAC;QACd,cAAc,EAAE,CAAC;QACjB,mBAAmB,EAAE,CAAC;QACtB,mBAAmB,EAAE,CAAC;QACtB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACW;IAEnC,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI;SACc;QAC7B,IAAI,EAAE;YACF,KAAK,EAAE,CAAC;SACiB;QAC7B,KAAK,EAAE;YACH,KAAK,EAAE,CAAC;SACiB;QAC7B,QAAQ,EAAE;YACN,KAAK,EAAE,GAAG;SACe;KACH;CACjC,CAAA;
|
|
1
|
+
{"version":3,"file":"SimpleButtonConfig.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonConfig.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACrC,8CAA8C;IAC9C,yCAAyC;IACzC,oDAAoD;IACpD,WAAW,EAAE,IAAqB;IAElC,QAAQ,EAAE;QACN,8DAA8D;QAC9D,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,QAAQ;QACrB,WAAW,EAAE,CAAC;QACd,cAAc,EAAE,CAAC;QACjB,mBAAmB,EAAE,CAAC;QACtB,mBAAmB,EAAE,CAAC;QACtB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACW;IAEnC,MAAM,EAAE;QACJ,MAAM,EAAE;YACJ,KAAK,EAAE,IAAI;SACc;QAC7B,IAAI,EAAE;YACF,KAAK,EAAE,CAAC;SACiB;QAC7B,KAAK,EAAE;YACH,KAAK,EAAE,CAAC;SACiB;QAC7B,QAAQ,EAAE;YACN,KAAK,EAAE,GAAG;SACe;KACH;CACjC,CAAA;AA4BD,yCAAyC;AACzC,sBAAsB;AACtB,uBAAuB;AACvB,kCAAkC;AAClC,gBAAgB;AAEhB,wBAAwB;AACxB,kCAAkC;AAClC,sCAAsC;AACtC,kCAAkC;AAClC,wCAAwC;AACxC,wCAAwC;AACxC,wCAAwC;AACxC,eAAe;AAEf,iCAAiC;AACjC,YAAY;AAEZ,mCAAmC;AACnC,IAAI"}
|
|
@@ -14,6 +14,7 @@ export declare class SimpleButtonView<DataType extends object = object> extends
|
|
|
14
14
|
protected bg: Graphics;
|
|
15
15
|
protected contentCont: FContainer;
|
|
16
16
|
protected layoutableCont: BaseLayoutableContainer;
|
|
17
|
+
protected curStateExternalView: DisplayObjectContainer;
|
|
17
18
|
protected icon: Sprite;
|
|
18
19
|
fLabel: FLabel;
|
|
19
20
|
protected _contentLayout: BaseLayout;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FContainer, FLabel, Texture, InteractiveEvent, Sprite, DisplayResizeTools, Graphics } from "@flashist/flibs";
|
|
1
|
+
import { FContainer, FLabel, Texture, InteractiveEvent, Sprite, DisplayResizeTools, Graphics, DisplayTools } from "@flashist/flibs";
|
|
2
2
|
import { SimpleButtonDefaultConfig } from "./SimpleButtonConfig";
|
|
3
3
|
import { SimpleButtonState } from "./SimpleButtonState";
|
|
4
4
|
import { AppResizableContainer } from "../resize/AppResizableContainer";
|
|
@@ -145,6 +145,12 @@ export class SimpleButtonView extends AppResizableContainer {
|
|
|
145
145
|
if (tempConfig.labelConfig) {
|
|
146
146
|
this.fLabel.changeConfig(tempConfig.labelConfig);
|
|
147
147
|
}
|
|
148
|
+
if (tempConfig.externalView !== this.curStateExternalView) {
|
|
149
|
+
DisplayTools.childRemoveItselfFromParent(this.curStateExternalView);
|
|
150
|
+
}
|
|
151
|
+
if (tempConfig.externalView) {
|
|
152
|
+
this.layoutableCont.addChild(tempConfig.externalView);
|
|
153
|
+
}
|
|
148
154
|
if (this.enabled) {
|
|
149
155
|
this.interactive = true;
|
|
150
156
|
this.cursor = "pointer";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAA0B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"SimpleButtonView.js","sourceRoot":"","sources":["../../../../src/display/views/button/SimpleButtonView.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ArrayTools, UniqueTools } from "@flashist/fcore";
|
|
2
2
|
import { BaseAppManager } from "../../base/managers/BaseAppManager";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
4
4
|
import { TimeManagerEvent } from "../../time/managers/TimeManagerEvent";
|
|
5
5
|
import { EntitiesQuery } from "../ecs/entities/queries/EntitiesQuery";
|
|
6
6
|
export class ECSManager extends BaseAppManager {
|
|
@@ -82,7 +82,7 @@ export class ECSManager extends BaseAppManager {
|
|
|
82
82
|
}
|
|
83
83
|
construction(...args) {
|
|
84
84
|
super.construction(...args);
|
|
85
|
-
this.timeState =
|
|
85
|
+
this.timeState = appStateStorage().getState();
|
|
86
86
|
}
|
|
87
87
|
addListeners() {
|
|
88
88
|
super.addListeners();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ECSManager.js","sourceRoot":"","sources":["../../../src/ecs/managers/ECSManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ECSManager.js","sourceRoot":"","sources":["../../../src/ecs/managers/ECSManager.ts"],"names":[],"mappings":"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"}
|
package/facade/Facade.js
CHANGED
|
@@ -29,7 +29,7 @@ import { RendererManagerEvent } from "../renderer/events/RendererManagerEvent";
|
|
|
29
29
|
import { RendererManager } from "../renderer/managers/RendererManager";
|
|
30
30
|
import { RendererModule } from "../renderer/RendererModule";
|
|
31
31
|
import { SoundsModule } from "../sounds/SoundsModule";
|
|
32
|
-
import { AppStateModule,
|
|
32
|
+
import { AppStateModule, appStateStorage } from "../state/AppStateModule";
|
|
33
33
|
import { TimeModule } from "../time/TimeModule";
|
|
34
34
|
export class Facade extends BaseObject {
|
|
35
35
|
constructor(options) {
|
|
@@ -128,7 +128,7 @@ export class Facade extends BaseObject {
|
|
|
128
128
|
}
|
|
129
129
|
onWindowResize() {
|
|
130
130
|
const documentSize = HtmlTools.getDocumentSize();
|
|
131
|
-
const appState =
|
|
131
|
+
const appState = appStateStorage().getState();
|
|
132
132
|
if (this.rendererManager) {
|
|
133
133
|
this.rendererManager.resize(documentSize.x, documentSize.y, appState.device.pixelRatio);
|
|
134
134
|
}
|
package/facade/Facade.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Facade.js","sourceRoot":"","sources":["../../src/facade/Facade.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAS,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2DAA2D,CAAC;AAClG,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"Facade.js","sourceRoot":"","sources":["../../src/facade/Facade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getInstance, LoadManager, LocaleManager } from "@flashist/flibs";
|
|
2
2
|
import { AppSettings } from "../../app/AppSettings";
|
|
3
3
|
import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
|
|
4
|
-
import {
|
|
4
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
5
5
|
export class ParseLocaleConfigCommand extends BaseAppCommand {
|
|
6
6
|
executeInternal() {
|
|
7
7
|
let loadManager = getInstance(LoadManager);
|
|
@@ -10,7 +10,7 @@ export class ParseLocaleConfigCommand extends BaseAppCommand {
|
|
|
10
10
|
// let appConfigModel: AppConfigModel = getInstance(AppConfigModel);
|
|
11
11
|
let localizationJson = localeConfigFileItem.data;
|
|
12
12
|
let localeManager = getInstance(LocaleManager);
|
|
13
|
-
const appState =
|
|
13
|
+
const appState = appStateStorage().getState();
|
|
14
14
|
// localeManager.setCurrentLanguage(appState.app.config.locale);
|
|
15
15
|
// localeManager.addLocale(localizationJson, appState.app.config.locale);
|
|
16
16
|
let localeKeys = Object.keys(localizationJson);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseLocaleConfigCommand.js","sourceRoot":"","sources":["../../../src/locales/commands/ParseLocaleConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,WAAW,EAAiB,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3G,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ParseLocaleConfigCommand.js","sourceRoot":"","sources":["../../../src/locales/commands/ParseLocaleConfigCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,WAAW,EAAiB,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3G,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,OAAO,wBAAyB,SAAQ,cAAc;IAE9C,eAAe;QACrB,IAAI,WAAW,GAAgB,WAAW,CAAC,WAAW,CAAC,CAAC;QACxD,IAAI,oBAAoB,GAAqB,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACrG,IAAI,oBAAoB,IAAI,oBAAoB,CAAC,IAAI,EAAE,CAAC;YACpD,oEAAoE;YAEpE,IAAI,gBAAgB,GAAkB,oBAAoB,CAAC,IAAI,CAAC;YAEhE,IAAI,aAAa,GAAkB,WAAW,CAAgB,aAAa,CAAC,CAAC;YAE7E,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAkB,CAAC;YAC9D,gEAAgE;YAChE,yEAAyE;YACzE,IAAI,UAAU,GAAa,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACzD,KAAK,IAAI,eAAe,IAAI,UAAU,EAAE,CAAC;gBACrC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;gBAC5D,aAAa,CAAC,cAAc,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAE1B,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { getInstance, LocaleManager } from "@flashist/flibs";
|
|
2
2
|
import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
4
4
|
export class SetAppLocaleCommand extends BaseAppCommand {
|
|
5
5
|
executeInternal() {
|
|
6
|
-
const deviceState =
|
|
6
|
+
const deviceState = appStateStorage().getState();
|
|
7
7
|
let localeManager = getInstance(LocaleManager);
|
|
8
8
|
localeManager.setCurrentLocaleId(deviceState.device.mainLocale);
|
|
9
9
|
this.notifyComplete();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SetAppLocaleCommand.js","sourceRoot":"","sources":["../../../src/locales/commands/SetAppLocaleCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"SetAppLocaleCommand.js","sourceRoot":"","sources":["../../../src/locales/commands/SetAppLocaleCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,OAAO,mBAAoB,SAAQ,cAAc;IAEzC,eAAe;QACrB,MAAM,WAAW,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAqB,CAAC;QACpE,IAAI,aAAa,GAAkB,WAAW,CAAgB,aAAa,CAAC,CAAC;QAC7E,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEhE,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;CACJ"}
|
package/package.json
CHANGED
package/pages/PagesModule.js
CHANGED
|
@@ -4,12 +4,12 @@ import { serviceLocatorAdd } from "@flashist/flibs";
|
|
|
4
4
|
import { PagesView } from "./views/PagesView";
|
|
5
5
|
import { PagesMediator } from "./views/PagesMediator";
|
|
6
6
|
import { PagesModuleInitialState } from "./data/state/PagesModuleState";
|
|
7
|
-
import {
|
|
7
|
+
import { appStateStorage } from "../state/AppStateModule";
|
|
8
8
|
export class PagesModule extends BaseAppModule {
|
|
9
9
|
init() {
|
|
10
10
|
super.init();
|
|
11
11
|
// Init the app with initial state
|
|
12
|
-
|
|
12
|
+
appStateStorage().initializeWith(PagesModuleInitialState);
|
|
13
13
|
//
|
|
14
14
|
serviceLocatorAdd(PagesView, { activateeConstructors: [PagesMediator] });
|
|
15
15
|
}
|
package/pages/PagesModule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PagesModule.js","sourceRoot":"","sources":["../../src/pages/PagesModule.ts"],"names":[],"mappings":"AACA,kDAAkD;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PagesModule.js","sourceRoot":"","sources":["../../src/pages/PagesModule.ts"],"names":[],"mappings":"AACA,kDAAkD;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,OAAO,WAAY,SAAQ,aAAa;IAE1C,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,kCAAkC;QAClC,eAAe,EAAE,CAAC,cAAc,CAAC,uBAAuB,CAAC,CAAC;QAE1D,EAAE;QACF,iBAAiB,CAAC,SAAS,EAAE,EAAE,qBAAqB,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC7E,CAAC;CACJ"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BaseAppCommand } from "../../base/commands/BaseAppCommand";
|
|
2
|
-
import {
|
|
2
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
3
3
|
export class ChangePageCommand extends BaseAppCommand {
|
|
4
4
|
// protected pagesModel: PagesModel = getInstance(PagesModel);
|
|
5
5
|
constructor(pageId) {
|
|
@@ -7,7 +7,7 @@ export class ChangePageCommand extends BaseAppCommand {
|
|
|
7
7
|
this.pageId = pageId;
|
|
8
8
|
}
|
|
9
9
|
executeInternal() {
|
|
10
|
-
|
|
10
|
+
appStateStorage().change()("pages.pageId", this.pageId);
|
|
11
11
|
this.notifyComplete();
|
|
12
12
|
}
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangePageCommand.js","sourceRoot":"","sources":["../../../src/pages/commands/ChangePageCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ChangePageCommand.js","sourceRoot":"","sources":["../../../src/pages/commands/ChangePageCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,MAAM,OAAO,iBAAkB,SAAQ,cAAc;IAEjD,8DAA8D;IAE9D,YAAsB,MAAc;QAChC,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAQ;IAEpC,CAAC;IAES,eAAe;QACrB,eAAe,EAAE,CAAC,MAAM,EAAoB,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE1E,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;CACJ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DisplayResizeTools, FContainer, Graphics, Point, Rectangle } from "@flashist/flibs";
|
|
2
2
|
import { BaseAppView } from "../../base/views/BaseAppView";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
4
4
|
export class BasePageView extends BaseAppView {
|
|
5
5
|
construction(...args) {
|
|
6
6
|
super.construction(args);
|
|
@@ -23,7 +23,7 @@ export class BasePageView extends BaseAppView {
|
|
|
23
23
|
// this.sizeAreaView.alpha = 0;
|
|
24
24
|
this.sizeAreaView.visible = false;
|
|
25
25
|
this._sizeArea = new Rectangle();
|
|
26
|
-
const appState =
|
|
26
|
+
const appState = appStateStorage().getState();
|
|
27
27
|
if (appState.app.config.sizeArea) {
|
|
28
28
|
this._sizeArea = new Rectangle(appState.app.config.sizeArea.x || 0, appState.app.config.sizeArea.y || 0, appState.app.config.sizeArea.width || 0, appState.app.config.sizeArea.height || 0);
|
|
29
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAe,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAiB,MAAM,iBAAiB,CAAC;AAGzH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"BasePageView.js","sourceRoot":"","sources":["../../../src/pages/views/BasePageView.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { BaseAppMediator } from "../../base/mediators/BaseAppMediator";
|
|
2
|
-
import {
|
|
2
|
+
import { appStateStorageChangeEvent } from "../../state/AppStateModule";
|
|
3
3
|
export class PagesMediator extends BaseAppMediator {
|
|
4
4
|
onActivatorStart(activator) {
|
|
5
5
|
super.onActivatorStart(activator);
|
|
6
|
-
this.eventListenerHelper.addEventListener(this.globalDispatcher,
|
|
6
|
+
this.eventListenerHelper.addEventListener(this.globalDispatcher, appStateStorageChangeEvent()("pages.pageId"), this.onPageIdChange);
|
|
7
7
|
}
|
|
8
8
|
onPageIdChange() {
|
|
9
9
|
this.activator.commitPagesData();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PagesMediator.js","sourceRoot":"","sources":["../../../src/pages/views/PagesMediator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PagesMediator.js","sourceRoot":"","sources":["../../../src/pages/views/PagesMediator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAIxE,MAAM,OAAO,aAAc,SAAQ,eAA0B;IAEzD,gBAAgB,CAAC,SAAoB;QACjC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAElC,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,CAAC,gBAAgB,EACrB,0BAA0B,EAAoB,CAAC,cAAc,CAAC,EAC9D,IAAI,CAAC,cAAc,CACtB,CAAC;IACN,CAAC;IAES,cAAc;QACpB,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC;CACJ"}
|
package/pages/views/PagesView.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AppResizableContainer } from "../../display/views/resize/AppResizableContainer";
|
|
2
2
|
import { ViewLazyCreationServiceLocatorStack } from "../../display/views/viewstack/ViewLazyCreationServiceLocatorStack";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
4
4
|
export class PagesView extends AppResizableContainer {
|
|
5
5
|
construction(...args) {
|
|
6
6
|
super.construction(args);
|
|
@@ -21,7 +21,7 @@ export class PagesView extends AppResizableContainer {
|
|
|
21
21
|
// let tempPageClass = pagesModuleState.pageIdToViewClassMap[singlePageId];
|
|
22
22
|
// this.viewStack.addViewClass(tempPageClass, singlePageId);
|
|
23
23
|
// }
|
|
24
|
-
const appState =
|
|
24
|
+
const appState = appStateStorage().getMutableState();
|
|
25
25
|
let pageIds = Object.keys(appState.pages.pageIdToViewClassMap);
|
|
26
26
|
for (let singlePageId of pageIds) {
|
|
27
27
|
let tempPageClass = appState.pages.pageIdToViewClassMap[singlePageId];
|
|
@@ -45,7 +45,7 @@ export class PagesView extends AppResizableContainer {
|
|
|
45
45
|
// this.commitPagesData();
|
|
46
46
|
// }
|
|
47
47
|
commitPagesData() {
|
|
48
|
-
this.viewStack.selectedId =
|
|
48
|
+
this.viewStack.selectedId = appStateStorage().getState().pages.pageId;
|
|
49
49
|
this.arrange();
|
|
50
50
|
}
|
|
51
51
|
arrange() {
|
|
@@ -53,7 +53,7 @@ export class PagesView extends AppResizableContainer {
|
|
|
53
53
|
this.viewStack.resize(this.resizeSize.x, this.resizeSize.y);
|
|
54
54
|
if (this.viewStack.selectedItem) {
|
|
55
55
|
if (this.viewStack.selectedItem.contentScale) {
|
|
56
|
-
|
|
56
|
+
appStateStorage().change()("pages.activePageContentScale", {
|
|
57
57
|
x: this.viewStack.selectedItem.contentScale.x,
|
|
58
58
|
y: this.viewStack.selectedItem.contentScale.y
|
|
59
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PagesView.js","sourceRoot":"","sources":["../../../src/pages/views/PagesView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,mCAAmC,EAAE,MAAM,mEAAmE,CAAC;AACxH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"PagesView.js","sourceRoot":"","sources":["../../../src/pages/views/PagesView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,mCAAmC,EAAE,MAAM,mEAAmE,CAAC;AACxH,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAI7D,MAAM,OAAO,SAAU,SAAQ,qBAAqB;IAMtC,YAAY,CAAC,GAAG,IAAI;QAC1B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEzB,6CAA6C;QAE7C,IAAI,CAAC,SAAS,GAAG,IAAI,mCAAmC,EAAgB,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9B,wEAAwE;QACxE,6DAA6D;QAC7D,6CAA6C;QAC7C,iFAAiF;QACjF,4EAA4E;QAC5E,qDAAqD;QAErD,8DAA8D;QAC9D,IAAI;QAEJ,oHAAoH;QACpH,8EAA8E;QAC9E,sCAAsC;QACtC,+EAA+E;QAC/E,gEAAgE;QAChE,IAAI;QAEJ,MAAM,QAAQ,GAAqB,eAAe,EAAE,CAAC,eAAe,EAAoB,CAAC;QACzF,IAAI,OAAO,GAAa,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACzE,KAAK,IAAI,YAAY,IAAI,OAAO,EAAE,CAAC;YAC/B,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;IAC3B,CAAC;IAES,YAAY;QAClB,KAAK,CAAC,YAAY,EAAE,CAAC;QAErB,6CAA6C;QAC7C,uBAAuB;QACvB,sCAAsC;QACtC,0BAA0B;QAC1B,KAAK;QACL,gDAAgD;QAChD,cAAc;QAEd,QAAQ;QACR,IAAI;IACR,CAAC;IAED,qCAAqC;IACrC,8BAA8B;IAC9B,IAAI;IAEG,eAAe;QAClB,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,eAAe,EAAE,CAAC,QAAQ,EAAoB,CAAC,KAAK,CAAC,MAAM,CAAC;QAExF,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAES,OAAO;QACb,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAE5D,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;gBAC3C,eAAe,EAAE,CAAC,MAAM,EAAoB,CACxC,8BAA8B,EAC9B;oBACI,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAC7C,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBAChD,CACJ,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -5,8 +5,8 @@ export declare class AppStateModule extends BaseAppModule {
|
|
|
5
5
|
init(): void;
|
|
6
6
|
initCompleteHook(): void;
|
|
7
7
|
}
|
|
8
|
-
export declare const
|
|
9
|
-
export declare const
|
|
8
|
+
export declare const appStateStorage: () => AppStateStorage;
|
|
9
|
+
export declare const appStateStorageChangeEvent: <StateType extends object>() => <DeepKeyType extends keyof Flatten<StateType>>(deepKey: DeepKeyType) => string;
|
|
10
10
|
/**
|
|
11
11
|
//
|
|
12
12
|
export const getAppStateStorage = (): AppStateStorage => {
|
package/state/AppStateModule.js
CHANGED
|
@@ -12,17 +12,17 @@ export class AppStateModule extends BaseAppModule {
|
|
|
12
12
|
getInstance(AppStateStorage).initializeComplete();
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
|
-
export const
|
|
15
|
+
export const appStateStorage = () => {
|
|
16
16
|
return getInstance(AppStateStorage);
|
|
17
17
|
};
|
|
18
|
-
export const
|
|
18
|
+
export const appStateStorageChangeEvent = () => {
|
|
19
19
|
return (deepKey) => {
|
|
20
20
|
return AppStateEventChangeTools.getChangeEvent(deepKey);
|
|
21
21
|
};
|
|
22
22
|
};
|
|
23
23
|
//
|
|
24
|
-
window["
|
|
25
|
-
window["
|
|
24
|
+
window["appStateStorage"] = appStateStorage;
|
|
25
|
+
window["appStateStorageChangeEvent"] = appStateStorageChangeEvent;
|
|
26
26
|
/**
|
|
27
27
|
//
|
|
28
28
|
export const getAppStateStorage = (): AppStateStorage => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppStateModule.js","sourceRoot":"","sources":["../../src/state/AppStateModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,MAAM,OAAO,cAAe,SAAQ,aAAa;IAE7C,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,iBAAiB,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,gBAAgB;QACZ,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAEzB,WAAW,CAAC,eAAe,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACtD,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"AppStateModule.js","sourceRoot":"","sources":["../../src/state/AppStateModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,MAAM,OAAO,cAAe,SAAQ,aAAa;IAE7C,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,iBAAiB,CAAC,eAAe,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,gBAAgB;QACZ,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAEzB,WAAW,CAAC,eAAe,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACtD,CAAC;CACJ;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAChC,OAAO,WAAW,CAAC,eAAe,CAAC,CAAC;AACxC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAA6B,EAAE;IACrE,OAAO,CAA+C,OAAoB,EAAU,EAAE;QAClF,OAAO,wBAAwB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;IAC3D,CAAC,CAAA;AACL,CAAC,CAAA;AAED,EAAE;AACF,MAAM,CAAC,iBAAiB,CAAC,GAAG,eAAe,CAAC;AAC5C,MAAM,CAAC,4BAA4B,CAAC,GAAG,0BAA0B,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { BaseAppCommand } from "../../base";
|
|
2
|
+
export declare class WaitAppStateDataChageCommand extends BaseAppCommand {
|
|
3
|
+
protected deepKey: string;
|
|
4
|
+
protected value: any;
|
|
5
|
+
constructor(deepKey: string, value: any);
|
|
6
|
+
guard(): boolean;
|
|
7
|
+
protected getAppStateValue(): any;
|
|
8
|
+
protected executeInternal(): void;
|
|
9
|
+
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { BaseAppCommand } from "../../base";
|
|
2
|
+
import { appStateStorageChangeEvent, appStateStorage } from "../AppStateModule";
|
|
3
|
+
export class WaitAppStateDataChageCommand extends BaseAppCommand {
|
|
4
|
+
constructor(deepKey, value) {
|
|
5
|
+
super();
|
|
6
|
+
this.deepKey = deepKey;
|
|
7
|
+
this.value = value;
|
|
8
|
+
}
|
|
9
|
+
guard() {
|
|
10
|
+
let result = super.guard();
|
|
11
|
+
if (result) {
|
|
12
|
+
if (this.value == this.getAppStateValue()) {
|
|
13
|
+
result = false;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return result;
|
|
17
|
+
}
|
|
18
|
+
getAppStateValue() {
|
|
19
|
+
return appStateStorage().getValue()(this.deepKey);
|
|
20
|
+
}
|
|
21
|
+
executeInternal() {
|
|
22
|
+
this.eventListenerHelper.addEventListener(this.globalDispatcher, appStateStorageChangeEvent()(this.deepKey), () => {
|
|
23
|
+
if (this.value == this.getAppStateValue()) {
|
|
24
|
+
this.notifyComplete();
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=WaitAppStateDataChangeCommand.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WaitAppStateDataChangeCommand.js","sourceRoot":"","sources":["../../../src/state/commands/WaitAppStateDataChangeCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEhF,MAAM,OAAO,4BAA6B,SAAQ,cAAc;IAC5D,YAAsB,OAAe,EAAY,KAAU;QACvD,KAAK,EAAE,CAAC;QADU,YAAO,GAAP,OAAO,CAAQ;QAAY,UAAK,GAAL,KAAK,CAAK;IAE3D,CAAC;IAED,KAAK;QACD,IAAI,MAAM,GAAY,KAAK,CAAC,KAAK,EAAE,CAAC;QACpC,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBACxC,MAAM,GAAG,KAAK,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,gBAAgB;QACtB,OAAQ,eAAe,EAAE,CAAC,QAAQ,EAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;IAES,eAAe;QACrB,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CACrC,IAAI,CAAC,gBAAgB,EACpB,0BAA0B,EAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EACnD,GAAG,EAAE;YACD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBACxC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,CAAC;QACL,CAAC,CACJ,CAAA;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './WaitAppStateDataChangeCommand';
|
package/state/commands/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './WaitAppStateDataChangeCommand';
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/state/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/state/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC"}
|
package/time/TimeModule.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { serviceLocatorAdd } from "@flashist/flibs";
|
|
2
2
|
import { BaseAppModule } from "../base/modules/BaseAppModule";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../state/AppStateModule";
|
|
4
4
|
import { TimeModuleInitialAppState } from "./data/state/TimeModuleAppState";
|
|
5
5
|
import { TimeManager } from "./managers/TimeManager";
|
|
6
6
|
export class TimeModule extends BaseAppModule {
|
|
7
7
|
init() {
|
|
8
8
|
super.init();
|
|
9
9
|
// Init the app with initial state
|
|
10
|
-
|
|
10
|
+
appStateStorage().initializeWith(TimeModuleInitialAppState);
|
|
11
11
|
// serviceLocatorAdd(TimeModel, {isSingleton: true, forceCreation: true});
|
|
12
12
|
serviceLocatorAdd(TimeManager, { isSingleton: true, forceCreation: true });
|
|
13
13
|
}
|
package/time/TimeModule.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeModule.js","sourceRoot":"","sources":["../../src/time/TimeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TimeModule.js","sourceRoot":"","sources":["../../src/time/TimeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,OAAO,UAAW,SAAQ,aAAa;IAEzC,IAAI;QACA,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,kCAAkC;QAClC,eAAe,EAAE,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;QAE5D,0EAA0E;QAC1E,iBAAiB,CAAC,WAAW,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;CAEJ"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Ticker } from "pixi.js";
|
|
2
2
|
import { BaseAppManager } from "../../base/managers/BaseAppManager";
|
|
3
|
-
import {
|
|
3
|
+
import { appStateStorage } from "../../state/AppStateModule";
|
|
4
4
|
import { TimeManagerEvent } from "./TimeManagerEvent";
|
|
5
5
|
export class TimeManager extends BaseAppManager {
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
|
-
this.appStateStorage =
|
|
9
|
-
this.timeModuleState =
|
|
8
|
+
this.appStateStorage = appStateStorage();
|
|
9
|
+
this.timeModuleState = appStateStorage().getState();
|
|
10
10
|
}
|
|
11
11
|
addListeners() {
|
|
12
12
|
super.addListeners();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeManager.js","sourceRoot":"","sources":["../../../src/time/managers/TimeManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"TimeManager.js","sourceRoot":"","sources":["../../../src/time/managers/TimeManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,MAAM,OAAO,WAAY,SAAQ,cAAc;IAA/C;;QAEc,oBAAe,GAAoB,eAAe,EAAE,CAAC;QACrD,oBAAe,GAAuB,eAAe,EAAE,CAAC,QAAQ,EAAsB,CAAC;IAgDrG,CAAC;IA9Ca,YAAY;QAClB,KAAK,CAAC,YAAY,EAAE,CAAC;QAErB,kFAAkF;QAClF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAES,eAAe;QACrB,KAAK,CAAC,eAAe,EAAE,CAAC;QAExB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAES,MAAM;QACZ,MAAM,OAAO,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;QACnC,IAAI,SAAS,GAAW,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;QACpE,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,IAAI,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrD,sDAAsD;gBACtD,OAAO;YACX,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,IAAI,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrD,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC;YACvD,CAAC;QACL,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,MAAM,EAAsB,CAC7C,cAAc,EACd,OAAO,CACV,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAsB,CAC7C,oBAAoB,EACpB,SAAS,CACZ,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,MAAM,EAAsB,CAC7C,uBAAuB,EACvB,SAAS,GAAG,IAAI,CACnB,CAAC;QAEF,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACJ"}
|