From 1551a29a5a2185aa5a77d2f72a826db5f656b61c Mon Sep 17 00:00:00 2001
From: Rikard Blixt <rikardblixt@gmail.com>
Date: Thu, 16 Jan 2025 16:01:22 +0200
Subject: [PATCH] fixes and improvments

---
 components/standings/commons/standings.lua                | 6 ++++--
 components/widget/basic/widget_basic_button.lua           | 3 ++-
 components/widget/standings/widget_standings_ffa.lua      | 2 +-
 .../widget/standings/widget_standings_round_selector.lua  | 8 ++++----
 stylesheets/commons/Miscellaneous.less                    | 2 --
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/standings/commons/standings.lua b/components/standings/commons/standings.lua
index 742eb30c3f2..4b6182fe8ae 100644
--- a/components/standings/commons/standings.lua
+++ b/components/standings/commons/standings.lua
@@ -95,7 +95,7 @@ function Standings.entryFromRecord(record)
 	local entry = {
 		opponent = Opponent.fromLpdbStruct(record),
 		placement = record.placement,
-		position = record.slotindex,
+		position = tonumber(record.slotindex),
 		positionStatus = record.currentstatus,
 		definitiveStatus = record.definitestatus,
 		changeFromPreviousRound = record.placementchange,
@@ -133,7 +133,9 @@ function Standings.makeRounds(standings)
 	local roundCount = Array.maxBy(Array.map(standingsEntries, Operator.property('roundindex')), FnUtil.identity)
 
 	return Array.map(Array.range(1, roundCount), function(roundIndex)
-		local roundEntries = Array.filter(standingsEntries, Operator.property('roundindex', Operator.eq(roundIndex)))
+		local roundEntries = Array.filter(standingsEntries, function(entry)
+			return tonumber(entry.roundindex) == roundIndex
+		end)
 		local opponents = Array.sortBy(Array.map(roundEntries, Standings.entryFromRecord), Operator.property('position'))
 		return {
 			round = roundIndex,
diff --git a/components/widget/basic/widget_basic_button.lua b/components/widget/basic/widget_basic_button.lua
index 04a4bee253f..119c7e03ecc 100644
--- a/components/widget/basic/widget_basic_button.lua
+++ b/components/widget/basic/widget_basic_button.lua
@@ -6,6 +6,7 @@
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
 
+local Array = require('Module:Array')
 local Class = require('Module:Class')
 local Lua = require('Module:Lua')
 local Table = require('Module:Table')
@@ -52,7 +53,7 @@ function Button:render()
 	end
 
 	local button = Div{
-		classes = Table.merge(cssClasses, self.props.classes or {}),
+		classes = Array.extend(cssClasses, self.props.classes or {}),
 		attributes = Table.merge({
 			title = self.props.title,
 			['aria-label'] = self.props.title,
diff --git a/components/widget/standings/widget_standings_ffa.lua b/components/widget/standings/widget_standings_ffa.lua
index 74593e89c31..e288f4038c9 100644
--- a/components/widget/standings/widget_standings_ffa.lua
+++ b/components/widget/standings/widget_standings_ffa.lua
@@ -40,7 +40,7 @@ function StandingsFfaWidget:render()
 		wrapperClasses = {'toggle-area', 'toggle-area-' .. roundCount},
 		classes = {'wikitable-bordered', 'wikitable-striped'},
 		attributes = {
-			['data-toggle-area'] = 'toggle-area-'.. roundCount,
+			['data-toggle-area'] = roundCount,
 		},
 		children = WidgetUtil.collect(
 			-- Outer header
diff --git a/components/widget/standings/widget_standings_round_selector.lua b/components/widget/standings/widget_standings_round_selector.lua
index 535acd95c6b..3d72bd3f288 100644
--- a/components/widget/standings/widget_standings_round_selector.lua
+++ b/components/widget/standings/widget_standings_round_selector.lua
@@ -43,7 +43,7 @@ function RoundSelectorWidget:render()
 
 	local function makeRoundButtons(roundTitle, roundIndex)
 		return Button{
-			title = roundTitle,
+			children = roundTitle,
 			variant = 'primary',
 			classes = {'toggle-area-button'},
 			attributes = {['data-toggle-area-btn'] = roundIndex},
@@ -52,16 +52,16 @@ function RoundSelectorWidget:render()
 
 	return HtmlWidgets.Div{
 		classes = {'dropdown-box-wrapper'},
-		style = {float = 'left'},
+		css = {float = 'left'},
 		children = {
 			Button{
-				title = finalRoundTitle(),
+				children = finalRoundTitle(),
 				variant = 'primary',
 				classes = {'dropdown-box-button'},
 			},
 			HtmlWidgets.Div{
 				classes = {'dropdown-box'},
-				style = {padding = '0px'},
+				css = {padding = '0px'},
 				children = Array.map(roundTitles, makeRoundButtons)
 			},
 		}
diff --git a/stylesheets/commons/Miscellaneous.less b/stylesheets/commons/Miscellaneous.less
index 3196ec91c44..3ce5740a45e 100644
--- a/stylesheets/commons/Miscellaneous.less
+++ b/stylesheets/commons/Miscellaneous.less
@@ -566,8 +566,6 @@ Author(s): Rapture
 	float: left;
 	margin: 0;
 	padding: 5px;
-	border: 1px solid var( --clr-border, #d3d3d3 );
-	background-color: var( --clr-surface, #ffffff );
 }
 
 .dropdown-box-visible {