ElvUI/Nameplates: Use /elvrole role for nameplate styling. Defer to group role assinged if not manually set elvrole to tank or healer

ElvUI/Core/API.lua

@@ -49,6 +49,24 @@ function E:GetPlayerRole()
 	return isTank and "TANK" or isHealer and "HEALER" or "DAMAGER"
 end
 
+function E:GetPlayerDesiredRole()
+	local myRole = E.Role
+	if myRole == "Tank" then
+		myRole = "TANK"
+	elseif myRole == "Healer" then
+		myRole = "HEALER"
+	else
+		local groupRole = E:GetPlayerRole()
+		if groupRole then
+			myRole = groupRole
+		else
+			myRole = "DAMAGER"
+		end
+	end
+
+	return myRole
+end
+
 do
 	--local Masque = E.Libs.Masque
 	local LBFGroupToTableElement = {

ElvUI/Core/Commands.lua

@@ -235,6 +235,7 @@ function E:ChangeRole(role)
 		["caster"]="Caster",
 		["ranged"]="Ranged",
 		["tank"]="Tank",
+		["healer"]="Healer",
 	}
 	E.Role = roles[lower(role)] or "Melee"
 	E:Print("Role was changed to "..E.Role)

ElvUI/Modules/Nameplates/StyleFilter.lua

@@ -904,7 +904,7 @@ function mod:StyleFilterConditionCheck(frame, filter, trigger)
 
 	-- My Role
 	if trigger.role.tank or trigger.role.healer or trigger.role.damager then
-		if trigger.role[mod.TriggerConditions.roles[E.myrole]] then passed = true else return end
+		if trigger.role[mod.TriggerConditions.roles[E:GetPlayerDesiredRole()]] then passed = true else return end
 	end
 
 	-- Unit Role