Skip to content

refactor(resultsTable): clean up teamIconDisplayWithText #7183

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
Open

refactor(resultsTable): clean up teamIconDisplayWithText #7183

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
33 changes: 13 additions & 20 deletions lua/wikis/commons/ResultsTable/Base.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ end
---@protected
---@param data placement
---@param options table?
---@return string|Widget?
---@return string|Widget|Widget[]?
function BaseResultsTable:opponentDisplay(data, options)
options = options or {}

Expand Down Expand Up @@ -498,7 +498,7 @@ function BaseResultsTable:opponentDisplay(data, options)
}

if self:shouldDisplayAdditionalText(rawTeamTemplate, not options.isLastVs) then
return BaseResultsTable.teamIconDisplayWithText(teamDisplay, rawTeamTemplate, options.flip)
return BaseResultsTable.teamIconDisplayWithText(teamDisplay, rawTeamTemplate)
end

return teamDisplay
Expand All @@ -521,30 +521,23 @@ end
---Builds team icon display with text below it
---@param teamDisplay Widget
---@param rawTeamTemplate teamTemplateData
---@param flip boolean?
---@return Widget
function BaseResultsTable.teamIconDisplayWithText(teamDisplay, rawTeamTemplate, flip)
return HtmlWidgets.Fragment{children = {
---@return Widget[]
function BaseResultsTable.teamIconDisplayWithText(teamDisplay, rawTeamTemplate)
return {
teamDisplay,
HtmlWidgets.Div{
css = {
width = '60px',
float = flip and 'right' or 'left',
['line-height'] = 1,
['font-size'] = '80%',
['text-align'] = 'center',
},
children = HtmlWidgets.Div{
css = {
['line-height'] = 1,
['font-size'] = '80%',
['text-align'] = 'center',
},
children = {
'(',
LinkWidget{link = rawTeamTemplate.page, children = rawTeamTemplate.shortname},
')'
}
children = {
'(',
LinkWidget{link = rawTeamTemplate.page, children = rawTeamTemplate.shortname},
')'
}
}
}}
}
end

---Builds the tournament display name
Expand Down
Loading