@vived/app 3.1.0 → 3.1.2

package/lib/AppObject/AppObject.d.ts

@@ -3,6 +3,7 @@ import { AppObjectComponent } from "./AppObjectComponent";
 import { AppObjectRepo } from "./AppObjectRepo";
 export declare abstract class AppObject extends ObservableEntity {
     abstract readonly id: string;
+    abstract readonly repo: AppObjectRepo;
     abstract get enabled(): boolean;
     abstract set enabled(val: boolean);
     abstract hasComponent(type: string): boolean;

package/lib/AppObject/AppObject.js

@@ -12,7 +12,6 @@ exports.makeAppObject = makeAppObject;
 class AppObjectImp extends AppObject {
     constructor(id, repo) {
         super();
-        this.repo = repo;
         this.memoizedEnabled = new Entities_1.MemoizedBoolean(true, this.notify);
         this.componentLookup = new Map();
         this.dispose = () => {
@@ -24,6 +23,7 @@ class AppObjectImp extends AppObject {
             }
         };
         this.id = id;
+        this.repo = repo;
         this.repo.add(this);
     }
     get enabled() {

package/lib/AppObject/AppObjectPM.d.ts

@@ -7,9 +7,9 @@ export declare abstract class AppObjectPM<T> implements AppObjectComponent {
     private _lastVM?;
     get lastVM(): T | undefined;
     private observerList;
-    addView: (updateView: (vm: T) => void) => void;
-    removeView: (updateView: (vm: T) => void) => void;
-    doUpdateView: (vm: T) => void;
+    addView(updateView: (vm: T) => void): void;
+    removeView(updateView: (vm: T) => void): void;
+    doUpdateView(vm: T): void;
     dispose(): void;
     constructor(appObject: AppObject, type: string);
 }

package/lib/AppObject/AppObjectPM.js

@@ -5,22 +5,6 @@ const Entities_1 = require("../Entities");
 class AppObjectPM {
     constructor(appObject, type) {
         this.observerList = new Entities_1.ObserverList();
-        this.addView = (updateView) => {
-            this.observerList.add(updateView);
-            if (this._lastVM) {
-                updateView(this._lastVM);
-            }
-        };
-        this.removeView = (updateView) => {
-            this.observerList.remove(updateView);
-        };
-        this.doUpdateView = (vm) => {
-            if (this._lastVM && this.vmsAreEqual(this._lastVM, vm)) {
-                return;
-            }
-            this._lastVM = vm;
-            this.observerList.notify(vm);
-        };
         this.type = type;
         this.appObject = appObject;
         appObject.addComponent(this);
@@ -28,6 +12,25 @@ class AppObjectPM {
     get lastVM() {
         return this._lastVM;
     }
+    addView(updateView) {
+        this.observerList.add(updateView);
+        if (this._lastVM) {
+            updateView(this._lastVM);
+        }
+    }
+    ;
+    removeView(updateView) {
+        this.observerList.remove(updateView);
+    }
+    ;
+    doUpdateView(vm) {
+        if (this._lastVM && this.vmsAreEqual(this._lastVM, vm)) {
+            return;
+        }
+        this._lastVM = vm;
+        this.observerList.notify(vm);
+    }
+    ;
     dispose() {
         this.observerList.clear();
         if (this.appObject.getComponent(this.type) === this) {

package/lib/AppObjectComponents/Hideable/PresentationManagers/IsHiddenPM.js

@@ -13,6 +13,7 @@ class IsHiddenPM extends AppObjectPM_1.AppObjectPM {
         };
         this.dispose = () => {
             var _a, _b;
+            super.dispose();
             (_a = this.hideable) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onIsHiddenChange);
             (_b = this.hideable) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
@@ -23,7 +24,7 @@ class IsHiddenPM extends AppObjectPM_1.AppObjectPM {
         }
         else {
             this.hideable.addChangeObserver(this.onIsHiddenChange);
-            this.hideable.addOnDisposeObserver(() => this.dispose());
+            this.hideable.addOnDisposeObserver(this.dispose);
             this.onIsHiddenChange();
         }
     }

package/lib/AppObjectComponents/Label/PresentationManagers/LabelPM.js

@@ -28,7 +28,7 @@ class LabelPM extends AppObject_1.AppObjectPM {
         this.label = Label_1.Label.get(appObject);
         if (this.label) {
             this.label.addChangeObserver(this.onLabelChange);
-            this.label.addOnDisposeObserver(() => this.dispose());
+            this.label.addOnDisposeObserver(this.dispose);
             this.onLabelChange();
         }
         else {

package/lib/AppObjectComponents/OverlayColor/PresentationManagers/OverlayColorPM.js

@@ -13,6 +13,7 @@ class OverlayColorPM extends AppObjectPM_1.AppObjectPM {
         };
         this.dispose = () => {
             var _a, _b;
+            super.dispose();
             (_a = this.overlayColor) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onColorChange);
             (_b = this.overlayColor) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
@@ -23,7 +24,7 @@ class OverlayColorPM extends AppObjectPM_1.AppObjectPM {
         }
         else {
             this.overlayColor.addChangeObserver(this.onColorChange);
-            this.overlayColor.addOnDisposeObserver(() => this.dispose());
+            this.overlayColor.addOnDisposeObserver(this.dispose);
             this.onColorChange();
         }
     }

package/lib/AppObjectComponents/Transform3D/PresentationManagers/CanBeStuckPM.js

@@ -16,6 +16,7 @@ class CanBeStuckPM extends AppObjectPM_1.AppObjectPM {
         };
         this.dispose = () => {
             var _a, _b;
+            super.dispose();
             (_a = this.transform) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onTransformChange);
             (_b = this.transform) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
@@ -26,7 +27,7 @@ class CanBeStuckPM extends AppObjectPM_1.AppObjectPM {
         }
         else {
             this.transform.addChangeObserver(this.onTransformChange);
-            this.transform.addOnDisposeObserver(() => this.dispose());
+            this.transform.addOnDisposeObserver(this.dispose);
             this.onTransformChange();
         }
     }

package/lib/AppObjectComponents/Transform3D/PresentationManagers/Transform3DPM.js

@@ -19,6 +19,7 @@ class Transform3DPM extends AppObjectPM_1.AppObjectPM {
         };
         this.dispose = () => {
             var _a, _b;
+            super.dispose();
             (_a = this.transform) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onTransformChange);
             (_b = this.transform) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
@@ -29,7 +30,7 @@ class Transform3DPM extends AppObjectPM_1.AppObjectPM {
         }
         else {
             this.transform.addChangeObserver(this.onTransformChange);
-            this.transform.addOnDisposeObserver(() => this.dispose());
+            this.transform.addOnDisposeObserver(this.dispose);
             this.onTransformChange();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",