10.0.1

README.md

@@ -6,7 +6,7 @@ If you're a Zenimax Media Inc. representative and have any objection to any of t
 
 This repo is also available at http://www.esoui.com/downloads/info1213-ESOUI-TheElderScrollsOnlinesourcecode.html
 
-**Last update: 10.0.0 (API 101042) on 16 Apr 2024.**
+**Last update: 10.0.1 (API 101042) on 24 Apr 2024.**
 
 *Join the ESOUI Dev Community on Matrix:*
 

bin/update-pts

@@ -8,12 +8,12 @@ grep -Phor 'EsoUI[^"]+?\.dds' esoui/ >> Textures.txt
 cat Textures.txt | tr '[A-Z]\\' '[a-z]/' | sort -u > 1.txt
 mv 1.txt Textures.txt
 find esoui/ -type f -not -name "*.txt" -not -name "*.xml" -not -name "*.lua" -delete
-version=$(grep -oP '\d\.\d\.\d+' README.md)
+version=$(grep -oP '\d+\.\d+\.\d+' README.md)
 apiversion=$(grep -oP 'API \K\d+' README.md)
 today=$(date +"%d %b %Y")
 read -p "Version [$version]: " new_version
 read -p "API Version [$apiversion]: " new_apiversion
-sed -i "s#[0-9]\.[0-9]\.[0-9]\+#${new_version:-$version}#" README.md
+sed -i "s#[0-9]\+\.[0-9]\+\.[0-9]\+#${new_version:-$version}#" README.md
 sed -i "s#API [0-9]\+#API ${new_apiversion:-$apiversion}#" README.md
 sed -i "s# on .\+\?\.# on $today.#" README.md
 git add esoui

esoui/ingame/collections/gamepad/collectionsbook_gamepad.lua

@@ -1351,25 +1351,26 @@ function ZO_GamepadCollectionsBook:TrySetClearNewFlag(callId)
 end
 
 function ZO_GamepadCollectionsBook:RefreshRightPanel(entryData)
-    if self:IsViewingCollectionsList() then
-        if entryData then
-            if entryData.dataSource:IsInstanceOf(ZO_RandomMountCollectibleData) then
-                self:RefreshRandomMountTooltip(entryData)
-            elseif entryData:IsStory() then
-                self:RefreshDLCTooltip(entryData)
-            elseif entryData:IsHouse() then
-                self:RefreshHousingTooltip(entryData)
-            else
-                self:RefreshStandardTooltip(entryData)
-            end
+    if self.pendingUtilityWheelCollectibleData then
+        -- Don't cover the wheel if it's open.
+        return
+    elseif entryData ~= nil and entryData.dataSource:IsInstanceOf(ZO_CollectibleCategoryData) then
+        self:UpdateGridPanelVisibility(entryData)
+        SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_DLC_PANEL_FRAGMENT)
+        SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_HOUSING_PANEL_FRAGMENT)
+        GAMEPAD_TOOLTIPS:ClearTooltip(GAMEPAD_LEFT_TOOLTIP)
+    elseif entryData then
+        if entryData.dataSource:IsInstanceOf(ZO_RandomMountCollectibleData) then
+            self:RefreshRandomMountTooltip(entryData)
+        elseif entryData:IsStory() then
+            self:RefreshDLCTooltip(entryData)
+        elseif entryData:IsHouse() then
+            self:RefreshHousingTooltip(entryData)
         else
-            SCENE_MANAGER:RemoveFragment(GAMEPAD_NAV_QUADRANT_2_3_BACKGROUND_FRAGMENT)
-            SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_DLC_PANEL_FRAGMENT)
-            SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_HOUSING_PANEL_FRAGMENT)
-            GAMEPAD_TOOLTIPS:ClearTooltip(GAMEPAD_LEFT_TOOLTIP)
+            self:RefreshStandardTooltip(entryData)
         end
     else
-        self:UpdateGridPanelVisibility(entryData)
+        SCENE_MANAGER:RemoveFragment(GAMEPAD_NAV_QUADRANT_2_3_BACKGROUND_FRAGMENT)
         SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_DLC_PANEL_FRAGMENT)
         SCENE_MANAGER:RemoveFragment(GAMEPAD_COLLECTIONS_BOOK_HOUSING_PANEL_FRAGMENT)
         GAMEPAD_TOOLTIPS:ClearTooltip(GAMEPAD_LEFT_TOOLTIP)

esoui/ingame/crafting/gamepad/scribing_gamepad.lua

@@ -20,7 +20,7 @@ function ZO_Scribing_Gamepad:Initialize(control)
         end,
         data1HeaderText = function()
             if self:IsCurrentList(self.scriptsList) then
-                return ZO_Scribing_Manager.GetScribingInkName()
+                return ZO_Scribing_Manager.GetFormattedScribingInkName()
             end
         end,
         data1Text = function()
@@ -575,12 +575,16 @@ function ZO_Scribing_Gamepad:RefreshRecentCraftedAbilitiesList(resetToTop)
             local craftedAbilityId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.CRAFTED_ABILITY]
             local craftedAbilityData = SCRIBING_DATA_MANAGER:GetCraftedAbilityData(craftedAbilityId)
             if craftedAbilityData and not craftedAbilityData:IsDisabled() then
-                local primaryScriptId, secondaryScriptId, tertiaryScriptId = craftedAbilityData:GetActiveScriptIds()
+                local primaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.PRIMARY_SCRIPT]
+                local secondaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.SECONDARY_SCRIPT]
+                local tertiaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.TERTIARY_SCRIPT]
+                local activePrimaryScriptId, activeSecondaryScriptId, activeTertiaryScriptId = craftedAbilityData:GetActiveScriptIds()
+
                 craftedAbilityData:SetScriptIdSelectionOverride(primaryScriptId, secondaryScriptId, tertiaryScriptId)
 
-                if not (recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.PRIMARY_SCRIPT] == primaryScriptId
-                    and recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.SECONDARY_SCRIPT] == secondaryScriptId
-                    and recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.TERTIARY_SCRIPT] == tertiaryScriptId) then
+                if not (primaryScriptId == activePrimaryScriptId
+                    and secondaryScriptId == activeSecondaryScriptId
+                    and tertiaryScriptId == activeTertiaryScriptId) then
 
                     local representativeAbilityId = craftedAbilityData:GetRepresentativeAbilityId()
                     local abilityName = ZO_CachedStrFormat(SI_ABILITY_NAME, GetAbilityName(representativeAbilityId))

esoui/ingame/crafting/keyboard/scribing_keyboard.lua

@@ -553,12 +553,16 @@ function ZO_Scribing_Keyboard:RefreshRecentCraftedAbilitiesList(resetToTop)
                 local craftedAbilityId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.CRAFTED_ABILITY]
                 local craftedAbilityData = SCRIBING_DATA_MANAGER:GetCraftedAbilityData(craftedAbilityId)
                 if craftedAbilityData and not craftedAbilityData:IsDisabled() then
-                    local primaryScriptId, secondaryScriptId, tertiaryScriptId = craftedAbilityData:GetActiveScriptIds()
+                    local primaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.PRIMARY_SCRIPT]
+                    local secondaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.SECONDARY_SCRIPT]
+                    local tertiaryScriptId = recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.TERTIARY_SCRIPT]
+                    local activePrimaryScriptId, activeSecondaryScriptId, activeTertiaryScriptId = craftedAbilityData:GetActiveScriptIds()
+
                     craftedAbilityData:SetScriptIdSelectionOverride(primaryScriptId, secondaryScriptId, tertiaryScriptId)
 
-                    if not (recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.PRIMARY_SCRIPT] == primaryScriptId
-                        and recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.SECONDARY_SCRIPT] == secondaryScriptId
-                        and recentCraftedAbility[ZO_RECENT_SCRIBE_SAVED_VAR_INDEX.TERTIARY_SCRIPT] == tertiaryScriptId) then
+                    if not (primaryScriptId == activePrimaryScriptId
+                        and secondaryScriptId == activeSecondaryScriptId
+                        and tertiaryScriptId == activeTertiaryScriptId) then
 
                         local representativeAbilityId = craftedAbilityData:GetRepresentativeAbilityId()
                         local entryData =
@@ -871,10 +875,6 @@ function ZO_Scribing_Keyboard.OnMouseEnterRecentCraftedAbility(control)
 end
 
 function ZO_Scribing_Keyboard.OnMouseExitRecentCraftedAbility(control)
-    if not SCRIBING_KEYBOARD:IsShowing() then
-        return
-    end
-
     SCRIBING_KEYBOARD:OnRecentCraftedAbilityEntryMouseExit(control)
 end
 

esoui/ingame/crafting/keyboard/scribinglayout_keyboard.lua

@@ -172,7 +172,7 @@ function ZO_ScribingLayout_Keyboard:PerformDeferredInitialization()
     self.libraryContainer = self.control:GetNamedChild("Library")
 
     self:InitializeLists()
-    self.inkNameLabel:SetText(zo_strformat(SI_TOOLTIP_ITEM_NAME, ZO_Scribing_Manager.GetScribingInkName()))
+    self.inkNameLabel:SetText(ZO_Scribing_Manager.GetFormattedScribingInkName())
 
     local function OnInventoryUpdated()
         if self:IsShowing() then

esoui/ingame/crafting/scribing_manager.lua

@@ -185,6 +185,10 @@ do
         return GetItemLinkName(itemLink)
     end
 
+    function ZO_Scribing_Manager.GetFormattedScribingInkName()
+        return zo_strformat(SI_TOOLTIP_ITEM_NAME, ZO_Scribing_Manager.GetScribingInkName())
+    end
+
     function ZO_Scribing_Manager.GetScribingInkIcon()
         local itemLink = GetInkItemLink()
         return GetItemLinkIcon(itemLink)

esoui/ingame/endlessdungeon/endlessdungeonbufftracker_shared.xml

@@ -15,6 +15,9 @@
         </Control>
 
         <Control name="ZO_EndDunBuffTrackerGridHeader_Shared" virtual="true">
+            <OnInitialized>
+                self.GetTextLabel = function() return self:GetNamedChild("Header") end
+            </OnInitialized>
             <Controls>
                 <Label name="$(parent)Header" color="INTERFACE_COLOR_TYPE_TEXT_COLORS:INTERFACE_TEXT_COLOR_NORMAL" horizontalAlignment="CENTER" modifyTextType="UPPERCASE">
                     <Anchor point="TOP" />

esoui/ingame/endlessdungeon/gamepad/endlessdungeonbufftracker_gamepad.lua

@@ -49,8 +49,10 @@ function ZO_EndlessDungeonBuffTracker_Gamepad:InitializeGridList()
     self.gridList = ZO_GridScrollList_Gamepad:New(self.gridListControl, "ZO_GridScrollList_Highlight_Gamepad", NO_AUTO_FILL_ROWS, RESIZE_TO_FIT_COLUMN_MAX, RESIZE_TO_FIT_ROW_MAX)
 
     local NO_HIDE_CALLBACK = nil
+    local NO_RESET_CALLBACK = nil
+    local CONSIDER_HEADER_WIDTH = true
     local gridList = self.gridList
-    gridList:AddHeaderTemplate("ZO_EndDunBuffTrackerGridHeader_Gamepad", ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_GAMEPAD, ZO_EndlessDungeonBuffTracker_Shared.SetupGridHeader)
+    gridList:AddHeaderTemplate("ZO_EndDunBuffTrackerGridHeader_Gamepad", ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_GAMEPAD, ZO_EndlessDungeonBuffTracker_Shared.SetupGridHeader, NO_HIDE_CALLBACK, NO_RESET_CALLBACK, CONSIDER_HEADER_WIDTH)
     gridList:AddEntryTemplate("ZO_EndDunBuffTrackerGridEntry_Gamepad", ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_GAMEPAD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_GAMEPAD_Y, ZO_GetCallbackForwardingFunction(self, self.SetupGridEntry), NO_HIDE_CALLBACK, ZO_GetCallbackForwardingFunction(self, self.ResetGridEntry), ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_GAMEPAD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_GAMEPAD_Y)
     gridList:SetAutoFillEntryTemplate("ZO_EndDunBuffTrackerEmptyGridEntry_Gamepad")
     gridList:SetEntryTemplateEqualityFunction("ZO_EndDunBuffTrackerGridEntry_Gamepad", self.CompareGridEntries)

esoui/ingame/endlessdungeon/keyboard/endlessdungeonbufftracker_keyboard.lua

@@ -41,10 +41,12 @@ function ZO_EndlessDungeonBuffTracker_Keyboard:InitializeGridList()
     local RESIZE_TO_FIT_ROW_MAX = 6
     self.gridList = ZO_GridScrollList_Keyboard:New(self.gridListControl, NO_AUTO_FILL_ROWS, RESIZE_TO_FIT_COLUMN_MAX, RESIZE_TO_FIT_ROW_MAX)
 
-    local HIDE_CALLBACK = nil
+    local NO_HIDE_CALLBACK = nil
+    local NO_RESET_CALLBACK = nil
+    local CONSIDER_HEADER_WIDTH = true
     local gridList = self.gridList
-    gridList:AddEntryTemplate("ZO_EndDunBuffTrackerGridEntry_Keyboard", ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_KEYBOARD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_KEYBOARD_Y, ZO_GetCallbackForwardingFunction(self, self.SetupGridEntry), HIDE_CALLBACK, ZO_GetCallbackForwardingFunction(self, self.ResetGridEntry), ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_KEYBOARD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_KEYBOARD_Y)
-    gridList:AddHeaderTemplate("ZO_EndDunBuffTrackerGridHeader_Keyboard", ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_KEYBOARD, ZO_EndlessDungeonBuffTracker_Shared.SetupGridHeader)
+    gridList:AddEntryTemplate("ZO_EndDunBuffTrackerGridEntry_Keyboard", ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_KEYBOARD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_DIMENSIONS_KEYBOARD_Y, ZO_GetCallbackForwardingFunction(self, self.SetupGridEntry), NO_HIDE_CALLBACK, ZO_GetCallbackForwardingFunction(self, self.ResetGridEntry), ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_KEYBOARD_X, ZO_ENDLESS_DUNGEON_BUFF_GRID_ENTRY_PADDING_KEYBOARD_Y)
+    gridList:AddHeaderTemplate("ZO_EndDunBuffTrackerGridHeader_Keyboard", ZO_ENDLESS_DUNGEON_BUFF_GRID_HEADER_ROW_HEIGHT_KEYBOARD, ZO_EndlessDungeonBuffTracker_Shared.SetupGridHeader, NO_HIDE_CALLBACK, NO_RESET_CALLBACK, CONSIDER_HEADER_WIDTH)
     gridList:SetAutoFillEntryTemplate("ZO_EndDunBuffTrackerEmptyGridEntry_Keyboard")
     gridList:SetHeaderPrePadding(ZO_ENDLESS_DUNGEON_BUFF_GRID_SECTION_PADDING_KEYBOARD_Y)
 end

esoui/ingame/help/gamepad/help_customer_service_gamepad.lua

@@ -457,6 +457,17 @@ function ZO_Help_Customer_Service_Gamepad:OnShow()
     self:RefreshExternalInfoTooltip()
 end
 
+function ZO_Help_Customer_Service_Gamepad:OnHiding()
+    ZO_Help_GenericTicketSubmission_Gamepad.OnHiding(self)
+
+    local targetData = self.itemList:GetTargetData()
+    if targetData and targetData.isDropdown then
+        local targetControl = self.itemList:GetTargetControl()
+        local dropdown = targetControl.dropdown
+        dropdown:Deactivate()
+    end
+end
+
 function ZO_Help_Customer_Service_Gamepad:SetupTicket(impact, category, subcategory, externalInfo)
     self:ResetTicket()
     self:SetCategories(impact, category, subcategory)

esoui/ingame/lfg/zo_activityfinderroot_manager.lua

@@ -424,13 +424,18 @@ function ActivityFinderRoot_Manager:UpdateLocationData()
 end
 
 function ActivityFinderRoot_Manager:ClearSelections()
+    local previousNumSelected = self.numSelected
     for _, locationsByActivity in pairs(self.sortedLocationsData) do
         for _, location in ipairs(locationsByActivity) do
             location:SetSelected(false)
         end
     end
 
     self.numSelected = 0
+
+    if previousNumSelected > 0 then
+        self:FireCallbacks("OnSelectionsChanged")
+    end
 end
 
 function ActivityFinderRoot_Manager:RebuildSelections(activityTypes)

esoui/ingame/skills/gamepad/gamepadskills.lua

@@ -1582,26 +1582,28 @@ do
                 for index = 1, GetNumProgressionSkillAbilityFxOverrides(progressionId) do
                     local collectibleId = GetProgressionSkillAbilityFxOverrideCollectibleIdByIndex(progressionId, index)
                     local collectibleData = ZO_COLLECTIBLE_DATA_MANAGER:GetCollectibleDataById(collectibleId)
-                    local entryData = ZO_GamepadEntryData:New(collectibleData:GetFormattedName())
-                    entryData.setup = ZO_SharedGamepadEntry_OnSetup
-                    entryData:AddIcon(collectibleData:GetIcon())
-                    entryData.iconIndex = index
-                    entryData.collectibleId = collectibleId
-                    entryData.collectibleData = collectibleData
-                    entryData.isCurrent = function()
-                        return collectibleId == currentCollectibleId
-                    end
+                    if collectibleData then
+                        local entryData = ZO_GamepadEntryData:New(collectibleData:GetFormattedName())
+                        entryData.setup = ZO_SharedGamepadEntry_OnSetup
+                        entryData:AddIcon(collectibleData:GetIcon())
+                        entryData.iconIndex = index
+                        entryData.collectibleId = collectibleId
+                        entryData.collectibleData = collectibleData
+                        entryData.isCurrent = function()
+                            return collectibleId == currentCollectibleId
+                        end
 
-                    entryData:InitializeCollectibleVisualData(collectibleData, GAMEPLAY_ACTOR_CATEGORY_PLAYER)
-                    entryData:SetEnabled(isSkillLinePurchased and collectibleData:IsUnlocked())
-                    entryData:SetSelected(entryData.isCurrent())
+                        entryData:InitializeCollectibleVisualData(collectibleData, GAMEPLAY_ACTOR_CATEGORY_PLAYER)
+                        entryData:SetEnabled(isSkillLinePurchased and collectibleData:IsUnlocked())
+                        entryData:SetSelected(entryData.isCurrent())
 
-                    local listItem =
-                    {
-                        template = "ZO_GamepadItemEntryTemplate",
-                        entryData = entryData,
-                    }
-                    table.insert(parametricListEntries, listItem)
+                        local listItem =
+                        {
+                            template = "ZO_GamepadItemEntryTemplate",
+                            entryData = entryData,
+                        }
+                        table.insert(parametricListEntries, listItem)
+                    end
                 end
 
                 ZO_GenericGamepadDialog_ShowTooltip(dialog)

esoui/ingame/stats/zo_stats_common.lua

@@ -158,7 +158,7 @@ function ZO_Stats_Common:GetDropdownTitleIndex(dropdown)
         return item.titleIndex == currentTitleIndex
     end
     if currentTitleIndex == nil then
-        return nil
+        return 1
     end
     return dropdown:GetIndexByEval(IsItemCurrentTitle)
 end