@rbxts/uiblox 0.2.0-alpha.25 → 0.2.0-alpha.26

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

@@ -5,6 +5,7 @@ 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
@@ -45,26 +46,25 @@ 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 = {}
+	local _attributes = {
+		tag = "textbutton",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Checkbox"
 	end
 	_attributes.key = _condition
-	_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.hostRef = ref
+	_attributes.base = root
+	_attributes.className = className
+	_attributes.sx = sx
+	_attributes.state = {
+		disabled = disabled,
+		checked = filled,
+		hover = hovering,
+		pressed = pressed,
+		focused = focused,
+	}
 	_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("textbutton", _attributes, _exp, _exp_3, _condition_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_3, _condition_1)
 end
 local default = Checkbox
 return {

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

@@ -2,6 +2,7 @@
 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
@@ -32,26 +33,22 @@ local function Chip(props)
 		variant = variant,
 		color = color,
 	})
-	local _attributes = {}
+	local _attributes = {
+		tag = "textbutton",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Chip"
 	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,
+		selected = selected,
+	}
 	_attributes.Text = if deletable then "" else label
 	_attributes.Event = {
 		Activated = function()
@@ -102,7 +99,7 @@ local function Chip(props)
 		}
 		_condition_1 = (React.createElement(React.Fragment, nil, _exp_3, _exp_4, React.createElement("imagebutton", _attributes_6)))
 	end
-	return React.createElement("textbutton", _attributes, _exp, _exp_1, _exp_2, _condition_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_1, _exp_2, _condition_1)
 end
 local default = Chip
 return {

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

@@ -6,6 +6,7 @@ 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
@@ -77,27 +78,26 @@ local function CircularProgress(props)
 		end
 		gradient.Rotation = -90
 	end, { motion })
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "CircularProgress"
 	end
 	_attributes.key = _condition
-	_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", {
+	_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", {
 		CornerRadius = UDim.new(1, 0),
 	}), React.createElement("uistroke", {
 		Color = tint,

package/out/ui/packages/colorPicker/components/ColorPicker.luau

@@ -7,6 +7,7 @@ local useRef = _react.useRef
 local useState = _react.useState
 local UserInputService = TS.import(script, TS.getModule(script, "@rbxts", "services")).UserInputService
 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 canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
 local Input = TS.import(script, script.Parent.Parent.Parent, "input").Input
 local NumberInput = TS.import(script, script.Parent.Parent.Parent, "numberInput").NumberInput
@@ -391,26 +392,21 @@ local function ColorPicker(props)
 			return connection:Disconnect()
 		end
 	end, { shown, value })
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "ColorPicker"
 	end
 	_attributes.key = _condition
-	_attributes.ref = ref
-	for _k, _v in styles.field 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.field
+	_attributes.className = className
+	_attributes.sx = sx
+	_attributes.state = {
+		disabled = disabled,
+	}
 	local _attributes_1 = table.clone(styles.rowLayout)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
@@ -504,7 +500,7 @@ local function ColorPicker(props)
 			onChange = onChange,
 		}))))
 	end
-	return React.createElement("frame", _attributes, _exp, _exp_2, _exp_3, _condition_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_2, _exp_3, _condition_1)
 end
 local default = ColorPicker
 return {

package/out/ui/packages/colorPicker/components/ColorSequenceEditor.luau

@@ -4,6 +4,7 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local React = _react
 local useRef = _react.useRef
 local useState = _react.useState
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
 local ColorPicker = TS.import(script, script.Parent, "ColorPicker").default
 local useColorPickerStyles = TS.import(script, script.Parent, "ColorPicker.styles").default
@@ -43,26 +44,21 @@ local function ColorSequenceEditor(props)
 		end
 		return math.clamp((position.X - rbx.AbsolutePosition.X) / width, 0, 1)
 	end
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "ColorSequenceEditor"
 	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,
+	}
 	_attributes.Selectable = false
 	local _attributes_1 = table.clone(styles.column)
 	setmetatable(_attributes_1, nil)
@@ -185,7 +181,7 @@ local function ColorSequenceEditor(props)
 		}
 		_condition_1 = (React.createElement("textbutton", _attributes_5))
 	end
-	return React.createElement("frame", _attributes, _exp, _exp_4, _exp_5, _condition_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_4, _exp_5, _condition_1)
 end
 local default = ColorSequenceEditor
 return {

package/out/ui/packages/colorPicker/components/NumberSequenceEditor.luau

@@ -4,6 +4,7 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local React = _react
 local useRef = _react.useRef
 local useState = _react.useState
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local canActivate = TS.import(script, script.Parent.Parent.Parent, "button", "components", "activation").canActivate
 local NumberInput = TS.import(script, script.Parent.Parent.Parent, "numberInput").NumberInput
 local useColorPickerStyles = TS.import(script, script.Parent, "ColorPicker.styles").default
@@ -44,26 +45,21 @@ local function NumberSequenceEditor(props)
 		end
 		return math.clamp((position.X - rbx.AbsolutePosition.X) / width, 0, 1)
 	end
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "NumberSequenceEditor"
 	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,
+	}
 	_attributes.Selectable = false
 	local _attributes_1 = table.clone(styles.column)
 	setmetatable(_attributes_1, nil)
@@ -239,7 +235,7 @@ local function NumberSequenceEditor(props)
 		}
 		_condition_1 = (React.createElement("textbutton", _attributes_15))
 	end
-	return React.createElement("frame", _attributes, _exp, _exp_4, _exp_11, _condition_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_4, _exp_11, _condition_1)
 end
 local default = NumberSequenceEditor
 return {

package/out/ui/packages/dialog/components/Dialog.d.ts

@@ -1,4 +1,5 @@
 import React from "@rbxts/react";
+import { CustomizedProps } from "../../../../theme/index";
 export interface DialogProps {
     host?: Instance;
     open: boolean;
@@ -7,5 +8,5 @@ export interface DialogProps {
     children?: React.ReactNode;
     actions?: React.ReactNode;
 }
-declare function Dialog(props: DialogProps): JSX.Element;
+declare function Dialog(props: CustomizedProps<Frame, DialogProps>): JSX.Element;
 export default Dialog;

package/out/ui/packages/dialog/components/Dialog.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 Modal = TS.import(script, script.Parent.Parent.Parent, "modal").Modal
 local useDialogStyles = TS.import(script, script.Parent, "Dialog.styles").default
 local function Dialog(props)
@@ -11,20 +12,30 @@ local function Dialog(props)
 	local onClose = _binding.onClose
 	local children = _binding.children
 	local actions = _binding.actions
+	local className = _binding.className
+	local sx = _binding.sx
+	local id = _binding.id
+	local ref = _binding.ref
 	local styles = useDialogStyles()
 	local hasTitle = title ~= nil and title ~= ""
 	local hasActions = actions ~= nil
 	local _attributes = {
-		key = "Column",
+		tag = "frame",
 	}
-	for _k, _v in styles.column do
-		_attributes[_k] = _v
+	local _condition = id
+	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
+		_condition = "Column"
 	end
+	_attributes.key = _condition
+	_attributes.hostRef = ref
+	_attributes.base = styles.column
+	_attributes.className = className
+	_attributes.sx = sx
 	local _attributes_1 = table.clone(styles.columnList)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
-	local _condition = hasTitle
-	if _condition then
+	local _condition_1 = hasTitle
+	if _condition_1 then
 		local _attributes_2 = {
 			key = "Title",
 		}
@@ -32,7 +43,7 @@ local function Dialog(props)
 			_attributes_2[_k] = _v
 		end
 		_attributes_2.Text = title
-		_condition = React.createElement("textlabel", _attributes_2)
+		_condition_1 = React.createElement("textlabel", _attributes_2)
 	end
 	local _attributes_2 = {
 		key = "Body",
@@ -41,8 +52,8 @@ local function Dialog(props)
 		_attributes_2[_k] = _v
 	end
 	local _exp_1 = React.createElement("frame", _attributes_2, children)
-	local _condition_1 = hasActions
-	if _condition_1 then
+	local _condition_2 = hasActions
+	if _condition_2 then
 		local _attributes_3 = {
 			key = "Actions",
 		}
@@ -51,13 +62,13 @@ local function Dialog(props)
 		end
 		local _attributes_4 = table.clone(styles.actionList)
 		setmetatable(_attributes_4, nil)
-		_condition_1 = (React.createElement("frame", _attributes_3, React.createElement("uilistlayout", _attributes_4), actions))
+		_condition_2 = (React.createElement("frame", _attributes_3, React.createElement("uilistlayout", _attributes_4), actions))
 	end
 	return React.createElement(Modal, {
 		host = host,
 		open = open,
 		onClose = onClose,
-	}, React.createElement("frame", _attributes, _exp, _condition, _exp_1, _condition_1))
+	}, React.createElement(SxHost, _attributes, _exp, _condition_1, _exp_1, _condition_2))
 end
 local default = Dialog
 return {

package/out/ui/packages/divider/components/Divider.luau

@@ -2,6 +2,7 @@
 local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local Orientations = TS.import(script, script.Parent.Parent.Parent.Parent, "enums").Orientations
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local dividerLabel = TS.import(script, script.Parent, "dividerLabel").dividerLabel
 local useDividerStyles = TS.import(script, script.Parent, "Divider.styles").default
 local function Divider(props)
@@ -20,26 +21,18 @@ local function Divider(props)
 	local captionPad = _binding_1.captionPad
 	local label = dividerLabel(text)
 	if label ~= nil and orientation ~= Orientations.Vertical then
-		local _attributes = {}
+		local _attributes = {
+			tag = "frame",
+		}
 		local _condition = id
 		if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 			_condition = "Divider"
 		end
 		_attributes.key = _condition
-		_attributes.ref = ref
-		for _k, _v in shell do
-			_attributes[_k] = _v
-		end
-		if className ~= 0 and className == className and className ~= "" and className then
-			for _k, _v in className do
-				_attributes[_k] = _v
-			end
-		end
-		if sx ~= 0 and sx == sx and sx ~= "" and sx then
-			for _k, _v in sx do
-				_attributes[_k] = _v
-			end
-		end
+		_attributes.hostRef = ref
+		_attributes.base = shell
+		_attributes.className = className
+		_attributes.sx = sx
 		local _attributes_1 = {
 			key = "Line",
 		}
@@ -56,30 +49,24 @@ local function Divider(props)
 		_attributes_2.Text = label
 		local _attributes_3 = table.clone(captionPad)
 		setmetatable(_attributes_3, nil)
-		return React.createElement("frame", _attributes, _exp, React.createElement("textlabel", _attributes_2, React.createElement("uipadding", _attributes_3)))
+		return React.createElement(SxHost, _attributes, _exp, React.createElement("textlabel", _attributes_2, React.createElement("uipadding", _attributes_3)))
 	end
-	local _attributes = {}
+	local _attributes = {
+		tag = "frame",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Divider"
 	end
 	_attributes.key = _condition
-	_attributes.ref = ref
-	for _k, _v in root do
-		_attributes[_k] = _v
-	end
-	_attributes.BorderSizePixel = 0
-	if className ~= 0 and className == className and className ~= "" and className then
-		for _k, _v in className do
-			_attributes[_k] = _v
-		end
-	end
-	if sx ~= 0 and sx == sx and sx ~= "" and sx then
-		for _k, _v in sx do
-			_attributes[_k] = _v
-		end
-	end
-	return React.createElement("frame", _attributes)
+	_attributes.hostRef = ref
+	local _object = table.clone(root)
+	setmetatable(_object, nil)
+	_object.BorderSizePixel = 0
+	_attributes.base = _object
+	_attributes.className = className
+	_attributes.sx = sx
+	return React.createElement(SxHost, _attributes)
 end
 local default = Divider
 return {

package/out/ui/packages/drawer/components/Drawer.d.ts

@@ -1,4 +1,5 @@
 import React from "@rbxts/react";
+import { CustomizedProps } from "../../../../theme/index";
 import { DrawerEdge } from "./drawerPlacement";
 export interface DrawerProps {
     host?: Instance;
@@ -8,5 +9,5 @@ export interface DrawerProps {
     onClose: () => void;
     children?: React.ReactNode;
 }
-declare function Drawer(props: DrawerProps): JSX.Element;
+declare function Drawer(props: CustomizedProps<Frame, DrawerProps>): JSX.Element;
 export default Drawer;

package/out/ui/packages/drawer/components/Drawer.luau

@@ -6,10 +6,11 @@ local useEffect = _react.useEffect
 local useRef = _react.useRef
 local useState = _react.useState
 local UserInputService = TS.import(script, TS.getModule(script, "@rbxts", "services")).UserInputService
+local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
+local isDismissInput = TS.import(script, script.Parent.Parent.Parent, "modal", "components", "dismissInput").isDismissInput
 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.Parent.Parent, "modal", "components", "dismissInput").isDismissInput
 local drawerAnchor = TS.import(script, script.Parent, "drawerPlacement").drawerAnchor
 local useDrawerStyles = TS.import(script, script.Parent, "Drawer.styles").default
 local function Drawer(props)
@@ -23,6 +24,10 @@ local function Drawer(props)
 	local width = _binding.width
 	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 = useDrawerStyles({
 		width = width,
 	})
@@ -49,6 +54,7 @@ local function Drawer(props)
 		end
 	end, { open, layer })
 	local placement = drawerAnchor(edge)
+	local panelStyle = styles.panel
 	local _exp = React.createElement("frame", {
 		key = "DrawerAnchor",
 		ref = anchor,
@@ -77,18 +83,25 @@ local function Drawer(props)
 		}
 		local _exp_1 = React.createElement("textbutton", _attributes_1)
 		local _attributes_2 = {
-			key = "Panel",
+			tag = "frame",
 		}
-		for _k, _v in styles.panel do
-			_attributes_2[_k] = _v
+		local _condition_1 = id
+		if not (_condition_1 ~= 0 and _condition_1 == _condition_1 and _condition_1 ~= "" and _condition_1) then
+			_condition_1 = "Panel"
 		end
+		_attributes_2.key = _condition_1
+		_attributes_2.hostRef = ref
+		_attributes_2.base = panelStyle
+		_attributes_2.className = className
+		_attributes_2.sx = sx
 		_attributes_2.AnchorPoint = Vector2.new(placement, 0)
 		_attributes_2.Position = UDim2.fromScale(placement, 0)
+		_attributes_2.ZIndex = panelStyle.ZIndex
 		local _attributes_3 = table.clone(styles.padding)
 		setmetatable(_attributes_3, nil)
 		_condition = (React.createElement(Portal, {
 			host = layer,
-		}, React.createElement("frame", _attributes, _exp_1, React.createElement("frame", _attributes_2, React.createElement("uipadding", _attributes_3), children))))
+		}, React.createElement("frame", _attributes, _exp_1, React.createElement(SxHost, _attributes_2, React.createElement("uipadding", _attributes_3), children))))
 	end
 	return React.createElement(React.Fragment, nil, _exp, _condition)
 end

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

@@ -7,6 +7,7 @@ local useState = _react.useState
 local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
 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 SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local Shadow = TS.import(script, script.Parent.Parent.Parent, "shadow").Shadow
 local _fabSize = TS.import(script, script.Parent, "fabSize")
 local fabExtended = _fabSize.fabExtended
@@ -83,26 +84,24 @@ local function Fab(props)
 		_result = (React.createElement("imagelabel", _attributes))
 	end
 	local iconEl = _result
-	local _attributes = {}
+	local _attributes = {
+		tag = "textbutton",
+	}
 	local _condition = id
 	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
 		_condition = "Fab"
 	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,
+		loading = loading,
+		hover = hovering,
+		focused = focused,
+	}
 	_attributes.Active = active
 	_attributes.Selectable = active
 	_attributes.BackgroundTransparency = if not active then 0.5 elseif hovering or focused then 0.15 else 0
@@ -157,7 +156,7 @@ local function Fab(props)
 	else
 		_result_1 = iconEl
 	end
-	return React.createElement("textbutton", _attributes, _exp, _exp_1, _result_1)
+	return React.createElement(SxHost, _attributes, _exp, _exp_1, _result_1)
 end
 local default = Fab
 return {