Minor fixes

Author: ofzza

projects/iqui-ngx/src/lib/components/basics/button/index.html

@@ -2,14 +2,21 @@
 <ng-template #content><ng-content></ng-content></ng-template>
 
 <!-- Button -->
-<button *ngIf="!href" [iquiFormParent]="_iquiFormParent" [attr.disabled]="disabled || null" [ngClass]="ngClass" [class]="_composedClassValue">
+<button *ngIf="!_href && !_routerLink" [iquiFormParent]="_iquiFormParent" [attr.disabled]="disabled || null" [ngClass]="ngClass" [class]="_composedClassValue">
   <span class="iqui-button-content d-flex align-items-center">
     <ng-container *ngTemplateOutlet="content"></ng-container>
   </span>
 </button>
 
-<!-- Anchor -->
-<a *ngIf="!!href" [attr.disabled]="disabled || null" [ngClass]="ngClass" [class]="_composedClassValue" [href]="href" [target]="target">
+<!-- Anchor (linking to URL) -->
+<a *ngIf="!!_href" [attr.disabled]="disabled || null" [ngClass]="ngClass" [class]="_composedClassValue" [href]="_href" [target]="target">
+  <span class="iqui-button-content d-flex align-items-center">
+    <ng-container *ngTemplateOutlet="content"></ng-container>
+  </span>
+</a>
+
+<!-- Anchor (routing to local URL) -->
+<a *ngIf="!!_routerLink" [attr.disabled]="disabled || null" [ngClass]="ngClass" [class]="_composedClassValue" [routerLink]="_routerLink">
   <span class="iqui-button-content d-flex align-items-center">
     <ng-container *ngTemplateOutlet="content"></ng-container>
   </span>

projects/iqui-ngx/src/lib/components/basics/button/index.ts

@@ -37,13 +37,13 @@ export type TButtonComponentSize = TBootstrapSize;
  * Usage:
  *
  *  <iqui-button\
- *    [ disabled  = "true|false" ]\
- *    [ class     = "..." ]\
- *    [ ngClass   = "{...}" ]\
- *    [ size      = "sm|lg" ]\
- *    [ theme     = "primary|secondary|success|warning|danger|info|light|dark|link" ]\
- *    [ href      = "https://example.com" ]\
- *    [ target    = "_blank|_self" ]\
+ *    [ disabled    = "true|false" ]\
+ *    [ class       = "..." ]\
+ *    [ ngClass     = "{...}" ]\
+ *    [ size        = "sm|lg" ]\
+ *    [ theme       = "primary|secondary|success|warning|danger|info|light|dark|link" ]\
+ *    [ href        = "https://example.com" ]\
+ *    [ target      = "_blank|_self" ]\
  *  >\
  *    Button content\
  *  </iqui-button>
@@ -109,6 +109,19 @@ export class ButtonComponent extends UsesFormElementDirectives {
   @Input()
   public target: '_self' | '_blank' = '_self';
 
+  /**
+   * Returns remote URL to link to if [href] property contains a remote URL as a value
+   */
+  public get _href() {
+    return this.href && this.href.includes('://') ? this.href : undefined;
+  }
+  /**
+   * Returns local URL to route to if [href] property contains a local URL as a value
+   */
+  public get _routerLink() {
+    return this.href && !this.href.includes('://') ? this.href : undefined;
+  }
+
   /**
    * Composes class value based on property values
    */
@@ -119,7 +132,7 @@ export class ButtonComponent extends UsesFormElementDirectives {
       // Mark size (.btn-sm)
       this.size ? 'btn-' + this.size : null,
       // Mark theme color (.btn-primary, .btn-link, etc ...)
-      'btn-' + (this.theme || (!this.href ? 'secondary' : 'link')),
+      'btn-' + (this.theme || (!this._href && !this._routerLink ? 'secondary' : 'link')),
       // Mark as disabled, if disabled (.disabled)
       this.disabled ? 'disabled' : null,
       // Pass-through host class

projects/iqui-ngx/src/lib/components/basics/index.ts

@@ -1,6 +1,7 @@
 // Import dependencies
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
 
 // Import dependency modules
 import { FunctionalModule } from '../functional';
@@ -37,9 +38,12 @@ export { PhraseInputComponent };
  * Implements components that are basic building blocks of any application or more-complex component
  */
 @NgModule({
-  imports: [CommonModule, FunctionalModule, FormModule],
+  imports: [CommonModule, RouterModule, FunctionalModule, FormModule],
   declarations: [ButtonComponent, DropdownButtonComponent, PhraseInputComponent],
   exports: [
+    // Export angular dependencies
+    CommonModule,
+    RouterModule,
     // Export dependency modules
     FunctionalModule,
     FormModule,

projects/iqui-ngx/src/lib/components/code/index.ts

@@ -24,6 +24,8 @@ export { HighlightJsComponent, HighlightJsTextareaDirective, HighlightJsInjectTo
   imports: [CommonModule, BasicsModule, FormModule],
   declarations: [HighlightJsComponent, HighlightJsTextareaDirective, HighlightJsInjectTopDirective, HighlightJsInjectBottomDirective],
   exports: [
+    // Export angular dependencies
+    CommonModule,
     // Export dependency modules
     CommonModule,
     BasicsModule,

projects/iqui-ngx/src/lib/components/form/index.ts

@@ -63,6 +63,8 @@ export { SelectComponent } from './components/select';
     OptionDirective,
   ],
   exports: [
+    // Export angular dependencies
+    CommonModule,
     // Export dependency modules
     TextFieldModule,
     // Export child components

projects/iqui-ngx/src/lib/components/functional/index.ts

@@ -61,6 +61,8 @@ export { BookmarkableDirective, BookmarkableService };
     BookmarkableDirective,
   ],
   exports: [
+    // Export angular dependencies
+    CommonModule,
     // Export dependency modules
     OverlayModule,
     // Export child components

projects/iqui-ngx/src/lib/components/showcasing/index.ts

@@ -18,6 +18,8 @@ export { PlaygroundComponent, PlaygroundTextareaDirective };
   imports: [CommonModule, FormModule, CodeModule],
   declarations: [PlaygroundComponent, PlaygroundTextareaDirective],
   exports: [
+    // Export angular dependencies
+    CommonModule,
     // Export dependency modules
     FormModule,
     CodeModule,

projects/iqui-ngx/src/lib/index.ts

@@ -104,6 +104,9 @@ export { providers };
   declarations: [],
   providers: [...providers],
   exports: [
+    // Export angular dependencies
+    CommonModule,
+    BrowserModule,
     // (Re)export individual modules, making them included into any app the root module is included in
     ...modules,
   ],