From 5b181a3ae6de3a516f678b19b00158ec72af91f2 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 14:00:57 +0100 Subject: [PATCH 1/9] installed protocol pr package and rebuilt --- package-lock.json | 14 +++++++------- package.json | 2 +- .../playground-assets/etc/playground-assets.api.md | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index caa76a49b..04af1bd90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f", + "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", @@ -577,9 +577,10 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-11406954347.commit-ba19c4f", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11406954347.commit-ba19c4f.tgz", - "integrity": "sha512-oMoq5IKAe1gout5SbP2w3Jq3Im+tbUiREW70BC+aVwwOly0YDtTWTZG9FyjeF36RDhyCg7z6jwtHL/rbWp0skw==", + "version": "1.0.0-11593429245.commit-6dd6863", + "resolved": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", + "integrity": "sha512-2MEa2+Q9Qd5l0TYlPjIUVBspnEyFvkTOqfHyJGwejxiiE0kIfdo29b5fUtKkMpcBS1VRfkJmsEiD1kOVzDSSlg==", + "license": "Apache-2.0", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -8232,9 +8233,8 @@ } }, "@dcl/protocol": { - "version": "1.0.0-11406954347.commit-ba19c4f", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11406954347.commit-ba19c4f.tgz", - "integrity": "sha512-oMoq5IKAe1gout5SbP2w3Jq3Im+tbUiREW70BC+aVwwOly0YDtTWTZG9FyjeF36RDhyCg7z6jwtHL/rbWp0skw==", + "version": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", + "integrity": "sha512-2MEa2+Q9Qd5l0TYlPjIUVBspnEyFvkTOqfHyJGwejxiiE0kIfdo29b5fUtKkMpcBS1VRfkJmsEiD1kOVzDSSlg==", "requires": { "@dcl/ts-proto": "1.154.0" }, diff --git a/package.json b/package.json index 0c809b80a..a26448492 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f", + "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", diff --git a/packages/@dcl/playground-assets/etc/playground-assets.api.md b/packages/@dcl/playground-assets/etc/playground-assets.api.md index c05702bbc..cd3f01bc0 100644 --- a/packages/@dcl/playground-assets/etc/playground-assets.api.md +++ b/packages/@dcl/playground-assets/etc/playground-assets.api.md @@ -2677,6 +2677,7 @@ export interface PBPointerEvents_Info { hoverText?: string | undefined; maxDistance?: number | undefined; showFeedback?: boolean | undefined; + showHighlight?: boolean | undefined; } // @public (undocumented) From a4ccbdfda81d64d4f26c6365c997ab73f77fe2f8 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 14:29:10 +0100 Subject: [PATCH 2/9] updated component tests --- test/ecs/components/PointerEvents.spec.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/ecs/components/PointerEvents.spec.ts b/test/ecs/components/PointerEvents.spec.ts index 17e1081fc..9ab62634c 100644 --- a/test/ecs/components/PointerEvents.spec.ts +++ b/test/ecs/components/PointerEvents.spec.ts @@ -14,7 +14,8 @@ describe('Generated OnPointerDown ProtoBuf', () => { button: 1, hoverText: 'Tap to run', maxDistance: 10, - showFeedback: true + showFeedback: true, + showHighlight: true } } ] @@ -28,7 +29,8 @@ describe('Generated OnPointerDown ProtoBuf', () => { button: InputAction.IA_ACTION_4, hoverText: 'Run to tap', maxDistance: 5, - showFeedback: false + showFeedback: false, + showHighlight: false } } ] @@ -51,7 +53,8 @@ describe('Generated OnPointerDown ProtoBuf', () => { button: InputAction.IA_ACTION_4, hoverText: 'Run to tap', maxDistance: 5, - showFeedback: false + showFeedback: false, + showHighlight: false } } ] From 8e7d62610318e1adfca4d6a25add16dd1c1c2207 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 15:02:33 +0100 Subject: [PATCH 3/9] updated inspector pointer event as well --- .../PointerEventsInspector/utils.spec.ts | 12 ++++++++---- .../EntityInspector/PointerEventsInspector/utils.ts | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.spec.ts b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.spec.ts index c2ee6996d..8aca0c000 100644 --- a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.spec.ts +++ b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.spec.ts @@ -23,7 +23,8 @@ describe('InputUtils', () => { button: InputAction.IA_ANY, hoverText: 'Interact', maxDistance: 10, - showFeedback: true + showFeedback: true, + showHighlight: true } } expect(result).toEqual(expected) @@ -36,7 +37,8 @@ describe('InputUtils', () => { button: InputAction.IA_PRIMARY, hoverText: 'Custom Interaction', maxDistance: 15, - showFeedback: false + showFeedback: false, + showHighlight: false } }) const expected = { @@ -45,7 +47,8 @@ describe('InputUtils', () => { button: InputAction.IA_PRIMARY, hoverText: 'Custom Interaction', maxDistance: 15, - showFeedback: false + showFeedback: false, + showHighlight: false } } expect(result).toEqual(expected) @@ -68,7 +71,8 @@ describe('InputUtils', () => { button: InputAction.IA_ANY, hoverText: 'Interact', maxDistance: 10, - showFeedback: true + showFeedback: true, + showHighlight: true } } expect(DEFAULTS).toEqual(expected) diff --git a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.ts b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.ts index c9ebdbc0e..b0ea8d80f 100644 --- a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.ts +++ b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/utils.ts @@ -18,6 +18,7 @@ export function getDefaultPointerEvent( hoverText: 'Interact', maxDistance: 10, showFeedback: true, + showHighlight: true, ...def?.eventInfo } } From b7e0e46b3dff3f82b5da3f605aa78ddcb0eff21c Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 15:47:27 +0100 Subject: [PATCH 4/9] updated pointer events helper system --- packages/@dcl/ecs/src/systems/events.ts | 4 +++- packages/@dcl/playground-assets/etc/playground-assets.api.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/@dcl/ecs/src/systems/events.ts b/packages/@dcl/ecs/src/systems/events.ts index 433b810d9..0ef768eee 100644 --- a/packages/@dcl/ecs/src/systems/events.ts +++ b/packages/@dcl/ecs/src/systems/events.ts @@ -20,6 +20,7 @@ export type EventSystemOptions = { hoverText?: string maxDistance?: number showFeedback?: boolean + showHighlight?: boolean } /** @@ -110,7 +111,7 @@ export function createPointerEventsSystem(engine: IEngine, inputSystem: IInputSy } function setPointerEvent(entity: Entity, type: PointerEventType, opts: EventSystemOptions) { - if (opts.hoverText || opts.showFeedback) { + if (opts.hoverText || opts.showFeedback || opts.showHighlight) { const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity) pointerEvent.pointerEvents.push({ @@ -118,6 +119,7 @@ export function createPointerEventsSystem(engine: IEngine, inputSystem: IInputSy eventInfo: { button: opts.button, showFeedback: opts.showFeedback, + showHighlight: opts.showHighlight, hoverText: opts.hoverText, maxDistance: opts.maxDistance } diff --git a/packages/@dcl/playground-assets/etc/playground-assets.api.md b/packages/@dcl/playground-assets/etc/playground-assets.api.md index cd3f01bc0..13d2e6dcd 100644 --- a/packages/@dcl/playground-assets/etc/playground-assets.api.md +++ b/packages/@dcl/playground-assets/etc/playground-assets.api.md @@ -1130,6 +1130,7 @@ export type EventSystemOptions = { hoverText?: string; maxDistance?: number; showFeedback?: boolean; + showHighlight?: boolean; }; // @public From 8bea972115be4042d572827d51f9b3f20ef20e15 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 20:08:46 +0100 Subject: [PATCH 5/9] updated protocol --- package-lock.json | 14 +++++++------- package.json | 2 +- packages/@dcl/sdk-commands/package-lock.json | 14 +++++++------- packages/@dcl/sdk-commands/package.json | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04af1bd90..75c4d21cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", + "@dcl/protocol": "1.0.0-11599848164.commit-ef74edc", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", @@ -577,10 +577,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-11593429245.commit-6dd6863", - "resolved": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", - "integrity": "sha512-2MEa2+Q9Qd5l0TYlPjIUVBspnEyFvkTOqfHyJGwejxiiE0kIfdo29b5fUtKkMpcBS1VRfkJmsEiD1kOVzDSSlg==", - "license": "Apache-2.0", + "version": "1.0.0-11599848164.commit-ef74edc", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11599848164.commit-ef74edc.tgz", + "integrity": "sha512-XSUOA0LbchlBUk5/BMJFBl0+qOm4UOIxwMGp38A1n4LQAatGO/RXjzReJRveqiFma+X7eq3e6+KCDqTLwepN0w==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -8233,8 +8232,9 @@ } }, "@dcl/protocol": { - "version": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", - "integrity": "sha512-2MEa2+Q9Qd5l0TYlPjIUVBspnEyFvkTOqfHyJGwejxiiE0kIfdo29b5fUtKkMpcBS1VRfkJmsEiD1kOVzDSSlg==", + "version": "1.0.0-11599848164.commit-ef74edc", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11599848164.commit-ef74edc.tgz", + "integrity": "sha512-XSUOA0LbchlBUk5/BMJFBl0+qOm4UOIxwMGp38A1n4LQAatGO/RXjzReJRveqiFma+X7eq3e6+KCDqTLwepN0w==", "requires": { "@dcl/ts-proto": "1.154.0" }, diff --git a/package.json b/package.json index a26448492..28538db1a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues", "dependencies": { "@actions/core": "^1.10.0", - "@dcl/protocol": "https://sdk-team-cdn.decentraland.org/@dcl/protocol/branch//dcl-protocol-1.0.0-11593429245.commit-6dd6863.tgz", + "@dcl/protocol": "1.0.0-11599848164.commit-ef74edc", "@dcl/quickjs-emscripten": "^0.21.0-3680274614.commit-1808aa1", "@dcl/ts-proto": "1.153.0", "@types/fs-extra": "^9.0.12", diff --git a/packages/@dcl/sdk-commands/package-lock.json b/packages/@dcl/sdk-commands/package-lock.json index bab6fbf37..2e1fcf497 100644 --- a/packages/@dcl/sdk-commands/package-lock.json +++ b/packages/@dcl/sdk-commands/package-lock.json @@ -15,7 +15,7 @@ "@dcl/inspector": "file:../inspector", "@dcl/linker-dapp": "^0.14.2", "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be", - "@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f", + "@dcl/protocol": "1.0.0-11599848164.commit-ef74edc", "@dcl/quests-client": "^1.0.3", "@dcl/quests-manager": "^0.1.4", "@dcl/rpc": "^1.1.1", @@ -239,9 +239,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-11406954347.commit-ba19c4f", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11406954347.commit-ba19c4f.tgz", - "integrity": "sha512-oMoq5IKAe1gout5SbP2w3Jq3Im+tbUiREW70BC+aVwwOly0YDtTWTZG9FyjeF36RDhyCg7z6jwtHL/rbWp0skw==", + "version": "1.0.0-11599848164.commit-ef74edc", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11599848164.commit-ef74edc.tgz", + "integrity": "sha512-XSUOA0LbchlBUk5/BMJFBl0+qOm4UOIxwMGp38A1n4LQAatGO/RXjzReJRveqiFma+X7eq3e6+KCDqTLwepN0w==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -3228,9 +3228,9 @@ } }, "@dcl/protocol": { - "version": "1.0.0-11406954347.commit-ba19c4f", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11406954347.commit-ba19c4f.tgz", - "integrity": "sha512-oMoq5IKAe1gout5SbP2w3Jq3Im+tbUiREW70BC+aVwwOly0YDtTWTZG9FyjeF36RDhyCg7z6jwtHL/rbWp0skw==", + "version": "1.0.0-11599848164.commit-ef74edc", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-11599848164.commit-ef74edc.tgz", + "integrity": "sha512-XSUOA0LbchlBUk5/BMJFBl0+qOm4UOIxwMGp38A1n4LQAatGO/RXjzReJRveqiFma+X7eq3e6+KCDqTLwepN0w==", "requires": { "@dcl/ts-proto": "1.154.0" } diff --git a/packages/@dcl/sdk-commands/package.json b/packages/@dcl/sdk-commands/package.json index e92c50308..aebff11ff 100644 --- a/packages/@dcl/sdk-commands/package.json +++ b/packages/@dcl/sdk-commands/package.json @@ -13,7 +13,7 @@ "@dcl/inspector": "file:../inspector", "@dcl/linker-dapp": "^0.14.2", "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be", - "@dcl/protocol": "1.0.0-11406954347.commit-ba19c4f", + "@dcl/protocol": "1.0.0-11599848164.commit-ef74edc", "@dcl/quests-client": "^1.0.3", "@dcl/quests-manager": "^0.1.4", "@dcl/rpc": "^1.1.1", From 0abea71304fb5c50ecd1ebbfc4af91a83673cd83 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 30 Oct 2024 20:33:30 +0100 Subject: [PATCH 6/9] fixed pointer events case without optional properties by removing problematic check --- packages/@dcl/ecs/src/systems/events.ts | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/@dcl/ecs/src/systems/events.ts b/packages/@dcl/ecs/src/systems/events.ts index 0ef768eee..04bb7b997 100644 --- a/packages/@dcl/ecs/src/systems/events.ts +++ b/packages/@dcl/ecs/src/systems/events.ts @@ -111,20 +111,17 @@ export function createPointerEventsSystem(engine: IEngine, inputSystem: IInputSy } function setPointerEvent(entity: Entity, type: PointerEventType, opts: EventSystemOptions) { - if (opts.hoverText || opts.showFeedback || opts.showHighlight) { - const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity) - - pointerEvent.pointerEvents.push({ - eventType: type, - eventInfo: { - button: opts.button, - showFeedback: opts.showFeedback, - showHighlight: opts.showHighlight, - hoverText: opts.hoverText, - maxDistance: opts.maxDistance - } - }) - } + const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity) + pointerEvent.pointerEvents.push({ + eventType: type, + eventInfo: { + button: opts.button, + showFeedback: opts.showFeedback, + showHighlight: opts.showHighlight, + hoverText: opts.hoverText, + maxDistance: opts.maxDistance + } + }) } function removePointerEvent(entity: Entity, type: PointerEventType, button: InputAction) { From cb790d0db794312d817f8a8d78926c8a9e106d0b Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 31 Oct 2024 12:29:52 +0100 Subject: [PATCH 7/9] updated pointer events inspector with new prop --- .../PointerEventsInspector/PointerEventsInspector.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/PointerEventsInspector.tsx b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/PointerEventsInspector.tsx index 1ce87c8ab..a28816df8 100644 --- a/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/PointerEventsInspector.tsx +++ b/packages/@dcl/inspector/src/components/EntityInspector/PointerEventsInspector/PointerEventsInspector.tsx @@ -115,6 +115,12 @@ export default withSdk(({ sdk, entity: entityId }) => { onChange={(e) => handleEventInfoChange({ showFeedback: !!e.target.checked }, idx)} /> + + handleEventInfoChange({ showHighlight: !!e.target.checked }, idx)} + /> + handleRemove(idx)}>Remove Pointer Event ))} From 08fa53960994557f1b100bcec3d3a5078e9dfb80 Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 31 Oct 2024 13:04:42 +0100 Subject: [PATCH 8/9] fixed test --- packages/@dcl/ecs/src/systems/events.ts | 10 +++++----- .../playground-assets/etc/playground-assets.api.md | 5 +++++ test/ecs/events/system.spec.ts | 13 ++++++++----- test/snapshots/package-lock.json | 2 +- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/@dcl/ecs/src/systems/events.ts b/packages/@dcl/ecs/src/systems/events.ts index 04bb7b997..91d92dc2e 100644 --- a/packages/@dcl/ecs/src/systems/events.ts +++ b/packages/@dcl/ecs/src/systems/events.ts @@ -23,6 +23,11 @@ export type EventSystemOptions = { showHighlight?: boolean } +export const getDefaultOpts = (opts: Partial = {}): EventSystemOptions => ({ + button: InputAction.IA_ANY, + ...opts +}) + /** * @public */ @@ -99,11 +104,6 @@ export function createPointerEventsSystem(engine: IEngine, inputSystem: IInputSy } type EventMapType = Map - const getDefaultOpts = (opts: Partial = {}): EventSystemOptions => ({ - button: InputAction.IA_ANY, - ...opts - }) - const eventsMap = new Map() function getEvent(entity: Entity) { diff --git a/packages/@dcl/playground-assets/etc/playground-assets.api.md b/packages/@dcl/playground-assets/etc/playground-assets.api.md index 13d2e6dcd..5560ba59a 100644 --- a/packages/@dcl/playground-assets/etc/playground-assets.api.md +++ b/packages/@dcl/playground-assets/etc/playground-assets.api.md @@ -1168,6 +1168,11 @@ export function getComponentEntityTree(engine: Pick; +// Warning: (ae-missing-release-tag) "getDefaultOpts" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const getDefaultOpts: (opts?: Partial) => EventSystemOptions; + // Warning: (ae-missing-release-tag) "GlobalDirectionRaycastOptions" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal) // // @public (undocumented) diff --git a/test/ecs/events/system.spec.ts b/test/ecs/events/system.spec.ts index 2532b2a9d..772e1c163 100644 --- a/test/ecs/events/system.spec.ts +++ b/test/ecs/events/system.spec.ts @@ -1,6 +1,6 @@ import { Engine, Entity, IEngine, components, PointerEventType, InputAction } from '../../../packages/@dcl/ecs/src' import { createInputSystem } from '../../../packages/@dcl/ecs/src/engine/input' -import { createPointerEventsSystem, PointerEventsSystem } from '../../../packages/@dcl/ecs/src/systems/events' +import { createPointerEventsSystem, getDefaultOpts, PointerEventsSystem } from '../../../packages/@dcl/ecs/src/systems/events' import { createTestPointerDownCommand } from './utils' let engine: IEngine @@ -69,7 +69,6 @@ describe('Events System', () => { expect(counter).toBe(1) const removedFeedback = PointerEvents.getOrNull(entity)?.pointerEvents expect(removedFeedback?.length).toBe(0) - // Update tick and verify we didnt increment the counter again await engine.update(1) expect(counter).toBe(1) @@ -83,13 +82,17 @@ describe('Events System', () => { entity, () => { counter += 1 - }, - { hoverText: '' } + } ) fakePointer(entity, PointerEventType.PET_DOWN) await engine.update(1) expect(counter).toBe(1) - expect(PointerEvents.getOrNull(entity)).toBe(null) + expect(PointerEvents.getOrNull(entity)).toMatchObject({ + 'pointerEvents': [{ + 'eventInfo': getDefaultOpts(), + 'eventType': 1 + }] + }) }) it('should remove pointer down', async () => { diff --git a/test/snapshots/package-lock.json b/test/snapshots/package-lock.json index 818683995..9ae988780 100644 --- a/test/snapshots/package-lock.json +++ b/test/snapshots/package-lock.json @@ -168,7 +168,7 @@ "@dcl/inspector": "file:../inspector", "@dcl/linker-dapp": "^0.14.2", "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be", - "@dcl/protocol": "1.0.0-10704143848.commit-a0c6d86", + "@dcl/protocol": "1.0.0-11599848164.commit-ef74edc", "@dcl/quests-client": "^1.0.3", "@dcl/quests-manager": "^0.1.4", "@dcl/rpc": "^1.1.1", From 630cb31ecd7c7d162f9040af3bb6829939bd5a07 Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 31 Oct 2024 13:07:46 +0100 Subject: [PATCH 9/9] ran make lint-fix --- test/ecs/events/system.spec.ts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/test/ecs/events/system.spec.ts b/test/ecs/events/system.spec.ts index 772e1c163..807900a39 100644 --- a/test/ecs/events/system.spec.ts +++ b/test/ecs/events/system.spec.ts @@ -1,6 +1,10 @@ import { Engine, Entity, IEngine, components, PointerEventType, InputAction } from '../../../packages/@dcl/ecs/src' import { createInputSystem } from '../../../packages/@dcl/ecs/src/engine/input' -import { createPointerEventsSystem, getDefaultOpts, PointerEventsSystem } from '../../../packages/@dcl/ecs/src/systems/events' +import { + createPointerEventsSystem, + getDefaultOpts, + PointerEventsSystem +} from '../../../packages/@dcl/ecs/src/systems/events' import { createTestPointerDownCommand } from './utils' let engine: IEngine @@ -78,20 +82,19 @@ describe('Events System', () => { const entity = engine.addEntity() const PointerEvents = components.PointerEvents(engine) let counter = 0 - EventsSystem.onPointerDown( - entity, - () => { - counter += 1 - } - ) + EventsSystem.onPointerDown(entity, () => { + counter += 1 + }) fakePointer(entity, PointerEventType.PET_DOWN) await engine.update(1) expect(counter).toBe(1) expect(PointerEvents.getOrNull(entity)).toMatchObject({ - 'pointerEvents': [{ - 'eventInfo': getDefaultOpts(), - 'eventType': 1 - }] + pointerEvents: [ + { + eventInfo: getDefaultOpts(), + eventType: 1 + } + ] }) })