@rbxts/uiblox 0.1.18 → 0.1.20

package/out/ui/packages/preloader/components/Preloader.d.ts

@@ -1,13 +1,19 @@
+import { ComponentType } from "@rbxts/react";
 import { CustomizedProps } from "../../../../theme/index";
 export interface PreloaderAssets {
     [key: string]: string | PreloaderAssets;
 }
+export interface CustomAdornmentProps {
+    progress: number;
+}
 export interface PreloaderProps {
-    assetMap: Map<string, PreloaderAssets>;
-    logoSrc?: string;
+    preloaderAssets: Map<string, PreloaderAssets>;
+    icon?: string;
     showPercentage?: boolean;
     loaderPrecision?: number;
+    hideProgressBar?: boolean;
     showAssetName?: boolean;
+    adornment?: ComponentType<CustomAdornmentProps>;
 }
 declare function Preloader(props: CustomizedProps<Frame, PreloaderProps>): JSX.Element;
 export default Preloader;

package/out/ui/packages/preloader/components/Preloader.luau

@@ -12,7 +12,8 @@ local ProgressBar = TS.import(script, script.Parent.Parent.Parent, "progressBar"
 local usePreloaderStyles = TS.import(script, script.Parent, "Preloader.styles").default
 local function Preloader(props)
 	local _binding = props
-	local assetMap = _binding.assetMap
+	local preloaderAssets = _binding.preloaderAssets
+	local icon = _binding.icon
 	local showPercentage = _binding.showPercentage
 	if showPercentage == nil then
 		showPercentage = false
@@ -21,10 +22,16 @@ local function Preloader(props)
 	if loaderPrecision == nil then
 		loaderPrecision = 0
 	end
+	local hideProgressBar = _binding.hideProgressBar
+	if hideProgressBar == nil then
+		hideProgressBar = false
+	end
 	local showAssetName = _binding.showAssetName
 	if showAssetName == nil then
 		showAssetName = false
 	end
+	local Adornment = _binding.adornment
+	local className = _binding.className
 	local children = _binding.children
 	local percentage, setPercentage = useState(0)
 	local loaded, setLoaded = useState(false)
@@ -55,8 +62,8 @@ local function Preloader(props)
 		local _callback = function(assets, category)
 			scan(assets, `{category}`)
 		end
-		for _k, _v in assetMap do
-			_callback(_v, _k, assetMap)
+		for _k, _v in preloaderAssets do
+			_callback(_v, _k, preloaderAssets)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
 		return { contentIds, contentNamesById }
@@ -79,6 +86,12 @@ local function Preloader(props)
 		end)
 		setCurrentAsset(nil)
 	end), {})
+	local percentageStr = useMemo(function()
+		if not showPercentage then
+			return nil
+		end
+		return `{string.format(`%.{loaderPrecision}f`, percentage)}%`
+	end, { showPercentage, loaderPrecision, percentage })
 	local _result
 	if loaded then
 		_result = ({
@@ -91,16 +104,31 @@ local function Preloader(props)
 		for _k, _v in container do
 			_attributes[_k] = _v
 		end
-		local _attributes_1 = table.clone(logo)
-		setmetatable(_attributes_1, nil)
-		local _exp = React.createElement("imagelabel", _attributes_1)
-		local _attributes_2 = table.clone(label)
-		setmetatable(_attributes_2, nil)
-		_attributes_2.Text = `Loading {if currentAsset ~= nil then currentAsset else "resources"}... {if showPercentage then string.format(`%.{loaderPrecision}f\%`, percentage) else ""}`
-		_result = (React.createElement("frame", _attributes, _exp, React.createElement("textlabel", _attributes_2), React.createElement(ProgressBar, {
-			className = progressBar,
+		if className then
+			for _k, _v in className do
+				_attributes[_k] = _v
+			end
+		end
+		local _exp = Adornment ~= nil and React.createElement(Adornment, {
 			progress = percentage,
-		})))
+		})
+		local _condition = icon ~= nil
+		if _condition then
+			local _attributes_1 = table.clone(logo)
+			setmetatable(_attributes_1, nil)
+			_condition = React.createElement("imagelabel", _attributes_1)
+		end
+		local _condition_1 = not hideProgressBar
+		if _condition_1 then
+			local _attributes_1 = table.clone(label)
+			setmetatable(_attributes_1, nil)
+			_attributes_1.Text = `Loading {if currentAsset ~= nil then currentAsset else "resources"}... {percentageStr}`
+			_condition_1 = (React.createElement(React.Fragment, nil, React.createElement("textlabel", _attributes_1), React.createElement(ProgressBar, {
+				className = progressBar,
+				progress = percentage,
+			})))
+		end
+		_result = (React.createElement("frame", _attributes, _exp, _condition, _condition_1))
 	end
 	return React.createElement(React.Fragment, nil, _result)
 end

package/out/ui/packages/preloader/components/Preloader.styles.luau

@@ -4,11 +4,6 @@ local _theme = TS.import(script, script.Parent.Parent.Parent.Parent.Parent, "the
 local createStyles = _theme.createStyles
 local makeStyles = _theme.makeStyles
 local usePreloaderStyles = makeStyles(function(theme, props)
-	local getLogoSrc = function(props)
-		local _binding = props
-		local logoSrc = _binding.logoSrc
-		return logoSrc
-	end
 	return createStyles({
 		container = {
 			Size = UDim2.new(1, 0, 1, 0),
@@ -22,7 +17,7 @@ local usePreloaderStyles = makeStyles(function(theme, props)
 			AnchorPoint = Vector2.new(0.5, 0.5),
 			BackgroundTransparency = 1,
 			BorderSizePixel = 0,
-			Image = getLogoSrc(props),
+			Image = props.icon,
 			ScaleType = Enum.ScaleType.Fit,
 			ZIndex = 110000,
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rbxts/uiblox",
-	"version": "0.1.18",
+	"version": "0.1.20",
 	"description": "UI Library and theming for roblox-ts projects",
 	"main": "out/init.lua",
 	"scripts": {