From f836c162afa2ccb5e42ef4a6c386a438608f4dd3 Mon Sep 17 00:00:00 2001
From: Ketho <sghs17@outlook.com>
Date: Wed, 22 Jan 2020 02:54:55 +0100
Subject: [PATCH] 8.3.0 (33095)

---
 .../AuctionHouseDocumentation.lua             |  9 +++++++++
 .../Blizzard_AuctionHouseAuctionsFrame.lua    |  3 +++
 .../Blizzard_Wardrobe.lua                     |  2 +-
 FrameXML/AutoComplete.lua                     |  1 +
 FrameXML/AutoComplete.xml                     |  2 +-
 FrameXML/UIParent.lua                         | 19 +++++++++++--------
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua b/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
index 5abef16cd..37d644386 100644
--- a/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
+++ b/AddOns/Blizzard_APIDocumentation/AuctionHouseDocumentation.lua
@@ -928,6 +928,15 @@ local AuctionHouse =
 			Type = "Event",
 			LiteralName = "AUCTION_HOUSE_FAVORITES_UPDATED",
 		},
+		{
+			Name = "AuctionHouseNewBidReceived",
+			Type = "Event",
+			LiteralName = "AUCTION_HOUSE_NEW_BID_RECEIVED",
+			Payload =
+			{
+				{ Name = "auctionID", Type = "number", Nilable = false },
+			},
+		},
 		{
 			Name = "AuctionHouseScriptDeprecated",
 			Type = "Event",
diff --git a/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua b/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
index ec14d9795..1d63a1d44 100644
--- a/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
+++ b/AddOns/Blizzard_AuctionHouseUI/Blizzard_AuctionHouseAuctionsFrame.lua
@@ -148,6 +148,7 @@ local AUCTIONS_FRAME_EVENTS = {
 	"BIDS_UPDATED",
 	"BID_ADDED",
 	"AUCTION_CANCELED",
+	"AUCTION_HOUSE_NEW_BID_RECEIVED",
 };
 
 local AuctionsFrameDisplayMode = {
@@ -227,6 +228,8 @@ function AuctionHouseAuctionsFrameMixin:OnEvent(event, ...)
 		end
 	elseif event == "AUCTION_CANCELED" then
 		self:RefreshSeachResults();
+	elseif event == "AUCTION_HOUSE_NEW_BID_RECEIVED" then
+		self:RefreshSeachResults();
 	end
 end
 
diff --git a/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua b/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
index ab7b2cfb4..eb5eab731 100644
--- a/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
+++ b/AddOns/Blizzard_Collections/Blizzard_Wardrobe.lua
@@ -229,7 +229,7 @@ function WardrobeTransmogFrame_UpdateSlotButton(slotButton)
 		local sourceID = WardrobeTransmogFrame_GetDisplayedSource(correspondingWeaponButton);
 		if ( sourceID ~= NO_TRANSMOG_SOURCE_ID and not WardrobeCollectionFrame_CanEnchantSource(sourceID) ) then
 			-- clear anything in the enchant slot, otherwise cost and Apply button state will still reflect anything pending
-			C_Transmog.SetPending(slotButton.slotID, slotButton.transmogType, REMOVE_TRANSMOG_ID);
+			C_Transmog.ClearPending(slotButton.slotID, slotButton.transmogType);
 			isTransmogrified = false;	-- handle legacy, this weapon could have had an illusion applied previously
 			canTransmogrify = false;
 			slotButton.invalidWeapon = true;
diff --git a/FrameXML/AutoComplete.lua b/FrameXML/AutoComplete.lua
index 7ff8c9131..8e0f0bc00 100644
--- a/FrameXML/AutoComplete.lua
+++ b/FrameXML/AutoComplete.lua
@@ -407,6 +407,7 @@ function AutoCompleteEditBox_OnChar(self)
 end
 
 function AutoCompleteEditBox_OnEditFocusLost(self)
+	self:HighlightText(0, 0);
 	AutoComplete_HideIfAttachedTo(self);
 end
 
diff --git a/FrameXML/AutoComplete.xml b/FrameXML/AutoComplete.xml
index f10a10966..0fb7d1eea 100644
--- a/FrameXML/AutoComplete.xml
+++ b/FrameXML/AutoComplete.xml
@@ -30,7 +30,7 @@
 		<DisabledFont style="GameFontDisable"/>
 		<HighlightTexture inherits="UIPanelButtonHighlightTexture"/>
 	</Button>
-	<Frame name="AutoCompleteBox" parent="UIParent" hidden="true">
+	<Frame name="AutoCompleteBox" parent="UIParent" enableMouse="true" hidden="true">
 		<Size>
 			<AbsDimension x="5" y="5"/>
 		</Size>
diff --git a/FrameXML/UIParent.lua b/FrameXML/UIParent.lua
index 81ee6e25f..7fa733acf 100644
--- a/FrameXML/UIParent.lua
+++ b/FrameXML/UIParent.lua
@@ -2193,14 +2193,17 @@ function UIParent_OnEvent(self, event, ...)
 		end
 
 		-- Clear keyboard focus.
-		if event == "GLOBAL_MOUSE_DOWN" and buttonID == "LeftButton" and not IsModifierKeyDown() then
-			local keyBoardFocus = GetCurrentKeyBoardFocus();
-			if keyBoardFocus then
-				local hasStickyFocus = keyBoardFocus.HasStickyFocus and keyBoardFocus:HasStickyFocus();
-				if keyBoardFocus.ClearFocus and not hasStickyFocus and keyBoardFocus ~= mouseFocus then
-					keyBoardFocus:ClearFocus();
-				end
- 			end
+		local autoCompleteShown = AutoCompleteBox and AutoCompleteBox:IsShown();
+		if not autoCompleteShown or not DoesAncestryInclude(AutoCompleteBox, mouseFocus) then
+			if event == "GLOBAL_MOUSE_DOWN" and buttonID == "LeftButton" and not IsModifierKeyDown() then
+				local keyBoardFocus = GetCurrentKeyBoardFocus();
+				if keyBoardFocus then
+					local hasStickyFocus = keyBoardFocus.HasStickyFocus and keyBoardFocus:HasStickyFocus();
+					if keyBoardFocus.ClearFocus and not hasStickyFocus and keyBoardFocus ~= mouseFocus then
+						keyBoardFocus:ClearFocus();
+					end
+ 				end
+			end
 		end
 	end
 end