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

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

@@ -1,106 +1,23 @@
 -- Compiled with roblox-ts v3.0.0
-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
+local function pageRange(count)
+	local pages = {}
 	do
-		local i = total - boundaries + 1
+		local page = 1
 		local _shouldIncrement = false
 		while true do
 			if _shouldIncrement then
-				i += 1
+				page += 1
 			else
 				_shouldIncrement = true
 			end
-			if not (i <= total) then
+			if not (page <= math.max(0, math.floor(count))) then
 				break
 			end
-			local _i = i
-			table.insert(tokens, _i)
+			local _page = page
+			table.insert(pages, _page)
 		end
 	end
-	return tokens
+	return pages
 end
 return {
 	pageRange = pageRange,

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

@@ -1,3 +1,2 @@
 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,5 +2,4 @@
 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/paper/components/Paper.d.ts

@@ -1,10 +1,8 @@
 import React from "@rbxts/react";
-import { CustomizedProps } from "../../../../theme/index";
-export type PaperElevation = "flat" | "raised" | "outlined";
+export type PaperElevation = "flat" | "raised";
 export interface PaperProps {
     elevation?: PaperElevation;
-    square?: boolean;
     children?: React.ReactNode;
 }
-declare function Paper(props: CustomizedProps<Frame, PaperProps>): JSX.Element;
+declare function Paper(props: PaperProps): JSX.Element;
 export default Paper;

package/out/ui/packages/paper/components/Paper.luau

@@ -1,8 +1,6 @@
 -- 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 Shadow = TS.import(script, script.Parent.Parent.Parent, "shadow").Shadow
 local usePaperStyles = TS.import(script, script.Parent, "Paper.styles").default
 local function Paper(props)
 	local _binding = props
@@ -10,42 +8,22 @@ local function Paper(props)
 	if elevation == nil then
 		elevation = "flat"
 	end
-	local square = _binding.square
 	local children = _binding.children
-	local className = _binding.className
-	local sx = _binding.sx
-	local id = _binding.id
-	local ref = _binding.ref
 	local styles = usePaperStyles({
 		elevation = elevation,
 	})
-	local _attributes = {}
-	local _condition = id
-	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
-		_condition = "Paper"
+	local _attributes = {
+		key = "Paper",
+	}
+	for _k, _v in styles.root do
+		_attributes[_k] = _v
 	end
-	_attributes.key = _condition
-	_attributes.hostRef = ref
-	_attributes.base = styles.root
-	_attributes.className = className
-	_attributes.sx = sx
-	local _exp = elevation == "raised" and React.createElement(Shadow)
 	local _attributes_1 = table.clone(styles.padding)
 	setmetatable(_attributes_1, nil)
-	local _exp_1 = React.createElement("uipadding", _attributes_1)
-	local _condition_1 = square ~= true
-	if _condition_1 then
-		local _attributes_2 = table.clone(styles.corner)
-		setmetatable(_attributes_2, nil)
-		_condition_1 = React.createElement("uicorner", _attributes_2)
-	end
-	local _condition_2 = elevation == "outlined"
-	if _condition_2 then
-		local _attributes_2 = table.clone(styles.stroke)
-		setmetatable(_attributes_2, nil)
-		_condition_2 = React.createElement("uistroke", _attributes_2)
-	end
-	return React.createElement(SxHost, _attributes, _exp, _exp_1, _condition_1, _condition_2, children)
+	local _exp = React.createElement("uipadding", _attributes_1)
+	local _attributes_2 = table.clone(styles.corner)
+	setmetatable(_attributes_2, nil)
+	return React.createElement("frame", _attributes, _exp, React.createElement("uicorner", _attributes_2), children)
 end
 local default = Paper
 return {

package/out/ui/packages/paper/components/Paper.styles.d.ts

@@ -1,4 +1,4 @@
 declare const usePaperStyles: (props: {
-    elevation?: "flat" | "raised" | "outlined";
+    elevation?: "flat" | "raised";
 }) => import("../../../../theme/index").ClassNameMap<string>;
 export default usePaperStyles;

package/out/ui/packages/paper/components/Paper.styles.luau

@@ -15,12 +15,6 @@ local usePaperStyles = componentStyles("Paper", function(theme, _param)
 			BackgroundColor3 = if elevation == "raised" then theme.palette.surface.elevated else theme.palette.surface.paper,
 			BorderSizePixel = 0,
 		},
-		stroke = {
-			Color = theme.palette.border,
-			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
-			Thickness = 1,
-			Transparency = 0,
-		},
 		padding = {
 			PaddingTop = UDim.new(0, theme.padding.calc(2)),
 			PaddingBottom = UDim.new(0, theme.padding.calc(2)),

package/out/ui/packages/physicalPropertiesEditor/components/PhysicalPropertiesEditor.luau

@@ -1,13 +1,11 @@
 -- 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 usePhysicalPropertiesEditorStyles = TS.import(script, script.Parent, "PhysicalPropertiesEditor.styles").default
 local _physicalParts = TS.import(script, script.Parent, "physicalParts")
 local patchPhysicalParts = _physicalParts.patchPhysicalParts
-local physicalCaption = _physicalParts.physicalCaption
-local physicalRows = _physicalParts.physicalRows
+local physicalFields = _physicalParts.physicalFields
 local function PhysicalPropertiesEditor(props)
 	local _binding = props
 	local value = _binding.value
@@ -18,91 +16,68 @@ local function PhysicalPropertiesEditor(props)
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = usePhysicalPropertiesEditorStyles()
-	local amounts = {
-		Density = value.Density,
-		Friction = value.Friction,
-		Elasticity = value.Elasticity,
-		FrictionWeight = value.FrictionWeight,
-		ElasticityWeight = value.ElasticityWeight,
-	}
+	local amounts = { value.Density, value.Friction, value.Elasticity, value.FrictionWeight, value.ElasticityWeight }
 	local commit = function(field, amount)
 		local parts = patchPhysicalParts(value.Density, value.Friction, value.Elasticity, value.FrictionWeight, value.ElasticityWeight, field, amount)
 		onChange(PhysicalProperties.new(parts[1], parts[2], parts[3], parts[4], parts[5]))
 	end
-	local _attributes = {
-		tag = "frame",
-	}
+	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "PhysicalPropertiesEditor"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
-	_attributes.base = styles.root
-	_attributes.className = className
-	_attributes.sx = sx
-	_attributes.state = {
-		disabled = disabled,
-	}
+	_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
 	local _attributes_1 = table.clone(styles.wrap)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
-	local _exp_1 = physicalRows()
+	local _exp_1 = physicalFields()
 	-- ▼ ReadonlyArray.map ▼
 	local _newValue = table.create(#_exp_1)
-	local _callback = function(row, rowIndex)
+	local _callback = function(field, index)
 		local _attributes_2 = {
-			key = `Row-{rowIndex}`,
+			key = field,
 		}
-		for _k, _v in styles.row do
+		for _k, _v in styles.axis do
 			_attributes_2[_k] = _v
 		end
-		_attributes_2.LayoutOrder = rowIndex + 1
-		local _attributes_3 = table.clone(styles.pair)
+		_attributes_2.LayoutOrder = index + 1
+		local _attributes_3 = table.clone(styles.row)
 		setmetatable(_attributes_3, nil)
 		local _exp_2 = React.createElement("uilistlayout", _attributes_3)
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue_1 = table.create(#row)
-		local _callback_1 = function(field, index)
-			local _attributes_4 = {
-				key = field,
-			}
-			for _k, _v in styles.cell do
-				_attributes_4[_k] = _v
-			end
-			_attributes_4.LayoutOrder = index + 1
-			local _attributes_5 = table.clone(styles.stack)
-			setmetatable(_attributes_5, nil)
-			local _exp_3 = React.createElement("uilistlayout", _attributes_5)
-			local _attributes_6 = table.clone(styles.label)
-			setmetatable(_attributes_6, nil)
-			_attributes_6.Text = physicalCaption(field)
-			_attributes_6.LayoutOrder = 1
-			local _exp_4 = React.createElement("textlabel", _attributes_6)
-			local _attributes_7 = table.clone(styles.field)
-			setmetatable(_attributes_7, nil)
-			_attributes_7.LayoutOrder = 2
-			return React.createElement("frame", _attributes_4, _exp_3, _exp_4, React.createElement("frame", _attributes_7, React.createElement(NumberInput, {
-				value = amounts[field],
-				places = 4,
-				disabled = disabled,
-				width = UDim.new(1, 0),
-				onChange = function(amount)
-					return commit(field, amount)
-				end,
-			})))
-		end
-		for _k, _v in row do
-			_newValue_1[_k] = _callback_1(_v, _k - 1, row)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		return React.createElement("frame", _attributes_2, _exp_2, React.createElement(React.Fragment, nil, _newValue_1))
+		local _attributes_4 = table.clone(styles.label)
+		setmetatable(_attributes_4, nil)
+		_attributes_4.Text = field
+		local _exp_3 = React.createElement("textlabel", _attributes_4)
+		local _attributes_5 = table.clone(styles.field)
+		setmetatable(_attributes_5, nil)
+		return React.createElement("frame", _attributes_2, _exp_2, _exp_3, React.createElement("frame", _attributes_5, React.createElement(NumberInput, {
+			value = amounts[index + 1],
+			disabled = disabled,
+			width = UDim.new(1, 0),
+			onChange = function(amount)
+				return commit(field, amount)
+			end,
+		})))
 	end
 	for _k, _v in _exp_1 do
 		_newValue[_k] = _callback(_v, _k - 1, _exp_1)
 	end
 	-- ▲ ReadonlyArray.map ▲
-	return React.createElement(SxHost, _attributes, _exp, React.createElement(React.Fragment, nil, _newValue))
+	return React.createElement("frame", _attributes, _exp, _newValue)
 end
 local default = PhysicalPropertiesEditor
 return {

package/out/ui/packages/physicalPropertiesEditor/components/PhysicalPropertiesEditor.styles.luau

@@ -1,11 +1,9 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
-local controlMetrics = _theme.controlMetrics
 local createStyles = _theme.createStyles
 local componentStyles = _theme.componentStyles
 local usePhysicalPropertiesEditorStyles = componentStyles("PhysicalPropertiesEditor", function(theme)
-	local gap = theme.padding.calc(1)
 	return createStyles({
 		root = {
 			Size = UDim2.new(1, 0, 0, 0),
@@ -18,38 +16,26 @@ local usePhysicalPropertiesEditorStyles = componentStyles("PhysicalPropertiesEdi
 			Padding = UDim.new(0, theme.padding.calc(0.5)),
 			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
-		pair = {
+		row = {
 			FillDirection = Enum.FillDirection.Horizontal,
-			Padding = UDim.new(0, gap),
+			Padding = UDim.new(0, theme.padding.calc(1)),
+			VerticalAlignment = Enum.VerticalAlignment.Center,
 			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
-		row = {
-			Size = UDim2.new(1, 0, 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
-			BackgroundTransparency = 1,
-		},
-		cell = {
-			Size = UDim2.new(0.5, -gap / 2, 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
+		axis = {
+			Size = UDim2.new(1, 0, 0, theme.spacing.calc(2)),
 			BackgroundTransparency = 1,
 		},
-		stack = {
-			FillDirection = Enum.FillDirection.Vertical,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
-			SortOrder = Enum.SortOrder.LayoutOrder,
-		},
 		label = {
-			Size = UDim2.new(1, 0, 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = UDim2.new(0, theme.spacing.calc(7), 1, 0),
 			BackgroundTransparency = 1,
 			Font = theme.typography.fontFamilies.default,
 			TextSize = theme.typography.fontSizes.caption,
 			TextColor3 = theme.palette.text.secondary,
 			TextXAlignment = Enum.TextXAlignment.Left,
-			TextTruncate = Enum.TextTruncate.AtEnd,
 		},
 		field = {
-			Size = UDim2.new(1, 0, 0, controlMetrics(theme.density).height),
+			Size = UDim2.new(1, -theme.spacing.calc(7), 1, 0),
 			BackgroundTransparency = 1,
 		},
 	})

package/out/ui/packages/physicalPropertiesEditor/components/physicalParts.d.ts

@@ -1,5 +1,3 @@
 export type PhysicalField = "Density" | "Friction" | "Elasticity" | "FrictionWeight" | "ElasticityWeight";
 export declare function physicalFields(): PhysicalField[];
-export declare function physicalCaption(field: PhysicalField): "Density" | "Friction" | "Elasticity" | "Friction wt" | "Elasticity wt";
-export declare function physicalRows(): PhysicalField[][];
 export declare function patchPhysicalParts(density: number, friction: number, elasticity: number, frictionWeight: number, elasticityWeight: number, field: PhysicalField, amount: number): number[];

package/out/ui/packages/physicalPropertiesEditor/components/physicalParts.luau

@@ -2,18 +2,6 @@
 local function physicalFields()
 	return { "Density", "Friction", "Elasticity", "FrictionWeight", "ElasticityWeight" }
 end
-local function physicalCaption(field)
-	if field == "FrictionWeight" then
-		return "Friction wt"
-	end
-	if field == "ElasticityWeight" then
-		return "Elasticity wt"
-	end
-	return field
-end
-local function physicalRows()
-	return { { "Density", "Friction" }, { "Elasticity", "FrictionWeight" }, { "ElasticityWeight" } }
-end
 local function patchPhysicalParts(density, friction, elasticity, frictionWeight, elasticityWeight, field, amount)
 	local parts = { density, friction, elasticity, frictionWeight, elasticityWeight }
 	local index = if field == "Density" then 0 elseif field == "Friction" then 1 elseif field == "Elasticity" then 2 elseif field == "FrictionWeight" then 3 else 4
@@ -22,7 +10,5 @@ local function patchPhysicalParts(density, friction, elasticity, frictionWeight,
 end
 return {
 	physicalFields = physicalFields,
-	physicalCaption = physicalCaption,
-	physicalRows = physicalRows,
 	patchPhysicalParts = patchPhysicalParts,
 }

package/out/ui/packages/popup/components/Popup.d.ts

@@ -1,5 +1,4 @@
 import React from "@rbxts/react";
-import { CustomizedProps } from "../../../../theme/index";
 export interface PopupProps {
     anchor?: GuiObject;
     /** Content height. Flips above the anchor and caps the shell. */
@@ -10,5 +9,5 @@ export interface PopupProps {
     onInput?: (input: InputObject) => void;
     children?: React.ReactNode;
 }
-declare function Popup(props: CustomizedProps<Frame, PopupProps>): JSX.Element | undefined;
+declare function Popup(props: PopupProps): JSX.Element | undefined;
 export default Popup;

package/out/ui/packages/popup/components/Popup.luau

@@ -5,7 +5,6 @@ local React = _react
 local useEffect = _react.useEffect
 local useRef = _react.useRef
 local useState = _react.useState
-local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local popupPlacement = TS.import(script, script.Parent, "placement").popupPlacement
 local Portal = TS.import(script, script.Parent, "Portal").default
 local portalTarget = TS.import(script, script.Parent, "portalTarget").portalTarget
@@ -17,10 +16,6 @@ local function Popup(props)
 	local onDismiss = _binding.onDismiss
 	local onInput = _binding.onInput
 	local children = _binding.children
-	local className = _binding.className
-	local sx = _binding.sx
-	local id = _binding.id
-	local ref = _binding.ref
 	local dismiss = useRef(onDismiss)
 	dismiss.current = onDismiss
 	local _, bump = useState(0)
@@ -93,7 +88,14 @@ local function Popup(props)
 	end
 	local place = popupPlacement(_exp, _exp_1, _exp_2, _exp_3, _exp_4, _exp_5, _exp_6, _exp_7, _condition, _condition_1)
 	local capped = place.height > 0
-	local _exp_8 = onDismiss and (React.createElement("textbutton", {
+	return React.createElement(Portal, {
+		host = layer,
+	}, React.createElement("frame", {
+		key = "Popup",
+		Size = UDim2.fromScale(1, 1),
+		BackgroundTransparency = 1,
+		ZIndex = 20000,
+	}, onDismiss and (React.createElement("textbutton", {
 		key = "Backdrop",
 		Size = UDim2.fromScale(1, 1),
 		BackgroundTransparency = 1,
@@ -111,36 +113,17 @@ local function Popup(props)
 				return _result
 			end,
 		},
-	}))
-	local _attributes = {
-		tag = "frame",
-	}
-	local _condition_2 = id
-	if not (_condition_2 ~= 0 and _condition_2 == _condition_2 and _condition_2 ~= "" and _condition_2) then
-		_condition_2 = "Content"
-	end
-	_attributes.key = _condition_2
-	_attributes.hostRef = ref
-	_attributes.base = {
+	})), React.createElement("frame", {
+		key = "Content",
+		Position = UDim2.fromOffset(place.x, place.y),
+		AnchorPoint = Vector2.new(0, if place.above then 1 else 0),
+		Size = if capped then UDim2.fromOffset(place.width, place.height) else UDim2.fromOffset(place.width, 0),
+		AutomaticSize = if capped then Enum.AutomaticSize.None else Enum.AutomaticSize.Y,
+		ClipsDescendants = capped,
 		BackgroundTransparency = 1,
-	}
-	_attributes.className = className
-	_attributes.sx = sx
-	_attributes.Position = UDim2.fromOffset(place.x, place.y)
-	_attributes.AnchorPoint = Vector2.new(0, if place.above then 1 else 0)
-	_attributes.Size = if capped then UDim2.fromOffset(place.width, place.height) else UDim2.fromOffset(place.width, 0)
-	_attributes.AutomaticSize = if capped then Enum.AutomaticSize.None else Enum.AutomaticSize.Y
-	_attributes.ClipsDescendants = capped
-	_attributes.Active = false
-	_attributes.ZIndex = 20001
-	return React.createElement(Portal, {
-		host = layer,
-	}, React.createElement("frame", {
-		key = "Popup",
-		Size = UDim2.fromScale(1, 1),
-		BackgroundTransparency = 1,
-		ZIndex = 20000,
-	}, _exp_8, React.createElement(SxHost, _attributes, children)))
+		Active = false,
+		ZIndex = 20001,
+	}, children)))
 end
 local default = Popup
 return {

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

@@ -2,4 +2,3 @@ export { default as Popup } from "./components/Popup";
 export { PopupProps } from "./components/Popup";
 export { default as Portal } from "./components/Portal";
 export { PortalProps } from "./components/Portal";
-export { portalTarget } from "./components/portalTarget";

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

@@ -3,5 +3,4 @@ local TS = _G[script]
 local exports = {}
 exports.Popup = TS.import(script, script, "components", "Popup").default
 exports.Portal = TS.import(script, script, "components", "Portal").default
-exports.portalTarget = TS.import(script, script, "components", "portalTarget").portalTarget
 return exports

package/out/ui/packages/preloader/components/Preloader.luau

@@ -9,7 +9,6 @@ local _pretty_react_hooks = TS.import(script, TS.getModule(script, "@rbxts", "pr
 local useAsyncEffect = _pretty_react_hooks.useAsyncEffect
 local useDeferState = _pretty_react_hooks.useDeferState
 local ContentProvider = TS.import(script, TS.getModule(script, "@rbxts", "services")).ContentProvider
-local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local ProgressBar = TS.import(script, script.Parent.Parent.Parent, "progressBar").ProgressBar
 local usePreloaderStyles = TS.import(script, script.Parent, "Preloader.styles").default
 local function Preloader(props)
@@ -104,18 +103,26 @@ local function Preloader(props)
 			children = children,
 		})
 	else
-		local _attributes = {
-			tag = "frame",
-		}
+		local _attributes = {}
 		local _condition = id
 		if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 			_condition = "Preloader"
 		end
 		_attributes.key = _condition
-		_attributes.hostRef = ref
-		_attributes.base = container
-		_attributes.className = className
-		_attributes.sx = sx
+		_attributes.ref = ref
+		for _k, _v in container 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
 		local _exp = Adornment ~= nil and React.createElement(Adornment, {
 			progress = percentage,
 		})
@@ -135,7 +142,7 @@ local function Preloader(props)
 				progress = percentage,
 			})))
 		end
-		_result = (React.createElement(SxHost, _attributes, _exp, _condition_1, _condition_2))
+		_result = (React.createElement("frame", _attributes, _exp, _condition_1, _condition_2))
 	end
 	return React.createElement(React.Fragment, nil, _result)
 end