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

package/out/ui/packages/gradientEditor/components/GradientEditor.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 useEditorHover = TS.import(script, script.Parent.Parent.Parent, "editorFace").useEditorHover
 local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local _colorPicker = TS.import(script, script.Parent.Parent.Parent, "colorPicker")
 local ColorSequenceEditor = _colorPicker.ColorSequenceEditor
@@ -22,6 +23,7 @@ local function GradientEditor(props)
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = useGradientEditorStyles()
+	local hover = useEditorHover(disabled)
 	local _attributes = {
 		tag = "frame",
 	}
@@ -31,12 +33,18 @@ local function GradientEditor(props)
 	end
 	_attributes.key = _condition
 	_attributes.hostRef = ref
-	_attributes.base = styles.root
+	local _object = table.clone(styles.root)
+	setmetatable(_object, nil)
+	for _k, _v in hover.face do
+		_object[_k] = _v
+	end
+	_attributes.base = _object
 	_attributes.className = className
 	_attributes.sx = sx
 	_attributes.state = {
 		disabled = disabled,
 	}
+	_attributes.Event = hover.event
 	local _attributes_1 = table.clone(styles.column)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)
@@ -58,10 +66,10 @@ local function GradientEditor(props)
 		value = value.color,
 		disabled = disabled,
 		onChange = function(color)
-			local _object = table.clone(value)
-			setmetatable(_object, nil)
-			_object.color = color
-			return onChange(_object)
+			local _object_1 = table.clone(value)
+			setmetatable(_object_1, nil)
+			_object_1.color = color
+			return onChange(_object_1)
 		end,
 	}))
 	local _attributes_5 = {
@@ -82,10 +90,10 @@ local function GradientEditor(props)
 		value = value.transparency,
 		disabled = disabled,
 		onChange = function(transparency)
-			local _object = table.clone(value)
-			setmetatable(_object, nil)
-			_object.transparency = transparency
-			return onChange(_object)
+			local _object_1 = table.clone(value)
+			setmetatable(_object_1, nil)
+			_object_1.transparency = transparency
+			return onChange(_object_1)
 		end,
 	}))
 	local _attributes_8 = {
@@ -142,10 +150,10 @@ local function GradientEditor(props)
 		value = value.offset,
 		disabled = disabled,
 		onChange = function(offset)
-			local _object = table.clone(value)
-			setmetatable(_object, nil)
-			_object.offset = offset
-			return onChange(_object)
+			local _object_1 = table.clone(value)
+			setmetatable(_object_1, nil)
+			_object_1.offset = offset
+			return onChange(_object_1)
 		end,
 	})))
 	local _attributes_17 = {

package/out/ui/packages/gradientEditor/components/GradientEditor.styles.luau

@@ -3,8 +3,11 @@ local TS = _G[script]
 local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
 local createStyles = _theme.createStyles
 local componentStyles = _theme.componentStyles
+local _editorFace = TS.import(script, script.Parent.Parent.Parent, "editorFace")
+local editorPad = _editorFace.editorPad
+local editorText = _editorFace.editorText
 local useGradientEditorStyles = componentStyles("GradientEditor", function(theme)
-	return createStyles({
+	local _object = {
 		root = {
 			Size = UDim2.new(1, 0, 0, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
@@ -13,7 +16,7 @@ local useGradientEditorStyles = componentStyles("GradientEditor", function(theme
 		},
 		column = {
 			FillDirection = Enum.FillDirection.Vertical,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
+			Padding = UDim.new(0, editorPad(theme)),
 			SortOrder = Enum.SortOrder.LayoutOrder,
 		},
 		block = {
@@ -21,48 +24,53 @@ local useGradientEditorStyles = componentStyles("GradientEditor", function(theme
 			AutomaticSize = Enum.AutomaticSize.Y,
 			BackgroundTransparency = 1,
 		},
-		label = {
-			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,
-		},
-		metrics = {
-			Size = UDim2.new(1, 0, 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
-			BackgroundTransparency = 1,
-		},
-		metricsRow = {
-			FillDirection = Enum.FillDirection.Horizontal,
-			Padding = UDim.new(0, theme.padding.calc(1)),
-			VerticalAlignment = Enum.VerticalAlignment.Top,
-			SortOrder = Enum.SortOrder.LayoutOrder,
-		},
-		metric = {
-			Size = UDim2.new(0.5, -theme.padding.calc(0.5), 0, 0),
-			AutomaticSize = Enum.AutomaticSize.Y,
-			BackgroundTransparency = 1,
-		},
-		metricInner = {
-			FillDirection = Enum.FillDirection.Vertical,
-			Padding = UDim.new(0, theme.padding.calc(0.5)),
-			SortOrder = Enum.SortOrder.LayoutOrder,
-		},
-		metricLabel = {
-			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,
-		},
-		metricField = {
-			Size = UDim2.new(1, 0, 0, theme.spacing.calc(3)),
-			BackgroundTransparency = 1,
-		},
-	})
+	}
+	local _left = "label"
+	local _object_1 = {
+		Size = UDim2.new(1, 0, 0, theme.spacing.calc(2)),
+		BackgroundTransparency = 1,
+		TextColor3 = theme.palette.text.secondary,
+	}
+	for _k, _v in editorText(theme) do
+		_object_1[_k] = _v
+	end
+	_object[_left] = _object_1
+	_object.metrics = {
+		Size = UDim2.new(1, 0, 0, 0),
+		AutomaticSize = Enum.AutomaticSize.Y,
+		BackgroundTransparency = 1,
+	}
+	_object.metricsRow = {
+		FillDirection = Enum.FillDirection.Horizontal,
+		Padding = UDim.new(0, editorPad(theme)),
+		VerticalAlignment = Enum.VerticalAlignment.Top,
+		SortOrder = Enum.SortOrder.LayoutOrder,
+	}
+	_object.metric = {
+		Size = UDim2.new(0.5, -editorPad(theme) / 2, 0, 0),
+		AutomaticSize = Enum.AutomaticSize.Y,
+		BackgroundTransparency = 1,
+	}
+	_object.metricInner = {
+		FillDirection = Enum.FillDirection.Vertical,
+		Padding = UDim.new(0, editorPad(theme)),
+		SortOrder = Enum.SortOrder.LayoutOrder,
+	}
+	local _left_1 = "metricLabel"
+	local _object_2 = {
+		Size = UDim2.new(1, 0, 0, theme.spacing.calc(2)),
+		BackgroundTransparency = 1,
+		TextColor3 = theme.palette.text.secondary,
+	}
+	for _k, _v in editorText(theme) do
+		_object_2[_k] = _v
+	end
+	_object[_left_1] = _object_2
+	_object.metricField = {
+		Size = UDim2.new(1, 0, 0, theme.spacing.calc(3)),
+		BackgroundTransparency = 1,
+	}
+	return createStyles(_object)
 end)
 local default = useGradientEditorStyles
 return {

package/out/ui/packages/icon/components/DrawnGlyph.d.ts

@@ -0,0 +1,11 @@
+import { Glyph } from "./glyphs";
+interface DrawnGlyphProps {
+    name: Glyph;
+    size: number;
+    color: Color3;
+    transparency?: number;
+    zIndex?: number;
+}
+/** Fills its parent. Parts are placed by scale so only the stroke weight depends on `size`. */
+export declare function DrawnGlyph(props: DrawnGlyphProps): JSX.Element;
+export {};

package/out/ui/packages/icon/components/DrawnGlyph.luau

@@ -0,0 +1,87 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local _glyphs = TS.import(script, script.Parent, "glyphs")
+local glyphParts = _glyphs.glyphParts
+local glyphStroke = _glyphs.glyphStroke
+local GRID = 24
+local PILL = UDim.new(1, 0)
+local CENTER = Vector2.new(0.5, 0.5)
+--* Fills its parent. Parts are placed by scale so only the stroke weight depends on `size`. 
+local function DrawnGlyph(props)
+	local _binding = props
+	local name = _binding.name
+	local size = _binding.size
+	local color = _binding.color
+	local transparency = _binding.transparency
+	if transparency == nil then
+		transparency = 0
+	end
+	local zIndex = _binding.zIndex
+	local t = glyphStroke(size)
+	local _exp = glyphParts(name)
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(part, index)
+		local key = `g{index}`
+		if part.kind == "bar" then
+			local dx = part.x2 - part.x1
+			local dy = part.y2 - part.y1
+			return React.createElement("frame", {
+				key = key,
+				AnchorPoint = CENTER,
+				Position = UDim2.fromScale((part.x1 + part.x2) / 2 / GRID, (part.y1 + part.y2) / 2 / GRID),
+				Size = UDim2.new(math.sqrt(dx * dx + dy * dy) / GRID, t, 0, t),
+				Rotation = math.deg(math.atan2(dy, dx)),
+				BackgroundColor3 = color,
+				BackgroundTransparency = transparency,
+				BorderSizePixel = 0,
+				ZIndex = zIndex,
+			}, React.createElement("uicorner", {
+				CornerRadius = PILL,
+			}))
+		end
+		if part.kind == "dot" then
+			return React.createElement("frame", {
+				key = key,
+				AnchorPoint = CENTER,
+				Position = UDim2.fromScale(part.x / GRID, part.y / GRID),
+				Size = UDim2.fromScale(part.d / GRID, part.d / GRID),
+				SizeConstraint = Enum.SizeConstraint.RelativeXX,
+				BackgroundColor3 = color,
+				BackgroundTransparency = transparency,
+				BorderSizePixel = 0,
+				ZIndex = zIndex,
+			}, React.createElement("uicorner", {
+				CornerRadius = PILL,
+			}))
+		end
+		local ringed = part.kind == "ring"
+		local w = if ringed then part.d else part.w
+		local h = if ringed then part.d else part.h
+		local x = if ringed then part.x - part.d / 2 else part.x
+		local y = if ringed then part.y - part.d / 2 else part.y
+		return React.createElement("frame", {
+			key = key,
+			Position = UDim2.new(x / GRID, t, y / GRID, t),
+			Size = UDim2.new(w / GRID, -t * 2, h / GRID, -t * 2),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			ZIndex = zIndex,
+		}, React.createElement("uicorner", {
+			CornerRadius = if ringed then PILL else UDim.new(0, t),
+		}), React.createElement("uistroke", {
+			Color = color,
+			Thickness = t,
+			Transparency = transparency,
+		}))
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	return React.createElement(React.Fragment, nil, _newValue)
+end
+return {
+	DrawnGlyph = DrawnGlyph,
+}

package/out/ui/packages/icon/components/Icon.d.ts

@@ -1,8 +1,12 @@
 import { Icons } from "../../../enums/index";
 import { CustomizedProps } from "../../../../theme/index";
+import { Glyph } from "./glyphs";
 export interface IconProps {
-    icon: Icons;
-    size?: "xxs" | "xs" | "sm" | "md" | "lg" | "xl";
+    icon?: Icons;
+    /** Drawn glyph. Wins over `icon`. */
+    glyph?: Glyph;
+    /** Named step, or pixels from `controlMetrics().icon`. */
+    size?: "xxs" | "xs" | "sm" | "md" | "lg" | "xl" | number;
     tint?: Color3;
 }
 type DefaultIconComponent = ImageLabel;

package/out/ui/packages/icon/components/Icon.luau

@@ -2,10 +2,12 @@
 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 DrawnGlyph = TS.import(script, script.Parent, "DrawnGlyph").DrawnGlyph
 local useIconStyles = TS.import(script, script.Parent, "Icon.styles").default
 local function Icon(props)
 	local _binding = props
 	local icon = _binding.icon
+	local glyph = _binding.glyph
 	local tint = _binding.tint
 	local className = _binding.className
 	local sx = _binding.sx
@@ -13,6 +15,7 @@ local function Icon(props)
 	local ref = _binding.ref
 	local _binding_1 = useIconStyles(props)
 	local container = _binding_1.container
+	local color = tint or (container.ImageColor3)
 	local _attributes = {
 		tag = "imagelabel",
 	}
@@ -25,9 +28,26 @@ local function Icon(props)
 	_attributes.base = container
 	_attributes.className = className
 	_attributes.sx = sx
-	_attributes.Image = tostring(icon)
-	_attributes.ImageColor3 = tint or container.ImageColor3
-	return React.createElement(SxHost, _attributes)
+	_attributes.Image = if glyph ~= nil or icon == nil then "" else tostring(icon)
+	_attributes.ImageColor3 = color
+	local _condition_1 = glyph ~= nil
+	if _condition_1 then
+		local _attributes_1 = {
+			name = glyph,
+		}
+		local _result = container.Size
+		if _result ~= nil then
+			_result = _result.X.Offset
+		end
+		local _condition_2 = _result
+		if _condition_2 == nil then
+			_condition_2 = 16
+		end
+		_attributes_1.size = _condition_2
+		_attributes_1.color = color
+		_condition_1 = (React.createElement(DrawnGlyph, _attributes_1))
+	end
+	return React.createElement(SxHost, _attributes, _condition_1)
 end
 local default = Icon
 return {

package/out/ui/packages/icon/components/Icon.styles.luau

@@ -7,6 +7,9 @@ local useIconStyles = componentStyles("Icon", function(theme, props)
 	local getIconSize = function(props)
 		local _binding = props
 		local size = _binding.size
+		if type(size) == "number" then
+			return UDim2.fromOffset(size, size)
+		end
 		repeat
 			if size == "xxs" then
 				return UDim2.new(0, theme.spacing.calc(1), 0, theme.spacing.calc(1))

package/out/ui/packages/icon/components/glyphs.d.ts

@@ -0,0 +1,28 @@
+export type Glyph = "close" | "chevronDown" | "chevronRight" | "check" | "add" | "remove" | "search" | "menu" | "more" | "error" | "warning" | "info" | "success" | "folder" | "expand";
+/** On a 24-unit grid. Bars run between two points, rings and dots sit on a center, boxes span a corner and size. */
+export type GlyphPart = {
+    kind: "bar";
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+} | {
+    kind: "ring";
+    x: number;
+    y: number;
+    d: number;
+} | {
+    kind: "dot";
+    x: number;
+    y: number;
+    d: number;
+} | {
+    kind: "box";
+    x: number;
+    y: number;
+    w: number;
+    h: number;
+};
+export declare function glyphParts(name: Glyph): GlyphPart[];
+/** Stroke weight for a glyph drawn at `size` pixels. */
+export declare function glyphStroke(size: number): number;

package/out/ui/packages/icon/components/glyphs.luau

@@ -0,0 +1,64 @@
+-- Compiled with roblox-ts v3.0.0
+--* On a 24-unit grid. Bars run between two points, rings and dots sit on a center, boxes span a corner and size. 
+local bar = function(x1, y1, x2, y2)
+	return {
+		kind = "bar",
+		x1 = x1,
+		y1 = y1,
+		x2 = x2,
+		y2 = y2,
+	}
+end
+local ring = function(x, y, d)
+	return {
+		kind = "ring",
+		x = x,
+		y = y,
+		d = d,
+	}
+end
+local dot = function(x, y, d)
+	return {
+		kind = "dot",
+		x = x,
+		y = y,
+		d = d,
+	}
+end
+local box = function(x, y, w, h)
+	return {
+		kind = "box",
+		x = x,
+		y = y,
+		w = w,
+		h = h,
+	}
+end
+local GLYPHS = {
+	close = { bar(6, 6, 18, 18), bar(18, 6, 6, 18) },
+	chevronDown = { bar(6, 9, 12, 15), bar(12, 15, 18, 9) },
+	chevronRight = { bar(9, 6, 15, 12), bar(15, 12, 9, 18) },
+	check = { bar(5, 12.5, 10, 17.5), bar(10, 17.5, 19, 7.5) },
+	add = { bar(12, 5, 12, 19), bar(5, 12, 19, 12) },
+	remove = { bar(5, 12, 19, 12) },
+	search = { ring(10.5, 10.5, 11), bar(15, 15, 19.5, 19.5) },
+	menu = { bar(4, 7, 20, 7), bar(4, 12, 20, 12), bar(4, 17, 20, 17) },
+	more = { dot(5.5, 12, 3.5), dot(12, 12, 3.5), dot(18.5, 12, 3.5) },
+	error = { ring(12, 12, 18), bar(12, 7.5, 12, 12.5), dot(12, 16, 2.5) },
+	warning = { bar(12, 4, 21, 19.5), bar(21, 19.5, 3, 19.5), bar(3, 19.5, 12, 4), bar(12, 9.5, 12, 14), dot(12, 17, 2.5) },
+	info = { ring(12, 12, 18), dot(12, 8, 2.5), bar(12, 11, 12, 16.5) },
+	success = { ring(12, 12, 18), bar(8, 12.5, 11, 15.5), bar(11, 15.5, 16.5, 9) },
+	folder = { box(3, 8, 18, 11), box(3, 5, 7, 4) },
+	expand = { bar(4, 9, 4, 4), bar(4, 4, 9, 4), bar(15, 4, 20, 4), bar(20, 4, 20, 9), bar(20, 15, 20, 20), bar(20, 20, 15, 20), bar(9, 20, 4, 20), bar(4, 20, 4, 15) },
+}
+local function glyphParts(name)
+	return GLYPHS[name]
+end
+--* Stroke weight for a glyph drawn at `size` pixels. 
+local function glyphStroke(size)
+	return math.max(1, math.floor(size / 9))
+end
+return {
+	glyphParts = glyphParts,
+	glyphStroke = glyphStroke,
+}

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

@@ -1,3 +1,4 @@
 export { default as Icon } from "./components/Icon";
 export { IconProps } from "./components/Icon";
 export * from "./components/Icon";
+export { Glyph } from "./components/glyphs";

package/out/ui/packages/iconButton/components/IconButton.d.ts

@@ -1,7 +1,12 @@
 import { Icons } from "../../../enums/index";
 import { CustomizedProps } from "../../../../theme/index";
+import { Glyph } from "../../icon/components/glyphs";
+import { TransportGlyph } from "./transportGlyph";
 export interface IconButtonProps {
-    icon: Icons;
+    icon?: Icons;
+    glyph?: TransportGlyph | Glyph;
+    /** Glyph pixels, usually `controlMetrics().icon`. `size` stays the hit target. */
+    iconSize?: number;
     size?: "xxs" | "xs" | "sm" | "md" | "lg" | "xl";
     tint: Color3;
     selected?: boolean;

package/out/ui/packages/iconButton/components/IconButton.luau

@@ -5,14 +5,27 @@ local React = _react
 local useEffect = _react.useEffect
 local useState = _react.useState
 local useReducedMotion = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "hooks").useReducedMotion
+local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
+local focusRing = _theme.focusRing
+local useTheme = _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 iconSpinnerPixels = TS.import(script, script.Parent.Parent.Parent, "button", "components", "buttonLook").iconSpinnerPixels
 local CircularProgress = TS.import(script, script.Parent.Parent.Parent, "circularProgress").CircularProgress
+local DrawnGlyph = TS.import(script, script.Parent.Parent.Parent, "icon", "components", "DrawnGlyph").DrawnGlyph
+local _iconButtonBox = TS.import(script, script.Parent, "iconButtonBox")
+local iconButtonFace = _iconButtonBox.iconButtonFace
+local iconButtonScale = _iconButtonBox.iconButtonScale
+local iconGlyphExtent = _iconButtonBox.iconGlyphExtent
 local useIconButtonStyles = TS.import(script, script.Parent, "IconButton.styles").default
+local _transportGlyph = TS.import(script, script.Parent, "transportGlyph")
+local isTransportGlyph = _transportGlyph.isTransportGlyph
+local transportGlyph = _transportGlyph.transportGlyph
 local function IconButton(props)
 	local _binding = props
 	local icon = _binding.icon
+	local glyph = _binding.glyph
+	local iconSize = _binding.iconSize
 	local selected = _binding.selected
 	local tint = _binding.tint
 	local disabled = _binding.disabled
@@ -29,27 +42,52 @@ local function IconButton(props)
 	local _binding_1 = useIconButtonStyles(props)
 	local container = _binding_1.container
 	local corner = _binding_1.corner
+	local _binding_2 = useTheme()
+	local theme = _binding_2.theme
 	local reducedMotion = useReducedMotion(reducedProp)
 	local active = canActivate(disabled, loading)
+	local extent = theme.spacing.calc(iconButtonScale(props.size))
+	local _condition = iconSize
+	if _condition == nil then
+		_condition = iconGlyphExtent(extent)
+	end
+	local glyphBox = _condition
+	local drawn = if glyph ~= nil and isTransportGlyph(glyph) and not loading then transportGlyph(glyph, glyphBox) else nil
+	local sketched = if glyph ~= nil and not isTransportGlyph(glyph) and not loading then glyph else nil
 	local hovering, setHovering = useState(false)
+	local down, setDown = useState(false)
 	local focused, setFocused = useState(false)
+	local face = iconButtonFace({
+		disabled = disabled == true,
+		loading = loading,
+		selected = selected == true,
+		hover = hovering and active,
+		down = down and active,
+	})
+	local fill = if face == "pressed" then theme.palette.action.pressed elseif face == "selected" then theme.palette.action.selected else theme.palette.action.hover
+	local mark = if disabled == true and not loading then 0.45 else 0
 	useEffect(function()
 		if active then
 			return nil
 		end
 		setHovering(false)
+		setDown(false)
 		setFocused(false)
 	end, { active })
 	local _attributes = {
 		tag = "imagebutton",
 	}
-	local _condition = id
-	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
-		_condition = "IconButton"
+	local _condition_1 = id
+	if not (_condition_1 ~= 0 and _condition_1 == _condition_1 and _condition_1 ~= "" and _condition_1) then
+		_condition_1 = "IconButton"
 	end
-	_attributes.key = _condition
+	_attributes.key = _condition_1
 	_attributes.hostRef = ref
-	_attributes.base = container
+	local _object = table.clone(container)
+	setmetatable(_object, nil)
+	_object.BackgroundColor3 = fill
+	_object.BackgroundTransparency = if face == "clear" then 1 else 0
+	_attributes.base = _object
 	_attributes.className = className
 	_attributes.sx = sx
 	_attributes.state = {
@@ -57,14 +95,14 @@ local function IconButton(props)
 		loading = loading,
 		selected = selected,
 		hover = hovering,
+		pressed = down,
 		focused = focused,
 	}
 	_attributes.Active = active
-	_attributes.AutoButtonColor = active
+	_attributes.AutoButtonColor = false
 	_attributes.Selectable = active
-	_attributes.BackgroundTransparency = if loading then 1 elseif not active or hovering or selected or focused then 0.5 else 1
-	_attributes.Image = tostring(icon)
-	_attributes.ImageTransparency = if loading then 1 else 0
+	_attributes.Image = if drawn ~= nil or sketched ~= nil or icon == nil then "" else tostring(icon)
+	_attributes.ImageTransparency = if drawn ~= nil or sketched ~= nil or loading then 1 else mark
 	_attributes.ImageColor3 = tint or container.ImageColor3
 	_attributes.Event = {
 		MouseButton1Click = function()
@@ -72,13 +110,22 @@ local function IconButton(props)
 				onClick()
 			end
 		end,
+		MouseButton1Down = function()
+			if active then
+				setDown(true)
+			end
+		end,
+		MouseButton1Up = function()
+			return setDown(false)
+		end,
 		MouseEnter = function()
 			if active then
 				setHovering(true)
 			end
 		end,
 		MouseLeave = function()
-			return setHovering(false)
+			setHovering(false)
+			setDown(false)
 		end,
 		SelectionGained = function()
 			if active then
@@ -91,7 +138,61 @@ local function IconButton(props)
 	}
 	local _attributes_1 = table.clone(corner)
 	setmetatable(_attributes_1, nil)
-	return React.createElement(SxHost, _attributes, React.createElement("uicorner", _attributes_1), loading and (React.createElement(CircularProgress, {
+	local _exp = React.createElement("uicorner", _attributes_1)
+	local _result
+	if focused and active then
+		local _attributes_2 = table.clone(focusRing(theme.palette.focus))
+		setmetatable(_attributes_2, nil)
+		_result = React.createElement("uistroke", _attributes_2)
+	else
+		_result = nil
+	end
+	local _result_1
+	if drawn ~= nil then
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#drawn)
+		local _callback = function(part, index)
+			return React.createElement("frame", {
+				key = `g-{index}`,
+				Position = UDim2.fromOffset(part.x, part.y),
+				Size = UDim2.fromOffset(math.max(part.w, 1), math.max(part.h, 1)),
+				BackgroundColor3 = tint,
+				BackgroundTransparency = mark,
+				BorderSizePixel = 0,
+				ZIndex = 12001,
+			})
+		end
+		for _k, _v in drawn do
+			_newValue[_k] = _callback(_v, _k - 1, drawn)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		_result_1 = (React.createElement("frame", {
+			key = "Glyph",
+			AnchorPoint = Vector2.new(0.5, 0.5),
+			Position = UDim2.fromScale(0.5, 0.5),
+			Size = UDim2.fromOffset(glyphBox, glyphBox),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			ZIndex = 12001,
+		}, _newValue))
+	else
+		_result_1 = nil
+	end
+	return React.createElement(SxHost, _attributes, _exp, _result, _result_1, sketched ~= nil and (React.createElement("frame", {
+		key = "Glyph",
+		AnchorPoint = Vector2.new(0.5, 0.5),
+		Position = UDim2.fromScale(0.5, 0.5),
+		Size = UDim2.fromOffset(glyphBox, glyphBox),
+		BackgroundTransparency = 1,
+		BorderSizePixel = 0,
+		ZIndex = 12001,
+	}, React.createElement(DrawnGlyph, {
+		name = sketched,
+		size = glyphBox,
+		color = tint,
+		transparency = mark,
+		zIndex = 12001,
+	}))), loading and (React.createElement(CircularProgress, {
 		size = iconSpinnerPixels(props.size),
 		thickness = 2,
 		color = tint,