Skip to content

refactor: cleanup popup code #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parker02311 merged 4 commits into from
Dec 10, 2025
Merged

refactor: cleanup popup code #53

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d51a9d4
Improve popup handling and animation stability
TwrblxDevs Nov 3, 2025
84b54f4
cleanup: fix UIElement input events and improve popup lifecycle
TwrblxDevs Nov 4, 2025
963b317
fix: correct types in new popup
parker02311 Dec 10, 2025
03c5d97
revert: bring back poison testing in popup
parker02311 Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 57 additions & 42 deletions src/Components/popup.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,41 @@ export type popup = {
}
local popup = {} :: popup

local function safeScope(scope: any): boolean
local mt = getmetatable(scope)
return not (typeof(mt) == "table" and mt._FUSION_POISONED)
end

local function getColors(valueType: string, theme)
if valueType == "primary" then
return theme.colors.sky, theme.colors.crust, theme.colors.sky, theme.colors.sky
elseif valueType == "danger" then
return theme.colors.red, theme.colors.crust, theme.colors.red, theme.colors.red
else
return theme.colors.crust, theme.colors.text, theme.colors.crust, theme.colors.maroon
end
end

local function cleanupPopups(self)
for _, popupInstance in ipairs({ self.currentPopup, self.currentCustomPopup }) do
if popupInstance and popupInstance.Destroy then
pcall(function()
popupInstance:Destroy()
end)
end
end
self.currentPopup = nil
self.currentCustomPopup = nil
end


function popup.addPopup(self, scope, props)
if self.currentContainer == nil then
return
end
if self.currentPopup ~= nil then
self.currentPopup:Destroy()
self.currentPopup = nil
end
if self.currentCustomPopup ~= nil then
self.currentCustomPopup.Parent = nil
self.currentCustomPopup = nil
end

cleanupPopups(self)

local currentContainer = scope.peek(self.currentContainer)
local currentTheme = RedonUI.theme.theme:now()
local newPopup
Expand Down Expand Up @@ -132,22 +155,8 @@ function popup.addPopup(self, scope, props)

--selene: allow(shadowing)
self.parentScope:ForValues(props.actions, function(_, newScope: types.Scope, value: action)
local BackgroundColor = if value.type == "primary"
then currentTheme.colors.sky
elseif value.type == "danger" then currentTheme.colors.red
else currentTheme.colors.crust
local TextColor = if value.type == "standard"
then currentTheme.colors.text
else currentTheme.colors.crust
local ShadowColor = if value.type == "primary"
then currentTheme.colors.sky
elseif value.type == "danger" then currentTheme.colors.red
else currentTheme.colors.crust
local ButtonGlowColor = if value.type == "primary"
then if currentTheme.colors.white == Color3.new(1, 1, 1)
then currentTheme.colors.text
else currentTheme.colors.base
else currentTheme.colors.maroon
local BackgroundColor, TextColor, ShadowColor, ButtonGlowColor =
getColors(value.type, currentTheme)
return newScope:textButton {
Size = UDim2.fromOffset(175, 35),
Text = value.text,
Expand Down Expand Up @@ -179,31 +188,34 @@ function popup.addPopup(self, scope, props)
},
}
self.enabled:set(true)
newPopup.Parent = currentContainer
if currentContainer and currentContainer.Parent then
newPopup.Parent = currentContainer
end

self.currentPopup = newPopup
end

function popup.customPopup(self, scope, child)
if self.currentContainer == nil then
return
end
if self.currentPopup ~= nil then
self.currentPopup:Destroy()
self.currentPopup = nil
end
if self.currentCustomPopup ~= nil then
self.currentCustomPopup.Parent = nil
self.currentCustomPopup = nil
end

cleanupPopups(self)

local currentContainer = scope.peek(self.currentContainer)
self.currentCustomPopup = child
self.enabled:set(true)
child.Parent = currentContainer

if currentContainer and currentContainer.Parent then
child.Parent = currentContainer
end
end

function popup.removePopup(self, _)
self.keybinds = {}
table.clear(self.keybinds)
self.enabled:set(false)
self.currentPopup = nil
self.currentCustomPopup = nil
end

function popup.container(self, scope)
Expand Down Expand Up @@ -248,12 +260,15 @@ function popup.container(self, scope)

scope:New("UIGradient") {
Rotation = 90,
Transparency = NumberSequence.new({
NumberSequenceKeypoint.new(0, 1),
NumberSequenceKeypoint.new(0.1, 0),
NumberSequenceKeypoint.new(0.9, 0),
NumberSequenceKeypoint.new(1, 1),
}),
Transparency = scope:Computed(function(use)
local enabled = use(self.enabled)
return NumberSequence.new({
NumberSequenceKeypoint.new(0, 1),
NumberSequenceKeypoint.new(0.1, enabled and 0 or 1),
NumberSequenceKeypoint.new(0.9, enabled and 0 or 1),
NumberSequenceKeypoint.new(1, 1),
})
end),
},
},
} :: Frame
Expand All @@ -262,4 +277,4 @@ function popup.container(self, scope)
return container, self.enabled
end

return popup
return (popup :: popup)