From 7b0dc65672a3551053da308d4690fb069c9b26dc Mon Sep 17 00:00:00 2001
From: Mike Masey <mike.masey@yoyodesign.com>
Date: Mon, 12 Oct 2020 14:10:27 +0100
Subject: [PATCH] Add umb-icon to umb-tree-item and umb-tree-search-box (#9064)

* feat: add svg icons to umb-tree-item and umb-tree-search-box

* refactor: remove unnessesary aria-hidden from umb-tree-icon

* refactor: remove aria hidden from umb-tree-search-box icon
---
 .../src/views/components/tree/umb-tree-item.html              | 2 +-
 .../src/views/components/tree/umb-tree-search-box.html        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
index 32e5edc68a..244ac81380 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-item.html
@@ -9,7 +9,7 @@
             <span class="sr-only">Expand child items for {{node.name}}</span>
         </button>
 
-        <i class="icon umb-tree-icon sprTree" ng-class="node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style" tabindex="-1" aria-hidden="true"></i>
+        <umb-icon icon="{{node.icon}}" class="icon umb-tree-icon sprTree" ng-class="node.cssClass" title="{{::node.title}}" ng-click="select(node, $event)" ng-style="::node.style" tabindex="-1"></umb-icon>
         <span class="umb-tree-item__annotation"></span>
         <a class="umb-tree-item__label" ng-href="#/{{::node.routePath}}" ng-click="select(node, $event)" title="{{::node.title}}">{{node.name}}</a>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
index 2c5605c973..77498cd007 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/tree/umb-tree-search-box.html
@@ -1,10 +1,10 @@
 <div class="form-search">
-    <i class="icon icon-search" ng-if="showSearch == 'false'" aria-hidden="true"></i>
+    <umb-icon icon="icon-search" class="icon icon-search" ng-if="showSearch == 'false'"></umb-icon>
     <button type="button" class="btn-reset icon icon-arrow-left" ng-if="showSearch == 'true'" localize="title" title="@general_back" ng-click="hideSearch()"></button>
     <input type="text"
            ng-model="term"
            class="umb-search-field search-query -full-width-input"
-           placeholder="{{searchPlaceholderText}}"           
+           placeholder="{{searchPlaceholderText}}"
            umb-auto-focus="{{autoFocus ? 'true' : 'false'}}">
     <h4 ng-if="showSearch && searchFromName">
         <small><localize key="general_search">Search</localize>:&nbsp;</small>