Fixed some stuff

Syiana · Oct 29, 2024 · 4dd618f · 4dd618f
1 parent d82bb4d
commit 4dd618f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 12 deletions.
diff --git a/Config/Components/_NPCColors.lua b/Config/Components/_NPCColors.lua
@@ -151,12 +151,9 @@ local function buildWindow()
         end
     end)
 
-    -- Create Input Field
-    local input = SUIConfig:NumericBox(window, 150, 24)
-    SUIConfig:GlueBelow(input, window, 0, 40, 'CENTER')
-
-    input.button:HookScript("OnClick", function(self)
-        local npcID = tonumber(self.editBox:GetText()) -- convert to number as it's necessary
+    -- Add NPC function
+    local function addNPC(value)
+        local npcID = tonumber(value) -- convert to number as it's necessary
 
         npcInfo.GetNPCInfoByID(
             npcID,
@@ -189,6 +186,26 @@ local function buildWindow()
                 print('|cffea00ffS|r|cff00a2ffUI|r: NPC with ID \'' .. npcID .. '\' does not exist.')
             end
         )
+    end
+
+    -- Create Input Field
+    local input = SUIConfig:NumericBox(window, 150, 24, nil, function() end)
+    SUIConfig:GlueBelow(input, window, 0, 40, 'CENTER')
+
+    input.button:HookScript("OnClick", function(self)
+        -- Add NPC
+        addNPC(self.editBox:GetText())
+
+        -- Clear Input Field
+        self.editBox:SetValue('')
+    end)
+
+    input:HookScript("OnEnterPressed", function(self)
+        -- Add NPC
+        addNPC(self:GetText())
+
+        -- Clear Input Field
+        self:SetValue('')
     end)
 
     -- Input Field Label

diff --git a/Libs/LibNPCInfo/LibNPCInfo.lua b/Libs/LibNPCInfo/LibNPCInfo.lua
@@ -99,12 +99,10 @@ end
 -- -----------------------------------------------------
 function lib.GetNPCInfoByID(npcID, callback, failedCallback)
     if not npcID then
-        print("LibNPCInfo.GetNPCInfoByID: npcID is nil.")
         return
     end
 
     if type(npcID) ~= "number" or callback and type(callback) ~= "function" then
-        print('LibNPCInfo.GetNPCInfoByID: "npcID" must be a number and "callback" must be a function or nil.')
         return
     end
 
@@ -156,8 +154,6 @@ function lib.GetNPCInfoByID(npcID, callback, failedCallback)
 
                         if failedCallback then
                             failedCallback(npcID)
-                        else
-                            print("LibNPCInfo.GetNPCInfoByID: failed to fetch data for npcID " .. npcID)
                         end
                     end
                 )
@@ -179,12 +175,10 @@ end
 -- -----------------------------------------------------
 function lib.GetNPCInfoWithIDTable(npcIDs, callback)
     if not npcIDs then
-        print("LibNPCInfo.GetNPCInfoWithIDTable: npcIDs is nil.")
         return
     end
 
     if type(npcIDs) ~= "table" or callback and type(callback) ~= "function" then
-        print('LibNPCInfo.GetNPCInfoWithIDTable: "npcIDs" must be a table and "callback" must be a function or nil.')
         return
     end
 

diff --git a/Libs/SUIConfig/widgets/EditBox.lua b/Libs/SUIConfig/widgets/EditBox.lua
@@ -203,6 +203,12 @@ end
 --- SearchEditBox
 ----------------------------------------------------
 
+local NumericBoxEvents = {
+	OnEnterPressed = function(self)
+		self:Validate();
+	end
+}
+
 local NumericBoxMethods = {
 	SetMaxValue = function(self, value)
 		self.maxValue = value;
@@ -239,6 +245,10 @@ function SUIConfig:NumericBox(parent, width, height, text, validator)
 
 	button:SetScript('OnClick', EditBoxButtonOnClick);
 
+	for k, v in pairs(NumericBoxEvents) do
+		editBox:SetScript(k, v);
+	end
+
 	return editBox;
 end