Merge pull request #105 from funidata/add-routerlink-to-fudis-link

Bump version 0.0.28 & add routerlink to fudis-link

ngx-fudis/projects/ngx-fudis/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@funidata/ngx-fudis",
- "version": "0.0.27",
+ "version": "0.0.28",
  "schematics": "./schematics/collection.json",
  "ng-add": {
  "save": "dependencies"

ngx-fudis/projects/ngx-fudis/src/lib/components/link/link.component.html

@@ -15,7 +15,8 @@
 <ng-template #externalLink>
  <a
  attr.aria-label="{{ linkTitle ? linkTitle : href }}, {{ externalLinkAriaLabel }}"
- [href]="href"
+ [href]="href ? href : null"
+ [routerLink]="routerLinkUrl"
  target="_blank"
  rel="noopener noreferrer"
  class="fudis-link__anchor fudis-link__anchor__{{ size }} fudis-link__anchor__{{

ngx-fudis/projects/ngx-fudis/src/lib/components/link/link.component.spec.ts

@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MockComponent } from 'ng-mocks';
+import { RouterModule } from '@angular/router';
 import { IconComponent } from '../icon/icon.component';
 import { LinkComponent } from './link.component';
 
@@ -12,6 +13,7 @@ describe('LinkComponent', () => {
  beforeEach(async () => {
  await TestBed.configureTestingModule({
  declarations: [LinkComponent, MockComponent(IconComponent)],
+ imports: [RouterModule.forRoot([])],
  })
  .overrideComponent(LinkComponent, {
  set: { changeDetection: ChangeDetectionStrategy.Default },

ngx-fudis/projects/ngx-fudis/src/lib/components/link/link.component.ts

@@ -33,10 +33,15 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@a
 })
 export class LinkComponent {
  /**
- * Link URL
+ * Link URL using native href
  */
  @Input() href: string;
 
+ /**
+ * Link URL using Angular RouterLink
+ */
+ @Input() routerLinkUrl: string | any[];
+
  /**
  * Title for the link, if not defined title will be the same as link URL
  */

ngx-fudis/projects/ngx-fudis/src/lib/ngx-fudis.module.ts

@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { LayoutModule } from '@angular/cdk/layout';
@@ -122,6 +123,7 @@ import { InputWithLanguageOptionsComponent } from './components/form/input-with-
  MatButtonModule,
  MatTooltipModule,
  ReactiveFormsModule,
+ RouterModule,
  ],
 
  /*

package.json

@@ -1,6 +1,6 @@
 {
  "name": "fudis",
- "version": "0.0.27",
+ "version": "0.0.28",
  "description": "Funidata Design System",
  "main": "index.js",
  "directories": {