From 61aaf1c7accd02cc5fa5377d015bdfbafdf14c88 Mon Sep 17 00:00:00 2001
From: Rikard Blixt <rikardblixt@gmail.com>
Date: Mon, 17 Aug 2026 12:30:01 +0000
Subject: [PATCH 1/2] refactor(match2): grid based view for chess

---
 lua/wikis/chess/MatchGroup/Input/Custom.lua |  2 +-
 lua/wikis/chess/MatchSummary.lua            | 93 ++++++---------------
 2 files changed, 28 insertions(+), 67 deletions(-)

diff --git a/lua/wikis/chess/MatchGroup/Input/Custom.lua b/lua/wikis/chess/MatchGroup/Input/Custom.lua
index f29344afd5a..9ed4e0cfbc9 100644
--- a/lua/wikis/chess/MatchGroup/Input/Custom.lua
+++ b/lua/wikis/chess/MatchGroup/Input/Custom.lua
@@ -77,7 +77,7 @@ end
 ---@return table
 function MapFunctions.getExtraData(match, map, opponents)
 	return {
-		header = map.header,
+		comment = map.comment or map.header,
 		eco = Eco.sanitise(map.eco),
 	}
 end
diff --git a/lua/wikis/chess/MatchSummary.lua b/lua/wikis/chess/MatchSummary.lua
index 7618424953e..f47768a79f8 100644
--- a/lua/wikis/chess/MatchSummary.lua
+++ b/lua/wikis/chess/MatchSummary.lua
@@ -5,8 +5,6 @@
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --
 
-local CustomMatchSummary = {}
-
 local Lua = require('Module:Lua')
 
 local Array = Lua.import('Module:Array')
@@ -14,7 +12,6 @@ local Eco = Lua.import('Module:ChessOpenings')
 local Icon = Lua.import('Module:Icon')
 local Logic = Lua.import('Module:Logic')
 local MatchSummary = Lua.import('Module:MatchSummary/Base')
-local String = Lua.import('Module:StringUtils')
 local Table = Lua.import('Module:Table')
 
 local Collapsible = Lua.import('Module:Widget/Match/Summary/Collapsible')
@@ -49,64 +46,40 @@ local KING_ICONS = {
 	},
 }
 
+---@class ChessCustomMatchSummary: CustomMatchSummaryInterface
+local CustomMatchSummary = {}
+
+---@class ChessMatchSummaryGameRowComponentProps: MatchSummaryGameRowComponentProps
+local GameRowComponentProps = {}
+
+local ChessMatchSummaryGameRow = MatchSummaryWidgets.GameRow.createComponent(GameRowComponentProps)
+
 ---@param args table
 ---@return VNode
 function CustomMatchSummary.getByMatchId(args)
 	return MatchSummary.defaultGetByMatchId(CustomMatchSummary, args)
 end
 
----@param date string
----@param game MatchGroupUtilGame
----@param gameIndex integer
----@return VNode
-function CustomMatchSummary.createGame(date, game, gameIndex)
-	return MatchSummaryWidgets.Row{
-		classes = {'brkts-popup-body-game'},
-		children = WidgetUtil.collect(
-			-- Header
-			CustomMatchSummary._getHeader(game),
-
-			-- Player 1
-			MatchSummaryWidgets.GameCenter{
-				css = {flex = 1},
-				children = {
-					CustomMatchSummary._getSideIcon(game.opponents[1]),
-					MatchSummaryWidgets.GameWinLossIndicator{winner = game.winner, opponentIndex = 1},
-					MatchSummaryWidgets.GameTeamWrapper{flipped = false},
-				},
-			},
-
-			-- Center
-			MatchSummaryWidgets.GameCenter{
-				children = CustomMatchSummary._getCenterContent(game, gameIndex),
-			},
-
-			-- Player 2
-			MatchSummaryWidgets.GameCenter{
-				css = {flex = 1},
-				children = {
-					MatchSummaryWidgets.GameTeamWrapper{flipped = true},
-					MatchSummaryWidgets.GameWinLossIndicator{winner = game.winner, opponentIndex = 2},
-					CustomMatchSummary._getSideIcon(game.opponents[2]),
-				},
-			},
-
-			-- Comment
-			MatchSummaryWidgets.GameComment{children = game.comment}
-		)
+---@param match MatchGroupUtilMatch
+---@return Renderable
+function CustomMatchSummary.createGames(match)
+	return MatchSummaryWidgets.GamesContainer{
+		children = Array.map(match.games, function (game, gameIndex)
+			return ChessMatchSummaryGameRow{game = game, gameIndex = gameIndex}
+		end)
 	}
 end
 
----@param game MatchGroupUtilGame
----@param gameIndex integer
----@return VNode
-function CustomMatchSummary._getCenterContent(game, gameIndex)
+---@param props MatchSummaryGameRowProps
+---@return Renderable?
+function GameRowComponentProps.createGameOverview(props)
+	local game = props.game
 	return Div{
 		children = {
 			Span{
 				classes = {'brkts-popup-spaced'},
 				children = {
-					'Game ' .. gameIndex,
+					'Game ' .. props.gameIndex,
 					tonumber(game.length) and (' - ' .. game.length .. ' moves') or '',
 				},
 			},
@@ -118,30 +91,18 @@ function CustomMatchSummary._getCenterContent(game, gameIndex)
 	}
 end
 
----@param gameOpponent table
+---@param props MatchSummaryGameRowProps
+---@param opponentIndex integer
 ---@return VNode
-function CustomMatchSummary._getSideIcon(gameOpponent)
-	return Div{
+function GameRowComponentProps.createGameOpponentView(props, opponentIndex)
+	local game = props.game
+	return  Div{
 		classes = {'brkts-popup-spaced'},
-		children = KING_ICONS[gameOpponent.color],
+		---@diagnostic disable-next-line: undefined-field
+		children = KING_ICONS[game.opponents[opponentIndex].color],
 	}
 end
 
----@param game MatchGroupUtilGame
----@return VNode?
-function CustomMatchSummary._getHeader(game)
-	return String.isNotEmpty(game.header) and {
-		Div{
-			children = game.header,
-			css = {
-				['font-weight'] = 'bold',
-				margin = 'auto'
-			}
-		},
-		MatchSummaryWidgets.Break{}
-	} or nil
-end
-
 ---@param match MatchGroupUtilMatch
 ---@return VNode[]
 function CustomMatchSummary.createFooter(match)

From da1ab8de4ed6b08b946b333341101b6deb838608 Mon Sep 17 00:00:00 2001
From: Rikard Blixt <rikardblixt@gmail.com>
Date: Thu, 20 Aug 2026 10:44:54 +0000
Subject: [PATCH 2/2] removed header input entirely, let's change on the wiki

---
 lua/wikis/chess/MatchGroup/Input/Custom.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/wikis/chess/MatchGroup/Input/Custom.lua b/lua/wikis/chess/MatchGroup/Input/Custom.lua
index 9ed4e0cfbc9..842fe15a8e7 100644
--- a/lua/wikis/chess/MatchGroup/Input/Custom.lua
+++ b/lua/wikis/chess/MatchGroup/Input/Custom.lua
@@ -77,7 +77,6 @@ end
 ---@return table
 function MapFunctions.getExtraData(match, map, opponents)
 	return {
-		comment = map.comment or map.header,
 		eco = Eco.sanitise(map.eco),
 	}
 end