Patch to PopUp logic

nightcycle · Feb 28, 2024 · 009cba3 · 009cba3
1 parent 1306772
commit 009cba3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/Component/Search/Filled/cfusion-theme.story.luau b/src/Component/Search/Filled/cfusion-theme.story.luau
@@ -37,6 +37,7 @@ return function(frame: Frame)
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.primaryContainer(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -50,15 +51,15 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame
 			end
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.secondaryContainer(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -72,15 +73,15 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame
 			end
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.tertiaryContainer(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -94,15 +95,15 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame
 			end
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.primary(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -116,15 +117,15 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame
 			end
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.secondary(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -138,15 +139,15 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame
 			end
 			do
 				local button = maid:GiveTask(
 					Module.ColdFusion.tertiary(
+						style,
 						function(input: string): string
 							print(`entered: {input}`)
 							return input
@@ -160,8 +161,7 @@ return function(frame: Frame)
 							return options
 						end,
 						nil,
-						0,
-						style
+						0
 					)
 				)
 				button.Parent = halfFrame

diff --git a/src/Util/PopUp/init.luau b/src/Util/PopUp/init.luau
@@ -67,8 +67,11 @@ function Util.ColdFusion.new(absolutePosition: CanBeState<Vector2>, anchorPoint:
 		local absSize = out.AbsoluteSize
 		local goalPos = goalAbsolutePositionState:Get()
 		local aPoint = anchorPointState:Get()
-		local x = math.clamp(goalPos.X, absSize.X * aPoint.X, viewportSize.X - absSize.X * (1 - aPoint.X))
-		local y = math.clamp(goalPos.Y, absSize.Y * aPoint.Y, viewportSize.Y - absSize.Y * (1 - aPoint.Y))
+		local xMin = absSize.X * aPoint.X
+		local yMin = absSize.Y * aPoint.Y
+
+		local x = math.clamp(goalPos.X, xMin, math.max(xMin, viewportSize.X - absSize.X * (1 - aPoint.X)))
+		local y = math.clamp(goalPos.Y, yMin, math.max(yMin, viewportSize.Y - absSize.Y * (1 - aPoint.Y)))
 		finalPositionState:Set(Vector2.new(x, y))
 	end))