diff --git a/package.json b/package.json index cf68548..4e8a485 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rbxts/zenui-core", - "version": "0.6.1", + "version": "0.6.2", "description": "", "main": "out/init.lua", "scripts": { diff --git a/src/Controllers/PageController.tsx b/src/Controllers/PageController.tsx index 1893ef6..a6f706a 100644 --- a/src/Controllers/PageController.tsx +++ b/src/Controllers/PageController.tsx @@ -1,8 +1,10 @@ import Roact from "@rbxts/roact"; +import { InferEnumNames } from "../Utility/Types"; export interface PageControllerProps { Size?: UDim2; Position?: UDim2; + SortOrder?: InferEnumNames | Enum.SortOrder; SelectedPageIndex: number; TabIndexChanged?: (index: number) => void; } @@ -49,7 +51,12 @@ export class PageController extends Roact.PureComponent - (this.page = page)} /> + (this.page = page)} + /> {children} ); diff --git a/src/Layouts/ColumnView.tsx b/src/Layouts/ColumnView.tsx index 2122c2b..0bb77bd 100644 --- a/src/Layouts/ColumnView.tsx +++ b/src/Layouts/ColumnView.tsx @@ -161,6 +161,8 @@ export class ColumnView extends Roact.Component { widthOffset -= colPadding.Offset * (seperatorCount / children.size()); scaleOffset -= colPadding.Scale * (seperatorCount / children.size()); + const useAutomaticSize = this.props.ColumnHeight === new UDim(); + let idx = 0; const count = children.size(); for (const [key, child] of children) { @@ -185,7 +187,7 @@ export class ColumnView extends Roact.Component { this.props.ColumnHeight.Offset, ) } - AutomaticSize={this.props.ColumnHeight === new UDim() ? "Y" : "None"} + AutomaticSize={useAutomaticSize ? "Y" : "None"} >