Merge branch 'Hagith-header-brand-router-link'

Author: xidedix

CHANGELOG.md

@@ -1,5 +1,8 @@
 ### [@coreui/angular](https://coreui.io/) changelog
 
+##### `v2.4.2`
+- feat(header): use routerLink for brand instead of href attribute #51 - thanks @Hagith
+
 ##### `v2.4.1`
 - fix(sidebar-nav): ie issues
 

dist/@coreui/angular/bundles/coreui-angular.umd.js

@@ -8,11 +8,12 @@ export declare class AppHeaderComponent implements OnInit, OnDestroy {
     navbarBrandFull: any;
     navbarBrandMinimized: any;
     navbarBrandText: any;
-    navbarBrandHref: any;
-    sidebarToggler: any;
-    mobileSidebarToggler: any;
-    asideMenuToggler: any;
-    mobileAsideMenuToggler: any;
+    navbarBrandHref: string;
+    navbarBrandRouterLink: any[] | string;
+    sidebarToggler: string | boolean;
+    mobileSidebarToggler: boolean;
+    asideMenuToggler: string | boolean;
+    mobileAsideMenuToggler: boolean;
     private readonly fixedClass;
     navbarBrandImg: boolean;
     constructor(document: any, renderer: Renderer2, hostElement: ElementRef);

dist/@coreui/angular/bundles/coreui-angular.umd.js.map

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/angular",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "CoreUI Angular Bootstrap 4 components",
   "license": "MIT",
   "homepage": "https://coreui.io/angular",
@@ -19,6 +19,7 @@
   "peerDependencies": {
     "@angular/common": "^7.2.5",
     "@angular/core": "^7.2.5",
+    "@angular/router": "^7.2.5",
     "@coreui/coreui": "^2.1.6"
   },
   "repository": {

dist/@coreui/angular/bundles/coreui-angular.umd.min.js

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/angular-dev",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "license": "MIT",
   "author": {
     "name": "Łukasz Holeczek",

dist/@coreui/angular/bundles/coreui-angular.umd.min.js.map

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/angular",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "CoreUI Angular Bootstrap 4 components",
   "license": "MIT",
   "homepage": "https://coreui.io/angular",
@@ -19,6 +19,7 @@
   "peerDependencies": {
     "@angular/common": "^7.2.5",
     "@angular/core": "^7.2.5",
+    "@angular/router": "^7.2.5",
     "@coreui/coreui": "^2.1.6"
   },
   "repository": {

dist/@coreui/angular/coreui-angular.metadata.json

@@ -3,7 +3,7 @@
     <span class="navbar-toggler-icon"></span>
   </button>
 </ng-template>
-<a class="navbar-brand" [href]="navbarBrandHref">
+<a class="navbar-brand" [routerLink]="navbarBrandRouterLink">
   <ng-template [ngIf]="navbarBrandImg">
     <img *ngIf="navbarBrand"
          [appHtmlAttr]="navbarBrand"

dist/@coreui/angular/esm2015/lib/header/app-header.component.js

@@ -13,13 +13,14 @@ export class AppHeaderComponent implements OnInit, OnDestroy {
   @Input() navbarBrandFull: any;
   @Input() navbarBrandMinimized: any;
   @Input() navbarBrandText: any = {icon: '🅲', text: '🅲 CoreUI'};
-  @Input() navbarBrandHref: any = '';
+  @Input() navbarBrandHref: string = ''; // deprecated, use navbarBrandRouterLink instead
+  @Input() navbarBrandRouterLink: any[] | string = '';
 
-  @Input() sidebarToggler: any;
-  @Input() mobileSidebarToggler: any;
+  @Input() sidebarToggler: string | boolean;
+  @Input() mobileSidebarToggler: boolean;
 
-  @Input() asideMenuToggler: any;
-  @Input() mobileAsideMenuToggler: any;
+  @Input() asideMenuToggler: string | boolean;
+  @Input() mobileAsideMenuToggler: boolean;
 
   private readonly fixedClass = 'header-fixed';
   navbarBrandImg: boolean;
@@ -36,6 +37,7 @@ export class AppHeaderComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.isFixed(this.fixed);
     this.navbarBrandImg = Boolean(this.navbarBrand || this.navbarBrandFull || this.navbarBrandMinimized);
+    this.navbarBrandRouterLink = this.navbarBrandRouterLink[0] ? this.navbarBrandRouterLink : this.navbarBrandHref;
   }
 
   ngOnDestroy(): void {

dist/@coreui/angular/esm2015/lib/header/app-header.module.js

@@ -1,12 +1,14 @@
-import { CommonModule} from '@angular/common';
+import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 
 import { LayoutModule } from '../shared/layout/layout.module';
 import { AppHeaderComponent } from './app-header.component';
 
 @NgModule({
   imports: [
     CommonModule,
+    RouterModule,
     LayoutModule
   ],
   exports: [

dist/@coreui/angular/esm2015/lib/sidebar/app-sidebar-nav/app-sidebar-nav-link.component.js

@@ -1,4 +1,4 @@
-import {Component, ElementRef, HostBinding, Input, OnInit, Renderer2} from '@angular/core';
+import {Component, ElementRef, Input, OnInit, Renderer2} from '@angular/core';
 
 @Component({
   selector: 'app-sidebar-nav-title',
@@ -23,7 +23,7 @@ export class AppSidebarNavTitleComponent implements OnInit {
 
     if ( this.item.wrapper ) {
       const wrapper = this.renderer.createElement(this.item.wrapper.element);
-      this.addAttribs(this.item.wrapper.attributes, wrapper)
+      this.addAttribs(this.item.wrapper.attributes, wrapper);
       this.renderer.appendChild(wrapper, name);
       this.renderer.appendChild(nativeElement, wrapper);
     } else {