@rbxts/uiblox 0.2.0-alpha.3 → 0.2.0-alpha.31

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

@@ -4,10 +4,14 @@ 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 SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
+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
@@ -19,10 +23,21 @@ local function Modal(props)
 	local open = _binding.open
 	local onClose = _binding.onClose
 	local children = _binding.children
+	local className = _binding.className
+	local sx = _binding.sx
+	local id = _binding.id
+	local ref = _binding.ref
 	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 +68,70 @@ 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 surfaceStyle = styles.surface
+	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 = {
+			tag = "frame",
+		}
+		local _condition_1 = id
+		if not (_condition_1 ~= 0 and _condition_1 == _condition_1 and _condition_1 ~= "" and _condition_1) then
+			_condition_1 = "Surface"
+		end
+		_attributes_2.key = _condition_1
+		_attributes_2.hostRef = function(instance)
+			surface.current = instance
+			if ref == nil then
+				return nil
+			end
+			if type(ref) == "function" then
+				ref(instance)
+				return nil
+			end
+			ref.current = instance
+		end
+		_attributes_2.base = surfaceStyle
+		_attributes_2.className = className
+		_attributes_2.sx = sx
+		_attributes_2.AnchorPoint = surfaceStyle.AnchorPoint
+		_attributes_2.Position = surfaceStyle.Position
+		_attributes_2.ZIndex = surfaceStyle.ZIndex
+		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(SxHost, _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

@@ -5,7 +5,9 @@ export interface NumberInputProps {
     min?: number;
     max?: number;
     step?: number;
+    places?: number;
     disabled?: boolean;
+    readOnly?: boolean;
     loading?: boolean;
     placeholder?: string;
     width?: UDim;

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

@@ -2,7 +2,9 @@
 local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local Input = TS.import(script, script.Parent.Parent.Parent, "input").Input
-local parseNumberDraft = TS.import(script, script.Parent, "numberValue").parseNumberDraft
+local _numberValue = TS.import(script, script.Parent, "numberValue")
+local formatNumber = _numberValue.formatNumber
+local parseNumberDraft = _numberValue.parseNumberDraft
 local function NumberInput(props)
 	local _binding = props
 	local value = _binding.value
@@ -10,13 +12,16 @@ local function NumberInput(props)
 	local min = _binding.min
 	local max = _binding.max
 	local step = _binding.step
+	local places = _binding.places
 	local disabled = _binding.disabled
+	local readOnly = _binding.readOnly
 	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 sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
 	local _attributes = {}
@@ -27,16 +32,24 @@ local function NumberInput(props)
 	_attributes.id = _condition
 	_attributes.ref = ref
 	_attributes.className = className
-	_attributes.text = tostring(value)
+	_attributes.sx = sx
+	_attributes.text = if places ~= nil then formatNumber(value, places) else tostring(value)
 	_attributes.placeholder = placeholder
 	_attributes.width = width
 	_attributes.disabled = disabled
+	_attributes.readOnly = readOnly
 	_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
+		if committed == nil then
+			return nil
+		end
+		if places ~= nil and formatNumber(committed, places) == formatNumber(value, places) then
+			return nil
+		end
+		if committed ~= value then
 			onChange(committed)
 		end
 	end

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

@@ -1,2 +1,3 @@
 export declare function commitNumber(value: number | undefined, min?: number, max?: number, step?: number): number | undefined;
 export declare function parseNumberDraft(text: string, min?: number, max?: number, step?: number): number | undefined;
+export declare function formatNumber(value: number, places?: number): string;

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

@@ -23,7 +23,52 @@ end
 local function parseNumberDraft(text, min, max, step)
 	return commitNumber(tonumber(text), min, max, step)
 end
+local function formatNumber(value, places)
+	if places == nil then
+		places = 4
+	end
+	if value ~= value or value == math.huge or value == -math.huge then
+		return tostring(value)
+	end
+	local scale = 10 ^ places
+	local scaled = math.floor(math.abs(value) * scale + 0.5)
+	if scaled == 0 then
+		return "0"
+	end
+	local sign = if value < 0 then "-" else ""
+	local whole = math.floor(scaled / scale)
+	local frac = scaled % scale
+	if frac == 0 then
+		return `{sign}{whole}`
+	end
+	local digits = ""
+	local rest = frac
+	while rest > 0 do
+		digits = `{rest % 10}{digits}`
+		rest = math.floor(rest / 10)
+	end
+	while #digits < places do
+		digits = `0{digits}`
+	end
+	while true do
+		local _condition = #digits > 0
+		if _condition then
+			local _digits = digits
+			local _arg0 = #digits
+			local _arg1 = #digits
+			_condition = string.sub(_digits, _arg0, _arg1) == "0"
+		end
+		if not _condition then
+			break
+		end
+		local _digits = digits
+		local _arg1 = #digits - 1
+		digits = string.sub(_digits, 1, _arg1)
+	end
+	return `{sign}{whole}.{digits}`
+end
 return {
 	commitNumber = commitNumber,
 	parseNumberDraft = parseNumberDraft,
+	formatNumber = formatNumber,
 }

package/out/ui/packages/numberRangeEditor/components/NumberRangeEditor.luau

@@ -1,6 +1,7 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local NumberInput = TS.import(script, script.Parent.Parent.Parent, "numberInput").NumberInput
 local useNumberRangeEditorStyles = TS.import(script, script.Parent, "NumberRangeEditor.styles").default
 local writeNumberRange = TS.import(script, script.Parent, "numberRangeValue").writeNumberRange
@@ -18,26 +19,21 @@ local function NumberRangeEditor(props)
 		local parts = writeNumberRange(value.Min, value.Max, field, amount)
 		onChange(NumberRange.new(parts.Min, parts.Max))
 	end
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "NumberRangeEditor"
 	end
 	_attributes.key = _condition
-	_attributes.ref = ref
-	for _k, _v in styles.root do
-		_attributes[_k] = _v
-	end
-	if className then
-		for _k, _v in className do
-			_attributes[_k] = _v
-		end
-	end
-	if sx then
-		for _k, _v in sx do
-			_attributes[_k] = _v
-		end
-	end
+	_attributes.hostRef = ref
+	_attributes.base = styles.root
+	_attributes.className = className
+	_attributes.sx = sx
+	_attributes.state = {
+		disabled = disabled,
+	}
 	local _attributes_1 = table.clone(styles.row)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
@@ -81,7 +77,7 @@ local function NumberRangeEditor(props)
 	local _exp_5 = React.createElement("textlabel", _attributes_8)
 	local _attributes_9 = table.clone(styles.field)
 	setmetatable(_attributes_9, nil)
-	return React.createElement("frame", _attributes, _exp, _exp_3, React.createElement("frame", _attributes_6, _exp_4, _exp_5, React.createElement("frame", _attributes_9, React.createElement(NumberInput, {
+	return React.createElement(SxHost, _attributes, _exp, _exp_3, React.createElement("frame", _attributes_6, _exp_4, _exp_5, React.createElement("frame", _attributes_9, React.createElement(NumberInput, {
 		value = value.Max,
 		disabled = disabled,
 		width = UDim.new(1, 0),

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

@@ -1,8 +1,13 @@
-import { CustomizedProps } from "../../../../theme/index";
+import { ControlSize, CustomizedProps } from "../../../../theme/index";
+import { PaginationVariant } from "./Pagination.styles";
 export interface PaginationProps {
     count: number;
     page: number;
     disabled?: boolean;
+    siblingCount?: number;
+    boundaryCount?: number;
+    size?: ControlSize;
+    variant?: PaginationVariant;
     onChange: (page: number) => void;
 }
 declare function Pagination(props: CustomizedProps<Frame, PaginationProps>): JSX.Element;

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

@@ -3,68 +3,92 @@ local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
 local pageRange = TS.import(script, script.Parent, "pageRange").pageRange
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local usePaginationStyles = TS.import(script, script.Parent, "Pagination.styles").default
 local function Pagination(props)
 	local _binding = props
 	local count = _binding.count
 	local page = _binding.page
 	local disabled = _binding.disabled
+	local siblingCount = _binding.siblingCount
+	local boundaryCount = _binding.boundaryCount
+	local size = _binding.size
+	local variant = _binding.variant
 	local onChange = _binding.onChange
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
-	local styles = usePaginationStyles()
-	local _attributes = {}
+	local styles = usePaginationStyles({
+		size = size,
+		variant = variant,
+	})
+	local tokens = pageRange(count, page, siblingCount, boundaryCount)
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Pagination"
 	end
 	_attributes.key = _condition
-	_attributes.ref = ref
-	for _k, _v in styles.root do
-		_attributes[_k] = _v
-	end
-	if className then
-		for _k, _v in className do
-			_attributes[_k] = _v
-		end
-	end
-	if sx then
-		for _k, _v in sx do
-			_attributes[_k] = _v
-		end
-	end
+	_attributes.hostRef = ref
+	_attributes.base = styles.root
+	_attributes.className = className
+	_attributes.sx = sx
+	_attributes.state = {
+		disabled = disabled,
+	}
 	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)
+			local _exp_1 = React.createElement("uicorner", _attributes_3)
+			local _condition_1 = variant == "outlined"
+			if _condition_1 then
+				local _attributes_4 = table.clone((if item == page then styles.selectedStroke else styles.stroke))
+				setmetatable(_attributes_4, nil)
+				_condition_1 = React.createElement("uistroke", _attributes_4)
+			end
+			_result = (React.createElement("textbutton", _attributes_2, _exp_1, _condition_1))
 		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)
+	return React.createElement(SxHost, _attributes, _exp, React.createElement(React.Fragment, nil, _newValue))
 end
 local default = Pagination
 return {

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

@@ -1,2 +1,7 @@
-declare const usePaginationStyles: () => import("../../../../theme/index").ClassNameMap<string>;
+import { ControlSize } from "../../../../theme/index";
+export type PaginationVariant = "text" | "outlined";
+declare const usePaginationStyles: (props: {
+    size?: ControlSize;
+    variant?: PaginationVariant;
+}) => import("../../../../theme/index").ClassNameMap<string>;
 export default usePaginationStyles;

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

@@ -3,7 +3,18 @@ local TS = _G[script]
 local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
 local componentStyles = _theme.componentStyles
 local createStyles = _theme.createStyles
-local usePaginationStyles = componentStyles("Pagination", function(theme)
+local usePaginationStyles = componentStyles("Pagination", function(theme, _param)
+	local size = _param.size
+	if size == nil then
+		size = "medium"
+	end
+	local variant = _param.variant
+	if variant == nil then
+		variant = "text"
+	end
+	local outlined = variant == "outlined"
+	local box = if size == "small" then theme.spacing.calc(2.5) elseif size == "large" then theme.spacing.calc(4) else theme.spacing.calc(3)
+	local text = if size == "small" then theme.typography.fontSizes.caption elseif size == "large" then theme.typography.fontSizes.h6 else theme.typography.fontSizes.body
 	return createStyles({
 		root = {
 			AutomaticSize = Enum.AutomaticSize.XY,
@@ -13,20 +24,41 @@ local usePaginationStyles = componentStyles("Pagination", function(theme)
 		},
 		list = {
 			FillDirection = Enum.FillDirection.Horizontal,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
+			Padding = UDim.new(0, theme.padding.calc(if size == "small" then 0.25 else 0.5)),
 			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
 		page = {
-			Size = UDim2.fromOffset(theme.spacing.calc(3), theme.spacing.calc(3)),
+			Size = UDim2.fromOffset(box, box),
 			BackgroundColor3 = theme.palette.surface.input,
+			BackgroundTransparency = if outlined then 1 else 0,
 			BorderSizePixel = 0,
 			AutoButtonColor = false,
 			Font = theme.typography.fontFamilies.default,
-			TextSize = theme.typography.fontSizes.body,
+			TextSize = text,
 			TextColor3 = theme.palette.text.primary,
 		},
 		selected = {
 			BackgroundColor3 = theme.palette.action.selected,
+			BackgroundTransparency = 0,
+		},
+		stroke = {
+			Color = theme.palette.border,
+			Thickness = 1,
+			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
+		},
+		selectedStroke = {
+			Color = theme.palette.primary.main,
+			Thickness = 1,
+			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
+		},
+		ellipsis = {
+			Size = UDim2.fromOffset(box, box),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies.default,
+			TextSize = text,
+			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[];