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

package/out/ui/packages/markdown/parseMarkdown.luau

@@ -46,6 +46,71 @@ local function trim(value)
 	local _stop = stop
 	return string.sub(_value, _start, _stop)
 end
+local function stripCr(raw)
+	local _condition = #raw > 0
+	if _condition then
+		local _raw = raw
+		local _arg0 = #raw
+		local _arg1 = #raw
+		_condition = string.sub(_raw, _arg0, _arg1) == "\r"
+	end
+	if _condition then
+		local _raw = raw
+		local _arg1 = #raw - 1
+		return string.sub(_raw, 1, _arg1)
+	end
+	return raw
+end
+--* Two trailing spaces end a paragraph line. A trailing backslash is not a break. 
+local function endsWithHardBreak(raw)
+	local line = stripCr(raw)
+	local _condition = #line >= 2
+	if _condition then
+		local _arg0 = #line - 1
+		local _arg1 = #line
+		_condition = string.sub(line, _arg0, _arg1) == "  "
+	end
+	return _condition
+end
+local function withoutHardBreak(raw)
+	local line = stripCr(raw)
+	if not endsWithHardBreak(line) then
+		return trimEnd(line)
+	end
+	local _arg1 = #line - 2
+	return trimEnd(string.sub(line, 1, _arg1))
+end
+--* Adjacent lines join with a space. A hard break on the previous line inserts a newline. 
+local function foldLines(rawLines)
+	local acc = ""
+	local breakNext = false
+	for index = 0, #rawLines - 1 do
+		local text = withoutHardBreak(rawLines[index + 1])
+		if index == 0 then
+			acc = text
+		elseif breakNext then
+			acc = `{acc}\n{text}`
+		else
+			acc = if #acc == 0 then text else `{acc} {text}`
+		end
+		breakNext = endsWithHardBreak(rawLines[index + 1])
+	end
+	return acc
+end
+--* `>` or `> ` starts a quote line. `>>` does not, so it stays ordinary text. 
+local function quoteBody(raw)
+	local line = stripCr(raw)
+	if #line == 0 or string.sub(line, 1, 1) ~= ">" then
+		return nil
+	end
+	if #line == 1 then
+		return ""
+	end
+	if string.sub(line, 2, 2) ~= " " then
+		return nil
+	end
+	return string.sub(line, 3)
+end
 local function headingLevel(line)
 	local n = 0
 	while true do
@@ -240,6 +305,138 @@ local function isHr(line)
 	end
 	return true
 end
+--* Split a pipe row. Leading and trailing pipes are optional. `\|` is a literal pipe. 
+local function splitCells(line)
+	local t = trim(line)
+	if (string.find(t, "|", 1, true)) == nil then
+		return nil
+	end
+	local body = t
+	if string.sub(body, 1, 1) == "|" then
+		body = string.sub(body, 2)
+	end
+	local _condition = #body > 0
+	if _condition then
+		local _body = body
+		local _arg0 = #body
+		local _arg1 = #body
+		_condition = string.sub(_body, _arg0, _arg1) == "|"
+	end
+	if _condition then
+		local _body = body
+		local _arg1 = #body - 1
+		body = string.sub(_body, 1, _arg1)
+	end
+	local cells = {}
+	local buf = ""
+	local i = 1
+	while i <= #body do
+		local _body = body
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_body, _i, _i_1)
+		local _condition_1 = ch == "\\" and i < #body
+		if _condition_1 then
+			local _body_1 = body
+			local _arg0 = i + 1
+			local _arg1 = i + 1
+			_condition_1 = string.sub(_body_1, _arg0, _arg1) == "|"
+		end
+		if _condition_1 then
+			buf = `{buf}|`
+			i += 2
+			continue
+		end
+		if ch == "|" then
+			local _arg0 = trim(buf)
+			table.insert(cells, _arg0)
+			buf = ""
+			i += 1
+			continue
+		end
+		buf = `{buf}{ch}`
+		i += 1
+	end
+	local _arg0 = trim(buf)
+	table.insert(cells, _arg0)
+	return cells
+end
+local function cellAlign(cell)
+	local t = trim(cell)
+	local i = 1
+	local left = false
+	local right = false
+	if string.sub(t, 1, 1) == ":" then
+		left = true
+		i = 2
+	end
+	local dashes = 0
+	while true do
+		local _condition = i <= #t
+		if _condition then
+			local _i = i
+			local _i_1 = i
+			_condition = string.sub(t, _i, _i_1) == "-"
+		end
+		if not _condition then
+			break
+		end
+		dashes += 1
+		i += 1
+	end
+	local _condition = i <= #t
+	if _condition then
+		local _i = i
+		local _i_1 = i
+		_condition = string.sub(t, _i, _i_1) == ":"
+	end
+	if _condition then
+		right = true
+		i += 1
+	end
+	if i <= #t or dashes < 3 then
+		return nil
+	end
+	if left and right then
+		return "center"
+	end
+	if right then
+		return "right"
+	end
+	return "left"
+end
+local function delimiterAlign(cells)
+	if #cells == 0 then
+		return nil
+	end
+	local align = {}
+	for _, cell in cells do
+		local aligned = cellAlign(cell)
+		if aligned == nil then
+			return nil
+		end
+		table.insert(align, aligned)
+	end
+	return align
+end
+local function tableAt(lines, index)
+	if index + 1 >= #lines then
+		return nil
+	end
+	local header = splitCells(trimEnd(lines[index + 1]))
+	local delim = splitCells(trimEnd(lines[index + 2]))
+	if header == nil or delim == nil then
+		return nil
+	end
+	local align = delimiterAlign(delim)
+	if align == nil or #align ~= #header then
+		return nil
+	end
+	return {
+		align = align,
+		header = header,
+	}
+end
 local function listMarker(line)
 	local t = trim(line)
 	if #t >= 2 and (string.sub(t, 1, 2) == "- " or string.sub(t, 1, 2) == "* ") then
@@ -275,6 +472,24 @@ local function listMarker(line)
 	end
 	return nil
 end
+local function codeLanguage(info)
+	local _condition = string.split(trim(info), " ")[1]
+	if _condition == nil then
+		_condition = ""
+	end
+	local token = _condition
+	local name = string.lower(token)
+	if name == "luau" then
+		return "luau"
+	end
+	if name == "ts" then
+		return "ts"
+	end
+	if name == "json" then
+		return "json"
+	end
+	return "text"
+end
 --* Small markdown subset → blocks. Unsupported syntax stays plain text. 
 local function parseMarkdown(source)
 	local lines = string.split(source, "\n")
@@ -288,6 +503,7 @@ local function parseMarkdown(source)
 			continue
 		end
 		if #line >= 3 and string.sub(line, 1, 3) == "```" then
+			local language = codeLanguage(string.sub(line, 4))
 			local body = {}
 			i += 1
 			while i < #lines and not (#lines[i + 1] >= 3 and string.sub(trim(lines[i + 1]), 1, 3) == "```") do
@@ -301,6 +517,7 @@ local function parseMarkdown(source)
 			local _arg0 = {
 				kind = "code",
 				text = table.concat(body, "\n"),
+				language = language,
 			}
 			table.insert(blocks, _arg0)
 			continue
@@ -325,20 +542,113 @@ local function parseMarkdown(source)
 			i += 1
 			continue
 		end
-		if string.sub(line, 1, 1) == ">" and (#line == 1 or string.sub(line, 2, 2) == " ") then
-			local parts = {}
+		if quoteBody(lines[i + 1]) ~= nil then
+			local groups = {}
+			local current = {}
+			while i < #lines do
+				local body = quoteBody(lines[i + 1])
+				if body == nil then
+					if trim(lines[i + 1]) ~= "" then
+						break
+					end
+					local ahead = i + 1
+					while ahead < #lines and trim(lines[ahead + 1]) == "" do
+						ahead += 1
+					end
+					if ahead >= #lines or quoteBody(lines[ahead + 1]) == nil then
+						break
+					end
+					body = ""
+					i = ahead
+				else
+					i += 1
+				end
+				if trim(body) == "" then
+					if #current > 0 then
+						local _current = current
+						table.insert(groups, _current)
+					end
+					current = {}
+				else
+					local _current = current
+					local _body = body
+					table.insert(_current, _body)
+				end
+			end
+			if #current > 0 then
+				local _current = current
+				table.insert(groups, _current)
+			end
+			if #groups == 0 then
+				table.insert(groups, {})
+			end
+			local _object = {
+				kind = "blockquote",
+			}
+			local _left = "paragraphs"
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue = table.create(#groups)
+			local _callback = function(group)
+				-- ▼ ReadonlyArray.map ▼
+				local _newValue_1 = table.create(#group)
+				local _callback_1 = function(line)
+					return withoutHardBreak(line)
+				end
+				for _k, _v in group do
+					_newValue_1[_k] = _callback_1(_v, _k - 1, group)
+				end
+				-- ▲ ReadonlyArray.map ▲
+				return parseInlines(table.concat(_newValue_1, "\n"))
+			end
+			for _k, _v in groups do
+				_newValue[_k] = _callback(_v, _k - 1, groups)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			_object[_left] = _newValue
+			table.insert(blocks, _object)
+			continue
+		end
+		local parsed = tableAt(lines, i)
+		if parsed ~= nil then
+			local _exp = parsed.header
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue = table.create(#_exp)
+			local _callback = function(cell)
+				return parseInlines(cell)
+			end
+			for _k, _v in _exp do
+				_newValue[_k] = _callback(_v, _k - 1, _exp)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			local header = _newValue
+			local rows = {}
+			i += 2
 			while i < #lines do
 				local cur = trimEnd(lines[i + 1])
-				if not (string.sub(cur, 1, 1) == ">" and (#cur == 1 or string.sub(cur, 2, 2) == " ")) then
+				if trim(cur) == "" then
+					break
+				end
+				local row = splitCells(cur)
+				if row == nil then
 					break
 				end
-				local _arg0 = if #cur >= 2 then string.sub(cur, 3) else ""
-				table.insert(parts, _arg0)
+				local cells = {}
+				for col = 0, #parsed.align - 1 do
+					local _condition = row[col + 1]
+					if _condition == nil then
+						_condition = ""
+					end
+					local _arg0 = parseInlines(_condition)
+					table.insert(cells, _arg0)
+				end
+				table.insert(rows, cells)
 				i += 1
 			end
 			local _arg0 = {
-				kind = "blockquote",
-				inlines = parseInlines(table.concat(parts, " ")),
+				kind = "table",
+				align = parsed.align,
+				header = header,
+				rows = rows,
 			}
 			table.insert(blocks, _arg0)
 			continue
@@ -365,7 +675,7 @@ local function parseMarkdown(source)
 			table.insert(blocks, _arg0)
 			continue
 		end
-		local para = { line }
+		local rawPara = { lines[i + 1] }
 		i += 1
 		while i < #lines do
 			local cur = trimEnd(lines[i + 1])
@@ -381,31 +691,22 @@ local function parseMarkdown(source)
 			if headingLevel(cur) ~= nil then
 				break
 			end
-			if string.sub(cur, 1, 1) == ">" and (#cur == 1 or string.sub(cur, 2, 2) == " ") then
+			if quoteBody(lines[i + 1]) ~= nil then
 				break
 			end
 			if listMarker(cur) ~= nil then
 				break
 			end
-			-- two trailing spaces = hard break
-			local prev = para[#para]
-			local _condition = #prev >= 2
-			if _condition then
-				local _arg0 = #prev - 1
-				_condition = string.sub(prev, _arg0) == "  "
-			end
-			if _condition then
-				local _arg1 = #prev - 2
-				para[#para] = trimEnd(string.sub(prev, 1, _arg1))
-				table.insert(para, cur)
-			else
-				para[#para] = `{prev} {cur}`
+			if tableAt(lines, i) ~= nil then
+				break
 			end
+			local _arg0 = lines[i + 1]
+			table.insert(rawPara, _arg0)
 			i += 1
 		end
 		local _arg0 = {
 			kind = "paragraph",
-			inlines = parseInlines(table.concat(para, "\n")),
+			inlines = parseInlines(foldLines(rawPara)),
 		}
 		table.insert(blocks, _arg0)
 	end
@@ -447,7 +748,7 @@ local function inlinesToRichText(inlines)
 		elseif part.kind == "code" then
 			out = `{out}<font face="RobotoMono">{escapeRich(part.text)}</font>`
 		elseif part.kind == "link" then
-			out = `{out}<font color="#4C9AFF"><u>{escapeRich(part.text)}</u></font>`
+			out = `{out}<u>{escapeRich(part.text)}</u>`
 		end
 	end
 	return out
@@ -462,6 +763,21 @@ local function markdownLinkPayload(inline)
 		href = inline.href,
 	}
 end
+local function isPunctuation(word)
+	if #word == 0 then
+		return false
+	end
+	for i = 1, #word do
+		local _word = word
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_word, _i, _i_1)
+		if ch ~= "," and ch ~= "." and ch ~= ";" and ch ~= ":" and ch ~= "!" and ch ~= "?" and ch ~= ")" and ch ~= "]" then
+			return false
+		end
+	end
+	return true
+end
 local function richWord(kind, word)
 	local safe = escapeRich(word)
 	if kind == "bold" then
@@ -497,11 +813,16 @@ local function inlinePieces(inlines)
 			if #word == 0 then
 				return nil
 			end
-			local _arg0 = {
-				kind = "word",
-				text = richWord(part.kind, word),
-			}
-			table.insert(out, _arg0)
+			local prev = out[#out]
+			if prev ~= nil and prev.kind ~= "break" and isPunctuation(word) then
+				prev.text = `{prev.text}{word}`
+			else
+				local _arg0 = {
+					kind = "word",
+					text = richWord(part.kind, word),
+				}
+				table.insert(out, _arg0)
+			end
 			word = ""
 		end
 		local source = part.text

package/out/ui/packages/menu/components/Menu.d.ts

@@ -19,5 +19,5 @@ export interface MenuProps {
     dense?: boolean;
     selected?: string;
 }
-declare function Menu(props: CustomizedProps<Frame, MenuProps>): JSX.Element | undefined;
+declare function Menu(props: CustomizedProps<Frame, MenuProps>): JSX.Element;
 export default Menu;

package/out/ui/packages/menu/components/Menu.luau

@@ -32,9 +32,6 @@ local function Menu(props)
 	local _binding_1 = useTheme()
 	local theme = _binding_1.theme
 	local styles = useMenuStyles()
-	if not open then
-		return nil
-	end
 	local vacant = #items == 0
 	-- ▼ ReadonlyArray.some ▼
 	local _result = false
@@ -50,7 +47,7 @@ local function Menu(props)
 	-- ▲ ReadonlyArray.some ▲
 	local icons = _result
 	local row = menuRow(dense, icons)
-	local height = if vacant then menuRow(dense) else #items * row
+	local height = (if vacant then menuRow(dense) else #items * row) + theme.shape.borderRadius * 2 + 2
 	local font = theme.typography.fontFamilies.default or Enum.Font.SourceSans
 	local _condition = (if dense == true then theme.typography.fontSizes.caption else theme.typography.fontSizes.body)
 	if _condition == nil then
@@ -85,21 +82,24 @@ local function Menu(props)
 	local _attributes_2 = table.clone(styles.stroke)
 	setmetatable(_attributes_2, nil)
 	local _exp_1 = React.createElement("uistroke", _attributes_2)
-	local _attributes_3 = table.clone(styles.list)
+	local _attributes_3 = table.clone(styles.inset)
 	setmetatable(_attributes_3, nil)
-	local _exp_2 = React.createElement("uilistlayout", _attributes_3)
+	local _exp_2 = React.createElement("uipadding", _attributes_3)
+	local _attributes_4 = table.clone(styles.list)
+	setmetatable(_attributes_4, nil)
+	local _exp_3 = React.createElement("uilistlayout", _attributes_4)
 	local _result_1
 	if vacant then
 		local _condition_2 = empty
 		if _condition_2 == nil then
-			local _attributes_4 = {}
+			local _attributes_5 = {}
 			local _condition_3 = emptyText
 			if _condition_3 == nil then
 				_condition_3 = "No options"
 			end
-			_attributes_4.text = _condition_3
-			_attributes_4.height = row
-			_condition_2 = React.createElement(EmptyListHint, _attributes_4)
+			_attributes_5.text = _condition_3
+			_attributes_5.height = row
+			_condition_2 = React.createElement(EmptyListHint, _attributes_5)
 		end
 		_result_1 = _condition_2
 	else
@@ -137,11 +137,12 @@ local function Menu(props)
 		_result_1 = (React.createElement(React.Fragment, nil, _newValue))
 	end
 	return React.createElement(Popup, {
+		open = open,
 		anchor = anchor,
 		preferredHeight = height,
 		preferredWidth = width,
 		onDismiss = onClose,
-	}, React.createElement(SxHost, _attributes, _exp, _exp_1, _exp_2, _result_1))
+	}, React.createElement(SxHost, _attributes, _exp, _exp_1, _exp_2, _exp_3, _result_1))
 end
 local default = Menu
 return {

package/out/ui/packages/menu/components/Menu.styles.luau

@@ -6,7 +6,8 @@ local componentStyles = _theme.componentStyles
 local useMenuStyles = componentStyles("Menu", function(theme)
 	return createStyles({
 		surface = {
-			Size = UDim2.new(1, 0, 0, 0),
+			Position = UDim2.fromOffset(1, 1),
+			Size = UDim2.new(1, -2, 0, 0),
 			AutomaticSize = Enum.AutomaticSize.Y,
 			BackgroundColor3 = theme.palette.surface.elevated,
 			BorderSizePixel = 0,
@@ -18,6 +19,10 @@ local useMenuStyles = componentStyles("Menu", function(theme)
 			Color = theme.palette.border,
 			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
 		},
+		inset = {
+			PaddingTop = UDim.new(0, theme.shape.borderRadius),
+			PaddingBottom = UDim.new(0, theme.shape.borderRadius),
+		},
 		list = {
 			FillDirection = Enum.FillDirection.Vertical,
 			SortOrder = Enum.SortOrder.LayoutOrder,

package/out/ui/packages/menu/components/menuIcon.d.ts

@@ -1,6 +1,6 @@
 /** An empty glyph stays off the row. */
 export declare function menuIcon(icon?: string): string | undefined;
 /** Icon rows need the leading slot. Plain rows stay the short menu height. */
-export declare function menuRow(dense?: boolean, icon?: boolean): 22 | 48 | 28 | 44;
+export declare function menuRow(dense?: boolean, icon?: boolean): 28 | 22 | 44 | 48;
 /** Grow past a narrow anchor so the label and glyph fit. Stay at least as wide as the anchor. */
 export declare function menuWidth(text: number, icon: boolean, pad: number, floor: number): number;

package/out/ui/packages/numberInput/components/NumberInput.luau

@@ -1,7 +1,9 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
 local React = TS.import(script, TS.getModule(script, "@rbxts", "react"))
-local useTheme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme").useTheme
+local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "theme")
+local controlMetrics = _theme.controlMetrics
+local useTheme = _theme.useTheme
 local Input = TS.import(script, script.Parent.Parent.Parent, "input").Input
 local _numberValue = TS.import(script, script.Parent, "numberValue")
 local formatNumber = _numberValue.formatNumber
@@ -12,13 +14,13 @@ local function StepButton(props)
 	local theme = _binding.theme
 	return React.createElement("textbutton", {
 		LayoutOrder = props.order,
-		Size = UDim2.fromOffset(28, 28),
+		Size = UDim2.fromOffset(props.extent, props.extent),
 		BackgroundColor3 = theme.palette.surface.paper,
 		BackgroundTransparency = if props.enabled then 0 else 0.45,
 		BorderSizePixel = 0,
 		Text = props.text,
 		Font = theme.typography.fontFamilies.default,
-		TextSize = theme.typography.fontSizes.body,
+		TextSize = props.font,
 		TextColor3 = if props.enabled then theme.palette.text.primary else theme.palette.text.secondary,
 		AutoButtonColor = props.enabled,
 		Active = props.enabled,
@@ -31,6 +33,10 @@ local function StepButton(props)
 		},
 	}, React.createElement("uicorner", {
 		CornerRadius = UDim.new(0, theme.shape.borderRadius),
+	}), React.createElement("uistroke", {
+		Color = theme.palette.border,
+		Thickness = 1,
+		ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
 	}))
 end
 local function NumberInput(props)
@@ -53,6 +59,8 @@ local function NumberInput(props)
 	local sx = _binding.sx
 	local id = _binding.id
 	local ref = _binding.ref
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
 	local locked = disabled == true or readOnly == true
 	local _attributes = {}
 	local _condition = id
@@ -87,6 +95,9 @@ local function NumberInput(props)
 	if stepper ~= true then
 		return field
 	end
+	local metrics = controlMetrics(theme.density, size)
+	local extent = metrics.height
+	local stepFont = math.floor(metrics.font * 1.5)
 	local down = stepNumber(value, -1, min, max, step)
 	local up = stepNumber(value, 1, min, max, step)
 	return React.createElement("frame", {
@@ -100,8 +111,10 @@ local function NumberInput(props)
 		VerticalAlignment = Enum.VerticalAlignment.Center,
 		SortOrder = Enum.SortOrder.LayoutOrder,
 	}), React.createElement(StepButton, {
-		text = "-",
+		text = "−",
 		order = 0,
+		extent = extent,
+		font = stepFont,
 		enabled = not locked and down ~= nil,
 		onClick = function()
 			return down ~= nil and onChange(down)
@@ -115,6 +128,8 @@ local function NumberInput(props)
 	}, field), React.createElement(StepButton, {
 		text = "+",
 		order = 2,
+		extent = extent,
+		font = stepFont,
 		enabled = not locked and up ~= nil,
 		onClick = function()
 			return up ~= nil and onChange(up)

package/out/ui/packages/numberRangeEditor/components/NumberRangeEditor.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 NumberInput = TS.import(script, script.Parent.Parent.Parent, "numberInput").NumberInput
 local useNumberRangeEditorStyles = TS.import(script, script.Parent, "NumberRangeEditor.styles").default
@@ -15,6 +16,7 @@ local function NumberRangeEditor(props)
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = useNumberRangeEditorStyles()
+	local hover = useEditorHover(disabled)
 	local commit = function(field, amount)
 		local parts = writeNumberRange(value.Min, value.Max, field, amount)
 		onChange(NumberRange.new(parts.Min, parts.Max))
@@ -28,12 +30,18 @@ local function NumberRangeEditor(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.row)
 	setmetatable(_attributes_1, nil)
 	local _exp = React.createElement("uilistlayout", _attributes_1)