@vived/app 4.23.0 → 4.24.0

package/lib/Components/Selection/UC/HoverAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class HoverAppObjectUC extends AppObjectUC {
     static readonly type = "HoverAppObjectUC";
     abstract allowHover(): boolean;
     abstract allowTryHover(): boolean;
-    abstract hoverSceneObject: (id: string, isHovered: boolean) => void;
-    abstract tryHoverSceneObject: (ray: ParametricLine) => void;
+    abstract hoverAppObject: (id: string, isHovered: boolean) => void;
+    abstract tryHoverAppObject: (ray: ParametricLine) => void;
+    static get(appObjects: AppObjectRepo): HoverAppObjectUC | undefined;
 }
 export declare function makeHoverAppObject(appObject: AppObject): HoverAppObjectUC;

package/lib/Components/Selection/UC/HoverAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeHoverAppObject = exports.HoverAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class HoverAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(HoverAppObjectUC.type, appObjects);
+    }
 }
 exports.HoverAppObjectUC = HoverAppObjectUC;
 HoverAppObjectUC.type = "HoverAppObjectUC";
@@ -22,7 +26,7 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
         this.allowTryHover = () => {
             return true;
         };
-        this.tryHoverSceneObject = (ray) => {
+        this.tryHoverAppObject = (ray) => {
             if (!this.selection)
                 return;
             if (!this.allowTryHover())
@@ -39,7 +43,7 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
             }
             this.selection.hoveredObjectId = rayPick.appObjectID;
         };
-        this.hoverSceneObject = (id, isHovered) => {
+        this.hoverAppObject = (id, isHovered) => {
             if (!this.selection)
                 return;
             if (!this.allowHover())
@@ -51,9 +55,9 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
                 this.selection.hoveredObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("HoverAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

package/lib/Components/Selection/UC/PressAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class PressAppObjectUC extends AppObjectUC {
     static readonly type = "PressAppObjectUC";
     abstract allowPress(): boolean;
     abstract allowTryPress(): boolean;
-    abstract pressSceneObject: (id: string | null, isPressed: boolean) => void;
-    abstract tryPressSceneObject: (ray: ParametricLine) => string | null;
+    abstract pressAppObject: (id: string | null, isPressed: boolean) => void;
+    abstract tryPressAppObject: (ray: ParametricLine) => string | null;
+    static get(appObjects: AppObjectRepo): PressAppObjectUC | undefined;
 }
 export declare function makePressAppObject(appObject: AppObject): PressAppObjectUC;

package/lib/Components/Selection/UC/PressAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePressAppObject = exports.PressAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class PressAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(PressAppObjectUC.type, appObjects);
+    }
 }
 exports.PressAppObjectUC = PressAppObjectUC;
 PressAppObjectUC.type = "PressAppObjectUC";
@@ -22,7 +26,7 @@ class PressAppObjectUCImp extends PressAppObjectUC {
         this.allowTryPress = () => {
             return true;
         };
-        this.tryPressSceneObject = (ray) => {
+        this.tryPressAppObject = (ray) => {
             if (!this.selection)
                 return null;
             if (!this.allowTryPress())
@@ -40,7 +44,7 @@ class PressAppObjectUCImp extends PressAppObjectUC {
             this.selection.pressedObjectId = rayPick.appObjectID;
             return this.selection.pressedObjectId;
         };
-        this.pressSceneObject = (id, isPressed) => {
+        this.pressAppObject = (id, isPressed) => {
             if (!this.selection)
                 return;
             if (!this.allowPress())
@@ -52,9 +56,9 @@ class PressAppObjectUCImp extends PressAppObjectUC {
                 this.selection.pressedObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("PressAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

package/lib/Components/Selection/UC/SelectAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class SelectAppObjectUC extends AppObjectUC {
     static readonly type = "SelectAppObjectUC";
     abstract allowSelect(): boolean;
     abstract allowTrySelect(): boolean;
-    abstract selectSceneObject: (id: string, isSelected: boolean) => void;
-    abstract trySelectSceneObject: (ray: ParametricLine) => void;
+    abstract selectAppObject: (id: string, isSelected: boolean) => void;
+    abstract trySelectAppObject: (ray: ParametricLine) => void;
+    static get(appObjects: AppObjectRepo): SelectAppObjectUC | undefined;
 }
 export declare function makeSelectAppObject(appObject: AppObject): SelectAppObjectUC;

package/lib/Components/Selection/UC/SelectAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSelectAppObject = exports.SelectAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class SelectAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(SelectAppObjectUC.type, appObjects);
+    }
 }
 exports.SelectAppObjectUC = SelectAppObjectUC;
 SelectAppObjectUC.type = "SelectAppObjectUC";
@@ -22,7 +26,7 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
         this.allowTrySelect = () => {
             return true;
         };
-        this.trySelectSceneObject = (ray) => {
+        this.trySelectAppObject = (ray) => {
             if (!this.selection)
                 return;
             if (!this.allowTrySelect())
@@ -39,7 +43,7 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
             }
             this.selection.selectedObjectId = rayPick.appObjectID;
         };
-        this.selectSceneObject = (id, isSelected) => {
+        this.selectAppObject = (id, isSelected) => {
             if (!this.selection)
                 return;
             if (!this.allowSelect())
@@ -51,9 +55,9 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
                 this.selection.selectedObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("SelectAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

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

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

package/lib/Components/Selection/index.js

@@ -10,7 +10,9 @@ 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("./Adapters"), exports);
+__exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
-__exportStar(require("./UC"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
-__exportStar(require("./Controller"), exports);
+__exportStar(require("./UC"), exports);

package/lib/Components/Tools/Adapters/index.d.ts

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

package/lib/Components/Tools/Adapters/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("./toolAdapter"), exports);

package/lib/Components/Tools/Adapters/toolAdapter.d.ts

@@ -0,0 +1,3 @@
+import { PmAdapter } from "../../../Types";
+import { ToolVM } from "../PM/ToolPM";
+export declare function makeToolAdapter<ToolTypes>(): PmAdapter<ToolVM<ToolTypes>>;

package/lib/Components/Tools/Adapters/toolAdapter.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeToolAdapter = void 0;
+const ToolPM_1 = require("../PM/ToolPM");
+function makeToolAdapter() {
+    return {
+        defaultVM: ToolPM_1.defaultToolVM,
+        subscribe: (id, appObjects, setVM) => {
+            const pm = ToolPM_1.ToolPM.get(id, appObjects);
+            if (!pm) {
+                appObjects.submitError("toolAdapter", "Unable to find ToolPM");
+                return;
+            }
+            pm.addView(setVM);
+        },
+        unsubscribe: (id, appObjects, setVM) => {
+            const pm = ToolPM_1.ToolPM.get(id, appObjects);
+            if (!pm) {
+                appObjects.submitError("toolAdapter", "Unable to find ToolPM");
+                return;
+            }
+            pm.removeView(setVM);
+        },
+    };
+}
+exports.makeToolAdapter = makeToolAdapter;

package/lib/Components/Tools/Controller/ToolHotkeys.js

@@ -20,7 +20,7 @@ class ToolHotkeys extends AppObjectController_1.AppObjectController {
                 shift: e.shiftKey,
             };
             const tool = this.toolRepo.getToolForHotkey(currentKey);
-            if (!tool)
+            if (!tool || !tool.toolType)
                 return;
             this.toolRepo.triggerTool(tool.toolType);
         };

package/lib/Components/Tools/Entities/ToolEntity.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectEntity } from "../../../AppObject/AppObjectEntity";
 export declare enum ToolState {
@@ -22,7 +23,7 @@ export interface HotKey {
 }
 export declare abstract class ToolEntity<ToolTypes> extends AppObjectEntity {
     static readonly type = "TOOL";
-    abstract readonly toolType: ToolTypes;
+    abstract get toolType(): ToolTypes | undefined;
     abstract get label(): string;
     abstract set label(toolLabel: string);
     abstract readonly isDefault: boolean;
@@ -35,5 +36,7 @@ export declare abstract class ToolEntity<ToolTypes> extends AppObjectEntity {
     abstract triggerActions(): void;
     abstract registerAction(action: () => void): void;
     abstract isMyHotkey(hotkey: HotKey): boolean;
+    abstract setupFromData(data: ToolData<ToolTypes>): void;
+    static get<ToolTypes>(id: string, appObjects: AppObjectRepo): ToolEntity<ToolTypes> | undefined;
 }
-export declare function makeToolEntity<ToolTypes>(data: ToolData<ToolTypes>, appObject: AppObject): ToolEntity<ToolTypes>;
+export declare function makeToolEntity<ToolTypes>(appObject: AppObject): ToolEntity<ToolTypes>;

package/lib/Components/Tools/Entities/ToolEntity.js

@@ -11,16 +11,24 @@ var ToolState;
     ToolState["ACTIVE"] = "ACTIVE";
 })(ToolState = exports.ToolState || (exports.ToolState = {}));
 class ToolEntity extends AppObjectEntity_1.AppObjectEntity {
+    static get(id, appObjects) {
+        var _a;
+        return (_a = appObjects
+            .get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(ToolEntity.type);
+    }
 }
 exports.ToolEntity = ToolEntity;
 ToolEntity.type = "TOOL";
-function makeToolEntity(data, appObject) {
-    return new ToolEntityImp(data, appObject);
+function makeToolEntity(appObject) {
+    return new ToolEntityImp(appObject);
 }
 exports.makeToolEntity = makeToolEntity;
 class ToolEntityImp extends ToolEntity {
-    constructor(data, appObject) {
+    constructor(appObject) {
         super(appObject, ToolEntity.type);
+        this._isDefault = false;
+        this.memoizedLabel = new Entities_1.MemoizedString("", this.notifyOnChange);
+        this.memoizedShortcut = new Entities_1.MemoizedString("", this.notifyOnChange);
         this.memoizedState = new Entities_1.MemoizedString(ToolState.ENABLED, this.notifyOnChange);
         this.actions = [];
         this._isAction = false;
@@ -33,6 +41,7 @@ class ToolEntityImp extends ToolEntity {
                 action();
             });
         };
+        this._hotkeys = [];
         this.isMyHotkey = (hotkey) => {
             let isMine = false;
             this.hotkeys.forEach((myHotkey) => {
@@ -42,11 +51,19 @@ class ToolEntityImp extends ToolEntity {
             });
             return isMine;
         };
-        this.toolType = data.toolType;
-        this.memoizedLabel = new Entities_1.MemoizedString(data.label, this.notifyOnChange);
-        this.isDefault = data.isDefault;
-        this.memoizedShortcut = new Entities_1.MemoizedString(data.shortcutLabel, this.notifyOnChange);
-        this.hotkeys = data.hotkeys;
+        this.setupFromData = (data) => {
+            this._toolType = data.toolType;
+            this.memoizedLabel.val = data.label;
+            this._isDefault = data.isDefault;
+            this.memoizedShortcut.val = data.shortcutLabel;
+            this._hotkeys = data.hotkeys;
+        };
+    }
+    get toolType() {
+        return this._toolType;
+    }
+    get isDefault() {
+        return this._isDefault;
     }
     get label() {
         return this.memoizedLabel.val;
@@ -69,6 +86,9 @@ class ToolEntityImp extends ToolEntity {
     get isAction() {
         return this._isAction;
     }
+    get hotkeys() {
+        return this._hotkeys;
+    }
     hotkeysMatch(a, b) {
         if (a.keyCode !== b.keyCode)
             return false;

package/lib/Components/Tools/Entities/ToolRepository.js

@@ -18,7 +18,10 @@ class ToolRepositoryImp extends ToolRepository {
         super(appObject, ToolRepository.type);
         this.toolLookup = new Map();
         this.toolFactory = (toolData) => {
-            throw new Error("Factory has not been injected");
+            const ao = this.appObjects.getOrCreate(toolData.toolType);
+            const toolEntity = ToolEntity_1.makeToolEntity(ao);
+            toolEntity.setupFromData(toolData);
+            return toolEntity;
         };
     }
     get allTools() {

package/lib/Components/Tools/Mocks/ToolPMMock.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ToolPM } from "../PM";
+export declare class ToolPMMock<CT> extends ToolPM<CT> {
+    vmsAreEqual: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeToolPMMock<CT>(appObjects: AppObjectRepo): ToolPMMock<CT>;

package/lib/Components/Tools/Mocks/ToolPMMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeToolPMMock = exports.ToolPMMock = void 0;
+const PM_1 = require("../PM");
+class ToolPMMock extends PM_1.ToolPM {
+    constructor(appObject) {
+        super(appObject, PM_1.ToolPM.type);
+        this.vmsAreEqual = jest.fn();
+    }
+}
+exports.ToolPMMock = ToolPMMock;
+function makeToolPMMock(appObjects) {
+    return new ToolPMMock(appObjects.getOrCreate("ToolPMMock"));
+}
+exports.makeToolPMMock = makeToolPMMock;

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

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

package/lib/Components/Tools/Mocks/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("./ToolPMMock"), exports);

package/lib/Components/Tools/PM/ToolPM.d.ts

@@ -1,7 +1,7 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectPM } from "../../../AppObject/AppObjectPM";
 export interface ToolVM<ToolType> {
-    toolType: ToolType;
     label: string;
     enabled: boolean;
     selected: boolean;
@@ -9,11 +9,23 @@ export interface ToolVM<ToolType> {
     shortcutLabel: string;
     tooltipLabel: string;
 }
-export declare class ToolPM<ToolType> extends AppObjectPM<ToolVM<ToolType>> {
+export declare const defaultToolVM: {
+    label: string;
+    enabled: boolean;
+    selected: boolean;
+    show: boolean;
+    shortcutLabel: string;
+    tooltipLabel: string;
+};
+export declare abstract class ToolPM<ToolType> extends AppObjectPM<ToolVM<ToolType>> {
     static readonly type = "ToolPM";
-    private tool?;
+    static get<ToolType>(id: string, appObjects: AppObjectRepo): ToolPM<ToolType> | undefined;
+}
+export declare function makeToolPM<ToolType>(appObject: AppObject): ToolPMImp<ToolType>;
+declare class ToolPMImp<ToolType> extends ToolPM<ToolType> {
+    private get tool();
     vmsAreEqual(a: ToolVM<ToolType>, b: ToolVM<ToolType>): boolean;
     onToolChange: () => void;
-    dispose: () => void;
     constructor(appObject: AppObject);
 }
+export {};

package/lib/Components/Tools/PM/ToolPM.js

@@ -1,15 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolPM = void 0;
+exports.makeToolPM = exports.ToolPM = exports.defaultToolVM = void 0;
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const ToolEntity_1 = require("../Entities/ToolEntity");
+exports.defaultToolVM = {
+    label: "",
+    enabled: false,
+    selected: false,
+    show: false,
+    shortcutLabel: "",
+    tooltipLabel: "",
+};
 class ToolPM extends AppObjectPM_1.AppObjectPM {
+    static get(id, appObjects) {
+        var _a;
+        return (_a = appObjects.get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(ToolPM.type);
+    }
+}
+exports.ToolPM = ToolPM;
+ToolPM.type = "ToolPM";
+function makeToolPM(appObject) {
+    return new ToolPMImp(appObject);
+}
+exports.makeToolPM = makeToolPM;
+class ToolPMImp extends ToolPM {
     constructor(appObject) {
+        var _a;
         super(appObject, ToolPM.type);
         this.onToolChange = () => {
             if (!this.tool)
                 return;
-            const { toolType, state, label, shortcutLabel } = this.tool;
+            const { state, label, shortcutLabel } = this.tool;
             let enabled = false;
             if (state === ToolEntity_1.ToolState.ACTIVE || state === ToolEntity_1.ToolState.ENABLED) {
                 enabled = true;
@@ -18,7 +39,6 @@ class ToolPM extends AppObjectPM_1.AppObjectPM {
             const show = state === ToolEntity_1.ToolState.HIDDEN ? false : true;
             const tooltipLabel = `${label} [${shortcutLabel}]`;
             const vm = {
-                toolType,
                 enabled,
                 label,
                 selected,
@@ -28,24 +48,13 @@ class ToolPM extends AppObjectPM_1.AppObjectPM {
             };
             this.doUpdateView(vm);
         };
-        this.dispose = () => {
-            var _a;
-            super.dispose();
-            (_a = this.tool) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onToolChange);
-        };
-        this.tool = appObject.getComponent(ToolEntity_1.ToolEntity.type);
-        if (!this.tool) {
-            this.warn("ToolPM is being added to an object that does not have a Tool Entity");
-            return;
-        }
-        else {
-            this.tool.addChangeObserver(this.onToolChange);
-            this.onToolChange();
-        }
+        (_a = this.tool) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onToolChange);
+        this.onToolChange();
+    }
+    get tool() {
+        return this.getCachedLocalComponent(ToolEntity_1.ToolEntity.type);
     }
     vmsAreEqual(a, b) {
-        if (a.toolType !== b.toolType)
-            return false;
         if (a.enabled !== b.enabled)
             return false;
         if (a.label !== b.label)
@@ -61,5 +70,3 @@ class ToolPM extends AppObjectPM_1.AppObjectPM {
         return true;
     }
 }
-exports.ToolPM = ToolPM;
-ToolPM.type = "ToolPM";

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

@@ -1,3 +1,5 @@
+export * from "./Adapters";
+export * from "./Controller";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";
-export * from "./Controller";

package/lib/Components/Tools/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("./Adapters"), exports);
+__exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
-__exportStar(require("./Controller"), exports);

package/lib/Components/TouchController/Entities/TouchInput.d.ts

@@ -18,6 +18,7 @@ export interface TouchController {
     onTouchMove?: (e: TouchInputEvent) => void;
     onTouchEnd?: (e: TouchInputEvent) => void;
     onTouchCancel?: (e: TouchInputEvent) => void;
+    onTap?: (e: TouchInputEvent) => void;
 }
 export declare abstract class TouchInputEntity extends AppObjectEntity {
     static readonly type = "TouchInputEntity";

package/lib/Components/TouchController/Entities/TouchInput.js

@@ -42,6 +42,9 @@ class TouchInputImp extends TouchInputEntity {
             this.eventElementBounds = eventElement.getBoundingClientRect();
             this._eventElement = eventElement;
         };
+        this.considerTap = false;
+        this.tapStartPosition = ValueObjects_1.Vector2.Zero();
+        this.maxTapDistancePx = 5;
         this.onTouchStart = (e) => {
             if (e.cancelable)
                 e.preventDefault();
@@ -51,6 +54,19 @@ class TouchInputImp extends TouchInputEntity {
                     c.onTouchStart(touchInput);
                 }
             });
+            if (touchInput.touchCount === 1) {
+                this.considerTap = true;
+                this.tapStartPosition = touchInput.touchCenter;
+                this.tapEvent = touchInput;
+            }
+            else {
+                this.cancelTap();
+            }
+        };
+        this.cancelTap = () => {
+            this.considerTap = false;
+            this.tapStartPosition = ValueObjects_1.Vector2.Zero();
+            this.tapEvent = undefined;
         };
         this.onTouchMove = (e) => {
             if (e.cancelable)
@@ -61,6 +77,15 @@ class TouchInputImp extends TouchInputEntity {
                     c.onTouchMove(touchInput);
                 }
             });
+            if (!this.considerTap)
+                return;
+            if (touchInput.touchCount !== 1) {
+                this.cancelTap();
+            }
+            const movement = ValueObjects_1.Vector2.Subtract(this.tapStartPosition, touchInput.touchCenter).magnitued;
+            if (movement > this.maxTapDistancePx) {
+                this.cancelTap();
+            }
         };
         this.onTouchEnd = (e) => {
             if (e.cancelable)
@@ -71,6 +96,14 @@ class TouchInputImp extends TouchInputEntity {
                     c.onTouchEnd(touchInput);
                 }
             });
+            if (!this.considerTap || !this.tapEvent)
+                return;
+            this.controllers.forEach((c) => {
+                if (c.onTap) {
+                    c.onTap(this.tapEvent);
+                }
+            });
+            this.cancelTap();
         };
         this.onTouchCancel = (e) => {
             if (e.cancelable)
@@ -81,6 +114,7 @@ class TouchInputImp extends TouchInputEntity {
                     c.onTouchCancel(touchInput);
                 }
             });
+            this.cancelTap();
         };
         this.clearInputElement = () => {
             if (!this._eventElement)

package/lib/Components/TouchController/Mock/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./MockTouchInput";
+export * from "./mockTouchInputEvent";