New Search Experience Part 1 (#95)

* Added new search experience via key binds.

BetterBags.toc

@@ -51,6 +51,7 @@ util\resize.lua
 util\sort.lua
 util\bucket.lua
 
+frames\search.lua
 frames\slider.lua
 frames\money.lua
 frames\context.lua

BetterBags_Vanilla.toc

@@ -52,6 +52,7 @@ util\resize.lua
 util\sort.lua
 util\bucket.lua
 
+frames\search.lua
 frames\slider.lua
 frames\money.lua
 frames\classic\money.lua

BetterBags_Wrath.toc

@@ -52,6 +52,7 @@ util\resize.lua
 util\sort.lua
 util\bucket.lua
 
+frames\search.lua
 frames\slider.lua
 frames\money.lua
 frames\classic\money.lua

Bindings.xml

@@ -0,0 +1,5 @@
+<Bindings>
+ <Binding name="BETTERBAGS_TOGGLESEARCH" category="BetterBags">
+  BetterBags_ToggleSearch()
+ </Binding>
+</Bindings>

animations/fade.lua

@@ -7,8 +7,9 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 local animations = addon:NewModule('Animations')
 
 ---@param region Region
+---@param nohide? boolean
 ---@return AnimationGroup, AnimationGroup
-function animations:AttachFadeGroup(region)
+function animations:AttachFadeGroup(region, nohide)
   local fadeInGroup = region:CreateAnimationGroup()
   local fadeIn = fadeInGroup:CreateAnimation('Alpha')
   fadeIn:SetFromAlpha(0)
@@ -31,15 +32,20 @@ function animations:AttachFadeGroup(region)
   fadeOut:SetDuration(0.10)
   fadeOut:SetSmoothing('IN')
   fadeOutGroup:SetScript('OnFinished', function()
-    region:Hide()
+    if not nohide then
+      region:Hide()
+    else
+      region:SetAlpha(0)
+    end
   end)
   return fadeInGroup, fadeOutGroup
 end
 
 ---@param region Region
+---@param nohide? boolean
 ---@return AnimationGroup, AnimationGroup
-function animations:AttachFadeAndSlideLeft(region)
-  local fadeInGroup, fadeOutGroup = self:AttachFadeGroup(region)
+function animations:AttachFadeAndSlideLeft(region, nohide)
+  local fadeInGroup, fadeOutGroup = self:AttachFadeGroup(region, nohide)
   local slideOut = fadeOutGroup:CreateAnimation('Translation')
   slideOut:SetOffset(10, 0)
   slideOut:SetDuration(0.10)
@@ -48,9 +54,10 @@ function animations:AttachFadeAndSlideLeft(region)
 end
 
 ---@param region Region
+---@param nohide? boolean
 ---@return AnimationGroup, AnimationGroup
-function animations:AttachFadeAndSlideTop(region)
-  local fadeInGroup, fadeOutGroup = self:AttachFadeGroup(region)
+function animations:AttachFadeAndSlideTop(region, nohide)
+  local fadeInGroup, fadeOutGroup = self:AttachFadeGroup(region, nohide)
   local slideOut = fadeOutGroup:CreateAnimation('Translation')
   slideOut:SetOffset(0, -10)
   slideOut:SetDuration(0.10)

core/boot.lua

@@ -7,3 +7,5 @@ local addonName, root = ... --[[@type string, table]]
 local addon = LibStub("AceAddon-3.0"):NewAddon(root, addonName, 'AceHook-3.0')
 
 addon:SetDefaultModuleState(false)
+
+BINDING_NAME_BETTERBAGS_TOGGLESEARCH = "Search Bags"

core/hooks.lua

@@ -8,6 +8,9 @@ local addon = LibStub('AceAddon-3.0'):GetAddon(addonName)
 ---@class Debug: AceModule
 local debug = addon:GetModule('Debug')
 
+---@class Events: AceModule
+local events = addon:GetModule('Events')
+
 addon.backpackShouldOpen = false
 addon.backpackShouldClose = false
 
@@ -28,12 +31,10 @@ function addon.OnUpdate()
     debug:Log('Hooks', 'OnUpdate', addon.backpackShouldOpen, addon.backpackShouldClose)
     addon.backpackShouldOpen = false
     addon.backpackShouldClose = false
-    addon.ForceShowBlizzardBags()
     addon.Bags.Backpack:Show()
   elseif addon.backpackShouldClose then
     debug:Log('Hooks', 'OnUpdate', addon.backpackShouldOpen, addon.backpackShouldClose)
     addon.backpackShouldClose = false
-    addon.ForceHideBlizzardBags()
     addon.Bags.Backpack:Hide()
   end
 end
@@ -105,6 +106,7 @@ function addon:CloseSpecialWindows(interactingFrame)
   addon.backpackShouldClose = true
   addon.Bags.Bank:Hide()
   addon.Bags.Bank:SwitchToBank()
+  events:SendMessage('addon/CloseSpecialWindows')
   CloseBankFrame()
 end
 

core/init.lua

@@ -44,6 +44,9 @@ local config = addon:GetModule('Config')
 ---@class Config: AceModule
 local currency = addon:GetModule('Currency')
 
+---@class Search: AceModule
+local search = addon:GetModule('Search')
+
 ---@class Debug: AceModule
 local debug = addon:GetModule('Debug')
 
@@ -110,8 +113,8 @@ function addon:OnEnable()
   config:Enable()
   categories:Enable()
   currency:Enable()
+  search:Enable()
   self:HideBlizzardBags()
-
   addon.Bags.Backpack = BagFrame:Create(const.BAG_KIND.BACKPACK)
   addon.Bags.Bank = BagFrame:Create(const.BAG_KIND.BANK)
 

frames/bag.lua

@@ -55,6 +55,9 @@ local Window = LibStub('LibWindow-1.1')
 ---@class Currency: AceModule
 local currency = addon:GetModule('Currency')
 
+---@class Search: AceModule
+local search = addon:GetModule('Search')
+
 -------
 --- Bag Prototype
 -------
@@ -91,6 +94,7 @@ function bagFrame.bagProto:Show()
   if self.frame:IsShown() then
     return
   end
+  addon.ForceShowBlizzardBags()
   PlaySound(self.kind == const.BAG_KIND.BANK and SOUNDKIT.IG_MAINMENU_OPEN or SOUNDKIT.IG_BACKPACK_OPEN)
   self.frame:Show()
 end
@@ -99,6 +103,7 @@ function bagFrame.bagProto:Hide()
   if not self.frame:IsShown() then
     return
   end
+  addon.ForceHideBlizzardBags()
   PlaySound(self.kind == const.BAG_KIND.BANK and SOUNDKIT.IG_MAINMENU_CLOSE or SOUNDKIT.IG_BACKPACK_CLOSE)
   self.frame:Hide()
   if self.drawOnClose and self.kind == const.BAG_KIND.BACKPACK then
@@ -206,7 +211,7 @@ function bagFrame.bagProto:Draw(dirtyItems)
     views:ListView(self, dirtyItems)
   end
   self.frame:SetScale(database:GetBagSizeInfo(self.kind, database:GetBagView(self.kind)).scale / 100)
-  local text = self.frame.SearchBox:GetText()
+  local text = search:GetText()
   self:Search(text)
   self:KeepBagInBounds()
 end
@@ -478,33 +483,9 @@ function bagFrame:Create(kind)
   slots.frame:Hide()
   b.slots = slots
 
-  -- Setup the search box events.
-  b.frame.SearchBox:SetAlpha(0)
-  b.frame.SearchBox:SetScript("OnEnter", function()
-    b.frame.SearchBox:SetAlpha(1)
-  end)
-  b.frame.SearchBox:SetScript("OnLeave", function()
-    if b.frame.SearchBox:HasFocus() then return end
-    if b.frame.SearchBox:GetText() ~= "" then return end
-    b.frame.SearchBox:SetAlpha(0)
-  end)
-  b.frame.SearchBox:SetScript("OnEditFocusGained", function()
-    b.frame.SearchBox:SetAlpha(1)
-  end)
-  b.frame.SearchBox:SetScript("OnEditFocusLost", function()
-    if b.frame.SearchBox:GetText() ~= "" then return end
-    b.frame.SearchBox:SetAlpha(0)
-  end)
-
-  b.frame.SearchBox:SetScript("OnTextChanged", function()
-    local text = b.frame.SearchBox:GetText()
-    if text == "" or text == nil then
-      b.frame.SearchBox.Instructions:Show()
-    else
-      b.frame.SearchBox.Instructions:Hide()
-    end
-    b:Search(text)
-  end)
+  if kind == const.BAG_KIND.BACKPACK then
+    search:Create(b.frame)
+  end
 
   if kind == const.BAG_KIND.BACKPACK then
     local currencyFrame = currency:Create(b.frame)

frames/classic/bag.lua

@@ -55,6 +55,9 @@ local Window = LibStub('LibWindow-1.1')
 ---@class Currency: AceModule
 local currency = addon:GetModule('Currency')
 
+---@class Search: AceModule
+local search = addon:GetModule('Search')
+
 function bagFrame.bagProto:WipeFreeSlots()
   self.content:RemoveCell("freeBagSlots", self.freeBagSlotsButton)
   self.freeSlots:RemoveCell("freeBagSlots", self.freeBagSlotsButton)
@@ -79,8 +82,8 @@ function bagFrame.bagProto:Draw(dirtyItems)
     views:ListView(self, dirtyItems)
   end
   self.frame:SetScale(database:GetBagSizeInfo(self.kind, database:GetBagView(self.kind)).scale / 100)
-  --local text = self.frame.SearchBox:GetText()
-  --self:Search(text)
+  local text = search:GetText()
+  self:Search(text)
   self:KeepBagInBounds()
 end
 
@@ -269,35 +272,9 @@ function bagFrame:Create(kind)
   slots.frame:Hide()
   b.slots = slots
 
-  -- Setup the search box events.
-  --[[
-  b.frame.SearchBox:SetAlpha(0)
-  b.frame.SearchBox:SetScript("OnEnter", function()
-    b.frame.SearchBox:SetAlpha(1)
-  end)
-  b.frame.SearchBox:SetScript("OnLeave", function()
-    if b.frame.SearchBox:HasFocus() then return end
-    if b.frame.SearchBox:GetText() ~= "" then return end
-    b.frame.SearchBox:SetAlpha(0)
-  end)
-  b.frame.SearchBox:SetScript("OnEditFocusGained", function()
-    b.frame.SearchBox:SetAlpha(1)
-  end)
-  b.frame.SearchBox:SetScript("OnEditFocusLost", function()
-    if b.frame.SearchBox:GetText() ~= "" then return end
-    b.frame.SearchBox:SetAlpha(0)
-  end)
-
-  b.frame.SearchBox:SetScript("OnTextChanged", function()
-    local text = b.frame.SearchBox:GetText()
-    if text == "" or text == nil then
-      b.frame.SearchBox.Instructions:Show()
-    else
-      b.frame.SearchBox.Instructions:Hide()
-    end
-    b:Search(text)
-  end)
-  --]]
+  if kind == const.BAG_KIND.BACKPACK then
+    search:Create(b.frame)
+  end
 
   -- Enable dragging of the bag frame.
   b.frame:SetMovable(true)

frames/classic/item.lua

@@ -48,7 +48,6 @@ local children = {
   "ItemContextOverlay"
 }
 
-
 function itemFrame.itemProto:UpdateCooldown()
   ContainerFrame_UpdateCooldown(self.frame:GetID(), self.button)
 end
@@ -237,6 +236,13 @@ function itemFrame:_DoCreate()
   i.button = button
   i.frame = p
 
+  button.SetMatchesSearch = function(me, match)
+    if match then
+      me.searchOverlay:Hide()
+    else
+      me.searchOverlay:Show()
+    end
+  end
   button.ItemSlotBackground = button:CreateTexture(nil, "BACKGROUND");
   button.ItemSlotBackground:SetAllPoints(button)
   button.ItemSlotBackground:SetTexture([[Interface\PaperDoll\UI-Backpack-EmptySlot]])