Skip to content

fix: widget3 using defaultProps incompatible with widget factory #7478

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

Open
ElectricalBoy wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

fix: widget3 using defaultProps incompatible with widget factory #7478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion lua/wikis/commons/Widget/Component.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,24 @@ ComponentCore.ComponentMT = {
-- Apply DefaultProps via lightweight metatable
-- Only shallow default props allowed
if self.defaultProps then
setmetatable(props, { __index = self.defaultProps })
local origMT = getmetatable(props)
if not origMT then
setmetatable(props, { __index = self.defaultProps })
else
---Calling from Widget/Factory requires extra handling
---as frame arguments are hidden behind a separate metatable
local origProps = props
props = setmetatable({}, {
__index = function (newProps, key)
local origVal = origProps[key]
if origVal ~= nil then
return origVal
end
return self.defaultProps[key]
end,
__newindex = origProps
})
end
end

return setmetatable({
Expand Down
Loading