Merge remote-tracking branch 'origin/experimenta/scroll' into temp

packages/@dcl/playground-assets/etc/playground-assets.api.md

@@ -671,6 +671,7 @@ export const componentDefinitionByName: {
     "core::UiDropdownResult": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiDropdownResult>>;
     "core::UiInput": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiInput>>;
     "core::UiInputResult": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiInputResult>>;
+    "core::UiScrollResult": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiScrollResult>>;
     "core::UiText": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiText>>;
     "core::UiTransform": LwwComponentGetter<LastWriteWinElementSetComponentDefinition<PBUiTransform>>;
     "core::VideoEvent": GSetComponentGetter<GrowOnlyValueSetComponentDefinition<PBVideoEvent>>;
@@ -3000,6 +3001,20 @@ export namespace PBUiInputResult {
     export function encode(message: PBUiInputResult, writer?: _m0.Writer): _m0.Writer;
 }
 
+// @public (undocumented)
+export interface PBUiScrollResult {
+    // (undocumented)
+    value: PBVector2 | undefined;
+}
+
+// @public (undocumented)
+export namespace PBUiScrollResult {
+    // (undocumented)
+    export function decode(input: _m0.Reader | Uint8Array, length?: number): PBUiScrollResult;
+    // (undocumented)
+    export function encode(message: PBUiScrollResult, writer?: _m0.Writer): _m0.Writer;
+}
+
 // @public (undocumented)
 export interface PBUiText {
     color?: PBColor4 | undefined;
@@ -3026,6 +3041,7 @@ export interface PBUiTransform {
     alignItems?: YGAlign | undefined;
     alignSelf: YGAlign;
     display: YGDisplay;
+    elementId?: string | undefined;
     // (undocumented)
     flexBasis: number;
     flexBasisUnit: YGUnit;
@@ -3094,6 +3110,8 @@ export interface PBUiTransform {
     positionType: YGPositionType;
     // (undocumented)
     rightOf: number;
+    scrollPosition?: ScrollPositionValue | undefined;
+    scrollVisible?: ShowScrollBar | undefined;
     // (undocumented)
     width: number;
     widthUnit: YGUnit;
@@ -3760,6 +3778,41 @@ export namespace Schemas {
     }) => void;
 }
 
+// @public (undocumented)
+export interface ScrollPositionValue {
+    // (undocumented)
+    value?: {
+        $case: "position";
+        position: PBVector2;
+    } | {
+        $case: "reference";
+        reference: string;
+    } | undefined;
+}
+
+// @public (undocumented)
+export namespace ScrollPositionValue {
+    // (undocumented)
+    export function decode(input: _m0.Reader | Uint8Array, length?: number): ScrollPositionValue;
+    // (undocumented)
+    export function encode(message: ScrollPositionValue, writer?: _m0.Writer): _m0.Writer;
+}
+
+// @public
+export type ScrollVisibleType = 'horizontal' | 'vertical' | 'both' | 'hidden';
+
+// @public (undocumented)
+export const enum ShowScrollBar {
+    // (undocumented)
+    SSB_BOTH = 0,
+    // (undocumented)
+    SSB_HIDDEN = 3,
+    // (undocumented)
+    SSB_ONLY_HORIZONTAL = 2,
+    // (undocumented)
+    SSB_ONLY_VERTICAL = 1
+}
+
 // @public (undocumented)
 export interface Spec {
     // (undocumented)
@@ -4128,6 +4181,9 @@ export interface UiLabelProps {
 // @public
 export type uint32 = number;
 
+// @public (undocumented)
+export const UiScrollResult: LastWriteWinElementSetComponentDefinition<PBUiScrollResult>;
+
 // @public (undocumented)
 export const UiText: LastWriteWinElementSetComponentDefinition<PBUiText>;
 
@@ -4150,6 +4206,7 @@ export interface UiTransformProps {
     alignItems?: AlignType;
     alignSelf?: AlignType;
     display?: DisplayType;
+    elementId?: string;
     flex?: number;
     flexBasis?: number;
     flexDirection?: FlexDirectionType;
@@ -4169,6 +4226,8 @@ export interface UiTransformProps {
     pointerFilter?: PointerFilterType;
     position?: Partial<Position> | PositionShorthand;
     positionType?: PositionType;
+    scrollPosition?: PBVector2 | string;
+    scrollVisible?: ScrollVisibleType;
     width?: PositionUnit | 'auto';
 }
 

packages/@dcl/react-ecs/src/components/uiTransform/index.ts

@@ -1,3 +1,15 @@
+import {
+  PointerFilterMode,
+  YGAlign,
+  YGDisplay,
+  YGFlexDirection,
+  YGJustify,
+  YGOverflow,
+  YGPositionType,
+  YGUnit
+} from '@dcl/ecs'
+import { PBUiTransform } from '@dcl/ecs/dist/components'
+import { UiTransformProps } from './types'
 import {
   getAlign,
   getDisplay,
@@ -7,21 +19,11 @@ import {
   getOverflow,
   getPointerFilter,
   getPositionType,
+  getScrollPosition,
+  getScrollVisible,
   parsePosition,
   parseSize
 } from './utils'
-import { UiTransformProps } from './types'
-import {
-  PointerFilterMode,
-  YGAlign,
-  YGDisplay,
-  YGFlexDirection,
-  YGJustify,
-  YGOverflow,
-  YGPositionType,
-  YGUnit
-} from '@dcl/ecs'
-import { PBUiTransform } from '@dcl/ecs/dist/components'
 
 /**
  * @internal
@@ -85,8 +87,21 @@ const defaultUiTransform: PBUiTransform = {
  */
 /* @__PURE__ */
 export function parseUiTransform(props: UiTransformProps = {}): PBUiTransform {
-  const { height, minHeight, maxHeight, width, minWidth, maxWidth, alignItems, alignContent, flexWrap, ...otherProps } =
-    props
+  const {
+    scrollPosition,
+    scrollVisible,
+    height,
+    minHeight,
+    maxHeight,
+    width,
+    minWidth,
+    maxWidth,
+    alignItems,
+    alignContent,
+    flexWrap,
+    ...otherProps
+  } = props
+
   return {
     ...defaultUiTransform,
     ...otherProps,
@@ -109,6 +124,8 @@ export function parseUiTransform(props: UiTransformProps = {}): PBUiTransform {
     // Optional values
     ...(alignContent && getAlign('alignContent', alignContent)),
     ...(alignItems && getAlign('alignItems', alignItems)),
-    ...(flexWrap && getFlexWrap(flexWrap))
+    ...(flexWrap && getFlexWrap(flexWrap)),
+    ...(scrollPosition && getScrollPosition(scrollPosition)),
+    ...(scrollVisible && getScrollVisible(scrollVisible))
   }
 }

packages/@dcl/react-ecs/src/components/uiTransform/types.ts

@@ -1,3 +1,4 @@
+import { Vector2 } from '@dcl/ecs/dist/components/generated/pb/decentraland/common/vectors.gen'
 import { ScaleUnit } from '../types'
 
 /**
@@ -83,6 +84,12 @@ export type PositionType = 'absolute' | 'relative'
  */
 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
@@ -136,4 +143,10 @@ export interface UiTransformProps {
   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
 }

packages/@dcl/react-ecs/src/components/uiTransform/utils.ts

@@ -7,7 +7,9 @@ import {
   YGPositionType,
   YGUnit,
   YGWrap,
-  PointerFilterMode
+  PointerFilterMode,
+  PBUiTransform,
+  ShowScrollBar
 } from '@dcl/ecs'
 import {
   AlignType,
@@ -20,10 +22,12 @@ import {
   PositionType,
   PositionUnit,
   PositionShorthand,
-  PointerFilterType
+  PointerFilterType,
+  ScrollVisibleType
 } from './types'
 import { calcOnViewport } from '../utils'
 import { ScaleUnit } from '../types'
+import { Vector2 } from '@dcl/ecs/dist/components/generated/pb/decentraland/common/vectors.gen'
 
 function capitalize<T extends string>(value: T): Capitalize<T> {
   return `${value[0].toUpperCase()}${value.slice(1, value.length)}` as Capitalize<T>
@@ -265,3 +269,43 @@ const parsePointerFilter: Readonly<Record<PointerFilterType, PointerFilterMode>>
   none: PointerFilterMode.PFM_NONE,
   block: PointerFilterMode.PFM_BLOCK
 }
+
+/**
+ * @internal
+ */
+export function getScrollPosition(scrollPosition: string | Vector2): Pick<PBUiTransform, 'scrollPosition'> {
+  if (typeof scrollPosition === 'string') {
+    return {
+      scrollPosition: {
+        value: {
+          $case: 'reference',
+          reference: scrollPosition
+        }
+      }
+    }
+  } else {
+    return {
+      scrollPosition: {
+        value: {
+          $case: 'position',
+          position: scrollPosition
+        }
+      }
+    }
+  }
+}
+
+const parseScrollVisible: Record<ScrollVisibleType, ShowScrollBar> = {
+  both: ShowScrollBar.SSB_BOTH,
+  hidden: ShowScrollBar.SSB_HIDDEN,
+  horizontal: ShowScrollBar.SSB_ONLY_HORIZONTAL,
+  vertical: ShowScrollBar.SSB_ONLY_VERTICAL
+}
+
+/**
+ * @internal
+ */
+
+export function getScrollVisible(scrollVisible: ScrollVisibleType): Pick<PBUiTransform, 'scrollVisible'> {
+  return { scrollVisible: parseScrollVisible[scrollVisible] }
+}

packages/@dcl/react-ecs/src/reconciler/index.ts

@@ -23,6 +23,7 @@ import {
   _ChildSet
 } from './types'
 import { componentKeys, isNotUndefined, noopConfig, propsChanged } from './utils'
+import { Vector2 } from '@dcl/ecs/dist/components/generated/pb/decentraland/common/vectors.gen'
 
 function getPointerEnum(pointerKey: keyof Listeners): PointerEventType {
   const pointers: { [key in keyof Required<Listeners>]: PointerEventType } = {
@@ -32,7 +33,7 @@ function getPointerEnum(pointerKey: keyof Listeners): PointerEventType {
   return pointers[pointerKey]
 }
 
-type OnChangeState<T = string | number> = {
+type OnChangeState<T = string | number | Vector2> = {
   onChangeCallback?: (val?: T) => void
   onSubmitCallback?: (val?: T) => void
   value?: T
@@ -58,6 +59,7 @@ export function createReconciler(
   const UiInputResult = components.UiInputResult(engine)
   const UiDropdown = components.UiDropdown(engine)
   const UiDropdownResult = components.UiDropdownResult(engine)
+  const UiScrollResult = components.UiScrollResult(engine)
 
   // Component ID Helper
   const getComponentId: {
@@ -330,7 +332,10 @@ export function createReconciler(
 
   // Maybe this could be something similar to Input system, but since we
   // are going to use this only here, i prefer to scope it here.
-  function handleOnChange(componentId: number, resultComponent: typeof UiDropdownResult | typeof UiInputResult) {
+  function handleOnChange(
+    componentId: number,
+    resultComponent: typeof UiDropdownResult | typeof UiInputResult | typeof UiScrollResult
+  ) {
     for (const [entity, Result] of engine.getEntitiesWith(resultComponent)) {
       const entityState = changeEvents.get(entity)?.get(componentId)
       const isSubmit = !!(Result as any).isSubmit
@@ -355,6 +360,8 @@ export function createReconciler(
       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 as any, root, null)
     },