From 88a5a57c46717e75cb8599ba698d96d06afd45ea Mon Sep 17 00:00:00 2001
From: Nicolas Barithel <nbarithel@gmail.com>
Date: Tue, 31 Jul 2018 16:52:03 +0200
Subject: [PATCH] Display icon and label in adf-info-drawer-tab (#3628)

- label is not displayed in case there is an icon set on the adf-info-drawer-tab
because it is using a mat-tab-label layout
---
 .../info-drawer/info-drawer.component.html    | 19 +++++++++----------
 .../info-drawer/info-drawer.component.scss    |  4 ++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/core/info-drawer/info-drawer.component.html b/lib/core/info-drawer/info-drawer.component.html
index 6ffddbc2ad..1c0b7c2072 100644
--- a/lib/core/info-drawer/info-drawer.component.html
+++ b/lib/core/info-drawer/info-drawer.component.html
@@ -8,17 +8,16 @@
 
     <ng-template #tabLayout>
         <mat-tab-group [(selectedIndex)]="selectedIndex" class="adf-info-drawer-tabs" (selectedTabChange)="onTabChange($event)">
-            <ng-container *ngFor="let contentBlock of contentBlocks">
-                <mat-tab [label]="contentBlock.label" class="adf-info-drawer-tab">
-                    <ng-container *ngIf="contentBlock.icon">
-                        <ng-template mat-tab-label>
-                            <mat-icon>{{ contentBlock.icon }}</mat-icon>
-                        </ng-template>
-                    </ng-container>
+            <mat-tab *ngFor="let contentBlock of contentBlocks" [label]="contentBlock.label" class="adf-info-drawer-tab">
+                <ng-container *ngIf="contentBlock.icon">
+                    <ng-template mat-tab-label>
+                        <mat-icon>{{ contentBlock.icon }}</mat-icon>
+                        <span *ngIf="contentBlock.label">{{ contentBlock.label }}</span>
+                    </ng-template>
+                </ng-container>
 
-                    <ng-container *ngTemplateOutlet="contentBlock.content"></ng-container>
-                </mat-tab>
-            </ng-container>
+                <ng-container *ngTemplateOutlet="contentBlock.content"></ng-container>
+            </mat-tab>
         </mat-tab-group>
     </ng-template>
 
diff --git a/lib/core/info-drawer/info-drawer.component.scss b/lib/core/info-drawer/info-drawer.component.scss
index 6d2a00dbe7..fbbd55abbd 100644
--- a/lib/core/info-drawer/info-drawer.component.scss
+++ b/lib/core/info-drawer/info-drawer.component.scss
@@ -28,6 +28,10 @@
 
                     .mat-tab-label {
                         flex-grow: 1;
+
+                        .mat-icon + span {
+                            padding-left: 5px;
+                        }
                     }
 
                     .mat-ink-bar {