Improve disable mods and custom mods box

spec/System/TestCustomModControl_spec.lua

@@ -0,0 +1,143 @@
+describe("Custom modifier controls", function()
+	local initialPopupCount
+
+	before_each(function()
+		newBuild()
+		main:SelectControl()
+		initialPopupCount = #main.popups
+	end)
+
+	after_each(function()
+		main:SelectControl()
+		while #main.popups > initialPopupCount do
+			main:ClosePopup()
+		end
+	end)
+
+	local function openModBrowser()
+		local configTab = build.configTab
+		local blockData = configTab.configSets[configTab.activeConfigSetId].customModsList[1]
+		configTab:OpenAddModPopup(blockData)
+		return main.popups[1], blockData
+	end
+
+	it("does not retain the modifier list focus after adding a mod", function()
+		local popup, blockData = openModBrowser()
+		local listControl = popup.controls.listControl
+		local selectedMod = listControl.list[1]
+
+		listControl:OnSelClick(1, selectedMod, false)
+		popup.controls.save.onClick()
+
+		assert.is_nil(main.selControl)
+		assert.are_not.equal(popup, main.popups[1])
+		assert.are.equal(selectedMod, blockData.text)
+	end)
+
+	it("collapses numeric tiers and imports the first range value", function()
+		local popup, blockData = openModBrowser()
+		local minionDamageEntries = { }
+		local minionDamageIndex
+		for index, modText in ipairs(popup.controls.listControl.list) do
+			if modText:match("^Minions deal .-%% increased Damage$") then
+				table.insert(minionDamageEntries, modText)
+				minionDamageIndex = index
+			end
+		end
+
+		assert.are.same({ "Minions deal 10% increased Damage" }, minionDamageEntries)
+		popup.controls.listControl.selIndex = minionDamageIndex
+		popup.controls.save.onClick()
+		assert.are.equal("Minions deal 10% increased Damage", blockData.text)
+	end)
+
+	it("orders modifiers alphabetically while ignoring numeric values", function()
+		local popup = openModBrowser()
+		local previousSortKey
+		for _, modText in ipairs(popup.controls.listControl.list) do
+			local sortKey = modText
+				:gsub("([%+-]?)%((%-?%d+%.?%d*)%-(%-?%d+%.?%d*)%)", "%1#")
+				:gsub("%d+%.?%d*", "#")
+				:lower()
+				:gsub("#", " ")
+				:gsub("[^%a]+", " ")
+				:match("^%s*(.-)%s*$")
+			assert.is_true(not previousSortKey or previousSortKey <= sortKey,
+				tostring(previousSortKey) .. " should be ordered before " .. sortKey)
+			previousSortKey = sortKey
+		end
+	end)
+
+	it("clears the modifier search with its clear button", function()
+		local popup = openModBrowser()
+		local controls = popup.controls
+		local unfilteredCount = #controls.listControl.list
+		assert.is_false(controls.search.controls.buttonClear:IsShown())
+		controls.search:SetText("minion damage", true)
+
+		assert.is_true(#controls.listControl.list < unfilteredCount)
+		assert.are.equal("minion damage", controls.search.buf)
+		assert.is_true(controls.search.controls.buttonClear:IsShown())
+
+		controls.search.controls.buttonClear.onClick()
+
+		assert.are.equal("", controls.search.buf)
+		assert.are.equal(unfilteredCount, #controls.listControl.list)
+		assert.is_false(controls.search.controls.buttonClear:IsShown())
+	end)
+
+	it("uses the expanded browser dimensions", function()
+		local popup = openModBrowser()
+		local listWidth, listHeight = popup.controls.listControl:GetSize()
+		local searchWidth = popup.controls.search:GetSize()
+
+		assert.are.equal(720, popup.width)
+		assert.are.equal(540, popup.height)
+		assert.are.equal(700, listWidth)
+		assert.are.equal(454, listHeight)
+		assert.are.equal(640, searchWidth)
+	end)
+
+	it("opens with the search field ready for typing", function()
+		local popup = openModBrowser()
+		local inputEvents = { { type = "Char", key = "m" } }
+
+		assert.are.equal(popup.controls.search, popup.selControl)
+		assert.is_true(popup.controls.search.hasFocus)
+		assert.is_nil(popup.controls.listControl.hasFocus)
+
+		popup:ProcessInput(inputEvents, { x = 0, y = 0, width = 1920, height = 1080 })
+
+		assert.are.equal("m", popup.controls.search.buf)
+	end)
+
+	it("uses the mod group title as the calculation source name", function()
+		local configTab = build.configTab
+		local blockData = configTab.configSets[configTab.activeConfigSetId].customModsList[1]
+		blockData.text = "+100 to maximum Life"
+		configTab:BuildModList()
+
+		configTab.customModsBlockControls[1].controls.titleEdit:SetText("Bossing", true)
+
+		local customMods = configTab.modList:Tabulate("BASE", nil, "Life")
+		assert.are.equal(1, #customMods)
+		assert.are.equal("Custom:Bossing", customMods[1].mod.source)
+
+		build.buildFlag = true
+		runCallback("OnFrame")
+		local breakdownControl = build.calcsTab.controls.breakdown
+		breakdownControl.sectionList = { }
+		breakdownControl:AddModSection({ modName = "Life", modType = "BASE" })
+		local customRow
+		for _, row in ipairs(breakdownControl.sectionList[1].rowList) do
+			if row.mod.source == "Custom:Bossing" then
+				customRow = row
+				break
+			end
+		end
+
+		assert.is_not_nil(customRow)
+		assert.are.equal("Custom", customRow.source)
+		assert.are.equal("Bossing", customRow.sourceName)
+	end)
+end)

spec/System/TestItemDBControl_spec.lua

@@ -1,4 +1,14 @@
 describe("ItemDBControl", function()
+	local originalGetCursorPos
+
+	before_each(function()
+		originalGetCursorPos = GetCursorPos
+	end)
+
+	after_each(function()
+		GetCursorPos = originalGetCursorPos
+	end)
+
 	it("sorts lower-is-better stats below zero", function()
 		local function makeItem(name)
 			return {
@@ -75,4 +85,33 @@ describe("ItemDBControl", function()
 
 		assert.is_true(control:DoesItemMatchFilters(item))
 	end)
+
+	it("releases focus after opening an item with a double click", function()
+		local item = {
+			raw = "Rarity: Unique\nTest Item\nLeather Belt",
+		}
+		local itemsTab
+		itemsTab = {
+			CreateDisplayItemFromRaw = function(_, raw, isUnique)
+				itemsTab.displayRaw = raw
+				itemsTab.displayIsUnique = isUnique
+			end,
+		}
+		local control = new("ItemDBControl", nil, { 0, 0, 100, 100 }, itemsTab, {
+			list = { item },
+		}, "UNIQUE")
+		control.list = { item }
+		GetCursorPos = function()
+			return 3, 3
+		end
+		control.GetRowRegion = function()
+			return { x = 0, y = 0, width = 100, height = 100 }
+		end
+
+		local selectedControl = control:OnKeyDown("LEFTBUTTON", true)
+
+		assert.is_nil(selectedControl)
+		assert.are.equal(item.raw, itemsTab.displayRaw)
+		assert.is_true(itemsTab.displayIsUnique)
+	end)
 end)

spec/System/TestItemListControl_spec.lua

@@ -1,5 +1,6 @@
 describe("ItemListControl", function()
 	local originalOpenConfirmPopup
+	local originalGetCursorPos
 
 	local function newItemListControl()
 		local activeItemSet = {
@@ -57,10 +58,12 @@ describe("ItemListControl", function()
 
 	before_each(function()
 		originalOpenConfirmPopup = main.OpenConfirmPopup
+		originalGetCursorPos = GetCursorPos
 	end)
 
 	after_each(function()
 		main.OpenConfirmPopup = originalOpenConfirmPopup
+		GetCursorPos = originalGetCursorPos
 	end)
 
 	it("only shows items from the active item set and passive tree", function()
@@ -172,4 +175,29 @@ describe("ItemListControl", function()
 		assert.are.same({ }, itemsTab.itemOrderList)
 		assert.are.same({ }, itemsTab.items)
 	end)
+
+	it("releases focus after opening an item with a double click", function()
+		local control, itemsTab = newItemListControl()
+		local item = new("Item", [[
+Rarity: Rare
+Test Belt
+Leather Belt
+]])
+		item.id = 1
+		itemsTab.items[1] = item
+		itemsTab.SetDisplayItem = function(_, displayItem)
+			itemsTab.displayItem = displayItem
+		end
+		GetCursorPos = function()
+			return 3, 3
+		end
+		control.GetRowRegion = function()
+			return { x = 0, y = 0, width = 360, height = 308 }
+		end
+
+		local selectedControl = control:OnKeyDown("LEFTBUTTON", true)
+
+		assert.is_nil(selectedControl)
+		assert.are.equal(1, itemsTab.displayItem.id)
+	end)
 end)

src/Classes/CalcBreakdownControl.lua

@@ -421,6 +421,8 @@ function CalcBreakdownClass:AddModSection(sectionData, modList)
 			row.sourceName = row.mod.source:match("Pantheon:(.+)")
 		elseif sourceType == "Spectre" then
 			row.sourceName = row.mod.source:match("Spectre:(.+)")
+		elseif sourceType == "Custom" then
+			row.sourceName = row.mod.source:match("Custom:(.+)")
 		end
 
 		if row.mod.flags ~= 0 or row.mod.keywordFlags ~= 0 then