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

package/out/ui/packages/slider/components/Slider.luau

@@ -4,11 +4,19 @@ local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
 local React = _react
 local useRef = _react.useRef
 local useState = _react.useState
-local cx = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").cx
+local TextService = TS.import(script, TS.getModule(script, "@rbxts", "services")).TextService
+local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
+local controlFade = _theme.controlFade
+local controlMetrics = _theme.controlMetrics
+local cx = _theme.cx
+local useTheme = _theme.useTheme
 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 commitNumber = TS.import(script, script.Parent.Parent.Parent, "numberInput", "components", "numberValue").commitNumber
 local useSliderStyles = TS.import(script, script.Parent, "Slider.styles").default
+local _sliderLabel = TS.import(script, script.Parent, "sliderLabel")
+local sliderLabel = _sliderLabel.sliderLabel
+local sliderSlot = _sliderLabel.sliderSlot
 local sliderMarkValues = TS.import(script, script.Parent, "sliderMarks").sliderMarkValues
 local _sliderNudge = TS.import(script, script.Parent, "sliderNudge")
 local isSliderDrag = _sliderNudge.isSliderDrag
@@ -26,6 +34,7 @@ local function Slider(props)
 	local disabled = _binding.disabled
 	local size = _binding.size
 	local marks = _binding.marks
+	local format = _binding.format
 	local color = _binding.color
 	if color == nil then
 		color = "primary"
@@ -34,17 +43,26 @@ local function Slider(props)
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
-	local _binding_1 = useSliderStyles({
+	local labelText = sliderLabel(format, value)
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
+	local metrics = controlMetrics(theme.density, size)
+	local caption = theme.typography.variants.caption
+	local font = theme.typography.fontFamilies[caption.family] or Enum.Font.SourceSans
+	local slot = if labelText == nil then 0 else sliderSlot(TextService:GetTextSize(labelText, caption.size, font, Vector2.new(10000, 100)).X, 52, 4)
+	local _binding_2 = useSliderStyles({
 		size = size,
 		color = color,
+		labeled = labelText ~= nil,
 	})
-	local root = _binding_1.root
-	local track = _binding_1.track
-	local fill = _binding_1.fill
-	local knob = _binding_1.knob
-	local corner = _binding_1.corner
-	local stroke = _binding_1.stroke
-	local mark = _binding_1.mark
+	local root = _binding_2.root
+	local track = _binding_2.track
+	local fill = _binding_2.fill
+	local knob = _binding_2.knob
+	local corner = _binding_2.corner
+	local stroke = _binding_2.stroke
+	local mark = _binding_2.mark
+	local label = _binding_2.label
 	local active = canActivate(disabled)
 	local focused, setFocused = useState(false)
 	local hovering, setHovering = useState(false)
@@ -112,7 +130,6 @@ local function Slider(props)
 	}
 	_attributes.Active = active
 	_attributes.Selectable = active
-	_attributes.BackgroundTransparency = if showFocus then 0.85 else 1
 	_attributes.Event = {
 		InputBegan = function(rbx, input)
 			if not active then
@@ -161,19 +178,15 @@ local function Slider(props)
 		key = "Track",
 	}
 	for _k, _v in cx(track, {
-		BackgroundTransparency = if faded then 0.55 elseif hovering and active then 0.2 else 0.35,
+		BackgroundTransparency = if faded then controlFade elseif hovering and active then 0.2 else 0.35,
+	}, labelText ~= nil and {
+		Size = UDim2.new(1, -(slot + 4), 0, metrics.sliderTrack),
 	}) do
 		_attributes_1[_k] = _v
 	end
 	local _attributes_2 = table.clone(corner)
 	setmetatable(_attributes_2, nil)
 	local _exp = React.createElement("uicorner", _attributes_2)
-	local _condition_1 = showFocus
-	if _condition_1 then
-		local _attributes_3 = table.clone(stroke)
-		setmetatable(_attributes_3, nil)
-		_condition_1 = React.createElement("uistroke", _attributes_3)
-	end
 	-- ▼ ReadonlyArray.map ▼
 	local _newValue = table.create(#markValues)
 	local _callback = function(markValue, index)
@@ -185,7 +198,7 @@ local function Slider(props)
 			_attributes_3[_k] = _v
 		end
 		_attributes_3.Position = UDim2.fromScale(markRatio, 0.5)
-		_attributes_3.BackgroundTransparency = if faded then 0.7 else 0.35
+		_attributes_3.BackgroundTransparency = if faded then controlFade else 0.35
 		return React.createElement("frame", _attributes_3)
 	end
 	for _k, _v in markValues do
@@ -197,7 +210,7 @@ local function Slider(props)
 		key = "Fill",
 	}
 	for _k, _v in cx(fill, {
-		BackgroundTransparency = if faded then 0.55 elseif pressed then 0.1 else 0,
+		BackgroundTransparency = if faded then controlFade elseif pressed then 0.1 else 0,
 	}) do
 		_attributes_3[_k] = _v
 	end
@@ -209,7 +222,7 @@ local function Slider(props)
 		key = "Knob",
 	}
 	for _k, _v in cx(knob, {
-		BackgroundTransparency = if faded then 0.45 else 0,
+		BackgroundTransparency = if faded then controlFade else 0,
 	}) do
 		_attributes_5[_k] = _v
 	end
@@ -217,14 +230,29 @@ local function Slider(props)
 	local _attributes_6 = table.clone(corner)
 	setmetatable(_attributes_6, nil)
 	local _exp_3 = React.createElement("uicorner", _attributes_6)
-	local _condition_2 = showFocus
-	if _condition_2 then
+	local _condition_1 = showFocus
+	if _condition_1 then
 		local _attributes_7 = table.clone(stroke)
 		setmetatable(_attributes_7, nil)
-		_attributes_7.Thickness = 1
-		_condition_2 = React.createElement("uistroke", _attributes_7)
+		_condition_1 = React.createElement("uistroke", _attributes_7)
+	end
+	local _exp_4 = React.createElement("frame", _attributes_1, _exp, _exp_1, _exp_2, React.createElement("frame", _attributes_5, _exp_3, _condition_1))
+	local _result
+	if labelText ~= nil then
+		local _attributes_7 = {
+			key = "Value",
+		}
+		for _k, _v in label do
+			_attributes_7[_k] = _v
+		end
+		_attributes_7.Size = UDim2.new(0, slot, 1, 0)
+		_attributes_7.Text = labelText
+		_attributes_7.TextTransparency = if faded then controlFade else 0
+		_result = (React.createElement("textlabel", _attributes_7))
+	else
+		_result = nil
 	end
-	return React.createElement(SxHost, _attributes, React.createElement("frame", _attributes_1, _exp, _condition_1, _exp_1, _exp_2, React.createElement("frame", _attributes_5, _exp_3, _condition_2)))
+	return React.createElement(SxHost, _attributes, _exp_4, _result)
 end
 local default = Slider
 return {

package/out/ui/packages/slider/components/Slider.styles.d.ts

@@ -3,6 +3,7 @@ export type SliderColor = "primary" | "accent";
 export interface SliderStyleProps {
     size?: ControlSize;
     color?: SliderColor;
+    labeled?: boolean;
 }
 declare const useSliderStyles: (props: SliderStyleProps) => import("../../../../theme/index").ClassNameMap<string>;
 export default useSliderStyles;

package/out/ui/packages/slider/components/Slider.styles.luau

@@ -4,14 +4,20 @@ local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "the
 local controlMetrics = _theme.controlMetrics
 local createStyles = _theme.createStyles
 local componentStyles = _theme.componentStyles
+local focusRing = _theme.focusRing
 local useSliderStyles = componentStyles("Slider", function(theme, _param)
 	local size = _param.size
 	local color = _param.color
 	if color == nil then
 		color = "primary"
 	end
+	local labeled = _param.labeled
+	if labeled == nil then
+		labeled = false
+	end
 	local metrics = controlMetrics(theme.density, size)
 	local tone = if color == "accent" then theme.palette.accent.main else theme.palette.primary.main
+	local caption = theme.typography.variants.caption
 	return createStyles({
 		root = {
 			Size = UDim2.new(1, 0, 0, metrics.sliderHeight),
@@ -19,7 +25,7 @@ local useSliderStyles = componentStyles("Slider", function(theme, _param)
 			BorderSizePixel = 0,
 		},
 		track = {
-			Size = UDim2.new(1, 0, 0, metrics.sliderTrack),
+			Size = UDim2.new(1, if labeled then -56 else 0, 0, metrics.sliderTrack),
 			Position = UDim2.fromScale(0, 0.5),
 			AnchorPoint = Vector2.new(0, 0.5),
 			BackgroundColor3 = theme.palette.action.disabled,
@@ -39,10 +45,18 @@ local useSliderStyles = componentStyles("Slider", function(theme, _param)
 		corner = {
 			CornerRadius = UDim.new(1, 0),
 		},
-		stroke = {
-			Color = theme.palette.focus,
-			Thickness = 2,
-			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
+		stroke = focusRing(theme.palette.focus),
+		label = {
+			Size = UDim2.new(0, 52, 1, 0),
+			Position = UDim2.fromScale(1, 0.5),
+			AnchorPoint = Vector2.new(1, 0.5),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies[caption.family],
+			TextSize = caption.size,
+			TextColor3 = theme.palette.text.secondary,
+			TextXAlignment = Enum.TextXAlignment.Right,
+			TextYAlignment = Enum.TextYAlignment.Center,
 		},
 		mark = {
 			Size = UDim2.new(0, 2, 0, metrics.sliderTrack + 4),

package/out/ui/packages/slider/components/rangeValue.d.ts

@@ -0,0 +1,21 @@
+export type RangeThumb = "low" | "high";
+export interface RangeValue {
+    start: number;
+    finish: number;
+}
+export declare function orderRange(start: number, finish: number): RangeValue;
+export declare function rangeRatios(start: number, finish: number, min: number, max: number): {
+    low: number;
+    high: number;
+};
+/** Ties belong to the high thumb. */
+export declare function rangeThumb(pointer: number, start: number, finish: number): RangeThumb;
+export declare function rangeMove(thumb: RangeThumb, value: number, start: number, finish: number): {
+    thumb: "high";
+    start: number;
+    finish: number;
+} | {
+    thumb: "low";
+    start: number;
+    finish: number;
+};

package/out/ui/packages/slider/components/rangeValue.luau

@@ -0,0 +1,77 @@
+-- Compiled with roblox-ts v3.0.0
+local function orderRange(start, finish)
+	if start <= finish then
+		return {
+			start = start,
+			finish = finish,
+		}
+	end
+	return {
+		start = finish,
+		finish = start,
+	}
+end
+local function unit(value, min, span)
+	local ratio = (value - min) / span
+	if ratio < 0 then
+		ratio = 0
+	end
+	if ratio > 1 then
+		ratio = 1
+	end
+	return ratio
+end
+local function rangeRatios(start, finish, min, max)
+	local span = max - min
+	local ordered = orderRange(start, finish)
+	if not (span > 0) then
+		return {
+			low = 0,
+			high = 0,
+		}
+	end
+	return {
+		low = unit(ordered.start, min, span),
+		high = unit(ordered.finish, min, span),
+	}
+end
+--* Ties belong to the high thumb. 
+local function rangeThumb(pointer, start, finish)
+	local ordered = orderRange(start, finish)
+	return if pointer < (ordered.start + ordered.finish) / 2 then "low" else "high"
+end
+local function rangeMove(thumb, value, start, finish)
+	local ordered = orderRange(start, finish)
+	if thumb == "low" then
+		if value > ordered.finish then
+			return {
+				thumb = "high",
+				start = ordered.finish,
+				finish = value,
+			}
+		end
+		return {
+			thumb = "low",
+			start = value,
+			finish = ordered.finish,
+		}
+	end
+	if value < ordered.start then
+		return {
+			thumb = "low",
+			start = value,
+			finish = ordered.start,
+		}
+	end
+	return {
+		thumb = "high",
+		start = ordered.start,
+		finish = value,
+	}
+end
+return {
+	orderRange = orderRange,
+	rangeRatios = rangeRatios,
+	rangeThumb = rangeThumb,
+	rangeMove = rangeMove,
+}

package/out/ui/packages/slider/components/sliderLabel.d.ts

@@ -0,0 +1,4 @@
+/** Caption for the current value. Missing or blank format leaves the track full width. */
+export declare function sliderLabel(format: ((value: number) => string) | undefined, value: number): string | undefined;
+/** A long caption grows past the short slot. A short caption keeps that slot. */
+export declare function sliderSlot(textWidth: number, floor: number, pad?: number): number;

package/out/ui/packages/slider/components/sliderLabel.luau

@@ -0,0 +1,30 @@
+-- Compiled with roblox-ts v3.0.0
+--* Caption for the current value. Missing or blank format leaves the track full width. 
+local function sliderLabel(format, value)
+	if format == nil then
+		return nil
+	end
+	local text = format(value)
+	if text == "" then
+		return nil
+	end
+	return text
+end
+--* A long caption grows past the short slot. A short caption keeps that slot. 
+local function sliderSlot(textWidth, floor, pad)
+	if pad == nil then
+		pad = 0
+	end
+	local need = textWidth + pad
+	if need < 0 then
+		need = 0
+	end
+	if floor > need then
+		return floor
+	end
+	return need
+end
+return {
+	sliderLabel = sliderLabel,
+	sliderSlot = sliderSlot,
+}

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

@@ -1,2 +1,5 @@
 export { default as Slider } from "./components/Slider";
 export { SliderProps } from "./components/Slider";
+export { default as RangeSlider } from "./components/RangeSlider";
+export { RangeSliderProps } from "./components/RangeSlider";
+export { orderRange, rangeMove, rangeRatios, rangeThumb, RangeValue } from "./components/rangeValue";

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

@@ -2,4 +2,10 @@
 local TS = _G[script]
 local exports = {}
 exports.Slider = TS.import(script, script, "components", "Slider").default
+exports.RangeSlider = TS.import(script, script, "components", "RangeSlider").default
+local _rangeValue = TS.import(script, script, "components", "rangeValue")
+exports.orderRange = _rangeValue.orderRange
+exports.rangeMove = _rangeValue.rangeMove
+exports.rangeRatios = _rangeValue.rangeRatios
+exports.rangeThumb = _rangeValue.rangeThumb
 return exports

package/out/ui/packages/snackbar/components/Snackbar.d.ts

@@ -8,6 +8,7 @@ export interface SnackbarProps {
     open?: boolean;
     action?: string;
     onAction?: () => void;
+    edge?: "top" | "bottom";
 }
 declare function Snackbar(props: CustomizedProps<Frame, SnackbarProps>): JSX.Element | undefined;
 export default Snackbar;

package/out/ui/packages/snackbar/components/Snackbar.luau

@@ -15,6 +15,7 @@ local function Snackbar(props)
 	end
 	local action = _binding.action
 	local onAction = _binding.onAction
+	local edge = _binding.edge
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
@@ -29,6 +30,7 @@ local function Snackbar(props)
 		variant = variant,
 		action = snackbarActionLabel(action),
 		onAction = onAction,
+		edge = edge,
 		className = className,
 		sx = sx,
 	}

package/out/ui/packages/sparkline/components/Sparkline.d.ts

@@ -4,6 +4,9 @@ export interface SparklineProps {
     width?: number;
     height?: number;
     color?: Color3;
+    area?: boolean;
+    mark?: number;
+    onPick?: (index: number) => void;
 }
 declare function Sparkline(props: CustomizedProps<Frame, SparklineProps>): JSX.Element;
 export default Sparkline;

package/out/ui/packages/sparkline/components/Sparkline.luau

@@ -1,9 +1,15 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
-local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local React = _react
+local useRef = _react.useRef
 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 sparklineLayout = TS.import(script, script.Parent.Parent, "sparklineLayout").sparklineLayout
+local _sparklineLayout = TS.import(script, script.Parent.Parent, "sparklineLayout")
+local sparklineArea = _sparklineLayout.sparklineArea
+local sparklineLayout = _sparklineLayout.sparklineLayout
+local sparklinePick = _sparklineLayout.sparklinePick
+local sparklinePoint = _sparklineLayout.sparklinePoint
 local function Sparkline(props)
 	local _binding = props
 	local values = _binding.values
@@ -16,13 +22,21 @@ local function Sparkline(props)
 		height = 36
 	end
 	local color = _binding.color
+	local area = _binding.area
+	local mark = _binding.mark
+	local onPick = _binding.onPick
 	local className = _binding.className
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
 	local _binding_1 = useTheme()
 	local theme = _binding_1.theme
-	local segments = sparklineLayout(values, width, height)
+	local host = useRef()
+	local inset = 6
+	local dot = 6
+	local segments = sparklineLayout(values, width, height, inset)
+	local bars = if area == true then sparklineArea(values, width, height, inset) else {}
+	local marked = if mark ~= nil then sparklinePoint(values, mark, width, height, inset) else nil
 	local stroke = color or theme.palette.primary.main
 	local _attributes = {
 		tag = "frame",
@@ -32,7 +46,30 @@ local function Sparkline(props)
 		_condition = "Sparkline"
 	end
 	_attributes.key = _condition
-	_attributes.hostRef = ref
+	_attributes.hostRef = function(instance)
+		host.current = instance
+		if ref == nil then
+			return nil
+		end
+		if type(ref) == "function" then
+			ref(instance)
+			return nil
+		end
+		ref.current = instance
+	end
+	_attributes.Active = onPick ~= nil
+	_attributes.Event = if onPick == nil then nil else {
+		InputBegan = function(input)
+			local frame = host.current
+			if frame == nil then
+				return nil
+			end
+			if input.UserInputType ~= Enum.UserInputType.MouseButton1 and input.UserInputType ~= Enum.UserInputType.Touch then
+				return nil
+			end
+			sparklinePick(input.Position.X - frame.AbsolutePosition.X, #values, width, onPick, inset)
+		end,
+	}
 	_attributes.base = {
 		Size = UDim2.fromOffset(width, height),
 		BackgroundTransparency = 1,
@@ -42,8 +79,35 @@ local function Sparkline(props)
 	_attributes.className = className
 	_attributes.sx = sx
 	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#segments)
-	local _callback = function(segment, index)
+	local _newValue = table.create(#bars)
+	local _callback = function(bar, index)
+		return if bar.height < 1 then nil else (React.createElement("frame", {
+			key = `a-{index}`,
+			Position = UDim2.fromOffset(bar.x, bar.y),
+			Size = UDim2.fromOffset(math.max(bar.width, 1), bar.height),
+			BackgroundColor3 = stroke,
+			BackgroundTransparency = 0.62,
+			BorderSizePixel = 0,
+		}))
+	end
+	for _k, _v in bars do
+		_newValue[_k] = _callback(_v, _k - 1, bars)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	local _exp = if marked ~= nil then (React.createElement("frame", {
+		key = "Mark",
+		AnchorPoint = Vector2.new(0.5, 0.5),
+		Position = UDim2.fromOffset(marked.x, marked.y),
+		Size = UDim2.fromOffset(dot, dot),
+		BackgroundColor3 = stroke,
+		BorderSizePixel = 0,
+		ZIndex = 3,
+	}, React.createElement("uicorner", {
+		CornerRadius = UDim.new(1, 0),
+	}))) else nil
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue_1 = table.create(#segments)
+	local _callback_1 = function(segment, index)
 		return React.createElement("frame", {
 			key = `s-{index}`,
 			AnchorPoint = Vector2.new(0.5, 0.5),
@@ -55,10 +119,10 @@ local function Sparkline(props)
 		})
 	end
 	for _k, _v in segments do
-		_newValue[_k] = _callback(_v, _k - 1, segments)
+		_newValue_1[_k] = _callback_1(_v, _k - 1, segments)
 	end
 	-- ▲ ReadonlyArray.map ▲
-	return React.createElement(SxHost, _attributes, _newValue)
+	return React.createElement(SxHost, _attributes, _newValue, _exp, _newValue_1)
 end
 local default = Sparkline
 return {

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

@@ -1,3 +1,3 @@
 export { default as Sparkline } from "./components/Sparkline";
 export { SparklineProps } from "./components/Sparkline";
-export { sparklineLayout, SparkSegment } from "./sparklineLayout";
+export { sparklineArea, sparklineIndex, sparklineLayout, sparklinePick, sparklinePoint, SparkBar, SparkSegment } from "./sparklineLayout";

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

@@ -2,5 +2,10 @@
 local TS = _G[script]
 local exports = {}
 exports.Sparkline = TS.import(script, script, "components", "Sparkline").default
-exports.sparklineLayout = TS.import(script, script, "sparklineLayout").sparklineLayout
+local _sparklineLayout = TS.import(script, script, "sparklineLayout")
+exports.sparklineArea = _sparklineLayout.sparklineArea
+exports.sparklineIndex = _sparklineLayout.sparklineIndex
+exports.sparklineLayout = _sparklineLayout.sparklineLayout
+exports.sparklinePick = _sparklineLayout.sparklinePick
+exports.sparklinePoint = _sparklineLayout.sparklinePoint
 return exports

package/out/ui/packages/sparkline/sparklineLayout.d.ts

@@ -4,5 +4,22 @@ export interface SparkSegment {
     length: number;
     rotation: number;
 }
+export interface SparkBar {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
 /** Line segments for a number series. Empty and single-point series draw nothing. */
 export declare function sparklineLayout(values: number[], width: number, height: number, pad?: number): SparkSegment[];
+/** Vertical slices under the line. Missing when the series cannot draw. */
+export declare function sparklineArea(values: number[], width: number, height: number, pad?: number): SparkBar[];
+/** Nearest sample from a local x. Undefined when the trace cannot be hit. */
+export declare function sparklineIndex(localX: number, count: number, width: number, pad?: number): number | undefined;
+/** Calls onPick with the nearest sample. Does nothing when the callback is absent. */
+export declare function sparklinePick(localX: number, count: number, width: number, onPick?: (index: number) => void, pad?: number): number | undefined;
+/** Point for a sample, used to mark the trace. */
+export declare function sparklinePoint(values: number[], index: number, width: number, height: number, pad?: number): {
+    x: number;
+    y: number;
+} | undefined;