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

package/out/ui/packages/card/components/Card.luau

@@ -11,13 +11,8 @@ local function Card(props)
 	if elevation == nil then
 		elevation = "flat"
 	end
-	local square = _binding.square
 	local actions = _binding.actions
 	local children = _binding.children
-	local className = _binding.className
-	local sx = _binding.sx
-	local id = _binding.id
-	local ref = _binding.ref
 	local styles = useCardStyles()
 	local _attributes = {
 		key = "Column",
@@ -71,11 +66,6 @@ local function Card(props)
 	end
 	return React.createElement(Paper, {
 		elevation = elevation,
-		square = square,
-		className = className,
-		sx = sx,
-		id = id,
-		ref = ref,
 	}, React.createElement("frame", _attributes, _exp, _condition, _condition_1, _exp_1, _condition_2))
 end
 local default = Card

package/out/ui/packages/cframeEditor/components/CFrameEditor.luau

@@ -1,12 +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 useCFrameEditorStyles = TS.import(script, script.Parent, "CFrameEditor.styles").default
-local nextCFrameParts = TS.import(script, script.Parent, "cframeValue").nextCFrameParts
-local POSITION = { "X", "Y", "Z" }
-local ORIENTATION = { "RX", "RY", "RZ" }
+local _cframeValue = TS.import(script, script.Parent, "cframeValue")
+local cframeFields = _cframeValue.cframeFields
+local nextCFrameParts = _cframeValue.nextCFrameParts
 local function CFrameEditor(props)
 	local _binding = props
 	local value = _binding.value
@@ -26,84 +25,63 @@ local function CFrameEditor(props)
 		local _arg0 = CFrame.Angles(math.rad(parts[4]), math.rad(parts[5]), math.rad(parts[6]))
 		onChange(_cFrame * _arg0)
 	end
-	local group = function(title, fields, order, offset)
-		local _attributes = {
-			key = title,
-		}
-		for _k, _v in styles.group do
-			_attributes[_k] = _v
-		end
-		_attributes.LayoutOrder = order
-		local _attributes_1 = table.clone(styles.wrap)
-		setmetatable(_attributes_1, nil)
-		local _exp = React.createElement("uilistlayout", _attributes_1)
-		local _attributes_2 = table.clone(styles.groupLabel)
-		setmetatable(_attributes_2, nil)
-		_attributes_2.Text = title
-		_attributes_2.LayoutOrder = 1
-		local _exp_1 = React.createElement("textlabel", _attributes_2)
-		local _attributes_3 = {
-			key = "Axes",
-		}
-		for _k, _v in styles.axes do
-			_attributes_3[_k] = _v
-		end
-		_attributes_3.LayoutOrder = 2
-		local _attributes_4 = table.clone(styles.row)
-		setmetatable(_attributes_4, nil)
-		local _exp_2 = React.createElement("uilistlayout", _attributes_4)
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#fields)
-		local _callback = function(field, index)
-			local _attributes_5 = {
-				key = field,
-			}
-			for _k, _v in styles.axis do
-				_attributes_5[_k] = _v
-			end
-			_attributes_5.LayoutOrder = index + 1
-			local _attributes_6 = table.clone(styles.row)
-			setmetatable(_attributes_6, nil)
-			local _exp_3 = React.createElement("uilistlayout", _attributes_6)
-			local _attributes_7 = table.clone(styles.label)
-			setmetatable(_attributes_7, nil)
-			_attributes_7.Text = field
-			local _exp_4 = React.createElement("textlabel", _attributes_7)
-			local _attributes_8 = table.clone(styles.field)
-			setmetatable(_attributes_8, nil)
-			return React.createElement("frame", _attributes_5, _exp_3, _exp_4, React.createElement("frame", _attributes_8, React.createElement(NumberInput, {
-				value = amounts[offset + index + 1],
-				disabled = disabled,
-				width = UDim.new(1, 0),
-				onChange = function(amount)
-					return commit(field, amount)
-				end,
-			})))
-		end
-		for _k, _v in fields do
-			_newValue[_k] = _callback(_v, _k - 1, fields)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		return React.createElement("frame", _attributes, _exp, _exp_1, React.createElement("frame", _attributes_3, _exp_2, React.createElement(React.Fragment, nil, _newValue)))
-	end
-	local _attributes = {
-		tag = "frame",
-	}
+	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "CFrameEditor"
 	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)
-	return React.createElement(SxHost, _attributes, React.createElement("uilistlayout", _attributes_1), group("Position", POSITION, 1, 0), group("Orientation", ORIENTATION, 2, 3))
+	local _exp = React.createElement("uilistlayout", _attributes_1)
+	local _exp_1 = cframeFields()
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp_1)
+	local _callback = function(field, index)
+		local _attributes_2 = {
+			key = field,
+		}
+		for _k, _v in styles.axis do
+			_attributes_2[_k] = _v
+		end
+		_attributes_2.LayoutOrder = index + 1
+		local _attributes_3 = table.clone(styles.row)
+		setmetatable(_attributes_3, nil)
+		local _exp_2 = React.createElement("uilistlayout", _attributes_3)
+		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("frame", _attributes, _exp, _newValue)
 end
 local default = CFrameEditor
 return {

package/out/ui/packages/cframeEditor/components/CFrameEditor.styles.luau

@@ -11,48 +11,31 @@ local useCFrameEditorStyles = componentStyles("CFrameEditor", function(theme)
 			BackgroundTransparency = 1,
 			BorderSizePixel = 0,
 		},
-		wrap = {
-			FillDirection = Enum.FillDirection.Vertical,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
-			SortOrder = Enum.SortOrder.LayoutOrder,
-		},
 		row = {
 			FillDirection = Enum.FillDirection.Horizontal,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
+			Padding = UDim.new(0, theme.padding.calc(1)),
 			VerticalAlignment = Enum.VerticalAlignment.Center,
 			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
-		group = {
-			Size = UDim2.new(1, 0, 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
-			BackgroundTransparency = 1,
-		},
-		groupLabel = {
-			Size = UDim2.new(1, 0, 0, theme.spacing.calc(2)),
-			BackgroundTransparency = 1,
-			Font = theme.typography.fontFamilies.default,
-			TextSize = theme.typography.fontSizes.button,
-			TextColor3 = theme.palette.text.secondary,
-			TextXAlignment = Enum.TextXAlignment.Left,
-		},
-		axes = {
-			Size = UDim2.new(1, 0, 0, theme.spacing.calc(3)),
-			BackgroundTransparency = 1,
+		wrap = {
+			FillDirection = Enum.FillDirection.Vertical,
+			Padding = UDim.new(0, theme.padding.calc(0.5)),
+			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
 		axis = {
-			Size = UDim2.new(1 / 3, -theme.padding.calc(0.5), 1, 0),
+			Size = UDim2.new(1, 0, 0, theme.spacing.calc(2)),
 			BackgroundTransparency = 1,
 		},
 		label = {
-			Size = UDim2.new(0, theme.spacing.calc(2.5), 1, 0),
+			Size = UDim2.new(0, theme.spacing.calc(2), 1, 0),
 			BackgroundTransparency = 1,
 			Font = theme.typography.fontFamilies.default,
-			TextSize = theme.typography.fontSizes.button,
+			TextSize = theme.typography.fontSizes.caption,
 			TextColor3 = theme.palette.text.secondary,
 			TextXAlignment = Enum.TextXAlignment.Left,
 		},
 		field = {
-			Size = UDim2.new(1, -theme.spacing.calc(2.5), 1, 0),
+			Size = UDim2.new(1, -theme.spacing.calc(2), 1, 0),
 			BackgroundTransparency = 1,
 		},
 	})

package/out/ui/packages/checkbox/components/Checkbox.luau

@@ -5,7 +5,6 @@ local React = _react
 local useState = _react.useState
 local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
 local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
-local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local useCheckboxStyles = TS.import(script, script.Parent, "Checkbox.styles").default
 local _checkboxLook = TS.import(script, script.Parent, "checkboxLook")
 local checkboxBoxTransparency = _checkboxLook.checkboxBoxTransparency
@@ -46,25 +45,26 @@ local function Checkbox(props)
 	local pointer = if active then checkboxPointer(hovering, pressed, focused) else "rest"
 	local boxTransparency = checkboxBoxTransparency(filled, disabled == true, pointer)
 	local strokeTransparency = checkboxStrokeTransparency(filled, disabled == true, pointer)
-	local _attributes = {
-		tag = "textbutton",
-	}
+	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Checkbox"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
-	_attributes.base = root
-	_attributes.className = className
-	_attributes.sx = sx
-	_attributes.state = {
-		disabled = disabled,
-		checked = filled,
-		hover = hovering,
-		pressed = pressed,
-		focused = focused,
-	}
+	_attributes.ref = ref
+	for _k, _v in 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.Active = active
 	_attributes.Selectable = not disabled
 	_attributes.BackgroundTransparency = if focused and active then 0.85 else 1
@@ -128,7 +128,7 @@ local function Checkbox(props)
 		_attributes_6.LayoutOrder = 2
 		_condition_1 = (React.createElement("textlabel", _attributes_6))
 	end
-	return React.createElement(SxHost, _attributes, _exp, _exp_3, _condition_1)
+	return React.createElement("textbutton", _attributes, _exp, _exp_3, _condition_1)
 end
 local default = Checkbox
 return {

package/out/ui/packages/checkbox/components/checkboxLook.d.ts

@@ -2,4 +2,4 @@ export type CheckboxPointer = "rest" | "hover" | "press" | "focus";
 export declare function checkboxMark(value: boolean, mixed?: boolean): "" | "–" | "✓";
 export declare function checkboxPointer(hovering: boolean, pressed: boolean, focused: boolean): CheckboxPointer;
 export declare function checkboxBoxTransparency(filled: boolean, disabled: boolean, pointer: CheckboxPointer): 1 | 0 | 0.7 | 0.55 | 0.85;
-export declare function checkboxStrokeTransparency(filled: boolean, disabled: boolean, pointer: CheckboxPointer): 0 | 0.25 | 0.45 | 0.55 | 0.2;
+export declare function checkboxStrokeTransparency(filled: boolean, disabled: boolean, pointer: CheckboxPointer): 0 | 0.25 | 0.55 | 0.45 | 0.2;

package/out/ui/packages/chip/components/Chip.d.ts

@@ -1,14 +1,9 @@
-import { ControlSize, CustomizedProps } from "../../../../theme/index";
-import { ChipColor } from "./Chip.styles";
+import { CustomizedProps } from "../../../../theme/index";
 export interface ChipProps {
     label: string;
     selected?: boolean;
     disabled?: boolean;
-    size?: ControlSize;
-    variant?: "filled" | "outlined";
-    color?: ChipColor;
     onActivated?: () => void;
-    onDelete?: () => void;
 }
 declare function Chip(props: CustomizedProps<TextButton, ChipProps>): JSX.Element;
 export default Chip;

package/out/ui/packages/chip/components/Chip.luau

@@ -1,55 +1,42 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
-local Icons = TS.import(script, script.Parent.Parent.Parent.Parent, "enums").Icons
-local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local useChipStyles = TS.import(script, script.Parent, "Chip.styles").default
 local function Chip(props)
 	local _binding = props
 	local label = _binding.label
 	local selected = _binding.selected
 	local disabled = _binding.disabled
-	local size = _binding.size
-	local variant = _binding.variant
-	if variant == nil then
-		variant = "filled"
-	end
-	local color = _binding.color
-	if color == nil then
-		color = "default"
-	end
 	local onActivated = _binding.onActivated
-	local onDelete = _binding.onDelete
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
-	local deletable = onDelete ~= nil
 	local styles = useChipStyles({
 		selected = selected,
 		disabled = disabled,
-		deletable = deletable,
-		size = size,
-		variant = variant,
-		color = color,
 	})
-	local _attributes = {
-		tag = "textbutton",
-	}
+	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Chip"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
-	_attributes.base = styles.root
-	_attributes.className = className
-	_attributes.sx = sx
-	_attributes.state = {
-		disabled = disabled,
-		selected = selected,
-	}
-	_attributes.Text = if deletable then "" else label
+	_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.Text = label
 	_attributes.Event = {
 		Activated = function()
 			if disabled ~= true then
@@ -68,38 +55,7 @@ local function Chip(props)
 	local _exp_1 = React.createElement("uicorner", _attributes_2)
 	local _attributes_3 = table.clone(styles.stroke)
 	setmetatable(_attributes_3, nil)
-	local _exp_2 = React.createElement("uistroke", _attributes_3)
-	local _condition_1 = deletable
-	if _condition_1 then
-		local _attributes_4 = table.clone(styles.row)
-		setmetatable(_attributes_4, nil)
-		local _exp_3 = React.createElement("uilistlayout", _attributes_4)
-		local _attributes_5 = {
-			key = "Label",
-		}
-		for _k, _v in styles.label do
-			_attributes_5[_k] = _v
-		end
-		_attributes_5.Text = label
-		local _exp_4 = React.createElement("textlabel", _attributes_5)
-		local _attributes_6 = {
-			key = "Delete",
-		}
-		for _k, _v in styles.delete do
-			_attributes_6[_k] = _v
-		end
-		_attributes_6.Image = tostring(Icons.Close)
-		_attributes_6.Active = disabled ~= true
-		_attributes_6.Event = {
-			Activated = function()
-				if disabled ~= true then
-					onDelete()
-				end
-			end,
-		}
-		_condition_1 = (React.createElement(React.Fragment, nil, _exp_3, _exp_4, React.createElement("imagebutton", _attributes_6)))
-	end
-	return React.createElement(SxHost, _attributes, _exp, _exp_1, _exp_2, _condition_1)
+	return React.createElement("textbutton", _attributes, _exp, _exp_1, React.createElement("uistroke", _attributes_3))
 end
 local default = Chip
 return {

package/out/ui/packages/chip/components/Chip.styles.d.ts

@@ -1,11 +1,5 @@
-import { ControlSize } from "../../../../theme/index";
-export type ChipColor = "default" | "primary";
 declare const useChipStyles: (props: {
     selected?: boolean;
     disabled?: boolean;
-    deletable?: boolean;
-    size?: ControlSize;
-    variant?: "filled" | "outlined";
-    color?: ChipColor;
 }) => import("../../../../theme/index").ClassNameMap<string>;
 export default useChipStyles;

package/out/ui/packages/chip/components/Chip.styles.luau

@@ -2,7 +2,6 @@
 local TS = _G[script]
 local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
 local componentStyles = _theme.componentStyles
-local controlMetrics = _theme.controlMetrics
 local createStyles = _theme.createStyles
 local useChipStyles = componentStyles("Chip", function(theme, _param)
 	local selected = _param.selected
@@ -13,76 +12,32 @@ local useChipStyles = componentStyles("Chip", function(theme, _param)
 	if disabled == nil then
 		disabled = false
 	end
-	local deletable = _param.deletable
-	if deletable == nil then
-		deletable = false
-	end
-	local size = _param.size
-	local variant = _param.variant
-	if variant == nil then
-		variant = "filled"
-	end
-	local color = _param.color
-	if color == nil then
-		color = "default"
-	end
-	local metrics = controlMetrics(theme.density, size)
-	local padY = if size == "small" then 0.25 elseif size == "large" then 0.75 else 0.5
-	local padX = if size == "small" then 1 elseif size == "large" then 2 else 1.5
-	local deletePx = metrics.icon
-	local primary = color == "primary"
-	local ink = if disabled then theme.palette.text.disabled elseif primary then if variant == "outlined" then theme.palette.primary.main else theme.palette.primary.on else theme.palette.text.primary
 	return createStyles({
 		root = {
 			AutomaticSize = Enum.AutomaticSize.XY,
 			Size = UDim2.fromScale(0, 0),
-			BackgroundColor3 = if primary and variant ~= "outlined" then theme.palette.primary.main elseif selected then theme.palette.action.selected else theme.palette.surface.input,
-			BackgroundTransparency = if variant == "outlined" and selected ~= true then 1 else 0,
+			BackgroundColor3 = if selected then theme.palette.action.selected else theme.palette.surface.input,
 			BorderSizePixel = 0,
 			AutoButtonColor = false,
 			Active = not disabled,
 			Selectable = not disabled,
-			TextColor3 = ink,
+			TextColor3 = if disabled then theme.palette.text.disabled else theme.palette.text.primary,
 			Font = theme.typography.fontFamilies.default,
-			TextSize = metrics.font,
+			TextSize = theme.typography.fontSizes.body,
 		},
 		padding = {
-			PaddingTop = UDim.new(0, theme.padding.calc(padY)),
-			PaddingBottom = UDim.new(0, theme.padding.calc(padY)),
-			PaddingLeft = UDim.new(0, theme.padding.calc(padX)),
-			PaddingRight = UDim.new(0, theme.padding.calc(if deletable then 0.5 else padX)),
+			PaddingTop = UDim.new(0, theme.padding.calc(0.5)),
+			PaddingBottom = UDim.new(0, theme.padding.calc(0.5)),
+			PaddingLeft = UDim.new(0, theme.padding.calc(1.5)),
+			PaddingRight = UDim.new(0, theme.padding.calc(1.5)),
 		},
 		corner = {
 			CornerRadius = UDim.new(theme.shape.pillScale, 0),
 		},
 		stroke = {
-			Color = if primary then theme.palette.primary.main else theme.palette.border,
+			Color = theme.palette.border,
 			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
-			Transparency = if variant == "outlined" then (if disabled then 0.5 else 0) elseif primary or selected then 1 else 0,
-		},
-		row = {
-			FillDirection = Enum.FillDirection.Horizontal,
-			VerticalAlignment = Enum.VerticalAlignment.Center,
-			SortOrder = Enum.SortOrder.LayoutOrder,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
-		},
-		label = {
-			AutomaticSize = Enum.AutomaticSize.XY,
-			Size = UDim2.fromScale(0, 0),
-			BackgroundTransparency = 1,
-			BorderSizePixel = 0,
-			TextColor3 = ink,
-			Font = theme.typography.fontFamilies.default,
-			TextSize = metrics.font,
-			LayoutOrder = 1,
-		},
-		delete = {
-			Size = UDim2.fromOffset(deletePx, deletePx),
-			BackgroundTransparency = 1,
-			BorderSizePixel = 0,
-			AutoButtonColor = false,
-			ImageColor3 = if disabled then theme.palette.text.disabled elseif primary and variant ~= "outlined" then theme.palette.primary.on else theme.palette.text.secondary,
-			LayoutOrder = 2,
+			Transparency = if selected then 1 else 0,
 		},
 	})
 end)

package/out/ui/packages/circularProgress/components/CircularProgress.luau

@@ -6,12 +6,10 @@ local useEffect = _react.useEffect
 local useRef = _react.useRef
 local useReducedMotion = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "hooks").useReducedMotion
 local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
-local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local _motion = TS.import(script, script.Parent.Parent.Parent, "motion")
 local arcKeys = _motion.arcKeys
 local loopProperty = _motion.loopProperty
 local progressSpin = _motion.progressSpin
-local spinArcKeys = _motion.spinArcKeys
 local function CircularProgress(props)
 	local _binding = props
 	local value = _binding.value
@@ -40,17 +38,7 @@ local function CircularProgress(props)
 	local shown = if indeterminate then (if motion == "spin" then nil else 0.25) else value
 	local _result
 	if shown == nil then
-		local _exp = spinArcKeys()
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#_exp)
-		local _callback = function(key)
-			return NumberSequenceKeypoint.new(key.time, key.transparency)
-		end
-		for _k, _v in _exp do
-			_newValue[_k] = _callback(_v, _k - 1, _exp)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		_result = NumberSequence.new(_newValue)
+		_result = NumberSequence.new({ NumberSequenceKeypoint.new(0, 1), NumberSequenceKeypoint.new(0.35, 1), NumberSequenceKeypoint.new(0.5, 0), NumberSequenceKeypoint.new(0.65, 1), NumberSequenceKeypoint.new(1, 1) })
 	else
 		local _exp = arcKeys(shown)
 		-- ▼ ReadonlyArray.map ▼
@@ -78,31 +66,32 @@ local function CircularProgress(props)
 		end
 		gradient.Rotation = -90
 	end, { motion })
-	local _attributes = {
-		tag = "frame",
-	}
+	local _attributes = {}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "CircularProgress"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
-	_attributes.base = {
-		Size = UDim2.new(0, size, 0, size),
-		BackgroundTransparency = 1,
-		BorderSizePixel = 0,
-	}
-	_attributes.className = className
-	_attributes.sx = sx
-	_attributes.state = {
-		disabled = disabled,
-	}
-	return React.createElement(SxHost, _attributes, React.createElement("uicorner", {
+	_attributes.ref = ref
+	_attributes.Size = UDim2.new(0, size, 0, size)
+	_attributes.BackgroundTransparency = 1
+	_attributes.BorderSizePixel = 0
+	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
+	return React.createElement("frame", _attributes, React.createElement("uicorner", {
 		CornerRadius = UDim.new(1, 0),
 	}), React.createElement("uistroke", {
 		Color = tint,
 		Thickness = thickness,
-		Transparency = if disabled then 0.85 else 0.82,
+		Transparency = if disabled then 0.75 else 0.7,
 	}), React.createElement("uistroke", {
 		Color = tint,
 		Thickness = thickness,