@rbxts/uiblox 0.2.0-alpha.0 → 0.2.0-alpha.10

package/out/ui/packages/loadingStroke/components/LoadingStroke.luau

@@ -4,37 +4,41 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local React = _react
 local useEffect = _react.useEffect
 local useRef = _react.useRef
-local TweenService = TS.import(script, TS.getModule(script, "@rbxts", "services")).TweenService
+local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
+local loopProperty = TS.import(script, script.Parent.Parent.Parent, "motion").loopProperty
 local function LoadingStroke(props)
 	local _binding = props
 	local animating = _binding.animating
 	if animating == nil then
 		animating = false
 	end
+	local color = _binding.color
+	local thickness = _binding.thickness
+	if thickness == nil then
+		thickness = 2
+	end
 	local className = _binding.className
 	local sx = _binding.sx
 	local children = _binding.children
 	local id = _binding.id
 	local ref = _binding.ref
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
 	local gradientRef = useRef()
+	local stroke = color or theme.palette.primary.on
 	useEffect(function()
-		if gradientRef.current then
-			if animating then
-				local tween = TweenService:Create(gradientRef.current, TweenInfo.new(2, Enum.EasingStyle.Linear, Enum.EasingDirection.InOut, -1, false), {
-					Rotation = 360,
-				})
-				tween:Play()
-				return function()
-					return tween:Destroy()
-				end
-			else
-				gradientRef.current.Rotation = 0
-			end
+		local gradient = gradientRef.current
+		if not gradient then
+			return nil
+		end
+		if animating then
+			gradient.Rotation = 0
+			return loopProperty(gradient, {
+				Rotation = 360,
+			}, 1.2)
 		end
+		gradient.Rotation = 0
 	end, { animating })
-	-- Decorative shimmer; not a semantic text/surface token.
-	local stroke = Color3.fromRGB(255, 255, 255)
-	local mid = Color3.fromRGB(235, 235, 235)
 	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
@@ -43,7 +47,7 @@ local function LoadingStroke(props)
 	_attributes.key = _condition
 	_attributes.ref = ref
 	_attributes.Color = stroke
-	_attributes.Thickness = 2
+	_attributes.Thickness = thickness
 	_attributes.ApplyStrokeMode = Enum.ApplyStrokeMode.Border
 	if className then
 		for _k, _v in className do
@@ -57,9 +61,9 @@ local function LoadingStroke(props)
 	end
 	return React.createElement("uistroke", _attributes, React.createElement("uigradient", {
 		ref = gradientRef,
-		Transparency = NumberSequence.new({ NumberSequenceKeypoint.new(0, 1), NumberSequenceKeypoint.new(0.5, 0), NumberSequenceKeypoint.new(1, 1) }),
+		Transparency = NumberSequence.new({ NumberSequenceKeypoint.new(0, 1), NumberSequenceKeypoint.new(0.45, 0), NumberSequenceKeypoint.new(0.55, 0), NumberSequenceKeypoint.new(1, 1) }),
 		Rotation = 0,
-		Color = ColorSequence.new({ ColorSequenceKeypoint.new(0, stroke), ColorSequenceKeypoint.new(0.5, mid), ColorSequenceKeypoint.new(1, stroke) }),
+		Color = ColorSequence.new(stroke),
 	}), children)
 end
 local default = LoadingStroke

package/out/ui/packages/menu/components/Menu.d.ts

@@ -1,3 +1,4 @@
+import React from "@rbxts/react";
 export interface MenuItem {
     id: string;
     text: string;
@@ -9,6 +10,8 @@ export interface MenuProps {
     items: MenuItem[];
     onSelect: (id: string) => void;
     onClose: () => void;
+    emptyText?: string;
+    empty?: React.Element;
 }
 declare function Menu(props: MenuProps): JSX.Element | undefined;
 export default Menu;

package/out/ui/packages/menu/components/Menu.luau

@@ -3,6 +3,7 @@ local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local ListItem = TS.import(script, script.Parent.Parent.Parent, "listItem").ListItem
 local Popup = TS.import(script, script.Parent.Parent.Parent, "popup").Popup
+local EmptyListHint = TS.import(script, script.Parent.Parent.Parent, "virtualList").EmptyListHint
 local useMenuStyles = TS.import(script, script.Parent, "Menu.styles").default
 local ROW = 28
 local function Menu(props)
@@ -12,10 +13,14 @@ local function Menu(props)
 	local items = _binding.items
 	local onSelect = _binding.onSelect
 	local onClose = _binding.onClose
+	local emptyText = _binding.emptyText
+	local empty = _binding.empty
 	local styles = useMenuStyles()
 	if not open then
 		return nil
 	end
+	local vacant = #items == 0
+	local height = if vacant then ROW else #items * ROW
 	local _attributes = {
 		key = "Surface",
 	}
@@ -25,34 +30,54 @@ local function Menu(props)
 	local _attributes_1 = table.clone(styles.corner)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uicorner", _attributes_1)
-	local _attributes_2 = table.clone(styles.list)
+	local _attributes_2 = table.clone(styles.stroke)
 	setmetatable(_attributes_2, nil)
-	local _exp_1 = React.createElement("uilistlayout", _attributes_2)
-	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#items)
-	local _callback = function(item)
-		return React.createElement(ListItem, {
-			key = item.id,
-			text = item.text,
-			disabled = item.disabled,
-			onActivated = function()
-				if item.disabled == true then
-					return nil
-				end
-				onSelect(item.id)
-				onClose()
-			end,
-		})
+	local _exp_1 = React.createElement("uistroke", _attributes_2)
+	local _attributes_3 = table.clone(styles.list)
+	setmetatable(_attributes_3, nil)
+	local _exp_2 = React.createElement("uilistlayout", _attributes_3)
+	local _result
+	if vacant then
+		local _condition = empty
+		if _condition == nil then
+			local _attributes_4 = {}
+			local _condition_1 = emptyText
+			if _condition_1 == nil then
+				_condition_1 = "No options"
+			end
+			_attributes_4.text = _condition_1
+			_attributes_4.height = ROW
+			_condition = React.createElement(EmptyListHint, _attributes_4)
+		end
+		_result = _condition
+	else
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#items)
+		local _callback = function(item)
+			return React.createElement(ListItem, {
+				key = item.id,
+				text = item.text,
+				disabled = item.disabled,
+				onActivated = function()
+					if item.disabled == true then
+						return nil
+					end
+					onSelect(item.id)
+					onClose()
+				end,
+			})
+		end
+		for _k, _v in items do
+			_newValue[_k] = _callback(_v, _k - 1, items)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		_result = _newValue
 	end
-	for _k, _v in items do
-		_newValue[_k] = _callback(_v, _k - 1, items)
-	end
-	-- ▲ ReadonlyArray.map ▲
 	return React.createElement(Popup, {
 		anchor = anchor,
-		preferredHeight = #items * ROW,
+		preferredHeight = height,
 		onDismiss = onClose,
-	}, React.createElement("frame", _attributes, _exp, _exp_1, _newValue))
+	}, React.createElement("frame", _attributes, _exp, _exp_1, _exp_2, _result))
 end
 local default = Menu
 return {

package/out/ui/packages/menu/components/Menu.styles.luau

@@ -8,12 +8,16 @@ local useMenuStyles = componentStyles("Menu", function(theme)
 		surface = {
 			Size = UDim2.new(1, 0, 0, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
-			BackgroundColor3 = theme.palette.surface.paper,
+			BackgroundColor3 = theme.palette.surface.elevated,
 			BorderSizePixel = 0,
 		},
 		corner = {
 			CornerRadius = UDim.new(0, theme.shape.borderRadius),
 		},
+		stroke = {
+			Color = theme.palette.border,
+			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
+		},
 		list = {
 			FillDirection = Enum.FillDirection.Vertical,
 			SortOrder = Enum.SortOrder.LayoutOrder,

package/out/ui/packages/modal/components/Modal.d.ts

@@ -5,5 +5,5 @@ export interface ModalProps {
     onClose: () => void;
     children?: React.ReactNode;
 }
-declare function Modal(props: ModalProps): JSX.Element | undefined;
+declare function Modal(props: ModalProps): JSX.Element;
 export default Modal;

package/out/ui/packages/modal/components/Modal.luau

@@ -4,10 +4,13 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local React = _react
 local useEffect = _react.useEffect
 local useRef = _react.useRef
+local useState = _react.useState
 local _services = TS.import(script, TS.getModule(script, "@rbxts", "services"))
 local GuiService = _services.GuiService
 local UserInputService = _services.UserInputService
-local Portal = TS.import(script, script.Parent.Parent.Parent, "popup").Portal
+local _popup = TS.import(script, script.Parent.Parent.Parent, "popup")
+local Portal = _popup.Portal
+local portalTarget = _popup.portalTarget
 local isDismissInput = TS.import(script, script.Parent, "dismissInput").isDismissInput
 local _focusTrap = TS.import(script, script.Parent, "focusTrap")
 local isFocusable = _focusTrap.isFocusable
@@ -22,7 +25,14 @@ local function Modal(props)
 	local styles = useModalStyles()
 	local close = useRef(onClose)
 	local surface = useRef()
+	local anchor = useRef()
+	local layer, setLayer = useState(function()
+		return portalTarget(host)
+	end)
 	close.current = onClose
+	useEffect(function()
+		setLayer(portalTarget(host or anchor.current))
+	end, { host, open })
 	useEffect(function()
 		if not open then
 			return nil
@@ -53,43 +63,51 @@ local function Modal(props)
 				GuiService.SelectedObject = previous
 			end
 		end
-	end, { open })
-	if not open then
-		return nil
-	end
-	local _attributes = {
-		key = "Modal",
-	}
-	for _k, _v in styles.root do
-		_attributes[_k] = _v
-	end
-	local _attributes_1 = {
-		key = "Backdrop",
-	}
-	for _k, _v in styles.backdrop do
-		_attributes_1[_k] = _v
-	end
-	_attributes_1.Event = {
-		Activated = function()
-			return close.current()
-		end,
-	}
-	local _exp = React.createElement("textbutton", _attributes_1)
-	local _attributes_2 = {
-		key = "Surface",
-		ref = surface,
-	}
-	for _k, _v in styles.surface do
-		_attributes_2[_k] = _v
+	end, { open, layer })
+	local _exp = React.createElement("frame", {
+		key = "ModalAnchor",
+		ref = anchor,
+		Size = UDim2.fromOffset(0, 0),
+		BackgroundTransparency = 1,
+		BorderSizePixel = 0,
+	})
+	local _condition = open and layer ~= nil
+	if _condition then
+		local _attributes = {
+			key = "Modal",
+		}
+		for _k, _v in styles.root do
+			_attributes[_k] = _v
+		end
+		local _attributes_1 = {
+			key = "Backdrop",
+		}
+		for _k, _v in styles.backdrop do
+			_attributes_1[_k] = _v
+		end
+		_attributes_1.Event = {
+			Activated = function()
+				return close.current()
+			end,
+		}
+		local _exp_1 = React.createElement("textbutton", _attributes_1)
+		local _attributes_2 = {
+			key = "Surface",
+			ref = surface,
+		}
+		for _k, _v in styles.surface do
+			_attributes_2[_k] = _v
+		end
+		local _attributes_3 = table.clone(styles.padding)
+		setmetatable(_attributes_3, nil)
+		local _exp_2 = React.createElement("uipadding", _attributes_3)
+		local _attributes_4 = table.clone(styles.corner)
+		setmetatable(_attributes_4, nil)
+		_condition = (React.createElement(Portal, {
+			host = layer,
+		}, React.createElement("frame", _attributes, _exp_1, React.createElement("frame", _attributes_2, _exp_2, React.createElement("uicorner", _attributes_4), children))))
 	end
-	local _attributes_3 = table.clone(styles.padding)
-	setmetatable(_attributes_3, nil)
-	local _exp_1 = React.createElement("uipadding", _attributes_3)
-	local _attributes_4 = table.clone(styles.corner)
-	setmetatable(_attributes_4, nil)
-	return React.createElement(Portal, {
-		host = host,
-	}, React.createElement("frame", _attributes, _exp, React.createElement("frame", _attributes_2, _exp_1, React.createElement("uicorner", _attributes_4), children)))
+	return React.createElement(React.Fragment, nil, _exp, _condition)
 end
 local default = Modal
 return {

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

@@ -2,4 +2,4 @@ export { loopProperty } from "./loop";
 export { motionDuration, assignGoal } from "./duration";
 export { playProperty } from "./play";
 export { resolveReduced } from "./resolveReduced";
-export { clampUnit, stopOnce, progressUnit, progressSpin, arcKeys } from "./unit";
+export { clampUnit, stopOnce, progressUnit, progressSpin, arcKeys, spinArcKeys } from "./unit";

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

@@ -13,4 +13,5 @@ exports.stopOnce = _unit.stopOnce
 exports.progressUnit = _unit.progressUnit
 exports.progressSpin = _unit.progressSpin
 exports.arcKeys = _unit.arcKeys
+exports.spinArcKeys = _unit.spinArcKeys
 return exports

package/out/ui/packages/motion/unit.d.ts

@@ -6,3 +6,8 @@ export declare function arcKeys(value: number): {
     time: number;
     transparency: number;
 }[];
+/** Indeterminate ring: long clear trail, bright head — reads as a sweep. */
+export declare function spinArcKeys(): {
+    time: number;
+    transparency: number;
+}[];

package/out/ui/packages/motion/unit.luau

@@ -71,10 +71,33 @@ local function arcKeys(value)
 		transparency = 1,
 	} }
 end
+--* Indeterminate ring: long clear trail, bright head — reads as a sweep. 
+local function spinArcKeys()
+	return { {
+		time = 0,
+		transparency = 1,
+	}, {
+		time = 0.45,
+		transparency = 1,
+	}, {
+		time = 0.7,
+		transparency = 0.55,
+	}, {
+		time = 0.88,
+		transparency = 0,
+	}, {
+		time = 0.96,
+		transparency = 0.35,
+	}, {
+		time = 1,
+		transparency = 1,
+	} }
+end
 return {
 	clampUnit = clampUnit,
 	stopOnce = stopOnce,
 	progressUnit = progressUnit,
 	progressSpin = progressSpin,
 	arcKeys = arcKeys,
+	spinArcKeys = spinArcKeys,
 }

package/out/ui/packages/numberInput/components/NumberInput.d.ts

@@ -6,9 +6,11 @@ export interface NumberInputProps {
     max?: number;
     step?: number;
     disabled?: boolean;
+    loading?: boolean;
     placeholder?: string;
     width?: UDim;
     size?: ControlSize;
+    reducedMotion?: boolean;
 }
 declare function NumberInput(props: CustomizedProps<Frame, NumberInputProps>): JSX.Element;
 export default NumberInput;

package/out/ui/packages/numberInput/components/NumberInput.luau

@@ -11,9 +11,11 @@ local function NumberInput(props)
 	local max = _binding.max
 	local step = _binding.step
 	local disabled = _binding.disabled
+	local loading = _binding.loading
 	local placeholder = _binding.placeholder
 	local width = _binding.width
 	local size = _binding.size
+	local reducedMotion = _binding.reducedMotion
 	local className = _binding.className
 	local id = _binding.id
 	local ref = _binding.ref
@@ -29,7 +31,9 @@ local function NumberInput(props)
 	_attributes.placeholder = placeholder
 	_attributes.width = width
 	_attributes.disabled = disabled
+	_attributes.loading = loading
 	_attributes.size = size
+	_attributes.reducedMotion = reducedMotion
 	_attributes.onTextChanged = function(text)
 		local committed = parseNumberDraft(text, min, max, step)
 		if committed ~= nil and committed ~= value then

package/out/ui/packages/pagination/components/Pagination.d.ts

@@ -3,6 +3,8 @@ export interface PaginationProps {
     count: number;
     page: number;
     disabled?: boolean;
+    siblingCount?: number;
+    boundaryCount?: number;
     onChange: (page: number) => void;
 }
 declare function Pagination(props: CustomizedProps<Frame, PaginationProps>): JSX.Element;

package/out/ui/packages/pagination/components/Pagination.luau

@@ -9,12 +9,15 @@ local function Pagination(props)
 	local count = _binding.count
 	local page = _binding.page
 	local disabled = _binding.disabled
+	local siblingCount = _binding.siblingCount
+	local boundaryCount = _binding.boundaryCount
 	local onChange = _binding.onChange
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = usePaginationStyles()
+	local tokens = pageRange(count, page, siblingCount, boundaryCount)
 	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
@@ -38,30 +41,43 @@ local function Pagination(props)
 	local _attributes_1 = table.clone(styles.list)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
-	local _exp_1 = pageRange(count)
 	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#_exp_1)
-	local _callback = function(item)
-		local _attributes_2 = {
-			key = tostring(item),
-		}
-		for _k, _v in cx(styles.page, item == page and styles.selected) do
-			_attributes_2[_k] = _v
+	local _newValue = table.create(#tokens)
+	local _callback = function(item, index)
+		local _result
+		if item == "ellipsis" then
+			local _attributes_2 = {
+				key = `e-{index}`,
+			}
+			for _k, _v in styles.ellipsis do
+				_attributes_2[_k] = _v
+			end
+			_attributes_2.LayoutOrder = index
+			_result = (React.createElement("textlabel", _attributes_2))
+		else
+			local _attributes_2 = {
+				key = tostring(item),
+			}
+			for _k, _v in cx(styles.page, item == page and styles.selected) do
+				_attributes_2[_k] = _v
+			end
+			_attributes_2.Text = tostring(item)
+			_attributes_2.LayoutOrder = index
+			_attributes_2.Active = disabled ~= true
+			_attributes_2.Selectable = disabled ~= true
+			_attributes_2.Event = {
+				Activated = function()
+					return disabled ~= true and item ~= page and onChange(item)
+				end,
+			}
+			local _attributes_3 = table.clone(styles.corner)
+			setmetatable(_attributes_3, nil)
+			_result = (React.createElement("textbutton", _attributes_2, React.createElement("uicorner", _attributes_3)))
 		end
-		_attributes_2.Text = tostring(item)
-		_attributes_2.Active = disabled ~= true
-		_attributes_2.Selectable = disabled ~= true
-		_attributes_2.Event = {
-			Activated = function()
-				return disabled ~= true and item ~= page and onChange(item)
-			end,
-		}
-		local _attributes_3 = table.clone(styles.corner)
-		setmetatable(_attributes_3, nil)
-		return React.createElement("textbutton", _attributes_2, React.createElement("uicorner", _attributes_3))
+		return _result
 	end
-	for _k, _v in _exp_1 do
-		_newValue[_k] = _callback(_v, _k - 1, _exp_1)
+	for _k, _v in tokens do
+		_newValue[_k] = _callback(_v, _k - 1, tokens)
 	end
 	-- ▲ ReadonlyArray.map ▲
 	return React.createElement("frame", _attributes, _exp, _newValue)

package/out/ui/packages/pagination/components/Pagination.styles.luau

@@ -28,6 +28,15 @@ local usePaginationStyles = componentStyles("Pagination", function(theme)
 		selected = {
 			BackgroundColor3 = theme.palette.action.selected,
 		},
+		ellipsis = {
+			Size = UDim2.fromOffset(theme.spacing.calc(3), theme.spacing.calc(3)),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies.default,
+			TextSize = theme.typography.fontSizes.body,
+			TextColor3 = theme.palette.text.secondary,
+			Text = "…",
+		},
 		corner = {
 			CornerRadius = UDim.new(1, 0),
 		},

package/out/ui/packages/pagination/components/pageRange.d.ts

@@ -1 +1,2 @@
-export declare function pageRange(count: number): number[];
+export type PageToken = number | "ellipsis";
+export declare function pageRange(count: number, page?: number, siblingCount?: number, boundaryCount?: number): PageToken[];

package/out/ui/packages/pagination/components/pageRange.luau

@@ -1,23 +1,106 @@
 -- Compiled with roblox-ts v3.0.0
-local function pageRange(count)
-	local pages = {}
+local function pageRange(count, page, siblingCount, boundaryCount)
+	if page == nil then
+		page = 1
+	end
+	if siblingCount == nil then
+		siblingCount = 1
+	end
+	if boundaryCount == nil then
+		boundaryCount = 1
+	end
+	local total = math.max(0, math.floor(count))
+	if total == 0 then
+		return {}
+	end
+	local current = math.clamp(math.floor(page), 1, total)
+	local siblings = math.max(0, math.floor(siblingCount))
+	local boundaries = math.max(0, math.floor(boundaryCount))
+	local rangeLength = boundaries * 2 + siblings * 2 + 3
+	if total <= rangeLength then
+		local all = {}
+		do
+			local i = 1
+			local _shouldIncrement = false
+			while true do
+				if _shouldIncrement then
+					i += 1
+				else
+					_shouldIncrement = true
+				end
+				if not (i <= total) then
+					break
+				end
+				local _i = i
+				table.insert(all, _i)
+			end
+		end
+		return all
+	end
+	local startFrom = math.max(current - siblings, boundaries + 2)
+	local endAt = math.min(current + siblings, total - (boundaries + 1))
+	local tokens = {}
+	do
+		local i = 1
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i <= boundaries) then
+				break
+			end
+			local _i = i
+			table.insert(tokens, _i)
+		end
+	end
+	if startFrom > boundaries + 2 then
+		table.insert(tokens, "ellipsis")
+	elseif boundaries + 1 < startFrom then
+		local _arg0 = boundaries + 1
+		table.insert(tokens, _arg0)
+	end
+	do
+		local i = startFrom
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i <= endAt) then
+				break
+			end
+			local _i = i
+			table.insert(tokens, _i)
+		end
+	end
+	if endAt < total - (boundaries + 1) then
+		table.insert(tokens, "ellipsis")
+	elseif endAt + 1 < total - boundaries + 1 then
+		local _arg0 = endAt + 1
+		table.insert(tokens, _arg0)
+	end
 	do
-		local page = 1
+		local i = total - boundaries + 1
 		local _shouldIncrement = false
 		while true do
 			if _shouldIncrement then
-				page += 1
+				i += 1
 			else
 				_shouldIncrement = true
 			end
-			if not (page <= math.max(0, math.floor(count))) then
+			if not (i <= total) then
 				break
 			end
-			local _page = page
-			table.insert(pages, _page)
+			local _i = i
+			table.insert(tokens, _i)
 		end
 	end
-	return pages
+	return tokens
 end
 return {
 	pageRange = pageRange,

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

@@ -1,2 +1,3 @@
 export { default as Pagination } from "./components/Pagination";
 export { PaginationProps } from "./components/Pagination";
+export { pageRange, PageToken } from "./components/pageRange";

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

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