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

package/out/ui/packages/markdown/components/Markdown.luau

@@ -1,6 +1,8 @@
 -- 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 CodeEditor = TS.import(script, script.Parent.Parent.Parent, "codeEditor").CodeEditor
 local Divider = TS.import(script, script.Parent.Parent.Parent, "divider").Divider
 local SxHost = TS.import(script, script.Parent.Parent.Parent, "host").SxHost
 local Link = TS.import(script, script.Parent.Parent.Parent, "link").Link
@@ -29,25 +31,28 @@ local function headingVariant(level)
 	end
 	return "h6"
 end
-local function textSizeFor(variant)
+local function textSizeFor(sizes, variant)
 	if variant == "h1" then
-		return 28
+		return sizes.h1
 	end
 	if variant == "h2" then
-		return 22
+		return sizes.h2
 	end
 	if variant == "h3" then
-		return 18
+		return sizes.h3
 	end
 	if variant == "h4" then
-		return 16
+		return sizes.h4
 	end
-	if variant == "h5" or variant == "h6" then
-		return 14
+	if variant == "h5" then
+		return sizes.h5
 	end
-	return 14
+	if variant == "h6" then
+		return sizes.h6
+	end
+	return sizes.body
 end
-local function richLabel(key, styles, inlines, variant, order)
+local function richLabel(key, styles, inlines, variant, order, size, sizes)
 	local text = inlinesToRichText(inlines)
 	local _attributes = {
 		key = key,
@@ -55,9 +60,14 @@ local function richLabel(key, styles, inlines, variant, order)
 	for _k, _v in styles.text do
 		_attributes[_k] = _v
 	end
+	for _k, _v in (if size ~= nil then {
+		Size = size,
+	} else {}) do
+		_attributes[_k] = _v
+	end
 	_attributes.LayoutOrder = order
 	_attributes.Text = text
-	_attributes.TextSize = textSizeFor(variant)
+	_attributes.TextSize = textSizeFor(sizes or {}, variant)
 	_attributes.Font = if variant ~= nil and variant ~= "body" then Enum.Font.SourceSansBold else Enum.Font.SourceSans
 	return React.createElement("textlabel", _attributes)
 end
@@ -69,17 +79,21 @@ local function inlineHasLink(inlines)
 	end
 	return false
 end
-local function inlineFlow(key, styles, inlines, variant, order, onLink)
+local function inlineFlow(key, styles, inlines, variant, order, onLink, sizes, flow)
+	if flow == nil then
+		flow = styles.flow
+	end
 	if not inlineHasLink(inlines) then
-		return richLabel(key, styles, inlines, variant, order)
+		local span = if flow ~= styles.flow then flow.Size else nil
+		return richLabel(key, styles, inlines, variant, order, span, sizes)
 	end
 	local pieces = inlinePieces(inlines)
-	local textSize = textSizeFor(variant)
+	local textSize = textSizeFor(sizes or {}, variant)
 	local font = if variant ~= nil and variant ~= "body" then Enum.Font.SourceSansBold else Enum.Font.SourceSans
 	local _attributes = {
 		key = key,
 	}
-	for _k, _v in styles.flow do
+	for _k, _v in flow do
 		_attributes[_k] = _v
 	end
 	_attributes.LayoutOrder = order
@@ -110,6 +124,7 @@ local function inlineFlow(key, styles, inlines, variant, order, onLink)
 			return React.createElement(Link, {
 				key = `ln-{index}`,
 				text = payload.text,
+				color = "primary",
 				sx = {
 					TextSize = textSize,
 					Font = font,
@@ -142,7 +157,7 @@ local function inlineFlow(key, styles, inlines, variant, order, onLink)
 	-- ▲ ReadonlyArray.map ▲
 	return React.createElement("frame", _attributes, _exp, _newValue)
 end
-local function renderBlock(block, index, styles, onLink)
+local function renderBlock(block, index, styles, sizes, onLink)
 	if block.kind == "heading" then
 		local _attributes = {
 			key = `h-{index}`,
@@ -151,7 +166,7 @@ local function renderBlock(block, index, styles, onLink)
 			_attributes[_k] = _v
 		end
 		_attributes.LayoutOrder = index
-		return React.createElement("frame", _attributes, inlineFlow("Text", styles, block.inlines, headingVariant(block.level), nil, onLink))
+		return React.createElement("frame", _attributes, inlineFlow("Text", styles, block.inlines, headingVariant(block.level), nil, onLink, sizes))
 	end
 	if block.kind == "paragraph" then
 		local _attributes = {
@@ -161,30 +176,19 @@ local function renderBlock(block, index, styles, onLink)
 			_attributes[_k] = _v
 		end
 		_attributes.LayoutOrder = index
-		return React.createElement("frame", _attributes, inlineFlow("Text", styles, block.inlines, "body", nil, onLink))
+		return React.createElement("frame", _attributes, inlineFlow("Text", styles, block.inlines, "body", nil, onLink, sizes))
 	end
 	if block.kind == "code" then
-		local _attributes = {
+		return React.createElement(CodeEditor, {
 			key = `c-{index}`,
-		}
-		for _k, _v in styles.code do
-			_attributes[_k] = _v
-		end
-		_attributes.LayoutOrder = index
-		local _exp = React.createElement("uicorner", {
-			CornerRadius = UDim.new(0, 4),
+			value = block.text,
+			language = block.language,
+			readOnly = true,
+			className = {
+				LayoutOrder = index,
+				Size = (styles.block).Size,
+			},
 		})
-		local _attributes_1 = table.clone(styles.codePad)
-		setmetatable(_attributes_1, nil)
-		local _exp_1 = React.createElement("uipadding", _attributes_1)
-		local _attributes_2 = {
-			key = "Code",
-		}
-		for _k, _v in styles.codeText do
-			_attributes_2[_k] = _v
-		end
-		_attributes_2.Text = block.text
-		return React.createElement("frame", _attributes, _exp, _exp_1, React.createElement("textlabel", _attributes_2))
 	end
 	if block.kind == "hr" then
 		return React.createElement(Divider, {
@@ -193,6 +197,7 @@ local function renderBlock(block, index, styles, onLink)
 			padding = 0,
 			className = {
 				LayoutOrder = index,
+				Size = (styles.block).Size,
 			},
 		})
 	end
@@ -204,19 +209,122 @@ local function renderBlock(block, index, styles, onLink)
 			_attributes[_k] = _v
 		end
 		_attributes.LayoutOrder = index
-		local _exp = React.createElement("uicorner", {
-			CornerRadius = UDim.new(0, 4),
-		})
+		local _attributes_1 = table.clone(styles.quoteCorner)
+		setmetatable(_attributes_1, nil)
+		local _exp = React.createElement("uicorner", _attributes_1)
+		local _attributes_2 = table.clone(styles.quoteBarPad)
+		setmetatable(_attributes_2, nil)
+		local _exp_1 = React.createElement("uipadding", _attributes_2)
+		local _attributes_3 = {
+			key = "Face",
+		}
+		for _k, _v in styles.quoteFace do
+			_attributes_3[_k] = _v
+		end
+		local _attributes_4 = table.clone(styles.quoteFaceCorner)
+		setmetatable(_attributes_4, nil)
+		local _exp_2 = React.createElement("uicorner", _attributes_4)
+		local _attributes_5 = table.clone(styles.quotePad)
+		setmetatable(_attributes_5, nil)
+		local _exp_3 = React.createElement("uipadding", _attributes_5)
+		local _attributes_6 = table.clone(styles.quoteStack)
+		setmetatable(_attributes_6, nil)
+		local _exp_4 = React.createElement("uilistlayout", _attributes_6)
+		local _exp_5 = block.paragraphs
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#_exp_5)
+		local _callback = function(inlines, para)
+			return inlineFlow(`p-{para}`, styles, inlines, "body", para, onLink, sizes, styles.quoteFlow)
+		end
+		for _k, _v in _exp_5 do
+			_newValue[_k] = _callback(_v, _k - 1, _exp_5)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		return React.createElement("frame", _attributes, _exp, _exp_1, React.createElement("frame", _attributes_3, _exp_2, _exp_3, _exp_4, _newValue))
+	end
+	if block.kind == "table" then
+		local alignOf = function(align)
+			if align == "center" then
+				return Enum.TextXAlignment.Center
+			end
+			if align == "right" then
+				return Enum.TextXAlignment.Right
+			end
+			return Enum.TextXAlignment.Left
+		end
+		local _array = { block.header }
+		local _length = #_array
+		local _array_1 = block.rows
+		table.move(_array_1, 1, #_array_1, _length + 1, _array)
+		local lines = _array
+		local _attributes = {
+			key = `t-{index}`,
+		}
+		for _k, _v in styles.tableScroll do
+			_attributes[_k] = _v
+		end
+		_attributes.LayoutOrder = index
 		local _attributes_1 = {
-			key = "Bar",
+			key = "Grid",
 		}
-		for _k, _v in styles.quoteBar do
+		for _k, _v in styles.tableGrid do
 			_attributes_1[_k] = _v
 		end
-		local _exp_1 = React.createElement("frame", _attributes_1)
-		local _attributes_2 = table.clone(styles.quotePad)
-		setmetatable(_attributes_2, nil)
-		return React.createElement("frame", _attributes, _exp, _exp_1, React.createElement("uipadding", _attributes_2), inlineFlow("Text", styles, block.inlines, "body", nil, onLink))
+		local _exp = React.createElement("uilistlayout", {
+			FillDirection = Enum.FillDirection.Vertical,
+			SortOrder = Enum.SortOrder.LayoutOrder,
+		})
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#lines)
+		local _callback = function(row, rowIndex)
+			local _attributes_2 = {
+				key = `tr-{rowIndex}`,
+			}
+			for _k, _v in styles.tableRow do
+				_attributes_2[_k] = _v
+			end
+			for _k, _v in (if rowIndex == 0 then styles.tableHead else {}) do
+				_attributes_2[_k] = _v
+			end
+			_attributes_2.LayoutOrder = rowIndex
+			local _attributes_3 = table.clone(styles.tableStroke)
+			setmetatable(_attributes_3, nil)
+			local _exp_1 = React.createElement("uistroke", _attributes_3)
+			local _exp_2 = React.createElement("uilistlayout", {
+				FillDirection = Enum.FillDirection.Horizontal,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+			})
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue_1 = table.create(#row)
+			local _callback_1 = function(cell, col)
+				local _attributes_4 = {
+					key = `td-{col}`,
+				}
+				for _k, _v in styles.tableCell do
+					_attributes_4[_k] = _v
+				end
+				for _k, _v in (if rowIndex == 0 then styles.tableHeadText else {}) do
+					_attributes_4[_k] = _v
+				end
+				_attributes_4.LayoutOrder = col
+				_attributes_4.Text = inlinesToRichText(cell)
+				_attributes_4.TextXAlignment = alignOf(block.align[col + 1] or "left")
+				local _attributes_5 = table.clone(styles.tableCellPad)
+				setmetatable(_attributes_5, nil)
+				return React.createElement("textlabel", _attributes_4, React.createElement("uipadding", _attributes_5))
+			end
+			for _k, _v in row do
+				_newValue_1[_k] = _callback_1(_v, _k - 1, row)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			return React.createElement("frame", _attributes_2, _exp_1, _exp_2, _newValue_1)
+		end
+		for _k, _v in lines do
+			_newValue[_k] = _callback(_v, _k - 1, lines)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		return React.createElement("frame", _attributes, React.createElement("frame", _attributes_1, _exp, _newValue))
 	end
 	if block.kind == "list" then
 		local _attributes = {
@@ -251,7 +359,7 @@ local function renderBlock(block, index, styles, onLink)
 				_attributes_1[_k] = _v
 			end
 			_attributes_1.LayoutOrder = itemIndex
-			return React.createElement("frame", _attributes_1, inlineFlow("Text", styles, labeled, "body", nil, onLink))
+			return React.createElement("frame", _attributes_1, inlineFlow("Text", styles, labeled, "body", nil, onLink, sizes))
 		end
 		for _k, _v in _exp_1 do
 			_newValue[_k] = _callback(_v, _k - 1, _exp_1)
@@ -273,6 +381,8 @@ local function Markdown(props)
 	local id = _binding.id
 	local ref = _binding.ref
 	local styles = useMarkdownStyles()
+	local _binding_1 = useTheme()
+	local theme = _binding_1.theme
 	local blocks = parseMarkdown(value)
 	local _attributes = {
 		tag = "frame",
@@ -286,19 +396,22 @@ local function Markdown(props)
 	_attributes.base = styles.root
 	_attributes.className = className
 	_attributes.sx = sx
-	local _attributes_1 = table.clone(styles.layout)
+	local _attributes_1 = table.clone(styles.inset)
 	setmetatable(_attributes_1, nil)
-	local _exp = React.createElement("uilistlayout", _attributes_1)
+	local _exp = React.createElement("uipadding", _attributes_1)
+	local _attributes_2 = table.clone(styles.layout)
+	setmetatable(_attributes_2, nil)
+	local _exp_1 = React.createElement("uilistlayout", _attributes_2)
 	-- ▼ ReadonlyArray.map ▼
 	local _newValue = table.create(#blocks)
 	local _callback = function(block, index)
-		return renderBlock(block, index, styles, onLink)
+		return renderBlock(block, index, styles, theme.typography.fontSizes, onLink)
 	end
 	for _k, _v in blocks do
 		_newValue[_k] = _callback(_v, _k - 1, blocks)
 	end
 	-- ▲ ReadonlyArray.map ▲
-	return React.createElement(SxHost, _attributes, _exp, _newValue)
+	return React.createElement(SxHost, _attributes, _exp, _exp_1, _newValue)
 end
 local default = Markdown
 return {

package/out/ui/packages/markdown/components/Markdown.styles.luau

@@ -5,7 +5,16 @@ local componentStyles = _theme.componentStyles
 local createStyles = _theme.createStyles
 local useMarkdownStyles = componentStyles("Markdown", function(theme)
 	local gap = if theme.density == "compact" then theme.padding.calc(1) else theme.spacing.calc(1)
-	local _object = {
+	local pad = theme.padding.calc(2)
+	local span = UDim2.new(1, -pad * 2, 0, 0)
+	local cellWidth = theme.spacing.calc(14)
+	return createStyles({
+		inset = {
+			PaddingTop = UDim.new(0, pad),
+			PaddingBottom = UDim.new(0, pad),
+			PaddingLeft = UDim.new(0, pad),
+			PaddingRight = UDim.new(0, pad),
+		},
 		root = {
 			AutomaticSize = Enum.AutomaticSize.Y,
 			Size = UDim2.new(1, 0, 0, 0),
@@ -21,7 +30,7 @@ local useMarkdownStyles = componentStyles("Markdown", function(theme)
 		},
 		block = {
 			AutomaticSize = Enum.AutomaticSize.Y,
-			Size = UDim2.new(1, 0, 0, 0),
+			Size = span,
 			BackgroundTransparency = 1,
 			BorderSizePixel = 0,
 		},
@@ -38,87 +47,127 @@ local useMarkdownStyles = componentStyles("Markdown", function(theme)
 			TextWrapped = true,
 			RichText = true,
 		},
-		code = {
+		quote = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = span,
+			BackgroundColor3 = theme.palette.primary.main,
+			BorderSizePixel = 0,
+		},
+		quoteCorner = {
+			CornerRadius = UDim.new(0, theme.shape.borderRadius),
+		},
+		quoteFaceCorner = {
+			CornerRadius = UDim.new(0, theme.shape.radius.small),
+		},
+		quoteBarPad = {
+			PaddingLeft = UDim.new(0, 3),
+		},
+		quoteFace = {
 			AutomaticSize = Enum.AutomaticSize.Y,
 			Size = UDim2.new(1, 0, 0, 0),
 			BackgroundColor3 = theme.palette.surface.paper,
 			BorderSizePixel = 0,
 		},
-		codePad = {
+		quotePad = {
+			PaddingTop = UDim.new(0, theme.padding.calc(1)),
+			PaddingBottom = UDim.new(0, theme.padding.calc(1)),
+			PaddingLeft = UDim.new(0, theme.padding.calc(1)),
+			PaddingRight = UDim.new(0, theme.padding.calc(1)),
+		},
+		quoteStack = {
+			FillDirection = Enum.FillDirection.Vertical,
+			HorizontalAlignment = Enum.HorizontalAlignment.Left,
+			SortOrder = Enum.SortOrder.LayoutOrder,
+			Padding = UDim.new(0, theme.padding.calc(1)),
+		},
+		tableScroll = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = span,
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+		},
+		tableGrid = {
+			AutomaticSize = Enum.AutomaticSize.XY,
+			Size = UDim2.fromScale(0, 0),
+			BackgroundColor3 = theme.palette.surface.paper,
+			BorderSizePixel = 0,
+		},
+		tableRow = {
+			AutomaticSize = Enum.AutomaticSize.XY,
+			Size = UDim2.fromScale(0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+		},
+		tableHead = {
+			BackgroundColor3 = theme.palette.surface.elevated,
+			BackgroundTransparency = 0,
+		},
+		tableStroke = {
+			Color = theme.palette.divider,
+			Thickness = 1,
+			Transparency = 0,
+			ApplyStrokeMode = Enum.ApplyStrokeMode.Border,
+		},
+		tableCell = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = UDim2.new(0, cellWidth, 0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies.default,
+			TextSize = theme.typography.fontSizes.body,
+			TextColor3 = theme.palette.text.primary,
+			TextYAlignment = Enum.TextYAlignment.Top,
+			TextWrapped = true,
+			RichText = true,
+		},
+		tableHeadText = {
+			Font = theme.typography.fontFamilies.bold,
+			TextColor3 = theme.palette.text.primary,
+		},
+		tableCellPad = {
 			PaddingTop = UDim.new(0, theme.padding.calc(1)),
 			PaddingBottom = UDim.new(0, theme.padding.calc(1)),
-			PaddingLeft = UDim.new(0, theme.padding.calc(1.5)),
-			PaddingRight = UDim.new(0, theme.padding.calc(1.5)),
-		},
-	}
-	local _left = "codeText"
-	local _object_1 = {
-		AutomaticSize = Enum.AutomaticSize.Y,
-		Size = UDim2.new(1, 0, 0, 0),
-		BackgroundTransparency = 1,
-		BorderSizePixel = 0,
-		Font = Enum.Font.RobotoMono,
-	}
-	local _left_1 = "TextSize"
-	local _condition = theme.typography.fontSizes.caption
-	if _condition == nil then
-		_condition = theme.typography.fontSizes.body
-	end
-	_object_1[_left_1] = _condition
-	_object_1.TextColor3 = theme.palette.text.primary
-	_object_1.TextXAlignment = Enum.TextXAlignment.Left
-	_object_1.TextYAlignment = Enum.TextYAlignment.Top
-	_object_1.TextWrapped = true
-	_object[_left] = _object_1
-	_object.quote = {
-		AutomaticSize = Enum.AutomaticSize.Y,
-		Size = UDim2.new(1, 0, 0, 0),
-		BackgroundColor3 = theme.palette.surface.paper,
-		BorderSizePixel = 0,
-	}
-	_object.quoteBar = {
-		Size = UDim2.new(0, 3, 1, 0),
-		BackgroundColor3 = theme.palette.primary.main,
-		BorderSizePixel = 0,
-	}
-	_object.quotePad = {
-		PaddingTop = UDim.new(0, theme.padding.calc(1)),
-		PaddingBottom = UDim.new(0, theme.padding.calc(1)),
-		PaddingLeft = UDim.new(0, theme.padding.calc(2)),
-		PaddingRight = UDim.new(0, theme.padding.calc(1)),
-	}
-	_object.listItem = {
-		AutomaticSize = Enum.AutomaticSize.Y,
-		Size = UDim2.new(1, 0, 0, 0),
-		BackgroundTransparency = 1,
-		BorderSizePixel = 0,
-	}
-	_object.flow = {
-		AutomaticSize = Enum.AutomaticSize.Y,
-		Size = UDim2.new(1, 0, 0, 0),
-		BackgroundTransparency = 1,
-		BorderSizePixel = 0,
-	}
-	_object.flowLayout = {
-		FillDirection = Enum.FillDirection.Horizontal,
-		HorizontalAlignment = Enum.HorizontalAlignment.Left,
-		VerticalAlignment = Enum.VerticalAlignment.Center,
-		SortOrder = Enum.SortOrder.LayoutOrder,
-		Wraps = true,
-		Padding = UDim.new(0, 4),
-	}
-	_object.word = {
-		AutomaticSize = Enum.AutomaticSize.XY,
-		Size = UDim2.fromScale(0, 0),
-		BackgroundTransparency = 1,
-		BorderSizePixel = 0,
-		Font = theme.typography.fontFamilies.default,
-		TextSize = theme.typography.fontSizes.body,
-		TextColor3 = theme.palette.text.primary,
-		TextXAlignment = Enum.TextXAlignment.Left,
-		RichText = true,
-	}
-	return createStyles(_object)
+			PaddingLeft = UDim.new(0, theme.padding.calc(1)),
+			PaddingRight = UDim.new(0, theme.padding.calc(1)),
+		},
+		listItem = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = UDim2.new(1, 0, 0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+		},
+		flow = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = UDim2.new(1, 0, 0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+		},
+		quoteFlow = {
+			AutomaticSize = Enum.AutomaticSize.Y,
+			Size = UDim2.new(1, 0, 0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+		},
+		flowLayout = {
+			FillDirection = Enum.FillDirection.Horizontal,
+			HorizontalAlignment = Enum.HorizontalAlignment.Left,
+			VerticalAlignment = Enum.VerticalAlignment.Center,
+			SortOrder = Enum.SortOrder.LayoutOrder,
+			Wraps = true,
+			Padding = UDim.new(0, 4),
+		},
+		word = {
+			AutomaticSize = Enum.AutomaticSize.XY,
+			Size = UDim2.fromScale(0, 0),
+			BackgroundTransparency = 1,
+			BorderSizePixel = 0,
+			Font = theme.typography.fontFamilies.default,
+			TextSize = theme.typography.fontSizes.body,
+			TextColor3 = theme.palette.text.primary,
+			TextXAlignment = Enum.TextXAlignment.Left,
+			RichText = true,
+		},
+	})
 end)
 local default = useMarkdownStyles
 return {