@rbxts/uiblox 0.2.0-alpha.7 → 0.2.0-alpha.8

package/out/ui/packages/breadcrumbs/components/Breadcrumbs.d.ts

@@ -6,6 +6,7 @@ export interface BreadcrumbItem {
 export interface BreadcrumbsProps {
     items: BreadcrumbItem[];
     separator?: string;
+    maxItems?: number;
 }
 declare function Breadcrumbs(props: CustomizedProps<Frame, BreadcrumbsProps>): JSX.Element;
 export default Breadcrumbs;

package/out/ui/packages/breadcrumbs/components/Breadcrumbs.luau

@@ -2,7 +2,9 @@
 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 breadcrumbCurrent = TS.import(script, script.Parent, "breadcrumbItems").breadcrumbCurrent
+local _breadcrumbItems = TS.import(script, script.Parent, "breadcrumbItems")
+local breadcrumbCurrent = _breadcrumbItems.breadcrumbCurrent
+local breadcrumbVisible = _breadcrumbItems.breadcrumbVisible
 local useBreadcrumbStyles = TS.import(script, script.Parent, "Breadcrumbs.styles").default
 local function Breadcrumbs(props)
 	local _binding = props
@@ -11,11 +13,13 @@ local function Breadcrumbs(props)
 	if separator == nil then
 		separator = "/"
 	end
+	local maxItems = _binding.maxItems
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = useBreadcrumbStyles()
+	local visible = breadcrumbVisible(items, maxItems)
 	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
@@ -40,38 +44,68 @@ local function Breadcrumbs(props)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
 	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#items)
-	local _callback = function(item, index)
-		local current = breadcrumbCurrent(index, #items)
-		local _condition_1 = index > 0
+	local _newValue = table.create(#visible)
+	local _callback = function(entry, order)
+		local current = not entry.ellipsis and breadcrumbCurrent(entry.index, #items)
+		local item = if entry.ellipsis then nil else items[entry.index + 1]
+		local _condition_1 = order > 0
 		if _condition_1 then
 			local _attributes_2 = table.clone(styles.separator)
 			setmetatable(_attributes_2, nil)
 			_attributes_2.Text = separator
-			_attributes_2.LayoutOrder = index * 2
+			_attributes_2.LayoutOrder = order * 2
 			_condition_1 = React.createElement("textlabel", _attributes_2)
 		end
-		local _attributes_2 = table.clone(cx(styles.item, current and styles.current))
-		setmetatable(_attributes_2, nil)
-		_attributes_2.Text = item.label
-		_attributes_2.LayoutOrder = index * 2 + 1
-		_attributes_2.Active = not current and item.onActivated ~= nil
-		_attributes_2.Selectable = not current and item.onActivated ~= nil
-		_attributes_2.Event = {
-			Activated = function()
-				local _result = item.onActivated
-				if _result ~= nil then
-					_result = _result()
+		local _result
+		if entry.ellipsis then
+			local _attributes_2 = table.clone(styles.separator)
+			setmetatable(_attributes_2, nil)
+			_attributes_2.Text = "…"
+			_attributes_2.LayoutOrder = order * 2 + 1
+			_result = (React.createElement("textlabel", _attributes_2))
+		else
+			local _attributes_2 = table.clone(cx(styles.item, current and styles.current))
+			setmetatable(_attributes_2, nil)
+			_attributes_2.Text = entry.label
+			_attributes_2.LayoutOrder = order * 2 + 1
+			local _condition_2 = not current
+			if _condition_2 then
+				local _result_1 = item
+				if _result_1 ~= nil then
+					_result_1 = _result_1.onActivated
 				end
-				return _result
-			end,
-		}
+				_condition_2 = _result_1 ~= nil
+			end
+			_attributes_2.Active = _condition_2
+			local _condition_3 = not current
+			if _condition_3 then
+				local _result_1 = item
+				if _result_1 ~= nil then
+					_result_1 = _result_1.onActivated
+				end
+				_condition_3 = _result_1 ~= nil
+			end
+			_attributes_2.Selectable = _condition_3
+			_attributes_2.Event = {
+				Activated = function()
+					local _result_1 = item
+					if _result_1 ~= nil then
+						_result_1 = _result_1.onActivated
+						if _result_1 ~= nil then
+							_result_1 = _result_1()
+						end
+					end
+					return _result_1
+				end,
+			}
+			_result = (React.createElement("textbutton", _attributes_2))
+		end
 		return React.createElement(React.Fragment, {
-			key = `{item.label}-{index}`,
-		}, _condition_1, React.createElement("textbutton", _attributes_2))
+			key = `{entry.label}-{order}`,
+		}, _condition_1, _result)
 	end
-	for _k, _v in items do
-		_newValue[_k] = _callback(_v, _k - 1, items)
+	for _k, _v in visible do
+		_newValue[_k] = _callback(_v, _k - 1, visible)
 	end
 	-- ▲ ReadonlyArray.map ▲
 	return React.createElement("frame", _attributes, _exp, _newValue)

package/out/ui/packages/breadcrumbs/components/breadcrumbItems.d.ts

@@ -1 +1,10 @@
 export declare function breadcrumbCurrent(index: number, count: number): boolean;
+export interface BreadcrumbSlice {
+    label: string;
+    index: number;
+    ellipsis?: boolean;
+}
+/** Collapse middle items when over maxItems (keep ends). */
+export declare function breadcrumbVisible<T extends {
+    label: string;
+}>(items: T[], maxItems?: number): BreadcrumbSlice[];

package/out/ui/packages/breadcrumbs/components/breadcrumbItems.luau

@@ -2,6 +2,74 @@
 local function breadcrumbCurrent(index, count)
 	return count > 0 and index == count - 1
 end
+--* Collapse middle items when over maxItems (keep ends). 
+local function breadcrumbVisible(items, maxItems)
+	local count = #items
+	if maxItems == nil or maxItems < 1 or count <= maxItems then
+		local out = {}
+		do
+			local i = 0
+			local _shouldIncrement = false
+			while true do
+				if _shouldIncrement then
+					i += 1
+				else
+					_shouldIncrement = true
+				end
+				if not (i < count) then
+					break
+				end
+				local _arg0 = {
+					label = items[i + 1].label,
+					index = i,
+				}
+				table.insert(out, _arg0)
+			end
+		end
+		return out
+	end
+	if maxItems == 1 then
+		return { {
+			label = items[count].label,
+			index = count - 1,
+		} }
+	end
+	local keepEnd = 1
+	local rawStart = maxItems - keepEnd - 1
+	local keepStart = if rawStart < 1 then 1 else rawStart
+	local out = {}
+	do
+		local i = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i < keepStart) then
+				break
+			end
+			local _arg0 = {
+				label = items[i + 1].label,
+				index = i,
+			}
+			table.insert(out, _arg0)
+		end
+	end
+	table.insert(out, {
+		label = "…",
+		index = -1,
+		ellipsis = true,
+	})
+	local _arg0 = {
+		label = items[count].label,
+		index = count - 1,
+	}
+	table.insert(out, _arg0)
+	return out
+end
 return {
 	breadcrumbCurrent = breadcrumbCurrent,
+	breadcrumbVisible = breadcrumbVisible,
 }

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

@@ -1,2 +1,3 @@
 export { default as Breadcrumbs } from "./components/Breadcrumbs";
 export { BreadcrumbItem, BreadcrumbsProps } from "./components/Breadcrumbs";
+export { breadcrumbCurrent, breadcrumbVisible } from "./components/breadcrumbItems";

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

@@ -2,4 +2,7 @@
 local TS = _G[script]
 local exports = {}
 exports.Breadcrumbs = TS.import(script, script, "components", "Breadcrumbs").default
+local _breadcrumbItems = TS.import(script, script, "components", "breadcrumbItems")
+exports.breadcrumbCurrent = _breadcrumbItems.breadcrumbCurrent
+exports.breadcrumbVisible = _breadcrumbItems.breadcrumbVisible
 return exports

package/out/ui/packages/fab/components/Fab.d.ts

@@ -3,6 +3,7 @@ import { Icons } from "../../../enums/index";
 import { FabSize } from "./fabSize";
 export interface FabProps {
     icon: Icons;
+    label?: string;
     size?: FabSize;
     disabled?: boolean;
     loading?: boolean;

package/out/ui/packages/fab/components/Fab.luau

@@ -8,11 +8,14 @@ local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "t
 local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
 local CircularProgress = TS.import(script, script.Parent.Parent.Parent, "circularProgress").CircularProgress
 local Shadow = TS.import(script, script.Parent.Parent.Parent, "shadow").Shadow
-local fabIconPixels = TS.import(script, script.Parent, "fabSize").fabIconPixels
+local _fabSize = TS.import(script, script.Parent, "fabSize")
+local fabExtended = _fabSize.fabExtended
+local fabIconPixels = _fabSize.fabIconPixels
 local useFabStyles = TS.import(script, script.Parent, "Fab.styles").default
 local function Fab(props)
 	local _binding = props
 	local icon = _binding.icon
+	local label = _binding.label
 	local size = _binding.size
 	if size == nil then
 		size = "medium"
@@ -29,9 +32,11 @@ local function Fab(props)
 	local id = _binding.id
 	local ref = _binding.ref
 	local active = canActivate(disabled, loading)
+	local extended = fabExtended(label)
 	local styles = useFabStyles({
 		size = size,
 		disabled = not active,
+		extended = extended,
 	})
 	local _binding_1 = useTheme()
 	local theme = _binding_1.theme
@@ -45,6 +50,34 @@ local function Fab(props)
 		setHovering(false)
 		setFocused(false)
 	end, { active })
+	local _result
+	if loading then
+		_result = (React.createElement(CircularProgress, {
+			size = iconPx,
+			thickness = 2,
+			color = theme.palette.primary.on,
+			reducedMotion = reducedMotion,
+			className = if extended then {
+				LayoutOrder = 1,
+			} else {
+				AnchorPoint = Vector2.new(0.5, 0.5),
+				Position = UDim2.fromScale(0.5, 0.5),
+			},
+		}))
+	else
+		local _attributes = {
+			key = "Icon",
+		}
+		for _k, _v in styles.icon do
+			_attributes[_k] = _v
+		end
+		_attributes.Size = UDim2.fromOffset(iconPx, iconPx)
+		_attributes.AnchorPoint = if extended then Vector2.new(0, 0) else Vector2.new(0.5, 0.5)
+		_attributes.Position = if extended then UDim2.fromScale(0, 0) else UDim2.fromScale(0.5, 0.5)
+		_attributes.Image = tostring(icon)
+		_result = (React.createElement("imagelabel", _attributes))
+	end
+	local iconEl = _result
 	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
@@ -95,32 +128,31 @@ local function Fab(props)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uicorner", _attributes_1)
 	local _exp_1 = React.createElement(Shadow)
-	local _result
-	if loading then
-		_result = (React.createElement(CircularProgress, {
-			size = iconPx,
-			thickness = 2,
-			color = theme.palette.primary.on,
-			reducedMotion = reducedMotion,
-			className = {
-				AnchorPoint = Vector2.new(0.5, 0.5),
-				Position = UDim2.fromScale(0.5, 0.5),
-			},
-		}))
-	else
-		local _attributes_2 = {
-			key = "Icon",
-		}
-		for _k, _v in styles.icon do
-			_attributes_2[_k] = _v
+	local _result_1
+	if extended then
+		local _attributes_2 = table.clone(styles.padding)
+		setmetatable(_attributes_2, nil)
+		local _exp_2 = React.createElement("uipadding", _attributes_2)
+		local _attributes_3 = table.clone(styles.row)
+		setmetatable(_attributes_3, nil)
+		local _exp_3 = React.createElement("uilistlayout", _attributes_3)
+		local _exp_4 = iconEl
+		local _condition_1 = not loading
+		if _condition_1 then
+			local _attributes_4 = {
+				key = "Label",
+			}
+			for _k, _v in styles.label do
+				_attributes_4[_k] = _v
+			end
+			_attributes_4.Text = label
+			_condition_1 = React.createElement("textlabel", _attributes_4)
 		end
-		_attributes_2.Size = UDim2.fromOffset(iconPx, iconPx)
-		_attributes_2.AnchorPoint = Vector2.new(0.5, 0.5)
-		_attributes_2.Position = UDim2.fromScale(0.5, 0.5)
-		_attributes_2.Image = tostring(icon)
-		_result = (React.createElement("imagelabel", _attributes_2))
+		_result_1 = (React.createElement(React.Fragment, nil, _exp_2, _exp_3, _exp_4, _condition_1))
+	else
+		_result_1 = iconEl
 	end
-	return React.createElement("textbutton", _attributes, _exp, _exp_1, _result)
+	return React.createElement("textbutton", _attributes, _exp, _exp_1, _result_1)
 end
 local default = Fab
 return {

package/out/ui/packages/fab/components/Fab.styles.d.ts

@@ -2,6 +2,7 @@ import { FabSize } from "./fabSize";
 export interface FabStyleProps {
     size?: FabSize;
     disabled?: boolean;
+    extended?: boolean;
 }
 declare const useFabStyles: (props: FabStyleProps) => import("../../../../theme/index").ClassNameMap<string>;
 export default useFabStyles;

package/out/ui/packages/fab/components/Fab.styles.luau

@@ -10,10 +10,12 @@ local useFabStyles = componentStyles("Fab", function(theme, _param)
 		size = "medium"
 	end
 	local disabled = _param.disabled
+	local extended = _param.extended
 	local diameter = fabPixels(size)
 	return createStyles({
 		root = {
-			Size = UDim2.fromOffset(diameter, diameter),
+			Size = if extended == true then UDim2.new(0, 0, 0, diameter) else UDim2.fromOffset(diameter, diameter),
+			AutomaticSize = if extended == true then Enum.AutomaticSize.X else Enum.AutomaticSize.None,
 			BackgroundColor3 = theme.palette.primary.main,
 			BackgroundTransparency = if disabled then 0.5 else 0,
 			BorderSizePixel = 0,
@@ -24,6 +26,17 @@ local useFabStyles = componentStyles("Fab", function(theme, _param)
 		corner = {
 			CornerRadius = UDim.new(1, 0),
 		},
+		padding = {
+			PaddingLeft = UDim.new(0, theme.padding.calc(2)),
+			PaddingRight = UDim.new(0, theme.padding.calc(2.5)),
+		},
+		row = {
+			FillDirection = Enum.FillDirection.Horizontal,
+			VerticalAlignment = Enum.VerticalAlignment.Center,
+			HorizontalAlignment = Enum.HorizontalAlignment.Center,
+			SortOrder = Enum.SortOrder.LayoutOrder,
+			Padding = UDim.new(0, theme.padding.calc(1)),
+		},
 		icon = {
 			Size = UDim2.fromScale(1, 1),
 			BackgroundTransparency = 1,
@@ -31,6 +44,18 @@ local useFabStyles = componentStyles("Fab", function(theme, _param)
 			ScaleType = Enum.ScaleType.Fit,
 			ImageColor3 = theme.palette.primary.on,
 			ImageTransparency = if disabled then 0.5 else 0,
+			LayoutOrder = 1,
+		},
+		label = {
+			AutomaticSize = Enum.AutomaticSize.XY,
+			Size = UDim2.fromScale(0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies.default,
+			TextSize = theme.typography.fontSizes.body,
+			TextColor3 = theme.palette.primary.on,
+			TextTransparency = if disabled then 0.5 else 0,
+			LayoutOrder = 2,
 		},
 	})
 end)

package/out/ui/packages/fab/components/fabSize.d.ts

@@ -1,3 +1,4 @@
 export type FabSize = "small" | "medium" | "large";
 export declare function fabPixels(size?: FabSize): 40 | 64 | 56;
 export declare function fabIconPixels(size?: FabSize): 18 | 24 | 28;
+export declare function fabExtended(label?: string): boolean;

package/out/ui/packages/fab/components/fabSize.luau

@@ -23,7 +23,11 @@ local function fabIconPixels(size)
 	end
 	return 24
 end
+local function fabExtended(label)
+	return label ~= nil and label ~= ""
+end
 return {
 	fabPixels = fabPixels,
 	fabIconPixels = fabIconPixels,
+	fabExtended = fabExtended,
 }

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

@@ -1,3 +1,3 @@
 export { default as Fab } from "./components/Fab";
 export { FabProps } from "./components/Fab";
-export { FabSize, fabPixels, fabIconPixels } from "./components/fabSize";
+export { FabSize, fabPixels, fabIconPixels, fabExtended } from "./components/fabSize";

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

@@ -5,4 +5,5 @@ exports.Fab = TS.import(script, script, "components", "Fab").default
 local _fabSize = TS.import(script, script, "components", "fabSize")
 exports.fabPixels = _fabSize.fabPixels
 exports.fabIconPixels = _fabSize.fabIconPixels
+exports.fabExtended = _fabSize.fabExtended
 return exports

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

package/out/ui/packages/stateMatrix.luau

@@ -1341,187 +1341,207 @@ local function chromeRows()
 	local _Length_8 = #_array_9
 	table.move(_array_9, 1, _Length_8, _length + 1, _array)
 	_length += _Length_8
-	local _array_10 = pair("Breadcrumbs", "custom-separator", {
-		text = "Home > Item",
+	local _array_10 = pair("Breadcrumbs", "collapsed", {
+		text = "Home / … / Item",
+		size = "small",
 	})
 	local _Length_9 = #_array_10
 	table.move(_array_10, 1, _Length_9, _length + 1, _array)
 	_length += _Length_9
-	local _array_11 = pair("Pagination", "first", {
-		value = 1,
+	local _array_11 = pair("Breadcrumbs", "custom-separator", {
+		text = "Home > Item",
 	})
 	local _Length_10 = #_array_11
 	table.move(_array_11, 1, _Length_10, _length + 1, _array)
 	_length += _Length_10
-	local _array_12 = pair("Pagination", "middle", {
-		value = 3,
+	local _array_12 = pair("Pagination", "first", {
+		value = 1,
 	})
 	local _Length_11 = #_array_12
 	table.move(_array_12, 1, _Length_11, _length + 1, _array)
 	_length += _Length_11
-	local _array_13 = pair("Pagination", "disabled", {
-		value = 2,
-		disabled = true,
+	local _array_13 = pair("Pagination", "middle", {
+		value = 3,
 	})
 	local _Length_12 = #_array_13
 	table.move(_array_13, 1, _Length_12, _length + 1, _array)
 	_length += _Length_12
-	local _array_14 = pair("Stepper", "first", {
-		value = 0,
+	local _array_14 = pair("Pagination", "collapsed", {
+		value = 10,
+		size = "large",
 	})
 	local _Length_13 = #_array_14
 	table.move(_array_14, 1, _Length_13, _length + 1, _array)
 	_length += _Length_13
-	local _array_15 = pair("Stepper", "middle", {
-		value = 1,
+	local _array_15 = pair("Pagination", "disabled", {
+		value = 2,
+		disabled = true,
 	})
 	local _Length_14 = #_array_15
 	table.move(_array_15, 1, _Length_14, _length + 1, _array)
 	_length += _Length_14
-	local _array_16 = pair("Stepper", "last", {
-		value = 2,
+	local _array_16 = pair("Stepper", "first", {
+		value = 0,
 	})
 	local _Length_15 = #_array_16
 	table.move(_array_16, 1, _Length_15, _length + 1, _array)
 	_length += _Length_15
-	local _array_17 = pair("Accordion", "closed", {
-		open = false,
+	local _array_17 = pair("Stepper", "middle", {
+		value = 1,
 	})
 	local _Length_16 = #_array_17
 	table.move(_array_17, 1, _Length_16, _length + 1, _array)
 	_length += _Length_16
-	local _array_18 = pair("Accordion", "open", {
-		open = true,
+	local _array_18 = pair("Stepper", "last", {
+		value = 2,
 	})
 	local _Length_17 = #_array_18
 	table.move(_array_18, 1, _Length_17, _length + 1, _array)
 	_length += _Length_17
-	local _array_19 = pair("Snackbar", "open", {
-		open = true,
-		text = "Saved",
+	local _array_19 = pair("Accordion", "closed", {
+		open = false,
 	})
 	local _Length_18 = #_array_19
 	table.move(_array_19, 1, _Length_18, _length + 1, _array)
 	_length += _Length_18
-	local _array_20 = pair("Snackbar", "closed", {
-		open = false,
-		text = "Saved",
+	local _array_20 = pair("Accordion", "open", {
+		open = true,
 	})
 	local _Length_19 = #_array_20
 	table.move(_array_20, 1, _Length_19, _length + 1, _array)
 	_length += _Length_19
-	local _array_21 = pair("Table", "empty", {
-		text = "",
+	local _array_21 = pair("Snackbar", "open", {
+		open = true,
+		text = "Saved",
 	})
 	local _Length_20 = #_array_21
 	table.move(_array_21, 1, _Length_20, _length + 1, _array)
 	_length += _Length_20
-	local _array_22 = pair("Table", "default", {
-		text = "Name / Role",
+	local _array_22 = pair("Snackbar", "closed", {
+		open = false,
+		text = "Saved",
 	})
 	local _Length_21 = #_array_22
 	table.move(_array_22, 1, _Length_21, _length + 1, _array)
 	_length += _Length_21
-	local _array_23 = pair("Table", "selected", {
-		text = "Name / Role",
-		value = 0,
+	local _array_23 = pair("Table", "empty", {
+		text = "",
 	})
 	local _Length_22 = #_array_23
 	table.move(_array_23, 1, _Length_22, _length + 1, _array)
 	_length += _Length_22
-	local _array_24 = pair("Autocomplete", "default", {
-		value = "Continue",
-		options = { "Continue", "Other" },
+	local _array_24 = pair("Table", "default", {
+		text = "Name / Role",
 	})
 	local _Length_23 = #_array_24
 	table.move(_array_24, 1, _Length_23, _length + 1, _array)
 	_length += _Length_23
-	local _array_25 = pair("Autocomplete", "open", {
-		value = "Continue",
-		options = { "Continue", "Other" },
-		open = true,
+	local _array_25 = pair("Table", "selected", {
+		text = "Name / Role",
+		value = 0,
 	})
 	local _Length_24 = #_array_25
 	table.move(_array_25, 1, _Length_24, _length + 1, _array)
 	_length += _Length_24
-	local _array_26 = pair("Autocomplete", "disabled", {
+	local _array_26 = pair("Autocomplete", "default", {
 		value = "Continue",
 		options = { "Continue", "Other" },
-		disabled = true,
 	})
 	local _Length_25 = #_array_26
 	table.move(_array_26, 1, _Length_25, _length + 1, _array)
 	_length += _Length_25
-	local _array_27 = pair("Autocomplete", "empty", {
-		value = "",
-		options = {},
+	local _array_27 = pair("Autocomplete", "open", {
+		value = "Continue",
+		options = { "Continue", "Other" },
 		open = true,
 	})
 	local _Length_26 = #_array_27
 	table.move(_array_27, 1, _Length_26, _length + 1, _array)
 	_length += _Length_26
-	local _array_28 = pair("Autocomplete", "no-results", {
+	local _array_28 = pair("Autocomplete", "disabled", {
 		value = "Continue",
 		options = { "Continue", "Other" },
-		open = true,
-		filter = "zzz",
+		disabled = true,
 	})
 	local _Length_27 = #_array_28
 	table.move(_array_28, 1, _Length_27, _length + 1, _array)
 	_length += _Length_27
-	local _array_29 = pair("Fab", "default")
+	local _array_29 = pair("Autocomplete", "empty", {
+		value = "",
+		options = {},
+		open = true,
+	})
 	local _Length_28 = #_array_29
 	table.move(_array_29, 1, _Length_28, _length + 1, _array)
 	_length += _Length_28
-	local _array_30 = pair("Fab", "small", {
-		size = "small",
+	local _array_30 = pair("Autocomplete", "no-results", {
+		value = "Continue",
+		options = { "Continue", "Other" },
+		open = true,
+		filter = "zzz",
 	})
 	local _Length_29 = #_array_30
 	table.move(_array_30, 1, _Length_29, _length + 1, _array)
 	_length += _Length_29
-	local _array_31 = pair("Fab", "large", {
-		size = "large",
-	})
+	local _array_31 = pair("Fab", "default")
 	local _Length_30 = #_array_31
 	table.move(_array_31, 1, _Length_30, _length + 1, _array)
 	_length += _Length_30
-	local _array_32 = pair("Fab", "disabled", {
-		disabled = true,
+	local _array_32 = pair("Fab", "extended", {
+		text = "Compose",
 	})
 	local _Length_31 = #_array_32
 	table.move(_array_32, 1, _Length_31, _length + 1, _array)
 	_length += _Length_31
-	local _array_33 = pair("Fab", "loading", {
-		loading = true,
+	local _array_33 = pair("Fab", "small", {
+		size = "small",
 	})
 	local _Length_32 = #_array_33
 	table.move(_array_33, 1, _Length_32, _length + 1, _array)
 	_length += _Length_32
-	local _array_34 = pair("AppBar", "default", {
-		text = "Storyblox",
+	local _array_34 = pair("Fab", "large", {
+		size = "large",
 	})
 	local _Length_33 = #_array_34
 	table.move(_array_34, 1, _Length_33, _length + 1, _array)
 	_length += _Length_33
-	local _array_35 = pair("AppBar", "flat", {
-		text = "Storyblox",
-		variant = "flat",
+	local _array_35 = pair("Fab", "disabled", {
+		disabled = true,
 	})
 	local _Length_34 = #_array_35
 	table.move(_array_35, 1, _Length_34, _length + 1, _array)
 	_length += _Length_34
-	local _array_36 = pair("AppBar", "raised", {
-		text = "Storyblox",
-		variant = "raised",
+	local _array_36 = pair("Fab", "loading", {
+		loading = true,
 	})
 	local _Length_35 = #_array_36
 	table.move(_array_36, 1, _Length_35, _length + 1, _array)
 	_length += _Length_35
-	local _array_37 = pair("BottomNavigation", "default", {
+	local _array_37 = pair("AppBar", "default", {
+		text = "Storyblox",
+	})
+	local _Length_36 = #_array_37
+	table.move(_array_37, 1, _Length_36, _length + 1, _array)
+	_length += _Length_36
+	local _array_38 = pair("AppBar", "flat", {
+		text = "Storyblox",
+		variant = "flat",
+	})
+	local _Length_37 = #_array_38
+	table.move(_array_38, 1, _Length_37, _length + 1, _array)
+	_length += _Length_37
+	local _array_39 = pair("AppBar", "raised", {
+		text = "Storyblox",
+		variant = "raised",
+	})
+	local _Length_38 = #_array_39
+	table.move(_array_39, 1, _Length_38, _length + 1, _array)
+	_length += _Length_38
+	local _array_40 = pair("BottomNavigation", "default", {
 		value = "Home",
 		options = { "Home", "Search", "Profile" },
 	})
-	table.move(_array_37, 1, #_array_37, _length + 1, _array)
+	table.move(_array_40, 1, #_array_40, _length + 1, _array)
 	return _array
 end
 local function miscRows()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/uiblox",
-	"version": "0.2.0-alpha.7",
+	"version": "0.2.0-alpha.8",
 	"description": "UI Library and theming for roblox-ts projects",
 	"main": "out/init.luau",
 	"packageManager": "pnpm@11.3.0",