@rbxts/uiblox 0.1.51 → 0.1.53

package/out/ui/packages/button/components/Button.luau

@@ -144,21 +144,22 @@ local function Button(props)
 			_attributes[_k] = _v
 		end
 	end
-	local _condition_1 = variant == "outlined"
+	local _condition_1 = variant == "outlined" and not animating
 	if _condition_1 then
 		local _attributes_1 = table.clone(stroke)
 		setmetatable(_attributes_1, nil)
 		_condition_1 = React.createElement("uistroke", _attributes_1)
 	end
+	local _exp = animating and React.createElement(LoadingStroke, {
+		animating = animating,
+	})
 	local _condition_2 = rounded
 	if _condition_2 then
 		local _attributes_1 = table.clone(corner)
 		setmetatable(_attributes_1, nil)
 		_condition_2 = React.createElement("uicorner", _attributes_1)
 	end
-	return React.createElement("textbutton", _attributes, _condition_1, _condition_2, children, React.createElement(LoadingStroke, {
-		animating = animating,
-	}))
+	return React.createElement("textbutton", _attributes, _condition_1, _exp, _condition_2, children)
 end
 local default = Button
 return {

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

@@ -12,3 +12,4 @@ export * from "./toast/index";
 export * from "./treeView/index";
 export * from "./typography/index";
 export * from "./button/index";
+export * from "./loadingStroke/index";

package/out/ui/packages/init.luau

@@ -43,4 +43,7 @@ end
 for _k, _v in TS.import(script, script, "button") or {} do
 	exports[_k] = _v
 end
+for _k, _v in TS.import(script, script, "loadingStroke") or {} do
+	exports[_k] = _v
+end
 return exports

package/out/ui/packages/loadingStroke/components/LoadingStroke.luau

@@ -31,31 +31,27 @@ local function LoadingStroke(props)
 			end
 		end
 	end, { animating })
-	local _condition = animating
-	if _condition then
-		local _attributes = {}
-		local _condition_1 = id
-		if not (_condition_1 ~= 0 and _condition_1 == _condition_1 and _condition_1 ~= "" and _condition_1) then
-			_condition_1 = "LoadingStroke"
-		end
-		_attributes.key = _condition_1
-		_attributes.ref = ref
-		_attributes.Color = Color3.fromRGB(255, 255, 255)
-		_attributes.Thickness = 2
-		_attributes.ApplyStrokeMode = Enum.ApplyStrokeMode.Border
-		if className then
-			for _k, _v in className do
-				_attributes[_k] = _v
-			end
+	local _attributes = {}
+	local _condition = id
+	if not (_condition ~= 0 and _condition == _condition and _condition ~= "" and _condition) then
+		_condition = "LoadingStroke"
+	end
+	_attributes.key = _condition
+	_attributes.ref = ref
+	_attributes.Color = Color3.fromRGB(255, 255, 255)
+	_attributes.Thickness = 2
+	_attributes.ApplyStrokeMode = Enum.ApplyStrokeMode.Border
+	if className then
+		for _k, _v in className do
+			_attributes[_k] = _v
 		end
-		_condition = (React.createElement("uistroke", _attributes, React.createElement("uigradient", {
-			ref = gradientRef,
-			Transparency = NumberSequence.new({ NumberSequenceKeypoint.new(0, 1), NumberSequenceKeypoint.new(0.5, 0), NumberSequenceKeypoint.new(1, 1) }),
-			Rotation = 0,
-			Color = ColorSequence.new({ ColorSequenceKeypoint.new(0, Color3.fromRGB(255, 255, 255)), ColorSequenceKeypoint.new(0.5, Color3.fromRGB(235, 235, 235)), ColorSequenceKeypoint.new(1, Color3.fromRGB(255, 255, 255)) }),
-		}), children))
 	end
-	return React.createElement(React.Fragment, nil, _condition)
+	return React.createElement("uistroke", _attributes, React.createElement("uigradient", {
+		ref = gradientRef,
+		Transparency = NumberSequence.new({ NumberSequenceKeypoint.new(0, 1), NumberSequenceKeypoint.new(0.5, 0), NumberSequenceKeypoint.new(1, 1) }),
+		Rotation = 0,
+		Color = ColorSequence.new({ ColorSequenceKeypoint.new(0, Color3.fromRGB(255, 255, 255)), ColorSequenceKeypoint.new(0.5, Color3.fromRGB(235, 235, 235)), ColorSequenceKeypoint.new(1, Color3.fromRGB(255, 255, 255)) }),
+	}), children)
 end
 local default = LoadingStroke
 return {

package/package.json

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