@vived/app 4.31.0 → 4.32.0

package/lib/Components/SceneRoot/Controllers/TouchPan.js

@@ -2,14 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchPan = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const ValueObjects_1 = require("../../../ValueObjects");
+const Tools_1 = require("../../Tools");
 const TouchController_1 = require("../../TouchController");
 const PanSceneRoot_1 = require("../UC/PanSceneRoot");
 class TouchPan extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, TouchPan.type);
+        this.PAN_FINGER_DISTANCE_PX = 80;
         this.isPanning = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const panTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("PAN");
+            if (!panTool)
+                return false;
+            const panToolIsAcvtive = panTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.touches.length === 1 && panToolIsAcvtive) {
+                return true;
+            }
+            else if (e.touches.length === 2) {
+                const dist = ValueObjects_1.Vector2.Subtract(e.touches[0].position, e.touches[1].position).magnitued;
+                if (dist > this.PAN_FINGER_DISTANCE_PX) {
+                    return true;
+                }
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a, _b;
@@ -34,11 +51,6 @@ class TouchPan extends AppObjectController_1.AppObjectController {
             (_a = this.panRootUC) === null || _a === void 0 ? void 0 : _a.finishPan();
         };
         const appObjects = appObject.appObjectRepo;
-        this.panRootUC = appObject.getComponent(PanSceneRoot_1.PanSceneRootUC.type);
-        if (!this.panRootUC) {
-            this.warn("Controller has been added to an App Object that does not have PanSceneRootUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -47,6 +59,12 @@ class TouchPan extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get panRootUC() {
+        return this.getCachedLocalComponent(PanSceneRoot_1.PanSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.TouchPan = TouchPan;
 TouchPan.type = "TouchPan";

package/lib/Components/SceneRoot/Controllers/TouchPinch.d.ts

@@ -1,11 +1,11 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { TouchController, TouchInputEvent } from "../../TouchController";
-import { PinchSceneRootUC } from "../UC/PinchSceneRoot";
 export declare class TouchPinch extends AppObjectController implements TouchController {
     static readonly type = "TouchPinch";
     private isPinching;
-    pinchRootUC?: PinchSceneRootUC;
+    PAN_FINGER_DISTANCE_PX: number;
+    private get pinchRootUC();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/TouchPinch.js

@@ -2,14 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchPinch = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const ValueObjects_1 = require("../../../ValueObjects");
 const TouchController_1 = require("../../TouchController");
 const PinchSceneRoot_1 = require("../UC/PinchSceneRoot");
 class TouchPinch extends AppObjectController_1.AppObjectController {
     constructor(appObject) {
         super(appObject, TouchPinch.type);
         this.isPinching = false;
+        this.PAN_FINGER_DISTANCE_PX = 80;
         this.allow = (e) => {
-            return true;
+            if (e.touches.length === 2) {
+                const dist = ValueObjects_1.Vector2.Subtract(e.touches[0].position, e.touches[1].position).magnitued;
+                if (dist > this.PAN_FINGER_DISTANCE_PX) {
+                    return true;
+                }
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a;
@@ -37,11 +45,6 @@ class TouchPinch extends AppObjectController_1.AppObjectController {
             (_a = this.pinchRootUC) === null || _a === void 0 ? void 0 : _a.finishPinch();
         };
         const appObjects = appObject.appObjectRepo;
-        this.pinchRootUC = appObject.getComponent(PinchSceneRoot_1.PinchSceneRootUC.type);
-        if (!this.pinchRootUC) {
-            this.warn("Controller has been added to an App Object that does not have PinchSceneRootUC. Add one first.");
-            return;
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -50,6 +53,9 @@ class TouchPinch extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get pinchRootUC() {
+        return this.getCachedLocalComponent(PinchSceneRoot_1.PinchSceneRootUC.type);
+    }
 }
 exports.TouchPinch = TouchPinch;
 TouchPinch.type = "TouchPinch";

package/lib/Components/SceneRoot/Controllers/TouchScale.d.ts

@@ -1,11 +1,11 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { TouchController, TouchInputEvent } from "../../TouchController";
-import { DragScaleSceneRootUC } from "../UC/DragScaleSceneRoot";
 export declare class TouchScale extends AppObjectController implements TouchController {
     static readonly type = "TouchScale";
     private isScaling;
-    dragScaleRootUC?: DragScaleSceneRootUC;
+    private get dragScaleRootUC();
+    private get toolRepo();
     allow: (e: TouchInputEvent) => boolean;
     onTouchStart: (e: TouchInputEvent) => void;
     onTouchMove: (e: TouchInputEvent) => void;

package/lib/Components/SceneRoot/Controllers/TouchScale.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TouchScale = void 0;
 const AppObjectController_1 = require("../../../AppObject/AppObjectController");
+const Tools_1 = require("../../Tools");
 const TouchController_1 = require("../../TouchController");
 const DragScaleSceneRoot_1 = require("../UC/DragScaleSceneRoot");
 class TouchScale extends AppObjectController_1.AppObjectController {
@@ -9,7 +10,15 @@ class TouchScale extends AppObjectController_1.AppObjectController {
         super(appObject, TouchScale.type);
         this.isScaling = false;
         this.allow = (e) => {
-            return true;
+            var _a;
+            const zoomTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("ZOOM");
+            if (!zoomTool)
+                return false;
+            const zoomToolIsActive = zoomTool.state === Tools_1.ToolState.ACTIVE;
+            if (e.touches.length === 1 && zoomToolIsActive) {
+                return true;
+            }
+            return false;
         };
         this.onTouchStart = (e) => {
             var _a;
@@ -39,10 +48,6 @@ class TouchScale extends AppObjectController_1.AppObjectController {
             (_a = this.dragScaleRootUC) === null || _a === void 0 ? void 0 : _a.finishScaling();
         };
         const appObjects = appObject.appObjectRepo;
-        this.dragScaleRootUC = DragScaleSceneRoot_1.DragScaleSceneRootUC.get(appObjects);
-        if (!this.dragScaleRootUC) {
-            this.warn("Unable to finde DragScaleSceneRootUC");
-        }
         const touchInput = TouchController_1.TouchInputEntity.get(appObjects);
         if (touchInput) {
             touchInput.registerController(this);
@@ -51,6 +56,12 @@ class TouchScale extends AppObjectController_1.AppObjectController {
             this.warn("Unable to find TouchInputEntity");
         }
     }
+    get dragScaleRootUC() {
+        return this.getCachedLocalComponent(DragScaleSceneRoot_1.DragScaleSceneRootUC.type);
+    }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
 }
 exports.TouchScale = TouchScale;
 TouchScale.type = "TouchScale";

package/lib/Components/SceneRoot/Factories/index.d.ts

@@ -0,0 +1 @@
+export * from "./setupSceneRoot";

package/lib/Components/SceneRoot/Factories/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./setupSceneRoot"), exports);

package/lib/Components/SceneRoot/Factories/setupSceneRoot.d.ts

@@ -0,0 +1,3 @@
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { DefaultSceneRootData } from "../Entities";
+export declare function setupSceneRoot(appObjects: AppObjectRepo, defaultData?: DefaultSceneRootData): AppObject;

package/lib/Components/SceneRoot/Factories/setupSceneRoot.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupSceneRoot = void 0;
+const Transform3D_1 = require("../../Transform3D");
+const Controllers_1 = require("../Controllers");
+const Entities_1 = require("../Entities");
+const UC_1 = require("../UC");
+function setupSceneRoot(appObjects, defaultData) {
+    const ao = appObjects.getOrCreate("SceneRoot");
+    const entity = Entities_1.makeSceneRootEntity(ao);
+    if (defaultData) {
+        entity.applyDefaultData(defaultData);
+    }
+    // UCs
+    UC_1.makeBumpSceneRootScaleAboutPixelPointUC(ao);
+    UC_1.makeCenterSceneRootOnPixelPickUC(ao);
+    UC_1.makeDragScaleSceneRootUC(ao);
+    UC_1.makeFocusOnPixelUC(ao);
+    UC_1.makeOrbitSceneRootUC(ao);
+    UC_1.makePanSceneRootUC(ao);
+    UC_1.makePinchSceneRootUC(ao);
+    new UC_1.ScaleSceneRootWithRay(ao);
+    UC_1.makeSerializeSceneRoot(ao);
+    Transform3D_1.makeStylusMoveTransformUC(ao);
+    const scaleUC = Transform3D_1.makeScaleTransformUC(ao);
+    scaleUC.raySensitivity = 10;
+    scaleUC.pixelSensitivity = 0.01;
+    // PMs
+    Transform3D_1.makeTransform3DPM(ao);
+    // Controllers
+    new Controllers_1.MouseClickToFocus(ao);
+    new Controllers_1.MouseOrbit(ao);
+    new Controllers_1.MousePan(ao);
+    new Controllers_1.MouseRoll(ao);
+    new Controllers_1.MouseScale(ao);
+    new Controllers_1.DoubleTapToFocus(ao);
+    new Controllers_1.TouchOrbit(ao);
+    new Controllers_1.TouchPan(ao);
+    new Controllers_1.TouchPinch(ao);
+    new Controllers_1.TouchScale(ao);
+    new Controllers_1.SceneRootMoveSC(ao);
+    new Controllers_1.ScaleSceneRootSC(ao);
+    return ao;
+}
+exports.setupSceneRoot = setupSceneRoot;

package/lib/Components/SceneRoot/Mocks/MockDragScaleSceneRootUC.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { DragScaleSceneRootUC } from "../UC";
+export declare class MockDragScaleSceneRootUC extends DragScaleSceneRootUC {
+    doScale: jest.Mock<any, any>;
+    initializeScale: jest.Mock<any, any>;
+    finishScaling: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/SceneRoot/Mocks/MockDragScaleSceneRootUC.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockDragScaleSceneRootUC = void 0;
+const UC_1 = require("../UC");
+class MockDragScaleSceneRootUC extends UC_1.DragScaleSceneRootUC {
+    constructor(appObject) {
+        super(appObject, UC_1.DragScaleSceneRootUC.type);
+        this.doScale = jest.fn();
+        this.initializeScale = jest.fn();
+        this.finishScaling = jest.fn();
+    }
+}
+exports.MockDragScaleSceneRootUC = MockDragScaleSceneRootUC;

package/lib/Components/SceneRoot/Mocks/MockFocusOnPixelUC.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { EaseFn } from "../../../Types";
+import { FocusOnPixelUC } from "../UC";
+export declare class MockFocusOnPixelUC extends FocusOnPixelUC {
+    durationMS: number;
+    easeFn: EaseFn;
+    centerOnPixel: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/SceneRoot/Mocks/MockFocusOnPixelUC.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockFocusOnPixelUC = void 0;
+const UC_1 = require("../UC");
+class MockFocusOnPixelUC extends UC_1.FocusOnPixelUC {
+    constructor(appObject) {
+        super(appObject, UC_1.FocusOnPixelUC.type);
+        this.durationMS = 500;
+        this.easeFn = (val) => {
+            return val;
+        };
+        this.centerOnPixel = jest.fn();
+    }
+}
+exports.MockFocusOnPixelUC = MockFocusOnPixelUC;

package/lib/Components/SceneRoot/Mocks/MockOrbitSceneRootUC.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { OrbitSceneRootUC } from "../UC/OrbitSceneRoot";
+export declare class MockOrbitSceneRootUC extends OrbitSceneRootUC {
+    sensitivity: number;
+    doOrbit: jest.Mock<any, any>;
+    initializeOrbit: jest.Mock<any, any>;
+    finishOrbit: jest.Mock<any, any>;
+    cancelOrbit: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/SceneRoot/Mocks/MockOrbitSceneRootUC.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockOrbitSceneRootUC = void 0;
+const OrbitSceneRoot_1 = require("../UC/OrbitSceneRoot");
+class MockOrbitSceneRootUC extends OrbitSceneRoot_1.OrbitSceneRootUC {
+    constructor(appObject) {
+        super(appObject, OrbitSceneRoot_1.OrbitSceneRootUC.type);
+        this.sensitivity = 1;
+        this.doOrbit = jest.fn();
+        this.initializeOrbit = jest.fn();
+        this.finishOrbit = jest.fn();
+        this.cancelOrbit = jest.fn();
+    }
+}
+exports.MockOrbitSceneRootUC = MockOrbitSceneRootUC;

package/lib/Components/SceneRoot/Mocks/MockPanSceneRootUC.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { PanSceneRootUC } from "../UC/PanSceneRoot";
+export declare class MockPanSceneRootUC extends PanSceneRootUC {
+    doPan: jest.Mock<any, any>;
+    initializePan: jest.Mock<any, any>;
+    finishPan: jest.Mock<any, any>;
+    cancelPan: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/SceneRoot/Mocks/MockPanSceneRootUC.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockPanSceneRootUC = void 0;
+const PanSceneRoot_1 = require("../UC/PanSceneRoot");
+class MockPanSceneRootUC extends PanSceneRoot_1.PanSceneRootUC {
+    constructor(appObject) {
+        super(appObject, PanSceneRoot_1.PanSceneRootUC.type);
+        this.doPan = jest.fn();
+        this.initializePan = jest.fn();
+        this.finishPan = jest.fn();
+        this.cancelPan = jest.fn();
+    }
+}
+exports.MockPanSceneRootUC = MockPanSceneRootUC;

package/lib/Components/SceneRoot/Mocks/MockPinchSceneRootUC.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { PinchSceneRootUC } from "../UC";
+export declare class MockPinchSceneRootUC extends PinchSceneRootUC {
+    sensitivity: number;
+    doPinch: jest.Mock<any, any>;
+    initializePinch: jest.Mock<any, any>;
+    finishPinch: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/SceneRoot/Mocks/MockPinchSceneRootUC.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockPinchSceneRootUC = void 0;
+const UC_1 = require("../UC");
+class MockPinchSceneRootUC extends UC_1.PinchSceneRootUC {
+    constructor(appObject) {
+        super(appObject, UC_1.PinchSceneRootUC.type);
+        this.sensitivity = 1;
+        this.doPinch = jest.fn();
+        this.initializePinch = jest.fn();
+        this.finishPinch = jest.fn();
+    }
+}
+exports.MockPinchSceneRootUC = MockPinchSceneRootUC;

package/lib/Components/SceneRoot/Mocks/index.d.ts

@@ -1,2 +1,5 @@
-export * from "./OrbitSceneRootUcMock";
-export * from "./PanSceneRootUcMock";
+export * from "./MockDragScaleSceneRootUC";
+export * from "./MockFocusOnPixelUC";
+export * from "./MockOrbitSceneRootUC";
+export * from "./MockPanSceneRootUC";
+export * from "./MockPinchSceneRootUC";

package/lib/Components/SceneRoot/Mocks/index.js

@@ -10,5 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./OrbitSceneRootUcMock"), exports);
-__exportStar(require("./PanSceneRootUcMock"), exports);
+__exportStar(require("./MockDragScaleSceneRootUC"), exports);
+__exportStar(require("./MockFocusOnPixelUC"), exports);
+__exportStar(require("./MockOrbitSceneRootUC"), exports);
+__exportStar(require("./MockPanSceneRootUC"), exports);
+__exportStar(require("./MockPinchSceneRootUC"), exports);

package/lib/Components/SceneRoot/UC/CenterSceneRootOnPixelPick.js

@@ -20,7 +20,7 @@ class CenterSceneRootOnPixelPickImp extends CenterSceneRootOnPixelPickUC {
     constructor(appObject) {
         super(appObject, CenterSceneRootOnPixelPickUC.type);
         this.durationMS = 500;
-        this.easeFn = Utilities_1.expoOut;
+        this.easeFn = Utilities_1.cubicInOut;
         this.centerOnPixel = (pixel) => {
             if (!this.sceneRoot)
                 return;

package/lib/Components/SceneRoot/UC/FocusOnPixel.js

@@ -20,7 +20,7 @@ class FocusOnPixelImp extends FocusOnPixelUC {
     constructor(appObject) {
         super(appObject, FocusOnPixelUC.type);
         this.durationMS = 500;
-        this.easeFn = Utilities_1.expoOut;
+        this.easeFn = Utilities_1.cubicInOut;
         this.centerOnPixel = (pixel) => {
             if (!this.sceneRoot)
                 return;

package/lib/Components/SceneRoot/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./Controllers";
 export * from "./Entities";
+export * from "./Factories";
+export * from "./Mocks";
 export * from "./UC";
-export * from "./Controllers";

package/lib/Components/SceneRoot/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Controllers"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./UC"), exports);
-__exportStar(require("./Controllers"), exports);

package/lib/Components/Selection/Controller/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./KeyboardToClearSelection";
 export * from "./MouseHoverOnAppObject";
 export * from "./MousePressOnAppObject";
 export * from "./MouseSelectAppObject";

package/lib/Components/Selection/Controller/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./KeyboardToClearSelection"), exports);
 __exportStar(require("./MouseHoverOnAppObject"), exports);
 __exportStar(require("./MousePressOnAppObject"), exports);
 __exportStar(require("./MouseSelectAppObject"), exports);

package/lib/Components/Selection/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./Adapters";
 export * from "./Controller";
 export * from "./Entities";
+export * from "./Factories";
 export * from "./Mocks";
 export * from "./PM";
 export * from "./UC";

package/lib/Components/Selection/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Adapters"), exports);
 __exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Components/Stick/UCs/TryStickAppObjectUC.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTryStickAppObjectUC = exports.TryStickAppObjectUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const UC_1 = require("../../Babylon/UC");
+const Tools_1 = require("../../Tools");
 const StickUC_1 = require("./StickUC");
 class TryStickAppObjectUC extends AppObject_1.AppObjectUC {
     static get(appObjects) {
@@ -19,6 +20,12 @@ class TryStickAppObjectUCImp extends TryStickAppObjectUC {
     constructor(appObject) {
         super(appObject, TryStickAppObjectUC.type);
         this.allow = () => {
+            var _a;
+            const peelTool = (_a = this.toolRepo) === null || _a === void 0 ? void 0 : _a.getTool("PEEL");
+            if (!peelTool)
+                return false;
+            if (peelTool.state !== Tools_1.ToolState.ACTIVE)
+                return false;
             return true;
         };
         this.tryWithPixel = (pixel) => {
@@ -49,6 +56,9 @@ class TryStickAppObjectUCImp extends TryStickAppObjectUC {
         };
         this.appObjects.registerSingleton(this);
     }
+    get toolRepo() {
+        return this.getCachedSingleton(Tools_1.ToolRepository.type);
+    }
     get pixelPick() {
         var _a;
         return (_a = this.getCachedSingleton(UC_1.ScenePixelPickUC.type)) === null || _a === void 0 ? void 0 : _a.scenePixelPick;

package/lib/Components/StoredView/PM/HasStoredViewPM.js

@@ -14,6 +14,7 @@ function makeHasStoredViewPM(appObject) {
 exports.makeHasStoredViewPM = makeHasStoredViewPM;
 class HasStoredViewPMImp extends HasStoredViewPM {
     constructor(appObject) {
+        var _a;
         super(appObject, HasStoredViewPM.type);
         this.onRepoChange = () => {
             if (!this.storedView)
@@ -26,15 +27,12 @@ class HasStoredViewPMImp extends HasStoredViewPM {
             (_a = this.storedView) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onRepoChange);
             (_b = this.storedView) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.storedView = appObject.getComponent(Entities_1.StoredView.type);
-        if (this.storedView) {
-            this.storedView.addChangeObserver(this.onRepoChange);
-            this.storedView.addOnDisposeObserver(() => this.dispose());
-            this.onRepoChange();
-        }
-        else {
-            console.warn("[HasStoredViewPMImp] App Object does not have a StoredView Entity");
-        }
+        (_a = this.storedView) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onRepoChange);
+        this.onRepoChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/StoredView/UC/ClearStoredViewUC.d.ts

@@ -5,4 +5,3 @@ export declare abstract class ClearStoredViewUC extends AppObjectUC {
     abstract clearStoredView(): void;
 }
 export declare function makeClearStoredViewUC(appObject: AppObject): ClearStoredViewUC;
-export declare function clearStoredView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/UC/ClearStoredViewUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearStoredView = exports.makeClearStoredViewUC = exports.ClearStoredViewUC = void 0;
+exports.makeClearStoredViewUC = exports.ClearStoredViewUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Dispatcher_1 = require("../../Dispatcher");
@@ -14,16 +14,6 @@ function makeClearStoredViewUC(appObject) {
     return new ClearStoredViewUCImp(appObject);
 }
 exports.makeClearStoredViewUC = makeClearStoredViewUC;
-function clearStoredView(appObjects) {
-    const uc = ClearStoredViewUC.get(appObjects);
-    if (uc) {
-        uc.clearStoredView();
-    }
-    else {
-        appObjects.submitWarning("clearStoredView", "Can't find ClearStoredViewUC");
-    }
-}
-exports.clearStoredView = clearStoredView;
 class ClearStoredViewUCImp extends ClearStoredViewUC {
     constructor(appObject) {
         super(appObject, ClearStoredViewUC.type);
@@ -36,9 +26,8 @@ class ClearStoredViewUCImp extends ClearStoredViewUC {
             this.storedView.hasStoredView = false;
             Dispatcher_1.dispatchStateChange(this.appObject.appObjectRepo);
         };
-        this.storedView = Entities_1.StoredView.get(appObject.appObjectRepo);
-        if (!this.storedView) {
-            this.warn("Unable to find stored view");
-        }
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
     }
 }

package/lib/Components/StoredView/UC/RestoreStoredViewUC.d.ts

@@ -7,4 +7,3 @@ export declare abstract class RestoreStoredViewUC extends AppObjectUC {
     abstract ease: EaseFn;
 }
 export declare function makeRestoreStoredViewUC(appObject: AppObject): RestoreStoredViewUC;
-export declare function restoreStoredView(appObjects: AppObjectRepo): void;