@rbxts/uiblox 0.2.0-alpha.35 → 0.2.0-alpha.37

package/out/ui/packages/stepper/components/stepState.luau

@@ -1,5 +1,8 @@
 -- Compiled with roblox-ts v3.0.0
-local function stepState(index, activeStep)
+local function stepState(index, activeStep, errorStep)
+	if errorStep ~= nil and index == errorStep then
+		return "error"
+	end
 	if index < activeStep then
 		return "complete"
 	end
@@ -8,6 +11,14 @@ local function stepState(index, activeStep)
 	end
 	return "pending"
 end
+--* Completed and current steps can be pressed. A later step cannot. 
+local function stepPress(index, activeStep)
+	if index < 0 or index > activeStep then
+		return nil
+	end
+	return index
+end
 return {
 	stepState = stepState,
+	stepPress = stepPress,
 }

package/out/ui/packages/stepper/index.d.ts

@@ -1,3 +1,3 @@
 export { default as Stepper } from "./components/Stepper";
 export { StepperProps } from "./components/Stepper";
-export { stepState, StepState } from "./components/stepState";
+export { stepPress, stepState, StepState } from "./components/stepState";

package/out/ui/packages/stepper/init.luau

@@ -2,5 +2,7 @@
 local TS = _G[script]
 local exports = {}
 exports.Stepper = TS.import(script, script, "components", "Stepper").default
-exports.stepState = TS.import(script, script, "components", "stepState").stepState
+local _stepState = TS.import(script, script, "components", "stepState")
+exports.stepPress = _stepState.stepPress
+exports.stepState = _stepState.stepState
 return exports

package/out/ui/packages/switch/components/Switch.styles.luau

@@ -4,6 +4,7 @@ local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "the
 local controlMetrics = _theme.controlMetrics
 local createStyles = _theme.createStyles
 local componentStyles = _theme.componentStyles
+local focusRing = _theme.focusRing
 local useSwitchStyles = componentStyles("Switch", function(theme, _param)
 	local size = _param.size
 	local color = _param.color
@@ -54,11 +55,7 @@ local useSwitchStyles = componentStyles("Switch", function(theme, _param)
 		corner = {
 			CornerRadius = UDim.new(theme.shape.pillScale, 0),
 		},
-		stroke = {
-			Color = theme.palette.focus,
-			Thickness = 2,
-			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
-		},
+		stroke = focusRing(theme.palette.focus),
 	})
 end)
 local default = useSwitchStyles

package/out/ui/packages/table/components/Table.luau

@@ -4,6 +4,7 @@ local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
 local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local rowSelected = TS.import(script, script.Parent, "rowSelected").rowSelected
+local sortedRowOrder = TS.import(script, script.Parent, "tableSort").sortedRowOrder
 local _tableColumns = TS.import(script, script.Parent, "tableColumns")
 local canSort = _tableColumns.canSort
 local columnSizes = _tableColumns.columnSizes
@@ -48,6 +49,7 @@ local function Table(props)
 	-- ▲ ReadonlyArray.map ▲
 	local resolved = _newValue
 	local sizes = columnSizes(resolved)
+	local order = sortedRowOrder(rows, sortColumn, sortDirection)
 	local _attributes = {
 		tag = "frame",
 	}
@@ -144,15 +146,16 @@ local function Table(props)
 	-- ▲ ReadonlyArray.map ▲
 	local _exp_4 = React.createElement("frame", _attributes_3, _exp_2, _exp_3, React.createElement(React.Fragment, nil, _newValue_1))
 	-- ▼ ReadonlyArray.map ▼
-	local _newValue_2 = table.create(#rows)
-	local _callback_2 = function(cells, rowIndex)
+	local _newValue_2 = table.create(#order)
+	local _callback_2 = function(rowIndex, place)
+		local cells = rows[rowIndex + 1]
 		local _attributes_6 = {
 			key = `r-{rowIndex}`,
 		}
 		for _k, _v in cx(styles.row, rowSelected(rowIndex, selected) and styles.selected) do
 			_attributes_6[_k] = _v
 		end
-		_attributes_6.LayoutOrder = rowIndex + 1
+		_attributes_6.LayoutOrder = place + 1
 		_attributes_6.Event = {
 			Activated = function()
 				local _result = onRowActivated
@@ -206,8 +209,8 @@ local function Table(props)
 		-- ▲ ReadonlyArray.map ▲
 		return React.createElement("textbutton", _attributes_6, _exp_5, _exp_6, React.createElement(React.Fragment, nil, _newValue_3))
 	end
-	for _k, _v in rows do
-		_newValue_2[_k] = _callback_2(_v, _k - 1, rows)
+	for _k, _v in order do
+		_newValue_2[_k] = _callback_2(_v, _k - 1, order)
 	end
 	-- ▲ ReadonlyArray.map ▲
 	return React.createElement(SxHost, _attributes, _exp, _exp_1, _exp_4, React.createElement(React.Fragment, nil, _newValue_2))

package/out/ui/packages/table/components/tableSort.d.ts

@@ -0,0 +1,2 @@
+/** Source indexes in sort order. Ties keep the original row order. */
+export declare function sortedRowOrder(rows: ReadonlyArray<ReadonlyArray<unknown>>, column?: number, direction?: "asc" | "desc"): number[];

package/out/ui/packages/table/components/tableSort.luau

@@ -0,0 +1,95 @@
+-- Compiled with roblox-ts v3.0.0
+local function sortKey(value)
+	local _value = value
+	if type(_value) == "number" then
+		return value
+	end
+	local _value_1 = value
+	local _condition = type(_value_1) == "string"
+	if _condition then
+		_condition = value ~= ""
+	end
+	if _condition then
+		local numeric = tonumber(value)
+		if numeric ~= nil then
+			return numeric
+		end
+		return value
+	end
+	return ""
+end
+local function keyBefore(left, right)
+	local _left = left
+	local _condition = type(_left) == "number"
+	if _condition then
+		local _right = right
+		_condition = type(_right) == "number"
+	end
+	if _condition then
+		return left < right
+	end
+	local _left_1 = left
+	local leftText = if type(_left_1) == "number" then `{left}` else left
+	local _right = right
+	local rightText = if type(_right) == "number" then `{right}` else right
+	return leftText < rightText
+end
+local function rowBefore(rows, left, right, column, desc)
+	local leftKey = sortKey(rows[left + 1][column + 1])
+	local rightKey = sortKey(rows[right + 1][column + 1])
+	if leftKey == rightKey then
+		return false
+	end
+	local before = keyBefore(leftKey, rightKey)
+	return if desc then not before else before
+end
+--* Source indexes in sort order. Ties keep the original row order. 
+local function sortedRowOrder(rows, column, direction)
+	local count = #rows
+	local order = {}
+	do
+		local index = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				index += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (index < count) then
+				break
+			end
+			local _index = index
+			table.insert(order, _index)
+		end
+	end
+	if column == nil then
+		return order
+	end
+	local desc = direction == "desc"
+	do
+		local index = 1
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				index += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (index < count) then
+				break
+			end
+			local current = order[index + 1]
+			local slot = index
+			while slot > 0 and rowBefore(rows, current, order[slot], column, desc) do
+				order[slot + 1] = order[slot]
+				slot -= 1
+			end
+			order[slot + 1] = current
+		end
+	end
+	return order
+end
+return {
+	sortedRowOrder = sortedRowOrder,
+}

package/out/ui/packages/table/index.d.ts

@@ -1,3 +1,4 @@
 export { default as Table } from "./components/Table";
 export { TableProps, TableColumn, TableCell } from "./components/Table";
 export { TableAlign, TableSortDirection } from "./components/tableColumns";
+export { sortedRowOrder } from "./components/tableSort";

package/out/ui/packages/table/init.luau

@@ -2,4 +2,5 @@
 local TS = _G[script]
 local exports = {}
 exports.Table = TS.import(script, script, "components", "Table").default
+exports.sortedRowOrder = TS.import(script, script, "components", "tableSort").sortedRowOrder
 return exports

package/out/ui/packages/tabs/components/Tabs.luau

@@ -1,10 +1,14 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
-local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local React = _react
+local useEffect = _react.useEffect
+local useRef = _react.useRef
 local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
 local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
 local stepChoice = TS.import(script, script.Parent.Parent.Parent, "select", "components", "stepChoice").stepChoice
 local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
+local tabScroll = TS.import(script, script.Parent, "tabScroll").tabScroll
 local tabsIsVertical = TS.import(script, script.Parent, "tabsOrientation").tabsIsVertical
 local useTabsStyles = TS.import(script, script.Parent, "Tabs.styles").default
 local function Tabs(props)
@@ -24,12 +28,61 @@ local function Tabs(props)
 		centered = centered,
 	})
 	local vertical = tabsIsVertical(orientation)
+	local frame = useRef()
+	local tabs = useRef({})
 	local choose = function(index)
 		local choice = options[index + 1]
 		if choice ~= nil and canActivate(disabled or choice.disabled) and choice.value ~= value then
 			onChange(choice.value)
 		end
 	end
+	useEffect(function()
+		local alive = true
+		local reveal = function()
+			if not alive then
+				return nil
+			end
+			local host = frame.current
+			if host == nil then
+				return nil
+			end
+			-- ▼ ReadonlyArray.findIndex ▼
+			local _callback = function(option)
+				return option.value == value
+			end
+			local _result = -1
+			for _i, _v in options do
+				if _callback(_v, _i - 1, options) == true then
+					_result = _i - 1
+					break
+				end
+			end
+			-- ▲ ReadonlyArray.findIndex ▲
+			local index = _result
+			local tab = tabs.current[index + 1]
+			if tab == nil then
+				return nil
+			end
+			local current = if vertical then host.CanvasPosition.Y else host.CanvasPosition.X
+			local origin = if vertical then host.AbsolutePosition.Y else host.AbsolutePosition.X
+			local start = if vertical then tab.AbsolutePosition.Y else tab.AbsolutePosition.X
+			local size = if vertical then tab.AbsoluteSize.Y else tab.AbsoluteSize.X
+			local view = if vertical then host.AbsoluteSize.Y else host.AbsoluteSize.X
+			if view <= 0 then
+				return nil
+			end
+			local scrolled = tabScroll(current, start - (origin - current), size, view)
+			if math.abs(scrolled - current) < 1 then
+				return nil
+			end
+			host.CanvasPosition = if vertical then Vector2.new(host.CanvasPosition.X, scrolled) else Vector2.new(scrolled, host.CanvasPosition.Y)
+		end
+		-- Next frame. A deferred scroll write runs inside this effect flush and re-enters render.
+		task.delay(0, reveal)
+		return function()
+			alive = false
+		end
+	end, { value, vertical, #options })
 	local onKey = function(_, input)
 		-- ▼ ReadonlyArray.findIndex ▼
 		local _callback = function(option)
@@ -60,7 +113,17 @@ local function Tabs(props)
 		_condition = "Tabs"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
+	_attributes.hostRef = function(instance)
+		frame.current = instance
+		if ref == nil then
+			return nil
+		end
+		if type(ref) == "function" then
+			ref(instance)
+		else
+			ref.current = instance
+		end
+	end
 	_attributes.base = styles.root
 	_attributes.className = className
 	_attributes.sx = sx
@@ -83,6 +146,11 @@ local function Tabs(props)
 		end
 		_attributes_2.Text = choice.label
 		_attributes_2.LayoutOrder = index
+		_attributes_2.ref = function(rbx)
+			if rbx ~= nil then
+				tabs.current[index + 1] = rbx
+			end
+		end
 		_attributes_2.Active = active
 		_attributes_2.Selectable = active
 		_attributes_2.Event = {

package/out/ui/packages/tabs/components/tabScroll.d.ts

@@ -0,0 +1,2 @@
+/** Canvas offset that keeps the selected tab inside the view. */
+export declare function tabScroll(current: number, tabStart: number, tabSize: number, view: number): number;

package/out/ui/packages/tabs/components/tabScroll.luau

@@ -0,0 +1,18 @@
+-- Compiled with roblox-ts v3.0.0
+--* Canvas offset that keeps the selected tab inside the view. 
+local function tabScroll(current, tabStart, tabSize, view)
+	if view <= 0 then
+		return current
+	end
+	if tabStart < current then
+		return if tabStart < 0 then 0 else tabStart
+	end
+	local tabEnd = tabStart + tabSize
+	if tabEnd > current + view then
+		return tabEnd - view
+	end
+	return current
+end
+return {
+	tabScroll = tabScroll,
+}

package/out/ui/packages/text/components/Text.d.ts

@@ -0,0 +1,7 @@
+import { CustomizedProps } from "../../../../theme/index";
+export interface TextProps {
+    text?: string;
+    wrap?: boolean;
+}
+declare function Text(props: CustomizedProps<TextLabel, TextProps>): JSX.Element;
+export default Text;

package/out/ui/packages/text/components/Text.luau

@@ -0,0 +1,54 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
+local textBox = TS.import(script, script.Parent, "textBox").textBox
+local function Text(props)
+	local _binding = props
+	local text = _binding.text
+	if text == nil then
+		text = ""
+	end
+	local wrap = _binding.wrap
+	local className = _binding.className
+	local sx = _binding.sx
+	local id = _binding.id
+	local ref = _binding.ref
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
+	local box = textBox(wrap)
+	local _attributes = {
+		tag = "textlabel",
+	}
+	local _condition = id
+	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
+		_condition = "Text"
+	end
+	_attributes.key = _condition
+	_attributes.hostRef = ref
+	local _object = {
+		Text = text,
+		Size = UDim2.new(box.widthScale, 0, box.heightScale, 0),
+		AutomaticSize = if box.automatic == "Y" then Enum.AutomaticSize.Y else Enum.AutomaticSize.XY,
+		TextWrapped = box.wrapped,
+		TextXAlignment = Enum.TextXAlignment.Left,
+		BackgroundTransparency = 1,
+		BorderSizePixel = 0,
+		Font = theme.typography.fontFamilies.default,
+		TextSize = theme.typography.fontSizes.body,
+		TextColor3 = theme.palette.text.primary,
+	}
+	if className then
+		for _k, _v in className do
+			_object[_k] = _v
+		end
+	end
+	_attributes.base = _object
+	_attributes.sx = sx
+	return React.createElement(SxHost, _attributes)
+end
+local default = Text
+return {
+	default = default,
+}

package/out/ui/packages/text/components/textBox.d.ts

@@ -0,0 +1,12 @@
+/** Shrink-wrap by default. Wrap uses the parent width and grows with the text. */
+export declare function textBox(wrap?: boolean): {
+    widthScale: number;
+    heightScale: number;
+    automatic: "Y";
+    wrapped: boolean;
+} | {
+    widthScale: number;
+    heightScale: number;
+    automatic: "XY";
+    wrapped: boolean;
+};

package/out/ui/packages/text/components/textBox.luau

@@ -0,0 +1,21 @@
+-- Compiled with roblox-ts v3.0.0
+--* Shrink-wrap by default. Wrap uses the parent width and grows with the text. 
+local function textBox(wrap)
+	if wrap == true then
+		return {
+			widthScale = 1,
+			heightScale = 0,
+			automatic = "Y",
+			wrapped = true,
+		}
+	end
+	return {
+		widthScale = 0,
+		heightScale = 0,
+		automatic = "XY",
+		wrapped = false,
+	}
+end
+return {
+	textBox = textBox,
+}

package/out/ui/packages/text/index.d.ts

@@ -0,0 +1,2 @@
+export { default as Text } from "./components/Text";
+export { TextProps } from "./components/Text";

package/out/ui/packages/text/init.luau

@@ -0,0 +1,5 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local exports = {}
+exports.Text = TS.import(script, script, "components", "Text").default
+return exports

package/out/ui/packages/timeField/components/TimeField.d.ts

@@ -0,0 +1,13 @@
+import { CustomizedProps } from "../../../../theme/index";
+import { TimeOfDay } from "../timeValue";
+export interface TimeFieldProps {
+    value: TimeOfDay;
+    onChange: (value: TimeOfDay) => void;
+    step?: number;
+    wrap?: boolean;
+    min?: number;
+    max?: number;
+    disabled?: boolean;
+}
+declare function TimeField(props: CustomizedProps<Frame, TimeFieldProps>): JSX.Element;
+export default TimeField;

package/out/ui/packages/timeField/components/TimeField.luau

@@ -0,0 +1,102 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
+local NumberInput = TS.import(script, script.Parent.Parent.Parent, "numberInput").NumberInput
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
+local resolveTime = TS.import(script, script.Parent.Parent, "timeValue").resolveTime
+local function TimeField(props)
+	local _binding = props
+	local value = _binding.value
+	local onChange = _binding.onChange
+	local step = _binding.step
+	if step == nil then
+		step = 1
+	end
+	local wrap = _binding.wrap
+	if wrap == nil then
+		wrap = true
+	end
+	local min = _binding.min
+	local max = _binding.max
+	local disabled = _binding.disabled
+	local className = _binding.className
+	local sx = _binding.sx
+	local id = _binding.id
+	local ref = _binding.ref
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
+	local commit = function(hour, minute)
+		local resolved = resolveTime({
+			hour = hour,
+			minute = minute,
+		}, step, wrap, min, max)
+		if resolved == nil then
+			return nil
+		end
+		if resolved.hour == value.hour and resolved.minute == value.minute then
+			return nil
+		end
+		onChange(resolved)
+	end
+	local _attributes = {
+		tag = "frame",
+	}
+	local _condition = id
+	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
+		_condition = "TimeField"
+	end
+	_attributes.key = _condition
+	_attributes.hostRef = ref
+	_attributes.base = {
+		AutomaticSize = Enum.AutomaticSize.XY,
+		Size = UDim2.fromScale(0, 0),
+		BackgroundTransparency = 1,
+		BorderSizePixel = 0,
+	}
+	_attributes.className = className
+	_attributes.sx = sx
+	return React.createElement(SxHost, _attributes, React.createElement("uilistlayout", {
+		FillDirection = Enum.FillDirection.Horizontal,
+		Padding = UDim.new(0, 4),
+		VerticalAlignment = Enum.VerticalAlignment.Center,
+		SortOrder = Enum.SortOrder.LayoutOrder,
+	}), React.createElement(NumberInput, {
+		value = value.hour,
+		step = 1,
+		disabled = disabled,
+		size = "small",
+		width = UDim.new(0, 56),
+		sx = {
+			LayoutOrder = 0,
+		},
+		onChange = function(hour)
+			return commit(hour, value.minute)
+		end,
+	}), React.createElement("textlabel", {
+		Text = ":",
+		LayoutOrder = 1,
+		BackgroundTransparency = 1,
+		BorderSizePixel = 0,
+		Size = UDim2.fromOffset(8, 24),
+		Font = theme.typography.fontFamilies.default,
+		TextSize = theme.typography.fontSizes.body,
+		TextColor3 = theme.palette.text.secondary,
+	}), React.createElement(NumberInput, {
+		value = value.minute,
+		step = step,
+		disabled = disabled,
+		size = "small",
+		width = UDim.new(0, 56),
+		sx = {
+			LayoutOrder = 2,
+		},
+		onChange = function(minute)
+			return commit(value.hour, minute)
+		end,
+	}))
+end
+local default = TimeField
+return {
+	default = default,
+}

package/out/ui/packages/timeField/index.d.ts

@@ -0,0 +1,4 @@
+export { default as TimeField } from "./components/TimeField";
+export { TimeFieldProps } from "./components/TimeField";
+export { resolveTime, timeRangeOk, timeToMinutes } from "./timeValue";
+export type { TimeOfDay } from "./timeValue";

package/out/ui/packages/timeField/init.luau

@@ -0,0 +1,9 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local exports = {}
+exports.TimeField = TS.import(script, script, "components", "TimeField").default
+local _timeValue = TS.import(script, script, "timeValue")
+exports.resolveTime = _timeValue.resolveTime
+exports.timeRangeOk = _timeValue.timeRangeOk
+exports.timeToMinutes = _timeValue.timeToMinutes
+return exports

package/out/ui/packages/timeField/timeValue.d.ts

@@ -0,0 +1,8 @@
+export interface TimeOfDay {
+    hour: number;
+    minute: number;
+}
+export declare function timeToMinutes(value: TimeOfDay): number;
+/** Snap to a minute step. Wrap into the day, or reject an invalid range. */
+export declare function resolveTime(value: TimeOfDay, step?: number, wrap?: boolean, min?: number, max?: number): TimeOfDay | undefined;
+export declare function timeRangeOk(start: TimeOfDay, finish: TimeOfDay): boolean;

package/out/ui/packages/timeField/timeValue.luau

@@ -0,0 +1,49 @@
+-- Compiled with roblox-ts v3.0.0
+local DAY = 1440
+local function modDay(total)
+	local remainder = total % DAY
+	return if remainder < 0 then remainder + DAY else remainder
+end
+local function timeToMinutes(value)
+	return value.hour * 60 + value.minute
+end
+--* Snap to a minute step. Wrap into the day, or reject an invalid range. 
+local function resolveTime(value, step, wrap, min, max)
+	if step == nil then
+		step = 1
+	end
+	if wrap == nil then
+		wrap = true
+	end
+	if step <= 0 then
+		return nil
+	end
+	if min ~= nil and max ~= nil and min > max then
+		return nil
+	end
+	local size = math.max(1, math.floor(step))
+	local total = math.floor((value.hour * 60 + value.minute) / size + 0.5) * size
+	if wrap then
+		total = modDay(total)
+	elseif total < 0 or total >= DAY then
+		return nil
+	end
+	if min ~= nil and total < min then
+		return nil
+	end
+	if max ~= nil and total > max then
+		return nil
+	end
+	return {
+		hour = math.floor(total / 60),
+		minute = total % 60,
+	}
+end
+local function timeRangeOk(start, finish)
+	return timeToMinutes(finish) > timeToMinutes(start)
+end
+return {
+	timeToMinutes = timeToMinutes,
+	resolveTime = resolveTime,
+	timeRangeOk = timeRangeOk,
+}

package/out/ui/packages/timeline/components/Timeline.d.ts

@@ -0,0 +1,12 @@
+import { CustomizedProps } from "../../../../theme/index";
+import { TimelineTone } from "./timelineRail";
+export interface TimelineItem {
+    title: string;
+    caption?: string;
+    tone?: TimelineTone;
+}
+export interface TimelineProps {
+    items: TimelineItem[];
+}
+declare function Timeline(props: CustomizedProps<Frame, TimelineProps>): JSX.Element;
+export default Timeline;