@dcl/react-ecs 7.7.2-12988530758.commit-08f37d7 → 7.7.2

package/dist/components/Button/index.js

@@ -29,7 +29,7 @@ function getButtonProps(props) {
  */
 /* @__PURE__ */
 export function Button(props) {
-    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, onMouseDrag, onMouseDragLocked, onMouseDragEnd, ...otherProps } = props;
+    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, ...otherProps } = props;
     const buttonProps = getButtonProps(props);
     const uiBackgroundProps = parseUiBackground({
         ...buttonProps.uiBackground,
@@ -54,5 +54,5 @@ export function Button(props) {
         if (uiBackgroundProps && uiBackgroundProps.color)
             uiBackgroundProps.color.a /= 2;
     }
-    return (ReactEcs.createElement("entity", { onMouseDown: !!props.disabled ? undefined : onMouseDown, onMouseUp: !!props.disabled ? undefined : onMouseUp, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, onMouseDrag: onMouseDrag, onMouseDragLocked: onMouseDragLocked, onMouseDragEnd: onMouseDragEnd, uiTransform: uiTransformProps, uiText: textProps, uiBackground: uiBackgroundProps }));
+    return (ReactEcs.createElement("entity", { onMouseDown: !!props.disabled ? undefined : onMouseDown, onMouseUp: !!props.disabled ? undefined : onMouseUp, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, uiTransform: uiTransformProps, uiText: textProps, uiBackground: uiBackgroundProps }));
 }

package/dist/components/Dropdown/index.js

@@ -34,7 +34,7 @@ function parseUiDropdown(props) {
  */
 /* @__PURE__ */
 export function Dropdown(props) {
-    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, onMouseDrag, onMouseDragLocked, onMouseDragEnd, ...otherProps } = props;
+    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, ...otherProps } = props;
     const dropdownProps = parseUiDropdown(otherProps);
     const commonProps = parseProps({
         uiTransform,
@@ -42,10 +42,7 @@ export function Dropdown(props) {
         onMouseDown,
         onMouseUp,
         onMouseEnter,
-        onMouseLeave,
-        onMouseDrag,
-        onMouseDragLocked,
-        onMouseDragEnd
+        onMouseLeave
     });
     return ReactEcs.createElement("entity", { ...commonProps, uiDropdown: dropdownProps });
 }

package/dist/components/Input/index.js

@@ -35,7 +35,7 @@ function parseUiInput(props) {
  * @category Component
  */ /* @__PURE__ */
 export function Input(props) {
-    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, onMouseDrag, onMouseDragLocked, onMouseDragEnd, ...otherProps } = props;
+    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, ...otherProps } = props;
     const inputProps = parseUiInput(otherProps);
     const commonProps = parseProps({
         uiTransform,
@@ -43,10 +43,7 @@ export function Input(props) {
         onMouseDown,
         onMouseUp,
         onMouseEnter,
-        onMouseLeave,
-        onMouseDrag,
-        onMouseDragLocked,
-        onMouseDragEnd
+        onMouseLeave
     });
     return ReactEcs.createElement("entity", { ...commonProps, uiInput: inputProps });
 }

package/dist/components/Label/index.js

@@ -16,17 +16,14 @@ export { scaleFontSize } from './utils';
  */
 /* @__PURE__ */
 export function Label(props) {
-    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, onMouseDrag, onMouseDragLocked, onMouseDragEnd, ...uiTextProps } = props;
+    const { uiTransform, uiBackground, onMouseDown, onMouseUp, onMouseEnter, onMouseLeave, ...uiTextProps } = props;
     const commonProps = parseProps({
         uiTransform,
         uiBackground,
         onMouseDown,
         onMouseUp,
         onMouseEnter,
-        onMouseLeave,
-        onMouseDrag,
-        onMouseDragLocked,
-        onMouseDragEnd
+        onMouseLeave
     });
     const { font, textAlign, fontSize, textWrap, ...textProps } = uiTextProps;
     const uiText = {
@@ -34,9 +31,7 @@ export function Label(props) {
         ...getFont(font),
         ...getTextAlign(textAlign),
         ...getFontSize(fontSize),
-        ...getTextWrap(textWrap),
-        outlineWidth: props.outlineWidth,
-        outlineColor: props.outlineColor
+        ...getTextWrap(textWrap)
     };
     return ReactEcs.createElement("entity", { ...commonProps, uiText: uiText });
 }

package/dist/components/Label/types.d.ts

@@ -15,10 +15,6 @@ export interface UiLabelProps {
     textAlign?: TextAlignType | undefined;
     /** Label font type. @defaultValue 'sans-serif' */
     font?: UiFontType | undefined;
-    /** Outline width of the text. @defaultValue 0 */
-    outlineWidth?: number | undefined;
-    /** Outline color of the text. @defaultValue `{ r: 0, g: 0, b: 0, a: 1 }` */
-    outlineColor?: Color4 | undefined;
     /** Behaviour when text reached. @defaultValue 'wrap' */
     textWrap?: UiTextWrapType | undefined;
 }

package/dist/components/listeners/types.d.ts

@@ -16,10 +16,4 @@ export type Listeners = {
     onMouseEnter?: Callback;
     /** triggered on mouse leave event */
     onMouseLeave?: Callback;
-    /** triggered on mouse drag event */
-    onMouseDrag?: Callback;
-    /** triggered on mouse drag event */
-    onMouseDragLocked?: Callback;
-    /** triggered on mouse drag event */
-    onMouseDragEnd?: Callback;
 };

package/dist/components/listeners/types.js

@@ -2,10 +2,7 @@ const listeners = {
     onMouseDown: undefined,
     onMouseUp: undefined,
     onMouseEnter: undefined,
-    onMouseLeave: undefined,
-    onMouseDrag: undefined,
-    onMouseDragLocked: undefined,
-    onMouseDragEnd: undefined
+    onMouseLeave: undefined
 };
 const listenersKey = Object.keys(listeners);
 /**

package/dist/components/uiBackground/types.d.ts

@@ -1,4 +1,4 @@
-import { BorderRect, Entity } from '@dcl/ecs';
+import { BorderRect } from '@dcl/ecs';
 import { Color4 } from '@dcl/ecs/dist/components/generated/pb/decentraland/common/colors.gen';
 /**
  * @public
@@ -15,8 +15,6 @@ export interface UiBackgroundProps {
     uvs?: number[];
     /** AvatarTexture for the background */
     avatarTexture?: UiAvatarTexture;
-    /** VideoTexture for the background */
-    videoTexture?: UiVideoTexture;
     /** Texture for the background */
     texture?: UiTexture;
 }
@@ -29,15 +27,6 @@ export interface UiAvatarTexture {
     wrapMode?: TextureWrapType;
     filterMode?: TextureFilterType;
 }
-/**
- * Texture
- * @public
- */
-export interface UiVideoTexture {
-    videoPlayerEntity: Entity;
-    wrapMode?: TextureWrapType;
-    filterMode?: TextureFilterType;
-}
 /**
  * Texture
  * @public

package/dist/components/uiBackground/utils.js

@@ -30,14 +30,6 @@ export function getTexture(props) {
             }
         };
     }
-    if (props.videoTexture) {
-        return {
-            tex: {
-                $case: 'videoTexture',
-                videoTexture: parseTexture(props.videoTexture)
-            }
-        };
-    }
     return undefined;
 }
 function parseTexture(texture) {

package/dist/components/uiTransform/index.d.ts

@@ -1,5 +1,5 @@
-import { PBUiTransform } from '@dcl/ecs/dist/components';
 import { UiTransformProps } from './types';
+import { PBUiTransform } from '@dcl/ecs/dist/components';
 /**
  * @public
  */

package/dist/components/uiTransform/index.js

@@ -1,4 +1,4 @@
-import { getAlign, getDisplay, getFlexDirection, getFlexWrap, getJustify, getOverflow, getPointerFilter, getPositionType, getScrollPosition, getScrollVisible, parsePosition, parseSize } from './utils';
+import { getAlign, getDisplay, getFlexDirection, getFlexWrap, getJustify, getOverflow, getPointerFilter, getPositionType, parsePosition, parseSize } from './utils';
 /**
  * @internal
  */
@@ -51,16 +51,14 @@ const defaultUiTransform = {
     flexBasisUnit: 0 /* YGUnit.YGU_UNDEFINED */,
     widthUnit: 3 /* YGUnit.YGU_AUTO */,
     heightUnit: 0 /* YGUnit.YGU_UNDEFINED */,
-    pointerFilter: 0 /* PointerFilterMode.PFM_NONE */,
-    opacity: 1,
-    zIndex: 0
+    pointerFilter: 0 /* PointerFilterMode.PFM_NONE */
 };
 /**
  * @public
  */
 /* @__PURE__ */
 export function parseUiTransform(props = {}) {
-    const { scrollPosition, scrollVisible, height, minHeight, maxHeight, width, minWidth, maxWidth, alignItems, alignContent, flexWrap, zIndex, ...otherProps } = props;
+    const { height, minHeight, maxHeight, width, minWidth, maxWidth, alignItems, alignContent, flexWrap, ...otherProps } = props;
     return {
         ...defaultUiTransform,
         ...otherProps,
@@ -83,9 +81,6 @@ export function parseUiTransform(props = {}) {
         // Optional values
         ...(alignContent && getAlign('alignContent', alignContent)),
         ...(alignItems && getAlign('alignItems', alignItems)),
-        ...(flexWrap && getFlexWrap(flexWrap)),
-        ...(scrollPosition && getScrollPosition(scrollPosition)),
-        ...(scrollVisible && getScrollVisible(scrollVisible)),
-        ...(zIndex && { zIndex })
+        ...(flexWrap && getFlexWrap(flexWrap))
     };
 }

package/dist/components/uiTransform/types.d.ts

@@ -1,4 +1,3 @@
-import { Vector2 } from '@dcl/ecs/dist/components/generated/pb/decentraland/common/vectors.gen';
 import { ScaleUnit } from '../types';
 /**
  * unit value specified. i.e. 1 || '100%' || '1px' || '10vw'
@@ -63,11 +62,6 @@ export type PositionType = 'absolute' | 'relative';
  * The pointer filter property determines if the ui element blocks the pointer or not (elements with pointer events always block the pointer regardless of this property)
  */
 export type PointerFilterType = 'none' | 'block';
-/**
- * @public
- * The scroll-visible determines if the scrollbars are shown when the scroll overflow is enabled
- */
-export type ScrollVisibleType = 'horizontal' | 'vertical' | 'both' | 'hidden';
 /**
  * Layout props to position things in the canvas
  * @public
@@ -119,14 +113,4 @@ export interface UiTransformProps {
     overflow?: OverflowType;
     /** The pointer filter property determines if the ui element blocks the pointer or not (elements with pointer events always block the pointer regardless of this property) **/
     pointerFilter?: PointerFilterType;
-    /** The opacity property sets the opacity level for an element, it's accumulated across children @defaultValue 1 */
-    opacity?: number;
-    /** A reference value to identify the element, default empty */
-    elementId?: string;
-    /** default position=(0,0) if it aplies, a vector or a reference-id */
-    scrollPosition?: Vector2 | string;
-    /** default ShowScrollBar.SSB_BOTH */
-    scrollVisible?: ScrollVisibleType;
-    /** default 0 */
-    zIndex?: number;
 }

package/dist/components/uiTransform/utils.js

@@ -184,40 +184,3 @@ const parsePointerFilter = {
     none: 0 /* PointerFilterMode.PFM_NONE */,
     block: 1 /* PointerFilterMode.PFM_BLOCK */
 };
-/**
- * @internal
- */
-export function getScrollPosition(scrollPosition) {
-    if (typeof scrollPosition === 'string') {
-        return {
-            scrollPosition: {
-                value: {
-                    $case: 'reference',
-                    reference: scrollPosition
-                }
-            }
-        };
-    }
-    else {
-        return {
-            scrollPosition: {
-                value: {
-                    $case: 'position',
-                    position: scrollPosition
-                }
-            }
-        };
-    }
-}
-const parseScrollVisible = {
-    both: 0 /* ShowScrollBar.SSB_BOTH */,
-    hidden: 3 /* ShowScrollBar.SSB_HIDDEN */,
-    horizontal: 2 /* ShowScrollBar.SSB_ONLY_HORIZONTAL */,
-    vertical: 1 /* ShowScrollBar.SSB_ONLY_VERTICAL */
-};
-/**
- * @internal
- */
-export function getScrollVisible(scrollVisible) {
-    return { scrollVisible: parseScrollVisible[scrollVisible] };
-}

package/dist/react-ecs.d.ts

@@ -22,9 +22,6 @@ export type EntityComponents = {
     onMouseUp: Callback;
     onMouseEnter: Callback;
     onMouseLeave: Callback;
-    onMouseDrag: Callback;
-    onMouseDragLocked: Callback;
-    onMouseDragEnd: Callback;
 };
 /**
  * @hidden

package/dist/reconciler/index.d.ts

@@ -1,7 +1,6 @@
 import { Entity, IEngine, PointerEventsSystem } from '@dcl/ecs';
 import { ReactEcs } from '../react-ecs';
-export interface DclReconciler {
-    update: (component: ReactEcs.JSX.ReactNode) => void;
+export declare function createReconciler(engine: Pick<IEngine, 'getComponent' | 'addEntity' | 'removeEntity' | 'defineComponentFromSchema' | 'getEntitiesWith'>, pointerEvents: PointerEventsSystem): {
+    update: (component: ReactEcs.JSX.ReactNode) => number;
     getEntities: () => Entity[];
-}
-export declare function createReconciler(engine: Pick<IEngine, 'getComponent' | 'addEntity' | 'removeEntity' | 'defineComponentFromSchema' | 'getEntitiesWith'>, pointerEvents: PointerEventsSystem, rootEntity: Entity | undefined): DclReconciler;
+};

package/dist/reconciler/index.js

@@ -8,14 +8,11 @@ function getPointerEnum(pointerKey) {
         onMouseDown: 1 /* PointerEventType.PET_DOWN */,
         onMouseUp: 0 /* PointerEventType.PET_UP */,
         onMouseEnter: 2 /* PointerEventType.PET_HOVER_ENTER */,
-        onMouseLeave: 3 /* PointerEventType.PET_HOVER_LEAVE */,
-        onMouseDrag: 5 /* PointerEventType.PET_DRAG */,
-        onMouseDragLocked: 4 /* PointerEventType.PET_DRAG_LOCKED */,
-        onMouseDragEnd: 6 /* PointerEventType.PET_DRAG_END */
+        onMouseLeave: 3 /* PointerEventType.PET_HOVER_LEAVE */
     };
     return pointers[pointerKey];
 }
-export function createReconciler(engine, pointerEvents, rootEntity) {
+export function createReconciler(engine, pointerEvents) {
     // Store all the entities so when we destroy the UI we can also destroy them
     const entities = new Set();
     // Store the onChange callbacks to be runned every time a Result has changed
@@ -29,8 +26,6 @@ export function createReconciler(engine, pointerEvents, rootEntity) {
     const UiInputResult = components.UiInputResult(engine);
     const UiDropdown = components.UiDropdown(engine);
     const UiDropdownResult = components.UiDropdownResult(engine);
-    const UiScrollResult = components.UiScrollResult(engine);
-    const Transform = components.Transform(engine);
     // Component ID Helper
     const getComponentId = {
         uiTransform: UiTransform.componentId,
@@ -63,15 +58,6 @@ export function createReconciler(engine, pointerEvents, rootEntity) {
             else if (update.component === 'onMouseLeave') {
                 pointerEvents.removeOnPointerHoverLeave(instance.entity);
             }
-            else if (update.component === 'onMouseDrag') {
-                pointerEvents.removeOnPointerDrag(instance.entity);
-            }
-            else if (update.component === 'onMouseDragLocked') {
-                pointerEvents.removeOnPointerDragLocked(instance.entity);
-            }
-            else if (update.component === 'onMouseDragEnd') {
-                pointerEvents.removeOnPointerDragEnd(instance.entity);
-            }
             return;
         }
         if (update.props) {
@@ -87,13 +73,7 @@ export function createReconciler(engine, pointerEvents, rootEntity) {
                     ? pointerEvents.onPointerUp
                     : update.component === 'onMouseEnter'
                         ? pointerEvents.onPointerHoverEnter
-                        : update.component === 'onMouseLeave'
-                            ? pointerEvents.onPointerHoverLeave
-                            : update.component === 'onMouseDrag'
-                                ? pointerEvents.onPointerDrag
-                                : update.component === 'onMouseDragLocked'
-                                    ? pointerEvents.onPointerDragLocked
-                                    : update.component === 'onMouseDragEnd' && pointerEvents.onPointerDragEnd;
+                        : update.component === 'onMouseLeave' && pointerEvents.onPointerHoverLeave;
             if (pointerEventSystem) {
                 pointerEventSystem({
                     entity: instance.entity,
@@ -202,10 +182,6 @@ export function createReconciler(engine, pointerEvents, rootEntity) {
         ...noopConfig,
         createInstance(type, props) {
             const entity = engine.addEntity();
-            // set root
-            if (rootEntity !== undefined) {
-                Transform.createOrReplace(entity, { parent: rootEntity });
-            }
             entities.add(entity);
             const instance = {
                 entity,
@@ -300,8 +276,6 @@ export function createReconciler(engine, pointerEvents, rootEntity) {
             if (changeEvents.size) {
                 handleOnChange(UiInput.componentId, UiInputResult);
                 handleOnChange(UiDropdown.componentId, UiDropdownResult);
-                // TODO: maybe as componentId could be a virtual id since the scroll input doesn't exist
-                handleOnChange(UiTransform.componentId, UiScrollResult);
             }
             return reconciler.updateContainer(component, root, null);
         },

package/dist/reconciler/utils.js

@@ -35,9 +35,6 @@ const entityComponent = {
     onMouseUp: undefined,
     onMouseEnter: undefined,
     onMouseLeave: undefined,
-    onMouseDrag: undefined,
-    onMouseDragLocked: undefined,
-    onMouseDragEnd: undefined,
     uiInput: undefined,
     uiDropdown: undefined
 };

package/dist/system.d.ts

@@ -1,4 +1,3 @@
-import type { Entity } from '@dcl/ecs';
 import type { ReactEcs } from './react-ecs';
 /**
  * @public
@@ -10,5 +9,4 @@ export type UiComponent = () => ReactEcs.JSX.ReactNode;
 export interface ReactBasedUiSystem {
     destroy(): void;
     setUiRenderer(ui: UiComponent): void;
-    setTextureRenderer(entity: Entity, ui: UiComponent): void;
 }

package/dist/system.js

@@ -3,15 +3,11 @@ import { createReconciler } from './reconciler';
  * @internal
  */
 export function createReactBasedUiSystem(engine, pointerSystem) {
-    const renderer = createReconciler(engine, pointerSystem, undefined);
+    const renderer = createReconciler(engine, pointerSystem);
     let uiComponent = undefined;
-    const textureRenderersAndUis = [];
     function ReactBasedUiSystem() {
         if (uiComponent)
             renderer.update(uiComponent());
-        for (const [textureRenderer, ui] of textureRenderersAndUis) {
-            textureRenderer.update(ui());
-        }
     }
     engine.addSystem(ReactBasedUiSystem, 100e3, '@dcl/react-ecs');
     return {
@@ -20,20 +16,9 @@ export function createReactBasedUiSystem(engine, pointerSystem) {
             for (const entity of renderer.getEntities()) {
                 engine.removeEntity(entity);
             }
-            for (const [textureRenderer, _] of textureRenderersAndUis) {
-                for (const entity of textureRenderer.getEntities()) {
-                    engine.removeEntity(entity);
-                }
-            }
-            for (const entity of renderer.getEntities()) {
-                engine.removeEntity(entity);
-            }
         },
         setUiRenderer(ui) {
             uiComponent = ui;
-        },
-        setTextureRenderer(entity, ui) {
-            textureRenderersAndUis.push([createReconciler(engine, pointerSystem, entity), ui]);
         }
     };
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dcl/react-ecs",
   "description": "Decentraland ECS",
-  "version": "7.7.2-12988530758.commit-08f37d7",
+  "version": "7.7.2",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/js-sdk-toolchain/issues",
   "dependencies": {
-    "@dcl/ecs": "https://sdk-team-cdn.decentraland.org/@dcl/js-sdk-toolchain/branch/refs/heads/protocol-squad/@dcl/ecs/dcl-ecs-7.7.2-12988530758.commit-08f37d7.tgz",
+    "@dcl/ecs": "7.7.2",
     "react": "^18.2.0",
     "react-reconciler": "^0.29.0"
   },
@@ -40,5 +40,5 @@
     "tsconfig": "./tsconfig.json"
   },
   "types": "./dist/index.d.ts",
-  "commit": "08f37d7ed9972258ab93fc8c1631d487afd2466b"
+  "commit": "024c250c134fec9c63fc229ca5dd67e07ce58d83"
 }