@dcl/ecs 7.0.6-3803395793.commit-999a6b9 → 7.0.6-3808564125.commit-7a2650b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/dist/components/generated/PointerEvents.gen.d.ts +8 -0
  2. package/dist/components/generated/PointerEvents.gen.js +19 -0
  3. package/dist/components/generated/UiDropdown.gen.d.ts +8 -0
  4. package/dist/components/generated/UiDropdown.gen.js +19 -0
  5. package/dist/components/generated/UiDropdownResult.gen.d.ts +8 -0
  6. package/dist/components/generated/UiDropdownResult.gen.js +19 -0
  7. package/dist/components/generated/UiInput.gen.d.ts +8 -0
  8. package/dist/components/generated/UiInput.gen.js +19 -0
  9. package/dist/components/generated/UiInputResult.gen.d.ts +8 -0
  10. package/dist/components/generated/UiInputResult.gen.js +19 -0
  11. package/dist/components/generated/global.gen.d.ts +10 -2
  12. package/dist/components/generated/global.gen.js +5 -1
  13. package/dist/components/generated/ids.gen.d.ts +5 -1
  14. package/dist/components/generated/ids.gen.js +5 -1
  15. package/dist/components/generated/index.gen.d.ts +15 -3
  16. package/dist/components/generated/index.gen.js +15 -3
  17. package/dist/components/generated/pb/decentraland/common/border_rect.gen.d.ts +15 -0
  18. package/dist/components/generated/pb/decentraland/common/border_rect.gen.js +52 -0
  19. package/dist/components/generated/pb/decentraland/sdk/components/{pointer_hover_feedback.gen.d.ts → pointer_events.gen.d.ts} +14 -14
  20. package/dist/components/generated/pb/decentraland/sdk/components/{pointer_hover_feedback.gen.js → pointer_events.gen.js} +13 -13
  21. package/dist/components/generated/pb/decentraland/sdk/components/pointer_events_result.gen.d.ts +1 -1
  22. package/dist/components/generated/pb/decentraland/sdk/components/ui_background.gen.d.ts +30 -2
  23. package/dist/components/generated/pb/decentraland/sdk/components/ui_background.gen.js +61 -4
  24. package/dist/components/generated/pb/decentraland/sdk/components/ui_dropdown.gen.d.ts +26 -0
  25. package/dist/components/generated/pb/decentraland/sdk/components/ui_dropdown.gen.js +93 -0
  26. package/dist/components/generated/pb/decentraland/sdk/components/ui_dropdown_result.gen.d.ts +11 -0
  27. package/dist/components/generated/pb/decentraland/sdk/components/ui_dropdown_result.gen.js +34 -0
  28. package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.d.ts +24 -0
  29. package/dist/components/generated/pb/decentraland/sdk/components/ui_input.gen.js +79 -0
  30. package/dist/components/generated/pb/decentraland/sdk/components/ui_input_result.gen.d.ts +11 -0
  31. package/dist/components/generated/pb/decentraland/sdk/components/ui_input_result.gen.js +34 -0
  32. package/dist/components/generated/types.gen.d.ts +1 -0
  33. package/dist/components/generated/types.gen.js +2 -0
  34. package/dist/engine/input.d.ts +1 -1
  35. package/dist/runtime/initialization/index.d.ts +3 -3
  36. package/dist/runtime/types.d.ts +6 -19
  37. package/dist/runtime/types.js +2 -17
  38. package/dist/schemas/basic/String.js +2 -2
  39. package/dist/serialization/ByteBuffer/index.d.ts +2 -0
  40. package/dist/serialization/ByteBuffer/index.js +13 -0
  41. package/dist/systems/events.d.ts +5 -4
  42. package/dist/systems/events.js +11 -14
  43. package/package.json +4 -4
  44. package/dist/components/generated/PointerHoverFeedback.gen.d.ts +0 -8
  45. package/dist/components/generated/PointerHoverFeedback.gen.js +0 -19
@@ -1,7 +1,7 @@
1
1
  import * as components from '../components';
2
2
  import { checkNotThenable } from '../runtime/invariant';
3
3
  export function createPointerEventSystem(engine, inputSystem) {
4
- const PointerHoverFeedback = components.PointerHoverFeedback(engine);
4
+ const PointerEvents = components.PointerEvents(engine);
5
5
  let EventType;
6
6
  (function (EventType) {
7
7
  EventType[EventType["Click"] = 0] = "Click";
@@ -10,31 +10,28 @@ export function createPointerEventSystem(engine, inputSystem) {
10
10
  })(EventType || (EventType = {}));
11
11
  const getDefaultOpts = (opts = {}) => ({
12
12
  button: 3 /* InputAction.IA_ANY */,
13
- hoverText: 'Interact',
14
- maxDistance: 100,
15
13
  ...opts
16
14
  });
17
15
  const eventsMap = new Map();
18
16
  function getEvent(entity) {
19
17
  return (eventsMap.get(entity) || eventsMap.set(entity, new Map()).get(entity));
20
18
  }
21
- function setHoverFeedback(entity, type, opts) {
22
- if (opts.hoverText) {
23
- const pointerEvent = PointerHoverFeedback.getMutableOrNull(entity) ||
24
- PointerHoverFeedback.create(entity);
19
+ function setPointerEvent(entity, type, opts) {
20
+ if (opts.hoverText || opts.showFeedback) {
21
+ const pointerEvent = PointerEvents.getMutableOrNull(entity) || PointerEvents.create(entity);
25
22
  pointerEvent.pointerEvents.push({
26
23
  eventType: type,
27
24
  eventInfo: {
28
25
  button: opts.button,
29
- showFeedback: true,
26
+ showFeedback: opts.showFeedback,
30
27
  hoverText: opts.hoverText,
31
28
  maxDistance: opts.maxDistance
32
29
  }
33
30
  });
34
31
  }
35
32
  }
36
- function removeHoverFeedback(entity, type, button) {
37
- const pointerEvent = PointerHoverFeedback.getMutableOrNull(entity);
33
+ function removePointerEvent(entity, type, button) {
34
+ const pointerEvent = PointerEvents.getMutableOrNull(entity);
38
35
  if (!pointerEvent)
39
36
  return;
40
37
  pointerEvent.pointerEvents = pointerEvent.pointerEvents.filter((pointer) => !(pointer.eventInfo?.button === button && pointer.eventType === type));
@@ -49,7 +46,7 @@ export function createPointerEventSystem(engine, inputSystem) {
49
46
  const event = getEvent(entity);
50
47
  const pointerEvent = event.get(type);
51
48
  if (pointerEvent?.opts.hoverText) {
52
- removeHoverFeedback(entity, getPointerEvent(type), pointerEvent.opts.button);
49
+ removePointerEvent(entity, getPointerEvent(type), pointerEvent.opts.button);
53
50
  }
54
51
  event.delete(type);
55
52
  }
@@ -113,7 +110,7 @@ export function createPointerEventSystem(engine, inputSystem) {
113
110
  removeEvent(entity, EventType.Click);
114
111
  // Set new event
115
112
  getEvent(entity).set(EventType.Click, { cb, opts: options });
116
- setHoverFeedback(entity, 1 /* PointerEventType.PET_DOWN */, options);
113
+ setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
117
114
  },
118
115
  /**
119
116
  * @public
@@ -126,7 +123,7 @@ export function createPointerEventSystem(engine, inputSystem) {
126
123
  const options = getDefaultOpts(opts);
127
124
  removeEvent(entity, EventType.Down);
128
125
  getEvent(entity).set(EventType.Down, { cb, opts: options });
129
- setHoverFeedback(entity, 1 /* PointerEventType.PET_DOWN */, options);
126
+ setPointerEvent(entity, 1 /* PointerEventType.PET_DOWN */, options);
130
127
  },
131
128
  /**
132
129
  * @public
@@ -139,7 +136,7 @@ export function createPointerEventSystem(engine, inputSystem) {
139
136
  const options = getDefaultOpts(opts);
140
137
  removeEvent(entity, EventType.Up);
141
138
  getEvent(entity).set(EventType.Up, { cb, opts: options });
142
- setHoverFeedback(entity, 0 /* PointerEventType.PET_UP */, options);
139
+ setPointerEvent(entity, 0 /* PointerEventType.PET_UP */, options);
143
140
  }
144
141
  };
145
142
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcl/ecs",
3
- "version": "7.0.6-3803395793.commit-999a6b9",
3
+ "version": "7.0.6-3808564125.commit-7a2650b",
4
4
  "description": "Decentraland ECS",
5
5
  "main": "./dist/index.js",
6
6
  "typings": "./dist/index.d.ts",
@@ -27,13 +27,13 @@
27
27
  "ts-proto": "^1.112.0"
28
28
  },
29
29
  "dependencies": {
30
- "@dcl/crdt": "7.0.6-3803395793.commit-999a6b9",
30
+ "@dcl/crdt": "7.0.6-3808564125.commit-7a2650b",
31
31
  "@dcl/js-runtime": "file:../js-runtime",
32
- "@dcl/protocol": "^1.0.0-3766287015.commit-7d88411"
32
+ "@dcl/protocol": "^1.0.0-3808528053.commit-d66d462"
33
33
  },
34
34
  "files": [
35
35
  "dist",
36
36
  "etc"
37
37
  ],
38
- "commit": "999a6b968b90045203c1d22ea5f7776af8f068f5"
38
+ "commit": "7a2650b741ac5f5a5d3f00ac1c955e5f773d679a"
39
39
  }
@@ -1,8 +0,0 @@
1
- import { ISchema } from '../../schemas/ISchema';
2
- import { PBPointerHoverFeedback } from './pb/decentraland/sdk/components/pointer_hover_feedback.gen';
3
- /**
4
- *
5
- */
6
- export declare const PointerHoverFeedbackSchema: ISchema<PBPointerHoverFeedback> & {
7
- COMPONENT_ID: number;
8
- };
@@ -1,19 +0,0 @@
1
- import { PBPointerHoverFeedback } from './pb/decentraland/sdk/components/pointer_hover_feedback.gen';
2
- /**
3
- *
4
- */
5
- export const PointerHoverFeedbackSchema = {
6
- COMPONENT_ID: 1062,
7
- serialize(value, builder) {
8
- const writer = PBPointerHoverFeedback.encode(value);
9
- const buffer = new Uint8Array(writer.finish(), 0, writer.len);
10
- builder.writeBuffer(buffer, false);
11
- },
12
- deserialize(reader) {
13
- return PBPointerHoverFeedback.decode(reader.buffer(), reader.remainingBytes());
14
- },
15
- create() {
16
- // TODO: this is a hack.
17
- return PBPointerHoverFeedback.decode(new Uint8Array());
18
- }
19
- };