@rbxts/uiblox 0.1.28 → 0.1.30

package/out/theme/styles/utilities/classNames.luau

@@ -3,10 +3,25 @@ local TS = _G[script]
 local classNamesInternal = function(conditionalStyles, ...)
 	local styles = { ... }
 	local style = {}
+	-- ▼ ReadonlyArray.forEach ▼
+	local _callback = function(value)
+		if value ~= 0 and value == value and value ~= "" and value then
+			local _object = table.clone(style)
+			setmetatable(_object, nil)
+			for _k, _v in value do
+				_object[_k] = _v
+			end
+			style = _object
+		end
+	end
+	for _k, _v in styles do
+		_callback(_v, _k - 1, styles)
+	end
+	-- ▲ ReadonlyArray.forEach ▲
 	local _result = conditionalStyles
 	if _result ~= nil then
 		-- ▼ ReadonlyMap.forEach ▼
-		local _callback = function(value, key)
+		local _callback_1 = function(value, key)
 			if value then
 				local _object = table.clone(style)
 				setmetatable(_object, nil)
@@ -17,25 +32,10 @@ local classNamesInternal = function(conditionalStyles, ...)
 			end
 		end
 		for _k, _v in _result do
-			_callback(_v, _k, _result)
+			_callback_1(_v, _k, _result)
 		end
 		-- ▲ ReadonlyMap.forEach ▲
 	end
-	-- ▼ ReadonlyArray.forEach ▼
-	local _callback = function(value)
-		if value ~= 0 and value == value and value ~= "" and value then
-			local _object = table.clone(style)
-			setmetatable(_object, nil)
-			for _k, _v in value do
-				_object[_k] = _v
-			end
-			style = _object
-		end
-	end
-	for _k, _v in styles do
-		_callback(_v, _k - 1, styles)
-	end
-	-- ▲ ReadonlyArray.forEach ▲
 	local _object = table.clone(style)
 	setmetatable(_object, nil)
 	return _object
@@ -47,7 +47,36 @@ local function classNames(...)
 	local hasConditionalStyles = function(args)
 		local _exitType, _returns = TS.try(function()
 			local lastArg = args[#args]
-			return TS.TRY_RETURN, { lastArg ~= nil and type(lastArg) == "table" }
+			-- If the last argument is undefined or not a table then its not a ConditionalStyles<T>
+			-- Map<K, V> compiles to a table literal (ref: https://roblox-ts.com/docs/api/constructors)
+			if lastArg == nil or not (type(lastArg) == "table") then
+				return TS.TRY_RETURN, { false }
+			end
+			local lastArgAsConditionalStylesMap = lastArg
+			local matchesMapFormat = true
+			local _result = lastArgAsConditionalStylesMap
+			if _result ~= nil then
+				-- ▼ ReadonlyMap.forEach ▼
+				local _callback = function(value, key)
+					-- Assume that the last argument is a ConditionalStyles<T> with correct format (Map<WriteableStyle<T>, boolean>)
+					-- If the key is not a WriteableStyle<T> then it does not match the format
+					-- If the value is not a boolean then it does not match the format
+					local _value = value
+					local _condition = not (type(_value) == "boolean")
+					if not _condition then
+						local _key = key
+						_condition = not (type(_key) == "table")
+					end
+					if _condition then
+						matchesMapFormat = false
+					end
+				end
+				for _k, _v in _result do
+					_callback(_v, _k, _result)
+				end
+				-- ▲ ReadonlyMap.forEach ▲
+			end
+			return TS.TRY_RETURN, { matchesMapFormat }
 		end, function()
 			-- If we catch an error, it means that the last argument is not a ConditionalStyles<T>
 			return TS.TRY_RETURN, { false }

package/out/ui/index.d.ts

@@ -2,6 +2,9 @@ export * from "./constants/index";
 export * from "./enums/index";
 export { Divider } from "./packages/index";
 export { DividerProps } from "./packages/index";
+export { ErrorBoundary } from "./packages/index";
+export { ErrorBoundaryProps } from "./packages/index";
+export { ErrorBoundaryState } from "./packages/index";
 export { Icon } from "./packages/index";
 export { IconProps } from "./packages/index";
 export { IconButton } from "./packages/index";

package/out/ui/init.luau

@@ -8,6 +8,7 @@ for _k, _v in TS.import(script, script, "enums") or {} do
 	exports[_k] = _v
 end
 exports.Divider = TS.import(script, script, "packages").Divider
+exports.ErrorBoundary = TS.import(script, script, "packages").ErrorBoundary
 exports.Icon = TS.import(script, script, "packages").Icon
 exports.IconButton = TS.import(script, script, "packages").IconButton
 exports.Input = TS.import(script, script, "packages").Input

package/out/ui/packages/errorBoundary/components/ErrorBoundary.d.ts

@@ -0,0 +1,17 @@
+import React, { Component, ErrorInfo } from "@rbxts/react";
+export interface ErrorBoundaryProps {
+    fallback?: (error: unknown) => React.Element;
+}
+export interface ErrorBoundaryState {
+    hasError: boolean;
+    message?: unknown;
+}
+export declare class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
+    state: ErrorBoundaryState;
+    componentDidCatch(message: unknown, info: ErrorInfo): void;
+    render(): boolean | ReadonlyMap<React.Key, React.ReactNode> | {
+        readonly [key: string]: React.ReactNode;
+        readonly [key: number]: React.ReactNode;
+    } | readonly React.ReactNode[] | JSX.Element | undefined;
+}
+export default ErrorBoundary;

package/out/ui/packages/errorBoundary/components/ErrorBoundary.luau

@@ -0,0 +1,46 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local _react = TS.import(script, TS.getModule(script, "@rbxts", "react"))
+local React = _react
+local Component = _react.Component
+local ReactComponent = _react.ReactComponent
+local ErrorBoundary
+do
+	local super = Component
+	ErrorBoundary = setmetatable({}, {
+		__tostring = function()
+			return "ErrorBoundary"
+		end,
+		__index = super,
+	})
+	ErrorBoundary.__index = ErrorBoundary
+	function ErrorBoundary.new(...)
+		local self = setmetatable({}, ErrorBoundary)
+		return self:constructor(...) or self
+	end
+	function ErrorBoundary:constructor(...)
+		super.constructor(self, ...)
+		self.state = {
+			hasError = false,
+		}
+	end
+	function ErrorBoundary:componentDidCatch(message, info)
+		warn(message, info.componentStack)
+		self:setState({
+			hasError = true,
+			message = `{message} {info.componentStack}`,
+		})
+	end
+	function ErrorBoundary:render()
+		if self.state.hasError then
+			return if self.props.fallback ~= nil then self.props.fallback(self.state.message) else React.createElement(React.Fragment)
+		end
+		return self.props.children
+	end
+	ErrorBoundary = ReactComponent(ErrorBoundary) or ErrorBoundary
+end
+local default = ErrorBoundary
+return {
+	ErrorBoundary = ErrorBoundary,
+	default = default,
+}

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

@@ -0,0 +1,4 @@
+export { default as ErrorBoundary } from "./components/ErrorBoundary";
+export { ErrorBoundaryProps } from "./components/ErrorBoundary";
+export { ErrorBoundaryState } from "./components/ErrorBoundary";
+export * from "./components/ErrorBoundary";

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

@@ -0,0 +1,8 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local exports = {}
+exports.ErrorBoundary = TS.import(script, script, "components", "ErrorBoundary").default
+for _k, _v in TS.import(script, script, "components", "ErrorBoundary") or {} do
+	exports[_k] = _v
+end
+return exports

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

@@ -1,4 +1,5 @@
 export * from "./divider/index";
+export * from "./errorBoundary/index";
 export * from "./icon/index";
 export * from "./iconButton/index";
 export * from "./input/index";

package/out/ui/packages/init.luau

@@ -4,6 +4,9 @@ local exports = {}
 for _k, _v in TS.import(script, script, "divider") or {} do
 	exports[_k] = _v
 end
+for _k, _v in TS.import(script, script, "errorBoundary") or {} do
+	exports[_k] = _v
+end
 for _k, _v in TS.import(script, script, "icon") or {} do
 	exports[_k] = _v
 end

package/package.json

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