@dcl/ecs 7.22.1 → 7.22.2-23600507492.commit-5f7f8a0

package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts

@@ -25,5 +25,14 @@ export declare const enum PointerEventType {
     PET_UP = 0,
     PET_DOWN = 1,
     PET_HOVER_ENTER = 2,
-    PET_HOVER_LEAVE = 3
+    PET_HOVER_LEAVE = 3,
+    PET_PROXIMITY_ENTER = 4,
+    PET_PROXIMITY_LEAVE = 5
+}
+/**
+ * @public
+ */
+export declare const enum InteractionType {
+    CURSOR = 0,
+    PROXIMITY = 1
 }

package/dist/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js

@@ -30,4 +30,14 @@ export var PointerEventType;
     PointerEventType[PointerEventType["PET_DOWN"] = 1] = "PET_DOWN";
     PointerEventType[PointerEventType["PET_HOVER_ENTER"] = 2] = "PET_HOVER_ENTER";
     PointerEventType[PointerEventType["PET_HOVER_LEAVE"] = 3] = "PET_HOVER_LEAVE";
+    PointerEventType[PointerEventType["PET_PROXIMITY_ENTER"] = 4] = "PET_PROXIMITY_ENTER";
+    PointerEventType[PointerEventType["PET_PROXIMITY_LEAVE"] = 5] = "PET_PROXIMITY_LEAVE";
 })(PointerEventType || (PointerEventType = {}));
+/**
+ * @public
+ */
+export var InteractionType;
+(function (InteractionType) {
+    InteractionType[InteractionType["CURSOR"] = 0] = "CURSOR";
+    InteractionType[InteractionType["PROXIMITY"] = 1] = "PROXIMITY";
+})(InteractionType || (InteractionType = {}));

package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts

@@ -1,5 +1,5 @@
 import _m0 from "protobufjs/minimal";
-import { InputAction, PointerEventType } from "./common/input_action.gen";
+import { InputAction, InteractionType, PointerEventType } from "./common/input_action.gen";
 /**
  * PointerEvents adds configurable pointer-based interactions to the attached Entity.
  *
@@ -61,6 +61,8 @@ export interface PBPointerEvents_Info {
     showHighlight?: boolean | undefined;
     /** range of interaction from the avatar's position (default 0) */
     maxPlayerDistance?: number | undefined;
+    /** resolution order when multiple events overlap, higher wins (default 0) */
+    priority?: number | undefined;
 }
 /**
  * @public
@@ -70,6 +72,8 @@ export interface PBPointerEvents_Entry {
     eventType: PointerEventType;
     /** additional configuration for this detection */
     eventInfo: PBPointerEvents_Info | undefined;
+    /** the type of interaction source (default 0 == CURSOR) */
+    interactionType?: InteractionType | undefined;
 }
 /**
  * @public

package/dist/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js

@@ -47,6 +47,7 @@ function createBasePBPointerEvents_Info() {
         showFeedback: undefined,
         showHighlight: undefined,
         maxPlayerDistance: undefined,
+        priority: undefined,
     };
 }
 /**
@@ -73,6 +74,9 @@ export var PBPointerEvents_Info;
         if (message.maxPlayerDistance !== undefined) {
             writer.uint32(53).float(message.maxPlayerDistance);
         }
+        if (message.priority !== undefined) {
+            writer.uint32(56).uint32(message.priority);
+        }
         return writer;
     }
     PBPointerEvents_Info.encode = encode;
@@ -119,6 +123,12 @@ export var PBPointerEvents_Info;
                     }
                     message.maxPlayerDistance = reader.float();
                     continue;
+                case 7:
+                    if (tag !== 56) {
+                        break;
+                    }
+                    message.priority = reader.uint32();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -130,7 +140,7 @@ export var PBPointerEvents_Info;
     PBPointerEvents_Info.decode = decode;
 })(PBPointerEvents_Info || (PBPointerEvents_Info = {}));
 function createBasePBPointerEvents_Entry() {
-    return { eventType: 0, eventInfo: undefined };
+    return { eventType: 0, eventInfo: undefined, interactionType: undefined };
 }
 /**
  * @public
@@ -144,6 +154,9 @@ export var PBPointerEvents_Entry;
         if (message.eventInfo !== undefined) {
             PBPointerEvents_Info.encode(message.eventInfo, writer.uint32(18).fork()).ldelim();
         }
+        if (message.interactionType !== undefined) {
+            writer.uint32(24).int32(message.interactionType);
+        }
         return writer;
     }
     PBPointerEvents_Entry.encode = encode;
@@ -166,6 +179,12 @@ export var PBPointerEvents_Entry;
                     }
                     message.eventInfo = PBPointerEvents_Info.decode(reader, reader.uint32());
                     continue;
+                case 3:
+                    if (tag !== 24) {
+                        break;
+                    }
+                    message.interactionType = reader.int32();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;

package/dist/systems/events.d.ts

@@ -17,6 +17,7 @@ export type EventSystemOptions = {
     showFeedback?: boolean;
     showHighlight?: boolean;
     maxPlayerDistance?: number;
+    priority?: number;
 };
 export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
 /**
@@ -47,6 +48,30 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnPointerHoverLeave(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityDown event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityDown(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityUp event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityUp(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityEnter event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityEnter(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityLeave event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityLeave(entity: Entity): void;
     /**
      * @public
      * Execute callback when the user press the InputButton pointing at the entity
@@ -101,6 +126,46 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user presses the proximity button on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when click fires
+     */
+    onProximityDown(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user releases the proximity button on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityUp(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the entity enters the proximity zone of the user
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityEnter(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the entity leaves the proximity zone of the user
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityLeave(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
 }
 /**
  * @public

package/dist/systems/events.js

@@ -18,12 +18,14 @@ export function createPointerEventsSystem(engine, inputSystem) {
         EventType[EventType["Up"] = 2] = "Up";
         EventType[EventType["HoverEnter"] = 3] = "HoverEnter";
         EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
+        EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
+        EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
     })(EventType || (EventType = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
         return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
     }
-    function setPointerEvent(entity, type, opts) {
+    function setPointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
         pointerEvent.pointerEvents.push({
             eventType: type,
@@ -33,15 +35,19 @@ export function createPointerEventsSystem(engine, inputSystem) {
                 showHighlight: opts.showHighlight,
                 hoverText: opts.hoverText,
                 maxDistance: opts.maxDistance,
-                maxPlayerDistance: opts.maxPlayerDistance
-            }
+                maxPlayerDistance: opts.maxPlayerDistance,
+                priority: opts.priority
+            },
+            interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
     }
-    function removePointerEvent(entity, type, button) {
+    function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity);
         if (!pointerEvent)
             return;
-        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button && pointer.eventType === type));
+        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button &&
+            pointer.eventType === type &&
+            pointer.interactionType === interactionType));
     }
     function getPointerEvent(eventType) {
         if (eventType === EventType.Up) {
@@ -53,9 +59,15 @@ export function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.HoverEnter) {
             return 2 /* PointerEventType.PET_HOVER_ENTER */;
         }
+        else if (eventType === EventType.ProximityEnter) {
+            return 4 /* PointerEventType.PET_PROXIMITY_ENTER */;
+        }
+        else if (eventType === EventType.ProximityLeave) {
+            return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
+        }
         return 1 /* PointerEventType.PET_DOWN */;
     }
-    function removeEvent(entity, type) {
+    function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
         const event = getEvent(entity);
         const pointerEvent = event.get(type);
         if (pointerEvent?.opts.hoverText) {
@@ -78,7 +90,9 @@ export function createPointerEventsSystem(engine, inputSystem) {
                 if (eventType === EventType.Down ||
                     eventType === EventType.Up ||
                     eventType === EventType.HoverEnter ||
-                    eventType === EventType.HoverLeave) {
+                    eventType === EventType.HoverLeave ||
+                    eventType === EventType.ProximityEnter ||
+                    eventType === EventType.ProximityLeave) {
                     const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
                     if (command) {
                         checkNotThenable(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
@@ -125,6 +139,38 @@ export function createPointerEventsSystem(engine, inputSystem) {
         getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
         setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
     };
+    const onProximityDown = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityUp = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityEnter = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
+        setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityLeave = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = getDefaultOpts(opts);
+        removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
+        setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
+    };
     return {
         removeOnClick(entity) {
             removeEvent(entity, EventType.Click);
@@ -141,6 +187,18 @@ export function createPointerEventsSystem(engine, inputSystem) {
         removeOnPointerHoverLeave(entity) {
             removeEvent(entity, EventType.HoverLeave);
         },
+        removeOnProximityDown(entity) {
+            removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityUp(entity) {
+            removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityEnter(entity) {
+            removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityLeave(entity) {
+            removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
+        },
         onClick(value, cb) {
             const { entity } = value;
             const options = getDefaultOpts(value.opts);
@@ -153,6 +211,10 @@ export function createPointerEventsSystem(engine, inputSystem) {
         onPointerDown,
         onPointerUp,
         onPointerHoverEnter,
-        onPointerHoverLeave
+        onPointerHoverLeave,
+        onProximityDown,
+        onProximityUp,
+        onProximityEnter,
+        onProximityLeave
     };
 }

package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.d.ts

@@ -25,5 +25,14 @@ export declare const enum PointerEventType {
     PET_UP = 0,
     PET_DOWN = 1,
     PET_HOVER_ENTER = 2,
-    PET_HOVER_LEAVE = 3
+    PET_HOVER_LEAVE = 3,
+    PET_PROXIMITY_ENTER = 4,
+    PET_PROXIMITY_LEAVE = 5
+}
+/**
+ * @public
+ */
+export declare const enum InteractionType {
+    CURSOR = 0,
+    PROXIMITY = 1
 }

package/dist-cjs/components/generated/pb/decentraland/sdk/components/common/input_action.gen.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PointerEventType = exports.InputAction = void 0;
+exports.InteractionType = exports.PointerEventType = exports.InputAction = void 0;
 const protobufPackageSarasa = "decentraland.sdk.components.common";
 /**
  * @public
@@ -33,4 +33,14 @@ var PointerEventType;
     PointerEventType[PointerEventType["PET_DOWN"] = 1] = "PET_DOWN";
     PointerEventType[PointerEventType["PET_HOVER_ENTER"] = 2] = "PET_HOVER_ENTER";
     PointerEventType[PointerEventType["PET_HOVER_LEAVE"] = 3] = "PET_HOVER_LEAVE";
+    PointerEventType[PointerEventType["PET_PROXIMITY_ENTER"] = 4] = "PET_PROXIMITY_ENTER";
+    PointerEventType[PointerEventType["PET_PROXIMITY_LEAVE"] = 5] = "PET_PROXIMITY_LEAVE";
 })(PointerEventType = exports.PointerEventType || (exports.PointerEventType = {}));
+/**
+ * @public
+ */
+var InteractionType;
+(function (InteractionType) {
+    InteractionType[InteractionType["CURSOR"] = 0] = "CURSOR";
+    InteractionType[InteractionType["PROXIMITY"] = 1] = "PROXIMITY";
+})(InteractionType = exports.InteractionType || (exports.InteractionType = {}));

package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.d.ts

@@ -1,5 +1,5 @@
 import _m0 from "protobufjs/minimal";
-import { InputAction, PointerEventType } from "./common/input_action.gen";
+import { InputAction, InteractionType, PointerEventType } from "./common/input_action.gen";
 /**
  * PointerEvents adds configurable pointer-based interactions to the attached Entity.
  *
@@ -61,6 +61,8 @@ export interface PBPointerEvents_Info {
     showHighlight?: boolean | undefined;
     /** range of interaction from the avatar's position (default 0) */
     maxPlayerDistance?: number | undefined;
+    /** resolution order when multiple events overlap, higher wins (default 0) */
+    priority?: number | undefined;
 }
 /**
  * @public
@@ -70,6 +72,8 @@ export interface PBPointerEvents_Entry {
     eventType: PointerEventType;
     /** additional configuration for this detection */
     eventInfo: PBPointerEvents_Info | undefined;
+    /** the type of interaction source (default 0 == CURSOR) */
+    interactionType?: InteractionType | undefined;
 }
 /**
  * @public

package/dist-cjs/components/generated/pb/decentraland/sdk/components/pointer_events.gen.js

@@ -53,6 +53,7 @@ function createBasePBPointerEvents_Info() {
         showFeedback: undefined,
         showHighlight: undefined,
         maxPlayerDistance: undefined,
+        priority: undefined,
     };
 }
 /**
@@ -79,6 +80,9 @@ var PBPointerEvents_Info;
         if (message.maxPlayerDistance !== undefined) {
             writer.uint32(53).float(message.maxPlayerDistance);
         }
+        if (message.priority !== undefined) {
+            writer.uint32(56).uint32(message.priority);
+        }
         return writer;
     }
     PBPointerEvents_Info.encode = encode;
@@ -125,6 +129,12 @@ var PBPointerEvents_Info;
                     }
                     message.maxPlayerDistance = reader.float();
                     continue;
+                case 7:
+                    if (tag !== 56) {
+                        break;
+                    }
+                    message.priority = reader.uint32();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;
@@ -136,7 +146,7 @@ var PBPointerEvents_Info;
     PBPointerEvents_Info.decode = decode;
 })(PBPointerEvents_Info = exports.PBPointerEvents_Info || (exports.PBPointerEvents_Info = {}));
 function createBasePBPointerEvents_Entry() {
-    return { eventType: 0, eventInfo: undefined };
+    return { eventType: 0, eventInfo: undefined, interactionType: undefined };
 }
 /**
  * @public
@@ -150,6 +160,9 @@ var PBPointerEvents_Entry;
         if (message.eventInfo !== undefined) {
             PBPointerEvents_Info.encode(message.eventInfo, writer.uint32(18).fork()).ldelim();
         }
+        if (message.interactionType !== undefined) {
+            writer.uint32(24).int32(message.interactionType);
+        }
         return writer;
     }
     PBPointerEvents_Entry.encode = encode;
@@ -172,6 +185,12 @@ var PBPointerEvents_Entry;
                     }
                     message.eventInfo = PBPointerEvents_Info.decode(reader, reader.uint32());
                     continue;
+                case 3:
+                    if (tag !== 24) {
+                        break;
+                    }
+                    message.interactionType = reader.int32();
+                    continue;
             }
             if ((tag & 7) === 4 || tag === 0) {
                 break;

package/dist-cjs/systems/events.d.ts

@@ -17,6 +17,7 @@ export type EventSystemOptions = {
     showFeedback?: boolean;
     showHighlight?: boolean;
     maxPlayerDistance?: number;
+    priority?: number;
 };
 export declare const getDefaultOpts: (opts?: Partial<EventSystemOptions>) => EventSystemOptions;
 /**
@@ -47,6 +48,30 @@ export interface PointerEventsSystem {
      * @param entity - Entity where the callback was attached
      */
     removeOnPointerHoverLeave(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityDown event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityDown(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityUp event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityUp(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityEnter event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityEnter(entity: Entity): void;
+    /**
+     * @public
+     * Remove the callback for onProximityLeave event
+     * @param entity - Entity where the callback was attached
+     */
+    removeOnProximityLeave(entity: Entity): void;
     /**
      * @public
      * Execute callback when the user press the InputButton pointing at the entity
@@ -101,6 +126,46 @@ export interface PointerEventsSystem {
         entity: Entity;
         opts?: Partial<EventSystemOptions>;
     }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user presses the proximity button on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when click fires
+     */
+    onProximityDown(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the user releases the proximity button on the entity
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityUp(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the entity enters the proximity zone of the user
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityEnter(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
+    /**
+     * @public
+     * Execute callback when the entity leaves the proximity zone of the user
+     * @param pointerData - Entity to attach the callback - Opts to trigger Feedback and Button
+     * @param cb - Function to execute when event fires
+     */
+    onProximityLeave(pointerData: {
+        entity: Entity;
+        opts?: Partial<EventSystemOptions>;
+    }, cb: EventSystemCallback): void;
 }
 /**
  * @public

package/dist-cjs/systems/events.js

@@ -45,12 +45,14 @@ function createPointerEventsSystem(engine, inputSystem) {
         EventType[EventType["Up"] = 2] = "Up";
         EventType[EventType["HoverEnter"] = 3] = "HoverEnter";
         EventType[EventType["HoverLeave"] = 4] = "HoverLeave";
+        EventType[EventType["ProximityEnter"] = 5] = "ProximityEnter";
+        EventType[EventType["ProximityLeave"] = 6] = "ProximityLeave";
     })(EventType || (EventType = {}));
     const eventsMap = new Map();
     function getEvent(entity) {
         return eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity);
     }
-    function setPointerEvent(entity, type, opts) {
+    function setPointerEvent(entity, type, opts, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
         pointerEvent.pointerEvents.push({
             eventType: type,
@@ -60,15 +62,19 @@ function createPointerEventsSystem(engine, inputSystem) {
                 showHighlight: opts.showHighlight,
                 hoverText: opts.hoverText,
                 maxDistance: opts.maxDistance,
-                maxPlayerDistance: opts.maxPlayerDistance
-            }
+                maxPlayerDistance: opts.maxPlayerDistance,
+                priority: opts.priority
+            },
+            interactionType: interactionType ?? 0 /* InteractionType.CURSOR */
         });
     }
-    function removePointerEvent(entity, type, button) {
+    function removePointerEvent(entity, type, button, interactionType = 0 /* InteractionType.CURSOR */) {
         const pointerEvent = PointerEvents.getMutableOrNull(entity);
         if (!pointerEvent)
             return;
-        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button && pointer.eventType === type));
+        pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button &&
+            pointer.eventType === type &&
+            pointer.interactionType === interactionType));
     }
     function getPointerEvent(eventType) {
         if (eventType === EventType.Up) {
@@ -80,9 +86,15 @@ function createPointerEventsSystem(engine, inputSystem) {
         else if (eventType === EventType.HoverEnter) {
             return 2 /* PointerEventType.PET_HOVER_ENTER */;
         }
+        else if (eventType === EventType.ProximityEnter) {
+            return 4 /* PointerEventType.PET_PROXIMITY_ENTER */;
+        }
+        else if (eventType === EventType.ProximityLeave) {
+            return 5 /* PointerEventType.PET_PROXIMITY_LEAVE */;
+        }
         return 1 /* PointerEventType.PET_DOWN */;
     }
-    function removeEvent(entity, type) {
+    function removeEvent(entity, type, interactionType = 0 /* InteractionType.CURSOR */) {
         const event = getEvent(entity);
         const pointerEvent = event.get(type);
         if (pointerEvent?.opts.hoverText) {
@@ -105,7 +117,9 @@ function createPointerEventsSystem(engine, inputSystem) {
                 if (eventType === EventType.Down ||
                     eventType === EventType.Up ||
                     eventType === EventType.HoverEnter ||
-                    eventType === EventType.HoverLeave) {
+                    eventType === EventType.HoverLeave ||
+                    eventType === EventType.ProximityEnter ||
+                    eventType === EventType.ProximityLeave) {
                     const command = inputSystem.getInputCommand(opts.button, getPointerEvent(eventType), entity);
                     if (command) {
                         (0, invariant_1.checkNotThenable)(cb(command), 'Event handler returned a thenable. Only synchronous functions are allowed');
@@ -152,6 +166,38 @@ function createPointerEventsSystem(engine, inputSystem) {
         getEvent(entity).set(EventType.HoverLeave, { cb, opts: options });
         setPointerEvent(entity, 3 /* PointerEventType.PET_HOVER_LEAVE */, options);
     };
+    const onProximityDown = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Down, { cb, opts: options });
+        setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityUp = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.Up, { cb, opts: options });
+        setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityEnter = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityEnter, { cb, opts: options });
+        setPointerEvent(entity, 4 /* PointerEventType.PET_PROXIMITY_ENTER */, options, 1 /* InteractionType.PROXIMITY */);
+    };
+    const onProximityLeave = (...args) => {
+        const [data, cb] = args;
+        const { entity, opts } = data;
+        const options = (0, exports.getDefaultOpts)(opts);
+        removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
+        getEvent(entity).set(EventType.ProximityLeave, { cb, opts: options });
+        setPointerEvent(entity, 5 /* PointerEventType.PET_PROXIMITY_LEAVE */, options, 1 /* InteractionType.PROXIMITY */);
+    };
     return {
         removeOnClick(entity) {
             removeEvent(entity, EventType.Click);
@@ -168,6 +214,18 @@ function createPointerEventsSystem(engine, inputSystem) {
         removeOnPointerHoverLeave(entity) {
             removeEvent(entity, EventType.HoverLeave);
         },
+        removeOnProximityDown(entity) {
+            removeEvent(entity, EventType.Down, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityUp(entity) {
+            removeEvent(entity, EventType.Up, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityEnter(entity) {
+            removeEvent(entity, EventType.ProximityEnter, 1 /* InteractionType.PROXIMITY */);
+        },
+        removeOnProximityLeave(entity) {
+            removeEvent(entity, EventType.ProximityLeave, 1 /* InteractionType.PROXIMITY */);
+        },
         onClick(value, cb) {
             const { entity } = value;
             const options = (0, exports.getDefaultOpts)(value.opts);
@@ -180,7 +238,11 @@ function createPointerEventsSystem(engine, inputSystem) {
         onPointerDown,
         onPointerUp,
         onPointerHoverEnter,
-        onPointerHoverLeave
+        onPointerHoverLeave,
+        onProximityDown,
+        onProximityUp,
+        onProximityEnter,
+        onProximityLeave
     };
 }
 exports.createPointerEventsSystem = createPointerEventsSystem;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.22.1",
+  "version": "7.22.2-23600507492.commit-5f7f8a0",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -34,5 +34,5 @@
   "dependencies": {},
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "02288870c7c740e4dcd970c6b4fc1dd4f81c5943"
+  "commit": "5f7f8a09410c9cb0e2e0e0d669dfc3733e76a8e8"
 }