Merge remote-tracking branch 'origin/demo' into starter

Re-enabled AngularCLI cache since Tailwind related issues are appeared to be fixed

.browserslistrc

@@ -14,4 +14,3 @@ last 2 Edge major versions
 last 2 Safari major versions
 last 2 iOS major versions
 Firefox ESR
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

.gitignore

@@ -31,6 +31,7 @@ chrome-profiler-events*.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

.nvmrc

@@ -1 +1 @@
-12
+16

README.md

@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
 
 ## Running unit tests
 
@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 
 ## Running end-to-end tests
 
-Run `ng e2e` to execute the end-to-end tests via a platform of your choice.
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice.  To use this command, you need to first add a package that implements end-to-end testing capabilities.
 
 ## Further help
 

angular.json

@@ -1,6 +1,9 @@
 {
     "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
     "version": 1,
+    "cli": {
+        "defaultCollection": "@angular-eslint/schematics"
+    },
     "newProjectRoot": "projects",
     "projects": {
         "fuse": {
@@ -60,13 +63,13 @@
                             "budgets": [
                                 {
                                     "type": "initial",
-                                    "maximumWarning": "5mb",
-                                    "maximumError": "8mb"
+                                    "maximumWarning": "3mb",
+                                    "maximumError": "5mb"
                                 },
                                 {
                                     "type": "anyComponentStyle",
-                                    "maximumWarning": "100kb",
-                                    "maximumError": "150kb"
+                                    "maximumWarning": "75kb",
+                                    "maximumError": "90kb"
                                 }
                             ],
                             "fileReplacements": [
@@ -137,8 +140,5 @@
             }
         }
     },
-    "defaultProject": "fuse",
-    "cli": {
-        "defaultCollection": "@angular-eslint/schematics"
-    }
+    "defaultProject": "fuse"
 }

karma.conf.js

@@ -26,7 +26,7 @@ module.exports = function (config)
             suppressAll: true // removes the duplicated traces
         },
         coverageReporter   : {
-            dir      : require('path').join(__dirname, './coverage/angular12'),
+            dir      : require('path').join(__dirname, './coverage/fuse'),
             subdir   : '.',
             reporters: [
                 {type: 'html'},

package.json

@@ -1,90 +1,81 @@
 {
-    "name": "@fuse/demo",
-    "version": "13.0.3",
+    "name": "@fuse/starter",
+    "version": "14.2.0",
+    "description": "Fuse - Angular Admin Template and Starter Project",
+    "author": "https://themeforest.net/user/srcn",
     "license": "https://themeforest.net/licenses/standard",
     "private": true,
     "scripts": {
         "ng": "ng",
         "start": "ng serve",
         "build": "ng build",
+        "watch": "ng build --watch --configuration development",
         "test": "ng test",
-        "lint": "ng lint",
-        "e2e": "ng e2e"
+        "lint": "ng lint"
     },
     "dependencies": {
-        "@angular/animations": "12.0.2",
-        "@angular/cdk": "12.0.2",
-        "@angular/common": "12.0.2",
-        "@angular/compiler": "12.0.2",
-        "@angular/core": "12.0.2",
-        "@angular/forms": "12.0.2",
-        "@angular/material": "12.0.2",
-        "@angular/material-moment-adapter": "12.0.2",
-        "@angular/platform-browser": "12.0.2",
-        "@angular/platform-browser-dynamic": "12.0.2",
-        "@angular/router": "12.0.2",
-        "@fullcalendar/angular": "4.4.5-beta",
-        "@fullcalendar/core": "4.4.2",
-        "@fullcalendar/daygrid": "4.4.2",
-        "@fullcalendar/interaction": "4.4.2",
-        "@fullcalendar/list": "4.4.2",
-        "@fullcalendar/moment": "4.4.2",
-        "@fullcalendar/rrule": "4.4.2",
-        "@fullcalendar/timegrid": "4.4.2",
-        "@ngneat/transloco": "2.21.0",
-        "apexcharts": "3.26.3",
+        "@angular/animations": "13.2.3",
+        "@angular/cdk": "13.2.3",
+        "@angular/common": "13.2.3",
+        "@angular/compiler": "13.2.3",
+        "@angular/core": "13.2.3",
+        "@angular/forms": "13.2.3",
+        "@angular/material": "13.2.3",
+        "@angular/material-moment-adapter": "13.2.3",
+        "@angular/platform-browser": "13.2.3",
+        "@angular/platform-browser-dynamic": "13.2.3",
+        "@angular/router": "13.2.3",
+        "@ngneat/transloco": "3.1.4",
+        "apexcharts": "3.33.1",
         "crypto-js": "3.3.0",
-        "highlight.js": "11.0.0",
+        "highlight.js": "11.4.0",
         "lodash-es": "4.17.21",
         "moment": "2.29.1",
-        "ng-apexcharts": "1.5.10",
-        "ngx-markdown": "12.0.1",
-        "ngx-quill": "14.0.0",
-        "perfect-scrollbar": "1.5.1",
+        "ng-apexcharts": "1.7.0",
+        "ngx-markdown": "13.1.0",
+        "ngx-quill": "16.1.2",
+        "perfect-scrollbar": "1.5.3",
         "quill": "1.3.7",
-        "rrule": "2.6.8",
-        "rxjs": "6.6.7",
-        "tslib": "2.2.0",
-        "web-animations-js": "2.3.2",
+        "rxjs": "7.5.4",
+        "tslib": "2.3.1",
         "zone.js": "0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "12.0.2",
-        "@angular-eslint/builder": "12.1.0",
-        "@angular-eslint/eslint-plugin": "12.1.0",
-        "@angular-eslint/eslint-plugin-template": "12.1.0",
-        "@angular-eslint/schematics": "12.1.0",
-        "@angular-eslint/template-parser": "12.1.0",
-        "@angular/cli": "12.0.2",
-        "@angular/compiler-cli": "12.0.2",
-        "@angular/language-service": "12.0.2",
-        "@tailwindcss/aspect-ratio": "0.2.1",
-        "@tailwindcss/line-clamp": "0.2.1",
-        "@tailwindcss/typography": "0.4.1",
+        "@angular-devkit/build-angular": "13.2.4",
+        "@angular-eslint/builder": "13.1.0",
+        "@angular-eslint/eslint-plugin": "13.1.0",
+        "@angular-eslint/eslint-plugin-template": "13.1.0",
+        "@angular-eslint/schematics": "13.1.0",
+        "@angular-eslint/template-parser": "13.1.0",
+        "@angular/cli": "13.2.4",
+        "@angular/compiler-cli": "13.2.3",
+        "@tailwindcss/aspect-ratio": "0.4.0",
+        "@tailwindcss/line-clamp": "0.3.1",
+        "@tailwindcss/typography": "0.5.2",
         "@types/chroma-js": "2.1.3",
         "@types/crypto-js": "3.1.47",
         "@types/highlight.js": "10.1.0",
-        "@types/jasmine": "3.6.11",
-        "@types/lodash": "4.14.170",
-        "@types/lodash-es": "4.17.4",
-        "@types/node": "12.20.14",
-        "@typescript-eslint/eslint-plugin": "4.26.0",
-        "@typescript-eslint/parser": "4.26.0",
-        "autoprefixer": "10.2.6",
-        "chroma-js": "2.1.2",
-        "eslint": "7.27.0",
-        "eslint-plugin-import": "2.23.4",
-        "eslint-plugin-jsdoc": "35.1.2",
+        "@types/jasmine": "3.10.3",
+        "@types/lodash": "4.14.178",
+        "@types/lodash-es": "4.17.6",
+        "@types/node": "12.20.46",
+        "@typescript-eslint/eslint-plugin": "5.12.0",
+        "@typescript-eslint/parser": "5.12.0",
+        "autoprefixer": "10.4.2",
+        "chroma-js": "2.4.2",
+        "eslint": "8.9.0",
+        "eslint-plugin-import": "2.25.4",
+        "eslint-plugin-jsdoc": "37.9.4",
         "eslint-plugin-prefer-arrow": "1.2.3",
-        "jasmine-core": "3.7.1",
-        "karma": "6.3.3",
+        "jasmine-core": "4.0.0",
+        "karma": "6.3.16",
         "karma-chrome-launcher": "3.1.0",
-        "karma-coverage": "2.0.3",
+        "karma-coverage": "2.1.1",
         "karma-jasmine": "4.0.1",
-        "karma-jasmine-html-reporter": "1.6.0",
+        "karma-jasmine-html-reporter": "1.7.0",
         "lodash": "4.17.21",
-        "postcss": "8.3.0",
-        "tailwindcss": "2.1.4",
-        "typescript": "4.2.4"
+        "postcss": "8.4.6",
+        "tailwindcss": "3.0.23",
+        "typescript": "4.5.5"
     }
 }

src/@fuse/components/alert/alert.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core';
-import { Subject } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, Subject, takeUntil } from 'rxjs';
 import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
 import { fuseAnimations } from '@fuse/animations';
 import { FuseAlertAppearance, FuseAlertType } from '@fuse/components/alert/alert.types';
@@ -145,7 +144,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/components/date-range/date-range.component.html

@@ -1,101 +0,0 @@
-<div
-    class="range"
-    (click)="openPickerPanel()"
-    #pickerPanelOrigin>
-
-    <div class="start">
-        <div class="date">{{range.startDate}}</div>
-        <div
-            class="time"
-            *ngIf="range.startTime">{{range.startTime}}</div>
-    </div>
-
-    <div class="separator">-</div>
-
-    <div class="end">
-        <div class="date">{{range.endDate}}</div>
-        <div
-            class="time"
-            *ngIf="range.endTime">{{range.endTime}}</div>
-    </div>
-
-</div>
-
-<ng-template #pickerPanel>
-
-    <!-- Start -->
-    <div class="start">
-
-        <div class="month">
-            <div class="month-header">
-                <button
-                    class="previous-button"
-                    mat-icon-button
-                    (click)="prev()"
-                    tabindex="1">
-                    <mat-icon [svgIcon]="'heroicons_outline:chevron-left'"></mat-icon>
-                </button>
-                <div class="month-label">{{getMonthLabel(1)}}</div>
-            </div>
-            <mat-month-view
-                [(activeDate)]="activeDates.month1"
-                [dateFilter]="dateFilter()"
-                [dateClass]="dateClass()"
-                (click)="$event.stopImmediatePropagation()"
-                (selectedChange)="onSelectedDateChange($event)"
-                #matMonthView1>
-            </mat-month-view>
-        </div>
-
-        <mat-form-field
-            class="fuse-mat-no-subscript time start-time"
-            *ngIf="timeRange">
-            <input
-                matInput
-                [autocomplete]="'off'"
-                [formControl]="startTimeFormControl"
-                (blur)="updateStartTime($event)"
-                tabindex="3">
-            <mat-label>Start time</mat-label>
-        </mat-form-field>
-
-    </div>
-
-    <!-- End -->
-    <div class="end">
-
-        <div class="month">
-            <div class="month-header">
-                <div class="month-label">{{getMonthLabel(2)}}</div>
-                <button
-                    class="next-button"
-                    mat-icon-button
-                    (click)="next()"
-                    tabindex="2">
-                    <mat-icon [svgIcon]="'heroicons_outline:chevron-right'"></mat-icon>
-                </button>
-            </div>
-            <mat-month-view
-                [(activeDate)]="activeDates.month2"
-                [dateFilter]="dateFilter()"
-                [dateClass]="dateClass()"
-                (click)="$event.stopImmediatePropagation()"
-                (selectedChange)="onSelectedDateChange($event)"
-                #matMonthView2>
-            </mat-month-view>
-        </div>
-
-        <mat-form-field
-            class="fuse-mat-no-subscript time end-time"
-            *ngIf="timeRange">
-            <input
-                matInput
-                [formControl]="endTimeFormControl"
-                (blur)="updateEndTime($event)"
-                tabindex="4">
-            <mat-label>End time</mat-label>
-        </mat-form-field>
-
-    </div>
-
-</ng-template>

src/@fuse/components/date-range/date-range.component.scss

@@ -1,292 +0,0 @@
-/* Variables */
-$body-cell-padding: 2px;
-
-fuse-date-range {
-    display: flex;
-
-    .range {
-        display: flex;
-        align-items: center;
-        height: 48px;
-        min-height: 48px;
-        max-height: 48px;
-        cursor: pointer;
-
-        .start,
-        .end {
-            display: flex;
-            align-items: center;
-            height: 100%;
-            padding: 0 16px;
-            border-radius: 6px;
-            border-width: 1px;
-            line-height: 1;
-            @apply shadow-sm border-gray-300 dark:bg-black dark:bg-opacity-5 dark:border-gray-500;
-
-            .date {
-                white-space: nowrap;
-
-                + .time {
-                    margin-left: 8px;
-                }
-            }
-
-            .time {
-                white-space: nowrap;
-            }
-        }
-
-        .separator {
-            margin: 0 2px;
-
-            @screen sm {
-                margin: 0 12px;
-            }
-        }
-    }
-}
-
-.fuse-date-range-panel {
-    border-radius: 4px;
-    padding: 24px;
-    @apply shadow-2xl bg-card;
-
-    .start,
-    .end {
-        display: flex;
-        flex-direction: column;
-
-        .month {
-            max-width: 196px;
-            min-width: 196px;
-            width: 196px;
-
-            .month-header {
-                position: relative;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                height: 32px;
-                margin-bottom: 16px;
-
-                .previous-button,
-                .next-button {
-                    position: absolute;
-                    width: 24px !important;
-                    height: 24px !important;
-                    min-height: 24px !important;
-                    max-height: 24px !important;
-                    line-height: 24px !important;
-
-                    .mat-icon {
-                        @apply icon-size-5;
-                    }
-                }
-
-                .previous-button {
-                    left: 0;
-                }
-
-                .next-button {
-                    right: 0;
-                }
-
-                .month-label {
-                    font-weight: 500;
-                    @apply text-secondary;
-                }
-            }
-
-            mat-month-view {
-                display: flex;
-                min-height: 188px;
-
-                .mat-calendar-table {
-                    width: 100%;
-                    border-collapse: collapse;
-
-                    tbody {
-
-                        tr {
-
-                            &[aria-hidden=true] {
-                                display: none !important;
-                            }
-
-                            &:first-child {
-
-                                td:first-child {
-
-                                    &[aria-hidden=true] {
-                                        visibility: hidden;
-                                        pointer-events: none;
-                                        opacity: 0;
-                                    }
-                                }
-                            }
-
-                            td,
-                            td:hover {
-
-                                &.fuse-date-range {
-
-                                    &:before {
-                                        @apply bg-primary-200;
-                                    }
-
-                                    .mat-calendar-body-cell-content {
-                                        background-color: transparent;
-                                    }
-                                }
-
-                                &.fuse-date-range-start,
-                                &.fuse-date-range-end {
-
-                                    .mat-calendar-body-cell-content {
-                                        @apply bg-primary text-on-primary;
-                                    }
-                                }
-
-                                .mat-calendar-body-today {
-                                    border: none;
-                                }
-                            }
-
-                            td.mat-calendar-body-cell {
-                                width: 28px !important;
-                                height: 28px !important;
-                                padding: $body-cell-padding !important;
-
-                                &.fuse-date-range {
-                                    position: relative;
-
-                                    &:before {
-                                        content: '';
-                                        position: absolute;
-                                        top: $body-cell-padding;
-                                        right: 0;
-                                        bottom: $body-cell-padding;
-                                        left: 0;
-                                    }
-
-                                    &.fuse-date-range-start {
-
-                                        &:before {
-                                            left: $body-cell-padding;
-                                            border-radius: 999px 0 0 999px;
-                                        }
-
-                                        &.fuse-date-range-end,
-                                        &:last-child {
-
-                                            &:before {
-                                                right: $body-cell-padding;
-                                                border-radius: 999px;
-                                            }
-                                        }
-                                    }
-
-                                    &.fuse-date-range-end {
-
-                                        &:before {
-                                            right: $body-cell-padding;
-                                            border-radius: 0 999px 999px 0;
-                                        }
-
-                                        &:first-child {
-
-                                            &:before {
-                                                left: $body-cell-padding;
-                                                border-radius: 999px;
-                                            }
-                                        }
-                                    }
-
-                                    &:first-child {
-
-                                        &:before {
-                                            border-radius: 999px 0 0 999px;
-                                        }
-                                    }
-
-                                    &:last-child {
-
-                                        &:before {
-                                            border-radius: 0 999px 999px 0;
-                                        }
-                                    }
-                                }
-
-                                .mat-calendar-body-cell-content {
-                                    position: relative;
-                                    top: 0;
-                                    left: 0;
-                                    width: 24px;
-                                    height: 24px;
-                                    font-size: 12px;
-                                }
-                            }
-
-                            td.mat-calendar-body-label {
-
-                                + td.mat-calendar-body-cell {
-
-                                    &.fuse-date-range {
-
-                                        &:before {
-                                            border-radius: 999px 0 0 999px;
-                                        }
-
-                                        &.fuse-date-range-start {
-
-                                            &.fuse-date-range-end {
-                                                border-radius: 999px;
-                                            }
-                                        }
-
-                                        &.fuse-date-range-end {
-
-                                            &:before {
-                                                left: $body-cell-padding;
-                                                border-radius: 999px;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        .time {
-            width: 100%;
-            max-width: 196px;
-        }
-    }
-
-    .start {
-        align-items: flex-start;
-        margin-right: 20px;
-
-        .month {
-
-            .month-label {
-                margin-left: 8px;
-            }
-        }
-    }
-
-    .end {
-        align-items: flex-end;
-        margin-left: 20px;
-
-        .month {
-
-            .month-label {
-                margin-right: 8px;
-            }
-        }
-    }
-}

src/@fuse/components/date-range/date-range.component.ts

@@ -1,682 +0,0 @@
-import { ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, HostBinding, Input, OnDestroy, OnInit, Output, Renderer2, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
-import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
-import { Overlay } from '@angular/cdk/overlay';
-import { TemplatePortal } from '@angular/cdk/portal';
-import { MatCalendarCellCssClasses, MatMonthView } from '@angular/material/datepicker';
-import { Subject } from 'rxjs';
-import * as moment from 'moment';
-import { Moment } from 'moment';
-
-@Component({
-    selector     : 'fuse-date-range',
-    templateUrl  : './date-range.component.html',
-    styleUrls    : ['./date-range.component.scss'],
-    encapsulation: ViewEncapsulation.None,
-    exportAs     : 'fuseDateRange',
-    providers    : [
-        {
-            provide    : NG_VALUE_ACCESSOR,
-            useExisting: forwardRef(() => FuseDateRangeComponent),
-            multi      : true
-        }
-    ]
-})
-export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnDestroy
-{
-    @Output() readonly rangeChanged: EventEmitter<{ start: string; end: string }> = new EventEmitter<{ start: string; end: string }>();
-    @ViewChild('matMonthView1') private _matMonthView1: MatMonthView<any>;
-    @ViewChild('matMonthView2') private _matMonthView2: MatMonthView<any>;
-    @ViewChild('pickerPanelOrigin', {read: ElementRef}) private _pickerPanelOrigin: ElementRef;
-    @ViewChild('pickerPanel') private _pickerPanel: TemplateRef<any>;
-    @HostBinding('class.fuse-date-range') private _defaultClassNames = true;
-
-    activeDates: { month1: Moment | null; month2: Moment | null } = {
-        month1: null,
-        month2: null
-    };
-    setWhichDate: 'start' | 'end' = 'start';
-    startTimeFormControl: FormControl;
-    endTimeFormControl: FormControl;
-    private _dateFormat: string;
-    private _onChange: (value: any) => void;
-    private _onTouched: (value: any) => void;
-    private _programmaticChange!: boolean;
-    private _range: { start: Moment | null; end: Moment | null } = {
-        start: null,
-        end  : null
-    };
-    private _timeFormat: string;
-    private _timeRange: boolean;
-    private readonly _timeRegExp: RegExp = new RegExp('^(0[0-9]|1[0-9]|2[0-4]|[0-9]):([0-5][0-9])(A|(?:AM)|P|(?:PM))?$', 'i');
-    private _unsubscribeAll: Subject<any> = new Subject<any>();
-
-    /**
-     * Constructor
-     */
-    constructor(
-        private _changeDetectorRef: ChangeDetectorRef,
-        private _elementRef: ElementRef,
-        private _overlay: Overlay,
-        private _renderer2: Renderer2,
-        private _viewContainerRef: ViewContainerRef
-    )
-    {
-        this._onChange = (): void => {
-        };
-        this._onTouched = (): void => {
-        };
-        this.dateFormat = 'DD/MM/YYYY';
-        this.timeFormat = '12';
-
-        // Initialize the component
-        this._init();
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Accessors
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Setter & getter for dateFormat input
-     *
-     * @param value
-     */
-    @Input()
-    set dateFormat(value: string)
-    {
-        // Return if the values are the same
-        if ( this._dateFormat === value )
-        {
-            return;
-        }
-
-        // Store the value
-        this._dateFormat = value;
-    }
-
-    get dateFormat(): string
-    {
-        return this._dateFormat;
-    }
-
-    /**
-     * Setter & getter for timeFormat input
-     *
-     * @param value
-     */
-    @Input()
-    set timeFormat(value: string)
-    {
-        // Return if the values are the same
-        if ( this._timeFormat === value )
-        {
-            return;
-        }
-
-        // Set format based on the time format input
-        this._timeFormat = value === '12' ? 'hh:mmA' : 'HH:mm';
-    }
-
-    get timeFormat(): string
-    {
-        return this._timeFormat;
-    }
-
-    /**
-     * Setter & getter for timeRange input
-     *
-     * @param value
-     */
-    @Input()
-    set timeRange(value: boolean)
-    {
-        // Return if the values are the same
-        if ( this._timeRange === value )
-        {
-            return;
-        }
-
-        // Store the value
-        this._timeRange = value;
-
-        // If the time range turned off...
-        if ( !value )
-        {
-            this.range = {
-                start: this._range.start.clone().startOf('day'),
-                end  : this._range.end.clone().endOf('day')
-            };
-        }
-    }
-
-    get timeRange(): boolean
-    {
-        return this._timeRange;
-    }
-
-    /**
-     * Setter & getter for range input
-     *
-     * @param value
-     */
-    @Input()
-    set range(value)
-    {
-        if ( !value )
-        {
-            return;
-        }
-
-        // Check if the value is an object and has 'start' and 'end' values
-        if ( !value.start || !value.end )
-        {
-            console.error('Range input must have "start" and "end" properties!');
-
-            return;
-        }
-
-        // Check if we are setting an individual date or both of them
-        const whichDate = value.whichDate || null;
-
-        // Get the start and end dates as moment
-        const start = moment(value.start);
-        const end = moment(value.end);
-
-        // If we are only setting the start date...
-        if ( whichDate === 'start' )
-        {
-            // Set the start date
-            this._range.start = start.clone();
-
-            // If the selected start date is after the end date...
-            if ( this._range.start.isAfter(this._range.end) )
-            {
-                // Set the end date to the start date but keep the end date's time
-                const endDate = start.clone().hours(this._range.end.hours()).minutes(this._range.end.minutes()).seconds(this._range.end.seconds());
-
-                // Test this new end date to see if it's ahead of the start date
-                if ( this._range.start.isBefore(endDate) )
-                {
-                    // If it's, set the new end date
-                    this._range.end = endDate;
-                }
-                else
-                {
-                    // Otherwise, set the end date same as the start date
-                    this._range.end = start.clone();
-                }
-            }
-        }
-
-        // If we are only setting the end date...
-        if ( whichDate === 'end' )
-        {
-            // Set the end date
-            this._range.end = end.clone();
-
-            // If the selected end date is before the start date...
-            if ( this._range.start.isAfter(this._range.end) )
-            {
-                // Set the start date to the end date but keep the start date's time
-                const startDate = end.clone().hours(this._range.start.hours()).minutes(this._range.start.minutes()).seconds(this._range.start.seconds());
-
-                // Test this new end date to see if it's ahead of the start date
-                if ( this._range.end.isAfter(startDate) )
-                {
-                    // If it's, set the new start date
-                    this._range.start = startDate;
-                }
-                else
-                {
-                    // Otherwise, set the start date same as the end date
-                    this._range.start = end.clone();
-                }
-            }
-        }
-
-        // If we are setting both dates...
-        if ( !whichDate )
-        {
-            // Set the start date
-            this._range.start = start.clone();
-
-            // If the start date is before the end date, set the end date as normal.
-            // If the start date is after the end date, set the end date same as the start date.
-            this._range.end = start.isBefore(end) ? end.clone() : start.clone();
-        }
-
-        // Prepare another range object that holds the ISO formatted range dates
-        const range = {
-            start: this._range.start.clone().toISOString(),
-            end  : this._range.end.clone().toISOString()
-        };
-
-        // Emit the range changed event with the range
-        this.rangeChanged.emit(range);
-
-        // Update the model with the range if the change was not a programmatic change
-        // Because programmatic changes trigger writeValue which triggers onChange and onTouched
-        // internally causing them to trigger twice which breaks the form's pristine and touched
-        // statuses.
-        if ( !this._programmaticChange )
-        {
-            this._onTouched(range);
-            this._onChange(range);
-        }
-
-        // Set the active dates
-        this.activeDates = {
-            month1: this._range.start.clone(),
-            month2: this._range.start.clone().add(1, 'month')
-        };
-
-        // Set the time form controls
-        this.startTimeFormControl.setValue(this._range.start.clone().format(this._timeFormat).toString());
-        this.endTimeFormControl.setValue(this._range.end.clone().format(this._timeFormat).toString());
-
-        // Run ngAfterContentInit on month views to trigger
-        // re-render on month views if they are available
-        if ( this._matMonthView1 && this._matMonthView2 )
-        {
-            this._matMonthView1.ngAfterContentInit();
-            this._matMonthView2.ngAfterContentInit();
-        }
-
-        // Reset the programmatic change status
-        this._programmaticChange = false;
-    }
-
-    get range(): any
-    {
-        // Clone the range start and end
-        const start = this._range.start.clone();
-        const end = this._range.end.clone();
-
-        // Build and return the range object
-        return {
-            startDate: start.clone().format(this.dateFormat),
-            startTime: this.timeRange ? start.clone().format(this.timeFormat) : null,
-            endDate  : end.clone().format(this.dateFormat),
-            endTime  : this.timeRange ? end.clone().format(this.timeFormat) : null
-        };
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Control Value Accessor
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Update the form model on change
-     *
-     * @param fn
-     */
-    registerOnChange(fn: any): void
-    {
-        this._onChange = fn;
-    }
-
-    /**
-     * Update the form model on blur
-     *
-     * @param fn
-     */
-    registerOnTouched(fn: any): void
-    {
-        this._onTouched = fn;
-    }
-
-    /**
-     * Write to view from model when the form model changes programmatically
-     *
-     * @param range
-     */
-    writeValue(range: { start: string; end: string }): void
-    {
-        // Set this change as a programmatic one
-        this._programmaticChange = true;
-
-        // Set the range
-        this.range = range;
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Lifecycle hooks
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * On init
-     */
-    ngOnInit(): void
-    {
-
-    }
-
-    /**
-     * On destroy
-     */
-    ngOnDestroy(): void
-    {
-        // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
-        this._unsubscribeAll.complete();
-
-        // @ TODO: Workaround until "angular/issues/20007" resolved
-        this.writeValue = (): void => {
-        };
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Public methods
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Open the picker panel
-     */
-    openPickerPanel(): void
-    {
-        // Create the overlay
-        const overlayRef = this._overlay.create({
-            panelClass      : 'fuse-date-range-panel',
-            backdropClass   : '',
-            hasBackdrop     : true,
-            scrollStrategy  : this._overlay.scrollStrategies.reposition(),
-            positionStrategy: this._overlay.position()
-                                  .flexibleConnectedTo(this._pickerPanelOrigin)
-                                  .withPositions([
-                                      {
-                                          originX : 'start',
-                                          originY : 'bottom',
-                                          overlayX: 'start',
-                                          overlayY: 'top',
-                                          offsetY : 8
-                                      },
-                                      {
-                                          originX : 'start',
-                                          originY : 'top',
-                                          overlayX: 'start',
-                                          overlayY: 'bottom',
-                                          offsetY : -8
-                                      }
-                                  ])
-        });
-
-        // Create a portal from the template
-        const templatePortal = new TemplatePortal(this._pickerPanel, this._viewContainerRef);
-
-        // On backdrop click
-        overlayRef.backdropClick().subscribe(() => {
-
-            // If template portal exists and attached...
-            if ( templatePortal && templatePortal.isAttached )
-            {
-                // Detach it
-                templatePortal.detach();
-            }
-
-            // If overlay exists and attached...
-            if ( overlayRef && overlayRef.hasAttached() )
-            {
-                // Detach it
-                overlayRef.detach();
-                overlayRef.dispose();
-            }
-        });
-
-        // Attach the portal to the overlay
-        overlayRef.attach(templatePortal);
-    }
-
-    /**
-     * Get month label
-     *
-     * @param month
-     */
-    getMonthLabel(month: number): string
-    {
-        if ( month === 1 )
-        {
-            return this.activeDates.month1.clone().format('MMMM Y');
-        }
-
-        return this.activeDates.month2.clone().format('MMMM Y');
-    }
-
-    /**
-     * Date class function to add/remove class names to calendar days
-     */
-    dateClass(): any
-    {
-        return (date: Moment): MatCalendarCellCssClasses => {
-
-            // If the date is both start and end date...
-            if ( date.isSame(this._range.start, 'day') && date.isSame(this._range.end, 'day') )
-            {
-                return ['fuse-date-range', 'fuse-date-range-start', 'fuse-date-range-end'];
-            }
-
-            // If the date is the start date...
-            if ( date.isSame(this._range.start, 'day') )
-            {
-                return ['fuse-date-range', 'fuse-date-range-start'];
-            }
-
-            // If the date is the end date...
-            if ( date.isSame(this._range.end, 'day') )
-            {
-                return ['fuse-date-range', 'fuse-date-range-end'];
-            }
-
-            // If the date is in between start and end dates...
-            if ( date.isBetween(this._range.start, this._range.end, 'day') )
-            {
-                return ['fuse-date-range', 'fuse-date-range-mid'];
-            }
-
-            return undefined;
-        };
-    }
-
-    /**
-     * Date filter to enable/disable calendar days
-     */
-    dateFilter(): any
-    {
-        // If we are selecting the end date, disable all the dates that comes before the start date
-        return (date: Moment): boolean => !(this.setWhichDate === 'end' && date.isBefore(this._range.start, 'day'));
-    }
-
-    /**
-     * On selected date change
-     *
-     * @param date
-     */
-    onSelectedDateChange(date: Moment): void
-    {
-        // Create a new range object
-        const newRange = {
-            start    : this._range.start.clone().toISOString(),
-            end      : this._range.end.clone().toISOString(),
-            whichDate: null
-        };
-
-        // Replace either the start or the end date with the new one
-        // depending on which date we are setting
-        if ( this.setWhichDate === 'start' )
-        {
-            newRange.start = moment(newRange.start).year(date.year()).month(date.month()).date(date.date()).toISOString();
-        }
-        else
-        {
-            newRange.end = moment(newRange.end).year(date.year()).month(date.month()).date(date.date()).toISOString();
-        }
-
-        // Append the which date to the new range object
-        newRange.whichDate = this.setWhichDate;
-
-        // Switch which date to set on the next run
-        this.setWhichDate = this.setWhichDate === 'start' ? 'end' : 'start';
-
-        // Set the range
-        this.range = newRange;
-    }
-
-    /**
-     * Go to previous month on both views
-     */
-    prev(): void
-    {
-        this.activeDates.month1 = moment(this.activeDates.month1).subtract(1, 'month');
-        this.activeDates.month2 = moment(this.activeDates.month2).subtract(1, 'month');
-    }
-
-    /**
-     * Go to next month on both views
-     */
-    next(): void
-    {
-        this.activeDates.month1 = moment(this.activeDates.month1).add(1, 'month');
-        this.activeDates.month2 = moment(this.activeDates.month2).add(1, 'month');
-    }
-
-    /**
-     * Update the start time
-     *
-     * @param event
-     */
-    updateStartTime(event): void
-    {
-        // Parse the time
-        const parsedTime = this._parseTime(event.target.value);
-
-        // Go back to the previous value if the form control is not valid
-        if ( this.startTimeFormControl.invalid )
-        {
-            // Override the time
-            const time = this._range.start.clone().format(this._timeFormat);
-
-            // Set the time
-            this.startTimeFormControl.setValue(time);
-
-            // Do not update the range
-            return;
-        }
-
-        // Append the new time to the start date
-        const startDate = this._range.start.clone().hours(parsedTime.hours()).minutes(parsedTime.minutes());
-
-        // If the new start date is after the current end date,
-        // use the end date's time and set the start date again
-        if ( startDate.isAfter(this._range.end) )
-        {
-            const endDateHours = this._range.end.hours();
-            const endDateMinutes = this._range.end.minutes();
-
-            // Set the start date
-            startDate.hours(endDateHours).minutes(endDateMinutes);
-        }
-
-        // If everything is okay, set the new date
-        this.range = {
-            start    : startDate.toISOString(),
-            end      : this._range.end.clone().toISOString(),
-            whichDate: 'start'
-        };
-    }
-
-    /**
-     * Update the end time
-     *
-     * @param event
-     */
-    updateEndTime(event): void
-    {
-        // Parse the time
-        const parsedTime = this._parseTime(event.target.value);
-
-        // Go back to the previous value if the form control is not valid
-        if ( this.endTimeFormControl.invalid )
-        {
-            // Override the time
-            const time = this._range.end.clone().format(this._timeFormat);
-
-            // Set the time
-            this.endTimeFormControl.setValue(time);
-
-            // Do not update the range
-            return;
-        }
-
-        // Append the new time to the end date
-        const endDate = this._range.end.clone().hours(parsedTime.hours()).minutes(parsedTime.minutes());
-
-        // If the new end date is before the current start date,
-        // use the start date's time and set the end date again
-        if ( endDate.isBefore(this._range.start) )
-        {
-            const startDateHours = this._range.start.hours();
-            const startDateMinutes = this._range.start.minutes();
-
-            // Set the end date
-            endDate.hours(startDateHours).minutes(startDateMinutes);
-        }
-
-        // If everything is okay, set the new date
-        this.range = {
-            start    : this._range.start.clone().toISOString(),
-            end      : endDate.toISOString(),
-            whichDate: 'end'
-        };
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Private methods
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Initialize
-     *
-     * @private
-     */
-    private _init(): void
-    {
-        // Start and end time form controls
-        this.startTimeFormControl = new FormControl('', [Validators.pattern(this._timeRegExp)]);
-        this.endTimeFormControl = new FormControl('', [Validators.pattern(this._timeRegExp)]);
-
-        // Set the default range
-        this._programmaticChange = true;
-        this.range = {
-            start: moment().startOf('day').toISOString(),
-            end  : moment().add(1, 'day').endOf('day').toISOString()
-        };
-
-        // Set the default time range
-        this._programmaticChange = true;
-        this.timeRange = true;
-    }
-
-    /**
-     * Parse the time from the inputs
-     *
-     * @param value
-     * @private
-     */
-    private _parseTime(value: string): Moment
-    {
-        // Parse the time using the time regexp
-        const timeArr = value.split(this._timeRegExp).filter(part => part !== '');
-
-        // Get the meridiem
-        const meridiem = timeArr[2] || null;
-
-        // If meridiem exists...
-        if ( meridiem )
-        {
-            // Create a moment using 12-hours format and return it
-            return moment(value, 'hh:mmA').seconds(0);
-        }
-
-        // If meridiem doesn't exist, create a moment using 24-hours format and return in
-        return moment(value, 'HH:mm').seconds(0);
-    }
-}

src/@fuse/components/date-range/date-range.module.ts

@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatMomentDateModule } from '@angular/material-moment-adapter';
-import { FuseDateRangeComponent } from '@fuse/components/date-range/date-range.component';
-
-@NgModule({
-    declarations: [
-        FuseDateRangeComponent
-    ],
-    imports     : [
-        CommonModule,
-        ReactiveFormsModule,
-        MatButtonModule,
-        MatDatepickerModule,
-        MatFormFieldModule,
-        MatInputModule,
-        MatIconModule,
-        MatMomentDateModule
-    ],
-    exports     : [
-        FuseDateRangeComponent
-    ]
-})
-export class FuseDateRangeModule
-{
-}

src/@fuse/components/date-range/index.ts

@@ -1 +0,0 @@
-export * from '@fuse/components/date-range/public-api';

src/@fuse/components/date-range/public-api.ts

@@ -1,2 +0,0 @@
-export * from '@fuse/components/date-range/date-range.component';
-export * from '@fuse/components/date-range/date-range.module';

src/@fuse/components/drawer/drawer.component.scss

@@ -1,14 +1,16 @@
 /* Variables */
-$fuse-drawer-width: 320;
+:root {
+    --fuse-drawer-width: 320px;
+}
 
 fuse-drawer {
     position: relative;
     display: flex;
     flex-direction: column;
     flex: 1 1 auto;
-    width: #{$fuse-drawer-width}px;
-    min-width: #{$fuse-drawer-width}px;
-    max-width: #{$fuse-drawer-width}px;
+    width: var(--fuse-drawer-width);
+    min-width: var(--fuse-drawer-width);
+    max-width: var(--fuse-drawer-width);
     z-index: 300;
     box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .35);
     @apply bg-card;
@@ -43,7 +45,7 @@ fuse-drawer {
 
         /* Side mode */
         &.fuse-drawer-mode-side {
-            margin-left: -#{$fuse-drawer-width}px;
+            margin-left: calc(var(--fuse-drawer-width) * -1);
 
             &.fuse-drawer-opened {
                 margin-left: 0;
@@ -71,7 +73,7 @@ fuse-drawer {
 
         /* Side mode */
         &.fuse-drawer-mode-side {
-            margin-right: -#{$fuse-drawer-width}px;
+            margin-right: calc(var(--fuse-drawer-width) * -1);
 
             &.fuse-drawer-opened {
                 margin-right: 0;
@@ -116,7 +118,7 @@ fuse-drawer {
     left: 0;
     right: 0;
     z-index: 299;
-    opacity: 0;
+    opacity: 1;
     background-color: rgba(0, 0, 0, 0.6);
 
     /* Fixed mode */

src/@fuse/components/drawer/drawer.component.ts

@@ -211,6 +211,12 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
      */
     ngOnDestroy(): void
     {
+        // Finish the animation
+        if ( this._player )
+        {
+            this._player.finish();
+        }
+
         // Deregister the drawer from the registry
         this._fuseDrawerService.deregisterComponent(this.name);
     }
@@ -338,9 +344,18 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
 
         // Create the enter animation and attach it to the player
         this._player = this._animationBuilder.build([
+            style({opacity: 0}),
             animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1}))
         ]).create(this._overlay);
 
+        // Once the animation is done...
+        this._player.onDone(() => {
+
+            // Destroy the player
+            this._player.destroy();
+            this._player = null;
+        });
+
         // Play the animation
         this._player.play();
 
@@ -373,6 +388,10 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
         // Once the animation is done...
         this._player.onDone(() => {
 
+            // Destroy the player
+            this._player.destroy();
+            this._player = null;
+
             // If the backdrop still exists...
             if ( this._overlay )
             {

src/@fuse/components/fullscreen/fullscreen.component.html

@@ -1,7 +1,12 @@
 <!-- Button -->
 <button
     mat-icon-button
-    [matTooltip]="'Toggle Fullscreen'"
+    [matTooltip]="tooltip || 'Toggle Fullscreen'"
     (click)="toggleFullscreen()">
-    <mat-icon [svgIcon]="'heroicons_outline:arrows-expand'"></mat-icon>
+    <ng-container [ngTemplateOutlet]="iconTpl || defaultIconTpl"></ng-container>
 </button>
+
+<!-- Default icon -->
+<ng-template #defaultIconTpl>
+    <mat-icon [svgIcon]="'heroicons_outline:arrows-expand'"></mat-icon>
+</ng-template>

src/@fuse/components/fullscreen/fullscreen.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject, Input, OnInit, TemplateRef, ViewEncapsulation } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { FSDocument, FSDocumentElement } from '@fuse/components/fullscreen/fullscreen.types';
 
@@ -11,6 +11,8 @@ import { FSDocument, FSDocumentElement } from '@fuse/components/fullscreen/fulls
 })
 export class FuseFullscreenComponent implements OnInit
 {
+    @Input() iconTpl: TemplateRef<any>;
+    @Input() tooltip: string;
     private _fsDoc: FSDocument;
     private _fsDocEl: FSDocumentElement;
     private _isFullscreen: boolean = false;

src/@fuse/components/fullscreen/fullscreen.module.ts

@@ -3,6 +3,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FuseFullscreenComponent } from '@fuse/components/fullscreen/fullscreen.component';
+import { CommonModule } from '@angular/common';
 
 @NgModule({
     declarations: [
@@ -11,7 +12,8 @@ import { FuseFullscreenComponent } from '@fuse/components/fullscreen/fullscreen.
     imports     : [
         MatButtonModule,
         MatIconModule,
-        MatTooltipModule
+        MatTooltipModule,
+        CommonModule
     ],
     exports     : [
         FuseFullscreenComponent

src/@fuse/components/loading-bar/index.ts

@@ -0,0 +1 @@
+export * from '@fuse/components/loading-bar/public-api';

src/@fuse/components/loading-bar/loading-bar.component.html

@@ -0,0 +1,5 @@
+<ng-container *ngIf="show">
+    <mat-progress-bar
+        [mode]="mode"
+        [value]="progress"></mat-progress-bar>
+</ng-container>

src/@fuse/components/loading-bar/loading-bar.component.scss

@@ -0,0 +1,7 @@
+fuse-loading-bar {
+    position: fixed;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+    height: 6px;
+}

src/@fuse/components/loading-bar/loading-bar.component.ts

@@ -0,0 +1,82 @@
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { Subject, takeUntil } from 'rxjs';
+import { FuseLoadingService } from '@fuse/services/loading';
+
+@Component({
+    selector     : 'fuse-loading-bar',
+    templateUrl  : './loading-bar.component.html',
+    styleUrls    : ['./loading-bar.component.scss'],
+    encapsulation: ViewEncapsulation.None,
+    exportAs     : 'fuseLoadingBar'
+})
+export class FuseLoadingBarComponent implements OnChanges, OnInit, OnDestroy
+{
+    @Input() autoMode: boolean = true;
+    mode: 'determinate' | 'indeterminate';
+    progress: number = 0;
+    show: boolean = false;
+    private _unsubscribeAll: Subject<any> = new Subject<any>();
+
+    /**
+     * Constructor
+     */
+    constructor(private _fuseLoadingService: FuseLoadingService)
+    {
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Lifecycle hooks
+    // -----------------------------------------------------------------------------------------------------
+
+    /**
+     * On changes
+     *
+     * @param changes
+     */
+    ngOnChanges(changes: SimpleChanges): void
+    {
+        // Auto mode
+        if ( 'autoMode' in changes )
+        {
+            // Set the auto mode in the service
+            this._fuseLoadingService.setAutoMode(coerceBooleanProperty(changes.autoMode.currentValue));
+        }
+    }
+
+    /**
+     * On init
+     */
+    ngOnInit(): void
+    {
+        // Subscribe to the service
+        this._fuseLoadingService.mode$
+            .pipe(takeUntil(this._unsubscribeAll))
+            .subscribe((value) => {
+                this.mode = value;
+            });
+
+        this._fuseLoadingService.progress$
+            .pipe(takeUntil(this._unsubscribeAll))
+            .subscribe((value) => {
+                this.progress = value;
+            });
+
+        this._fuseLoadingService.show$
+            .pipe(takeUntil(this._unsubscribeAll))
+            .subscribe((value) => {
+                this.show = value;
+            });
+
+    }
+
+    /**
+     * On destroy
+     */
+    ngOnDestroy(): void
+    {
+        // Unsubscribe from all subscriptions
+        this._unsubscribeAll.next(null);
+        this._unsubscribeAll.complete();
+    }
+}

src/@fuse/components/loading-bar/loading-bar.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { FuseLoadingBarComponent } from '@fuse/components/loading-bar/loading-bar.component';
+
+@NgModule({
+    declarations: [
+        FuseLoadingBarComponent
+    ],
+    imports     : [
+        CommonModule,
+        MatProgressBarModule
+    ],
+    exports     : [
+        FuseLoadingBarComponent
+    ]
+})
+export class FuseLoadingBarModule
+{
+}

src/@fuse/components/loading-bar/public-api.ts

@@ -0,0 +1,2 @@
+export * from '@fuse/components/loading-bar/loading-bar.component';
+export * from '@fuse/components/loading-bar/loading-bar.module';

src/@fuse/components/masonry/masonry.component.ts

@@ -5,7 +5,6 @@ import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
 @Component({
     selector     : 'fuse-masonry',
     templateUrl  : './masonry.component.html',
-    styleUrls    : ['./masonry.component.scss'],
     encapsulation: ViewEncapsulation.None,
     animations   : fuseAnimations,
     exportAs     : 'fuseMasonry'

src/@fuse/components/navigation/horizontal/components/basic/basic.component.html

@@ -5,69 +5,83 @@
     [ngClass]="item.classes?.wrapper">
 
     <!-- Item with an internal link -->
-    <div
-        class="fuse-horizontal-navigation-item"
-        *ngIf="item.link && !item.externalLink && !item.function && !item.disabled"
-        [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-horizontal-navigation-item-active'"
-        [routerLinkActiveOptions]="isActiveMatchOptions">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="item.link && !item.externalLink && !item.function && !item.disabled">
+        <div
+            class="fuse-horizontal-navigation-item"
+            [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
+            [routerLink]="[item.link]"
+            [routerLinkActive]="'fuse-horizontal-navigation-item-active'"
+            [routerLinkActiveOptions]="isActiveMatchOptions"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item with an external link -->
-    <a
-        class="fuse-horizontal-navigation-item"
-        *ngIf="item.link && item.externalLink && !item.function && !item.disabled"
-        [href]="item.link">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && item.externalLink && !item.function && !item.disabled">
+        <a
+            class="fuse-horizontal-navigation-item"
+            [href]="item.link"
+            [target]="item.target || '_self'"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a function -->
-    <div
-        class="fuse-horizontal-navigation-item"
-        *ngIf="!item.link && item.function && !item.disabled"
-        [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
-        (click)="item.function(item)">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="!item.link && item.function && !item.disabled">
+        <div
+            class="fuse-horizontal-navigation-item"
+            [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item with an internal link and function -->
-    <div
-        class="fuse-horizontal-navigation-item"
-        *ngIf="item.link && !item.externalLink && item.function && !item.disabled"
-        [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-horizontal-navigation-item-active'"
-        [routerLinkActiveOptions]="isActiveMatchOptions"
-        (click)="item.function(item)">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="item.link && !item.externalLink && item.function && !item.disabled">
+        <div
+            class="fuse-horizontal-navigation-item"
+            [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
+            [routerLink]="[item.link]"
+            [routerLinkActive]="'fuse-horizontal-navigation-item-active'"
+            [routerLinkActiveOptions]="isActiveMatchOptions"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item with an external link and function -->
-    <a
-        class="fuse-horizontal-navigation-item"
-        *ngIf="item.link && item.externalLink && item.function && !item.disabled"
-        [href]="item.link"
-        (click)="item.function(item)"
-        mat-menu-item>
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && item.externalLink && item.function && !item.disabled">
+        <a
+            class="fuse-horizontal-navigation-item"
+            [href]="item.link"
+            [target]="item.target || '_self'"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)"
+            mat-menu-item>
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a no link and no function -->
-    <div
-        class="fuse-horizontal-navigation-item"
-        *ngIf="!item.link && !item.function && !item.disabled"
-        [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="!item.link && !item.function && !item.disabled">
+        <div
+            class="fuse-horizontal-navigation-item"
+            [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item is disabled -->
-    <div
-        class="fuse-horizontal-navigation-item fuse-horizontal-navigation-item-disabled"
-        *ngIf="item.disabled">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="item.disabled">
+        <div class="fuse-horizontal-navigation-item fuse-horizontal-navigation-item-disabled">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
 </div>
 
@@ -75,11 +89,12 @@
 <ng-template #itemTemplate>
 
     <!-- Icon -->
-    <mat-icon
-        class="fuse-horizontal-navigation-item-icon"
-        [ngClass]="item.classes?.icon"
-        *ngIf="item.icon"
-        [svgIcon]="item.icon"></mat-icon>
+    <ng-container *ngIf="item.icon">
+        <mat-icon
+            class="fuse-horizontal-navigation-item-icon"
+            [ngClass]="item.classes?.icon"
+            [svgIcon]="item.icon"></mat-icon>
+    </ng-container>
 
     <!-- Title & Subtitle -->
     <div class="fuse-horizontal-navigation-item-title-wrapper">
@@ -88,24 +103,24 @@
                 {{item.title}}
             </span>
         </div>
-        <div
-            class="fuse-horizontal-navigation-item-subtitle text-hint"
-            *ngIf="item.subtitle">
-            <span [ngClass]="item.classes?.subtitle">
-                {{item.subtitle}}
-            </span>
-        </div>
+        <ng-container *ngIf="item.subtitle">
+            <div class="fuse-horizontal-navigation-item-subtitle text-hint">
+                <span [ngClass]="item.classes?.subtitle">
+                    {{item.subtitle}}
+                </span>
+            </div>
+        </ng-container>
     </div>
 
     <!-- Badge -->
-    <div
-        class="fuse-horizontal-navigation-item-badge"
-        *ngIf="item.badge">
-        <div
-            class="fuse-horizontal-navigation-item-badge-content"
-            [ngClass]="item.badge.classes">
-            {{item.badge.title}}
+    <ng-container *ngIf="item.badge">
+        <div class="fuse-horizontal-navigation-item-badge">
+            <div
+                class="fuse-horizontal-navigation-item-badge-content"
+                [ngClass]="item.badge.classes">
+                {{item.badge.title}}
+            </div>
         </div>
-    </div>
+    </ng-container>
 
 </ng-template>

src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts

@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { IsActiveMatchOptions } from '@angular/router';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -10,7 +9,6 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
 @Component({
     selector       : 'fuse-horizontal-navigation-basic-item',
     templateUrl    : './basic.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDestroy
@@ -77,7 +75,7 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/horizontal/components/branch/branch.component.html

@@ -1,59 +1,63 @@
-<div
-    *ngIf="!child"
-    [ngClass]="{'fuse-horizontal-navigation-menu-active': trigger.menuOpen,
+<ng-container *ngIf="!child">
+    <div
+        [ngClass]="{'fuse-horizontal-navigation-menu-active': trigger.menuOpen,
                  'fuse-horizontal-navigation-menu-active-forced': item.active}"
-    [matMenuTriggerFor]="matMenu"
-    (onMenuOpen)="triggerChangeDetection()"
-    (onMenuClose)="triggerChangeDetection()"
-    #trigger="matMenuTrigger">
-    <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
-</div>
+        [matMenuTriggerFor]="matMenu"
+        (onMenuOpen)="triggerChangeDetection()"
+        (onMenuClose)="triggerChangeDetection()"
+        #trigger="matMenuTrigger">
+        <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
+    </div>
+</ng-container>
 
 <mat-menu
     class="fuse-horizontal-navigation-menu-panel"
     [overlapTrigger]="false"
     #matMenu="matMenu">
 
-    <ng-container *ngFor="let item of item.children">
+    <ng-container *ngFor="let item of item.children; trackBy: trackByFn">
 
         <!-- Skip the hidden items -->
         <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
             <!-- Basic -->
-            <div
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'basic'"
-                [disabled]="item.disabled"
-                mat-menu-item>
-                <fuse-horizontal-navigation-basic-item
-                    [item]="item"
-                    [name]="name"></fuse-horizontal-navigation-basic-item>
-            </div>
+            <ng-container *ngIf="item.type === 'basic'">
+                <div
+                    class="fuse-horizontal-navigation-menu-item"
+                    [disabled]="item.disabled"
+                    mat-menu-item>
+                    <fuse-horizontal-navigation-basic-item
+                        [item]="item"
+                        [name]="name"></fuse-horizontal-navigation-basic-item>
+                </div>
+            </ng-container>
 
             <!-- Branch: aside, collapsable, group -->
-            <div
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'"
-                [disabled]="item.disabled"
-                [matMenuTriggerFor]="branch.matMenu"
-                mat-menu-item>
-                <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
-                <fuse-horizontal-navigation-branch-item
-                    [child]="true"
-                    [item]="item"
-                    [name]="name"
-                    #branch></fuse-horizontal-navigation-branch-item>
-            </div>
+            <ng-container *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'">
+                <div
+                    class="fuse-horizontal-navigation-menu-item"
+                    [disabled]="item.disabled"
+                    [matMenuTriggerFor]="branch.matMenu"
+                    mat-menu-item>
+                    <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
+                    <fuse-horizontal-navigation-branch-item
+                        [child]="true"
+                        [item]="item"
+                        [name]="name"
+                        #branch></fuse-horizontal-navigation-branch-item>
+                </div>
+            </ng-container>
 
             <!-- Divider -->
-            <div
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'divider'"
-                mat-menu-item>
-                <fuse-horizontal-navigation-divider-item
-                    [item]="item"
-                    [name]="name"></fuse-horizontal-navigation-divider-item>
-            </div>
+            <ng-container *ngIf="item.type === 'divider'">
+                <div
+                    class="fuse-horizontal-navigation-menu-item"
+                    mat-menu-item>
+                    <fuse-horizontal-navigation-divider-item
+                        [item]="item"
+                        [name]="name"></fuse-horizontal-navigation-divider-item>
+                </div>
+            </ng-container>
 
         </ng-container>
 
@@ -74,14 +78,16 @@
         <div
             class="fuse-horizontal-navigation-item"
             [ngClass]="{'fuse-horizontal-navigation-item-disabled': item.disabled,
-                         'fuse-horizontal-navigation-item-active-forced': item.active}">
+                         'fuse-horizontal-navigation-item-active-forced': item.active}"
+            [matTooltip]="item.tooltip || ''">
 
             <!-- Icon -->
-            <mat-icon
-                class="fuse-horizontal-navigation-item-icon"
-                [ngClass]="item.classes?.icon"
-                *ngIf="item.icon"
-                [svgIcon]="item.icon"></mat-icon>
+            <ng-container *ngIf="item.icon">
+                <mat-icon
+                    class="fuse-horizontal-navigation-item-icon"
+                    [ngClass]="item.classes?.icon"
+                    [svgIcon]="item.icon"></mat-icon>
+            </ng-container>
 
             <!-- Title & Subtitle -->
             <div class="fuse-horizontal-navigation-item-title-wrapper">
@@ -90,25 +96,25 @@
                         {{item.title}}
                     </span>
                 </div>
-                <div
-                    class="fuse-horizontal-navigation-item-subtitle text-hint"
-                    *ngIf="item.subtitle">
-                    <span [ngClass]="item.classes?.subtitle">
-                        {{item.subtitle}}
-                    </span>
-                </div>
+                <ng-container *ngIf="item.subtitle">
+                    <div class="fuse-horizontal-navigation-item-subtitle text-hint">
+                        <span [ngClass]="item.classes?.subtitle">
+                            {{item.subtitle}}
+                        </span>
+                    </div>
+                </ng-container>
             </div>
 
             <!-- Badge -->
-            <div
-                class="fuse-horizontal-navigation-item-badge"
-                *ngIf="item.badge">
-                <div
-                    class="fuse-horizontal-navigation-item-badge-content"
-                    [ngClass]="item.badge.classes">
-                    {{item.badge.title}}
+            <ng-container *ngIf="item.badge">
+                <div class="fuse-horizontal-navigation-item-badge">
+                    <div
+                        class="fuse-horizontal-navigation-item-badge-content"
+                        [ngClass]="item.badge.classes">
+                        {{item.badge.title}}
+                    </div>
                 </div>
-            </div>
+            </ng-container>
         </div>
     </div>
 

src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts

@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { MatMenu } from '@angular/material/menu';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -10,7 +9,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-horizontal-navigation-branch-item',
     templateUrl    : './branch.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDestroy
@@ -65,7 +63,7 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 
@@ -81,4 +79,15 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe
         // Mark for check
         this._changeDetectorRef.markForCheck();
     }
+
+    /**
+     * Track by function for ngFor loops
+     *
+     * @param index
+     * @param item
+     */
+    trackByFn(index: number, item: any): any
+    {
+        return item.id || index;
+    }
 }

src/@fuse/components/navigation/horizontal/components/divider/divider.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -8,7 +7,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-horizontal-navigation-divider-item',
     templateUrl    : './divider.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnDestroy
@@ -57,7 +55,7 @@ export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnD
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/horizontal/components/spacer/spacer.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -8,7 +7,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-horizontal-navigation-spacer-item',
     templateUrl    : './spacer.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDestroy
@@ -57,7 +55,7 @@ export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDe
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/horizontal/horizontal.component.html

@@ -1,30 +1,33 @@
 <div class="fuse-horizontal-navigation-wrapper">
 
-    <ng-container *ngFor="let item of navigation">
+    <ng-container *ngFor="let item of navigation; trackBy: trackByFn">
 
         <!-- Skip the hidden items -->
         <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
             <!-- Basic -->
-            <fuse-horizontal-navigation-basic-item
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'basic'"
-                [item]="item"
-                [name]="name"></fuse-horizontal-navigation-basic-item>
+            <ng-container *ngIf="item.type === 'basic'">
+                <fuse-horizontal-navigation-basic-item
+                    class="fuse-horizontal-navigation-menu-item"
+                    [item]="item"
+                    [name]="name"></fuse-horizontal-navigation-basic-item>
+            </ng-container>
 
             <!-- Branch: aside, collapsable, group -->
-            <fuse-horizontal-navigation-branch-item
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'"
-                [item]="item"
-                [name]="name"></fuse-horizontal-navigation-branch-item>
+            <ng-container *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'">
+                <fuse-horizontal-navigation-branch-item
+                    class="fuse-horizontal-navigation-menu-item"
+                    [item]="item"
+                    [name]="name"></fuse-horizontal-navigation-branch-item>
+            </ng-container>
 
             <!-- Spacer -->
-            <fuse-horizontal-navigation-spacer-item
-                class="fuse-horizontal-navigation-menu-item"
-                *ngIf="item.type === 'spacer'"
-                [item]="item"
-                [name]="name"></fuse-horizontal-navigation-spacer-item>
+            <ng-container *ngIf="item.type === 'spacer'">
+                <fuse-horizontal-navigation-spacer-item
+                    class="fuse-horizontal-navigation-menu-item"
+                    [item]="item"
+                    [name]="name"></fuse-horizontal-navigation-spacer-item>
+            </ng-container>
 
         </ng-container>
 

src/@fuse/components/navigation/horizontal/horizontal.component.ts

@@ -76,7 +76,7 @@ export class FuseHorizontalNavigationComponent implements OnChanges, OnInit, OnD
         this._fuseNavigationService.deregisterComponent(this.name);
 
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/components/navigation/navigation.types.ts

@@ -15,8 +15,15 @@ export interface FuseNavigationItem
     hidden?: (item: FuseNavigationItem) => boolean;
     active?: boolean;
     disabled?: boolean;
+    tooltip?: string;
     link?: string;
     externalLink?: boolean;
+    target?:
+        | '_blank'
+        | '_self'
+        | '_parent'
+        | '_top'
+        | string;
     exactMatch?: boolean;
     isActiveMatchOptions?: IsActiveMatchOptions;
     function?: (item: FuseNavigationItem) => void;

src/@fuse/components/navigation/vertical/components/aside/aside.component.html

@@ -7,14 +7,16 @@
         class="fuse-vertical-navigation-item"
         [ngClass]="{'fuse-vertical-navigation-item-active': active,
                     'fuse-vertical-navigation-item-disabled': item.disabled,
-                    'fuse-vertical-navigation-item-active-forced': item.active}">
+                    'fuse-vertical-navigation-item-active-forced': item.active}"
+        [matTooltip]="item.tooltip || ''">
 
         <!-- Icon -->
-        <mat-icon
-            class="fuse-vertical-navigation-item-icon"
-            [ngClass]="item.classes?.icon"
-            *ngIf="item.icon"
-            [svgIcon]="item.icon"></mat-icon>
+        <ng-container *ngIf="item.icon">
+            <mat-icon
+                class="fuse-vertical-navigation-item-icon"
+                [ngClass]="item.classes?.icon"
+                [svgIcon]="item.icon"></mat-icon>
+        </ng-container>
 
         <!-- Title & Subtitle -->
         <div class="fuse-vertical-navigation-item-title-wrapper">
@@ -23,25 +25,25 @@
                     {{item.title}}
                 </span>
             </div>
-            <div
-                class="fuse-vertical-navigation-item-subtitle"
-                *ngIf="item.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
-                    {{item.subtitle}}
-                </span>
-            </div>
+            <ng-container *ngIf="item.subtitle">
+                <div class="fuse-vertical-navigation-item-subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
+                    </span>
+                </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
-            class="fuse-vertical-navigation-item-badge"
-            *ngIf="item.badge">
-            <div
-                class="fuse-vertical-navigation-item-badge-content"
-                [ngClass]="item.badge.classes">
-                {{item.badge.title}}
+        <ng-container *ngIf="item.badge">
+            <div class="fuse-vertical-navigation-item-badge">
+                <div
+                    class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
+                </div>
             </div>
-        </div>
+        </ng-container>
 
     </div>
 
@@ -57,35 +59,40 @@
             <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
                 <!-- Basic -->
-                <fuse-vertical-navigation-basic-item
-                    *ngIf="item.type === 'basic'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-basic-item>
+                <ng-container *ngIf="item.type === 'basic'">
+                    <fuse-vertical-navigation-basic-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-basic-item>
+                </ng-container>
 
                 <!-- Collapsable -->
-                <fuse-vertical-navigation-collapsable-item
-                    *ngIf="item.type === 'collapsable'"
-                    [item]="item"
-                    [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                <ng-container *ngIf="item.type === 'collapsable'">
+                    <fuse-vertical-navigation-collapsable-item
+                        [item]="item"
+                        [name]="name"
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                </ng-container>
 
                 <!-- Divider -->
-                <fuse-vertical-navigation-divider-item
-                    *ngIf="item.type === 'divider'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-divider-item>
+                <ng-container *ngIf="item.type === 'divider'">
+                    <fuse-vertical-navigation-divider-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-divider-item>
+                </ng-container>
 
                 <!-- Group -->
-                <fuse-vertical-navigation-group-item
-                    *ngIf="item.type === 'group'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-group-item>
+                <ng-container *ngIf="item.type === 'group'">
+                    <fuse-vertical-navigation-group-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-group-item>
+                </ng-container>
 
                 <!-- Spacer -->
-                <fuse-vertical-navigation-spacer-item
-                    *ngIf="item.type === 'spacer'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-spacer-item>
+                <ng-container *ngIf="item.type === 'spacer'">
+                    <fuse-vertical-navigation-spacer-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-spacer-item>
+                </ng-container>
 
             </ng-container>
 

src/@fuse/components/navigation/vertical/components/aside/aside.component.ts

@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { Subject } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, Subject, takeUntil } from 'rxjs';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -10,7 +9,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-vertical-navigation-aside-item',
     templateUrl    : './aside.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnInit, OnDestroy
@@ -99,7 +97,7 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/components/navigation/vertical/components/basic/basic.component.html

@@ -5,68 +5,84 @@
     [ngClass]="item.classes?.wrapper">
 
     <!-- Item with an internal link -->
-    <a
-        class="fuse-vertical-navigation-item"
-        *ngIf="item.link && !item.externalLink && !item.function && !item.disabled"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-vertical-navigation-item-active'"
-        [routerLinkActiveOptions]="isActiveMatchOptions">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && !item.externalLink && !item.function && !item.disabled">
+        <a
+            class="fuse-vertical-navigation-item"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [routerLink]="[item.link]"
+            [routerLinkActive]="'fuse-vertical-navigation-item-active'"
+            [routerLinkActiveOptions]="isActiveMatchOptions"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with an external link -->
-    <a
-        class="fuse-vertical-navigation-item"
-        *ngIf="item.link && item.externalLink && !item.function && !item.disabled"
-        [href]="item.link">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && item.externalLink && !item.function && !item.disabled">
+        <a
+            class="fuse-vertical-navigation-item"
+            [href]="item.link"
+            [target]="item.target || '_self'"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a function -->
-    <div
-        class="fuse-vertical-navigation-item"
-        *ngIf="!item.link && item.function && !item.disabled"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        (click)="item.function(item)">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="!item.link && item.function && !item.disabled">
+        <div
+            class="fuse-vertical-navigation-item"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item with an internal link and function -->
-    <a
-        class="fuse-vertical-navigation-item"
-        *ngIf="item.link && !item.externalLink && item.function && !item.disabled"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-vertical-navigation-item-active'"
-        [routerLinkActiveOptions]="isActiveMatchOptions"
-        (click)="item.function(item)">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && !item.externalLink && item.function && !item.disabled">
+        <a
+            class="fuse-vertical-navigation-item"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [routerLink]="[item.link]"
+            [routerLinkActive]="'fuse-vertical-navigation-item-active'"
+            [routerLinkActiveOptions]="isActiveMatchOptions"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with an external link and function -->
-    <a
-        class="fuse-vertical-navigation-item"
-        *ngIf="item.link && item.externalLink && item.function && !item.disabled"
-        [href]="item.link"
-        (click)="item.function(item)">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </a>
+    <ng-container *ngIf="item.link && item.externalLink && item.function && !item.disabled">
+        <a
+            class="fuse-vertical-navigation-item"
+            [href]="item.link"
+            [target]="item.target || '_self'"
+            [matTooltip]="item.tooltip || ''"
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a no link and no function -->
-    <div
-        class="fuse-vertical-navigation-item"
-        *ngIf="!item.link && !item.function && !item.disabled"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="!item.link && !item.function && !item.disabled">
+        <div
+            class="fuse-vertical-navigation-item"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item is disabled -->
-    <div
-        class="fuse-vertical-navigation-item fuse-vertical-navigation-item-disabled"
-        *ngIf="item.disabled">
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
-    </div>
+    <ng-container *ngIf="item.disabled">
+        <div
+            class="fuse-vertical-navigation-item fuse-vertical-navigation-item-disabled"
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
 </div>
 
@@ -74,11 +90,12 @@
 <ng-template #itemTemplate>
 
     <!-- Icon -->
-    <mat-icon
-        class="fuse-vertical-navigation-item-icon"
-        [ngClass]="item.classes?.icon"
-        *ngIf="item.icon"
-        [svgIcon]="item.icon"></mat-icon>
+    <ng-container *ngIf="item.icon">
+        <mat-icon
+            class="fuse-vertical-navigation-item-icon"
+            [ngClass]="item.classes?.icon"
+            [svgIcon]="item.icon"></mat-icon>
+    </ng-container>
 
     <!-- Title & Subtitle -->
     <div class="fuse-vertical-navigation-item-title-wrapper">
@@ -87,24 +104,24 @@
                 {{item.title}}
             </span>
         </div>
-        <div
-            class="fuse-vertical-navigation-item-subtitle"
-            *ngIf="item.subtitle">
-            <span [ngClass]="item.classes?.subtitle">
-                {{item.subtitle}}
-            </span>
-        </div>
+        <ng-container *ngIf="item.subtitle">
+            <div class="fuse-vertical-navigation-item-subtitle">
+                <span [ngClass]="item.classes?.subtitle">
+                    {{item.subtitle}}
+                </span>
+            </div>
+        </ng-container>
     </div>
 
     <!-- Badge -->
-    <div
-        class="fuse-vertical-navigation-item-badge"
-        *ngIf="item.badge">
-        <div
-            class="fuse-vertical-navigation-item-badge-content"
-            [ngClass]="item.badge.classes">
-            {{item.badge.title}}
+    <ng-container *ngIf="item.badge">
+        <div class="fuse-vertical-navigation-item-badge">
+            <div
+                class="fuse-vertical-navigation-item-badge-content"
+                [ngClass]="item.badge.classes">
+                {{item.badge.title}}
+            </div>
         </div>
-    </div>
+    </ng-container>
 
 </ng-template>

src/@fuse/components/navigation/vertical/components/basic/basic.component.ts

@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { IsActiveMatchOptions } from '@angular/router';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -10,7 +9,6 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
 @Component({
     selector       : 'fuse-vertical-navigation-basic-item',
     templateUrl    : './basic.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestroy
@@ -77,7 +75,7 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.html

@@ -6,14 +6,16 @@
     <div
         class="fuse-vertical-navigation-item"
         [ngClass]="{'fuse-vertical-navigation-item-disabled': item.disabled}"
+        [matTooltip]="item.tooltip || ''"
         (click)="toggleCollapsable()">
 
         <!-- Icon -->
-        <mat-icon
-            class="fuse-vertical-navigation-item-icon"
-            [ngClass]="item.classes?.icon"
-            *ngIf="item.icon"
-            [svgIcon]="item.icon"></mat-icon>
+        <ng-container *ngIf="item.icon">
+            <mat-icon
+                class="fuse-vertical-navigation-item-icon"
+                [ngClass]="item.classes?.icon"
+                [svgIcon]="item.icon"></mat-icon>
+        </ng-container>
 
         <!-- Title & Subtitle -->
         <div class="fuse-vertical-navigation-item-title-wrapper">
@@ -22,25 +24,25 @@
                     {{item.title}}
                 </span>
             </div>
-            <div
-                class="fuse-vertical-navigation-item-subtitle"
-                *ngIf="item.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
-                    {{item.subtitle}}
-                </span>
-            </div>
+            <ng-container *ngIf="item.subtitle">
+                <div class="fuse-vertical-navigation-item-subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
+                    </span>
+                </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
-            class="fuse-vertical-navigation-item-badge"
-            *ngIf="item.badge">
-            <div
-                class="fuse-vertical-navigation-item-badge-content"
-                [ngClass]="item.badge.classes">
-                {{item.badge.title}}
+        <ng-container *ngIf="item.badge">
+            <div class="fuse-vertical-navigation-item-badge">
+                <div
+                    class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
+                </div>
             </div>
-        </div>
+        </ng-container>
 
         <!-- Arrow -->
         <mat-icon
@@ -62,35 +64,40 @@
         <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
             <!-- Basic -->
-            <fuse-vertical-navigation-basic-item
-                *ngIf="item.type === 'basic'"
-                [item]="item"
-                [name]="name"></fuse-vertical-navigation-basic-item>
+            <ng-container *ngIf="item.type === 'basic'">
+                <fuse-vertical-navigation-basic-item
+                    [item]="item"
+                    [name]="name"></fuse-vertical-navigation-basic-item>
+            </ng-container>
 
             <!-- Collapsable -->
-            <fuse-vertical-navigation-collapsable-item
-                *ngIf="item.type === 'collapsable'"
-                [item]="item"
-                [name]="name"
-                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+            <ng-container *ngIf="item.type === 'collapsable'">
+                <fuse-vertical-navigation-collapsable-item
+                    [item]="item"
+                    [name]="name"
+                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+            </ng-container>
 
             <!-- Divider -->
-            <fuse-vertical-navigation-divider-item
-                *ngIf="item.type === 'divider'"
-                [item]="item"
-                [name]="name"></fuse-vertical-navigation-divider-item>
+            <ng-container *ngIf="item.type === 'divider'">
+                <fuse-vertical-navigation-divider-item
+                    [item]="item"
+                    [name]="name"></fuse-vertical-navigation-divider-item>
+            </ng-container>
 
             <!-- Group -->
-            <fuse-vertical-navigation-group-item
-                *ngIf="item.type === 'group'"
-                [item]="item"
-                [name]="name"></fuse-vertical-navigation-group-item>
+            <ng-container *ngIf="item.type === 'group'">
+                <fuse-vertical-navigation-group-item
+                    [item]="item"
+                    [name]="name"></fuse-vertical-navigation-group-item>
+            </ng-container>
 
             <!-- Spacer -->
-            <fuse-vertical-navigation-spacer-item
-                *ngIf="item.type === 'spacer'"
-                [item]="item"
-                [name]="name"></fuse-vertical-navigation-spacer-item>
+            <ng-container *ngIf="item.type === 'spacer'">
+                <fuse-vertical-navigation-spacer-item
+                    [item]="item"
+                    [name]="name"></fuse-vertical-navigation-spacer-item>
+            </ng-container>
 
         </ng-container>
 

src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts

@@ -1,8 +1,7 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnDestroy, OnInit } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { Subject } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, Subject, takeUntil } from 'rxjs';
 import { fuseAnimations } from '@fuse/animations';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
@@ -11,7 +10,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-vertical-navigation-collapsable-item',
     templateUrl    : './collapsable.component.html',
-    styles         : [],
     animations     : fuseAnimations,
     changeDetection: ChangeDetectionStrategy.OnPush
 })
@@ -177,7 +175,7 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/components/navigation/vertical/components/divider/divider.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -8,7 +7,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-vertical-navigation-divider-item',
     templateUrl    : './divider.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDestroy
@@ -57,7 +55,7 @@ export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDes
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/vertical/components/group/group.component.html

@@ -7,11 +7,12 @@
     <div class="fuse-vertical-navigation-item">
 
         <!-- Icon -->
-        <mat-icon
-            class="fuse-vertical-navigation-item-icon"
-            [ngClass]="item.classes?.icon"
-            *ngIf="item.icon"
-            [svgIcon]="item.icon"></mat-icon>
+        <ng-container *ngIf="item.icon">
+            <mat-icon
+                class="fuse-vertical-navigation-item-icon"
+                [ngClass]="item.classes?.icon"
+                [svgIcon]="item.icon"></mat-icon>
+        </ng-container>
 
         <!-- Title & Subtitle -->
         <div class="fuse-vertical-navigation-item-title-wrapper">
@@ -20,25 +21,25 @@
                     {{item.title}}
                 </span>
             </div>
-            <div
-                class="fuse-vertical-navigation-item-subtitle"
-                *ngIf="item.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
-                    {{item.subtitle}}
-                </span>
-            </div>
+            <ng-container *ngIf="item.subtitle">
+                <div class="fuse-vertical-navigation-item-subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
+                    </span>
+                </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
-            class="fuse-vertical-navigation-item-badge"
-            *ngIf="item.badge">
-            <div
-                class="fuse-vertical-navigation-item-badge-content"
-                [ngClass]="item.badge.classes">
-                {{item.badge.title}}
+        <ng-container *ngIf="item.badge">
+            <div class="fuse-vertical-navigation-item-badge">
+                <div
+                    class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
+                </div>
             </div>
-        </div>
+        </ng-container>
 
     </div>
 
@@ -50,35 +51,40 @@
     <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
         <!-- Basic -->
-        <fuse-vertical-navigation-basic-item
-            *ngIf="item.type === 'basic'"
-            [item]="item"
-            [name]="name"></fuse-vertical-navigation-basic-item>
+        <ng-container *ngIf="item.type === 'basic'">
+            <fuse-vertical-navigation-basic-item
+                [item]="item"
+                [name]="name"></fuse-vertical-navigation-basic-item>
+        </ng-container>
 
         <!-- Collapsable -->
-        <fuse-vertical-navigation-collapsable-item
-            *ngIf="item.type === 'collapsable'"
-            [item]="item"
-            [name]="name"
-            [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+        <ng-container *ngIf="item.type === 'collapsable'">
+            <fuse-vertical-navigation-collapsable-item
+                [item]="item"
+                [name]="name"
+                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+        </ng-container>
 
         <!-- Divider -->
-        <fuse-vertical-navigation-divider-item
-            *ngIf="item.type === 'divider'"
-            [item]="item"
-            [name]="name"></fuse-vertical-navigation-divider-item>
+        <ng-container *ngIf="item.type === 'divider'">
+            <fuse-vertical-navigation-divider-item
+                [item]="item"
+                [name]="name"></fuse-vertical-navigation-divider-item>
+        </ng-container>
 
         <!-- Group -->
-        <fuse-vertical-navigation-group-item
-            *ngIf="item.type === 'group'"
-            [item]="item"
-            [name]="name"></fuse-vertical-navigation-group-item>
+        <ng-container *ngIf="item.type === 'group'">
+            <fuse-vertical-navigation-group-item
+                [item]="item"
+                [name]="name"></fuse-vertical-navigation-group-item>
+        </ng-container>
 
         <!-- Spacer -->
-        <fuse-vertical-navigation-spacer-item
-            *ngIf="item.type === 'spacer'"
-            [item]="item"
-            [name]="name"></fuse-vertical-navigation-spacer-item>
+        <ng-container *ngIf="item.type === 'spacer'">
+            <fuse-vertical-navigation-spacer-item
+                [item]="item"
+                [name]="name"></fuse-vertical-navigation-spacer-item>
+        </ng-container>
 
     </ng-container>
 

src/@fuse/components/navigation/vertical/components/group/group.component.ts

@@ -1,7 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -9,7 +8,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-vertical-navigation-group-item',
     templateUrl    : './group.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestroy
@@ -63,7 +61,7 @@ export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestr
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/components/navigation/vertical/components/spacer/spacer.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { Subject, takeUntil } from 'rxjs';
 import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@@ -8,7 +7,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
 @Component({
     selector       : 'fuse-vertical-navigation-spacer-item',
     templateUrl    : './spacer.component.html',
-    styles         : [],
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDestroy
@@ -57,7 +55,7 @@ export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDest
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/components/navigation/vertical/styles/appearances/compact.scss

@@ -1,20 +1,22 @@
 /* Variables */
-$fuse-vertical-navigation-compact-width: 112;
+:root {
+    --fuse-vertical-navigation-compact-width: 112px;
+}
 
 fuse-vertical-navigation {
 
     /* Compact appearance overrides */
     &.fuse-vertical-navigation-appearance-compact {
-        width: #{$fuse-vertical-navigation-compact-width}px;
-        min-width: #{$fuse-vertical-navigation-compact-width}px;
-        max-width: #{$fuse-vertical-navigation-compact-width}px;
+        width: var(--fuse-vertical-navigation-compact-width);
+        min-width: var(--fuse-vertical-navigation-compact-width);
+        max-width: var(--fuse-vertical-navigation-compact-width);
 
         /* Left positioned */
         &.fuse-vertical-navigation-position-left {
 
             /* Side mode */
             &.fuse-vertical-navigation-mode-side {
-                margin-left: -#{$fuse-vertical-navigation-compact-width}px;
+                margin-left: calc(var(--fuse-vertical-navigation-compact-width) * -1);
             }
 
             /* Opened */
@@ -28,7 +30,7 @@ fuse-vertical-navigation {
 
             /* Side mode */
             &.fuse-vertical-navigation-mode-side {
-                margin-right: -#{$fuse-vertical-navigation-compact-width}px;
+                margin-right: calc(var(--fuse-vertical-navigation-compact-width) * -1);
             }
 
             /* Opened */
@@ -39,7 +41,7 @@ fuse-vertical-navigation {
             /* Aside wrapper */
             .fuse-vertical-navigation-aside-wrapper {
                 left: auto;
-                right: #{$fuse-vertical-navigation-compact-width}px;
+                right: var(--fuse-vertical-navigation-compact-width);
             }
         }
 
@@ -104,7 +106,7 @@ fuse-vertical-navigation {
 
         /* Aside wrapper */
         .fuse-vertical-navigation-aside-wrapper {
-            left: #{$fuse-vertical-navigation-compact-width}px;
+            left: var(--fuse-vertical-navigation-compact-width);
         }
     }
 }

src/@fuse/components/navigation/vertical/styles/appearances/default.scss

@@ -1,5 +1,7 @@
 /* Variables */
-$fuse-vertical-navigation-width: 280;
+:root {
+    --fuse-vertical-navigation-width: 280px;
+}
 
 fuse-vertical-navigation {
     position: sticky;
@@ -7,9 +9,9 @@ fuse-vertical-navigation {
     flex-direction: column;
     flex: 1 0 auto;
     top: 0;
-    width: #{$fuse-vertical-navigation-width}px;
-    min-width: #{$fuse-vertical-navigation-width}px;
-    max-width: #{$fuse-vertical-navigation-width}px;
+    width: var(--fuse-vertical-navigation-width);
+    min-width: var(--fuse-vertical-navigation-width);
+    max-width: var(--fuse-vertical-navigation-width);
     height: 100vh;
     min-height: 100vh;
     max-height: 100vh;
@@ -45,7 +47,7 @@ fuse-vertical-navigation {
 
         /* Side mode */
         &.fuse-vertical-navigation-mode-side {
-            margin-left: -#{$fuse-vertical-navigation-width}px;
+            margin-left: calc(#{var(--fuse-vertical-navigation-width)} * -1);
 
             &.fuse-vertical-navigation-opened {
                 margin-left: 0;
@@ -73,7 +75,7 @@ fuse-vertical-navigation {
 
         /* Side mode */
         &.fuse-vertical-navigation-mode-side {
-            margin-right: -#{$fuse-vertical-navigation-width}px;
+            margin-right: calc(var(--fuse-vertical-navigation-width) * -1);
 
             &.fuse-vertical-navigation-opened {
                 margin-right: 0;
@@ -170,8 +172,8 @@ fuse-vertical-navigation {
         flex-direction: column;
         top: 0;
         bottom: 0;
-        left: #{$fuse-vertical-navigation-width}px;
-        width: #{$fuse-vertical-navigation-width}px;
+        left: var(--fuse-vertical-navigation-width);
+        width: var(--fuse-vertical-navigation-width);
         height: 100%;
         z-index: 5;
         overflow-x: hidden;
@@ -196,7 +198,7 @@ fuse-vertical-navigation {
 
         .fuse-vertical-navigation-aside-wrapper {
             left: auto;
-            right: #{$fuse-vertical-navigation-width}px;
+            right: var(--fuse-vertical-navigation-width);
         }
     }
 
@@ -335,6 +337,7 @@ fuse-vertical-navigation {
         }
 
         > .fuse-vertical-navigation-item-children {
+            margin-top: 6px;
 
             > *:last-child {
                 padding-bottom: 6px;

src/@fuse/components/navigation/vertical/styles/appearances/dense.scss

@@ -1,6 +1,8 @@
 /* Variables */
-$fuse-vertical-navigation-width: 280;
-$fuse-vertical-navigation-dense-width: 80;
+:root {
+    --fuse-vertical-navigation-width: 280px;
+    --fuse-vertical-navigation-dense-width: 80px;
+}
 
 fuse-vertical-navigation {
 
@@ -8,16 +10,16 @@ fuse-vertical-navigation {
     &.fuse-vertical-navigation-appearance-dense {
 
         &:not(.fuse-vertical-navigation-mode-over) {
-            width: #{$fuse-vertical-navigation-dense-width}px;
-            min-width: #{$fuse-vertical-navigation-dense-width}px;
-            max-width: #{$fuse-vertical-navigation-dense-width}px;
+            width: var(--fuse-vertical-navigation-dense-width);
+            min-width: var(--fuse-vertical-navigation-dense-width);
+            max-width: var(--fuse-vertical-navigation-dense-width);
 
             /* Left positioned */
             &.fuse-vertical-navigation-position-left {
 
                 /* Side mode */
                 &.fuse-vertical-navigation-mode-side {
-                    margin-left: -#{$fuse-vertical-navigation-dense-width}px;
+                    margin-left: calc(var(--fuse-vertical-navigation-dense-width) * -1);
                 }
 
                 /* Opened */
@@ -31,7 +33,7 @@ fuse-vertical-navigation {
 
                 /* Side mode */
                 &.fuse-vertical-navigation-mode-side {
-                    margin-right: -#{$fuse-vertical-navigation-dense-width}px;
+                    margin-right: calc(var(--fuse-vertical-navigation-dense-width) * -1);
                 }
 
                 /* Opened */
@@ -42,14 +44,14 @@ fuse-vertical-navigation {
                 /* Aside wrapper */
                 .fuse-vertical-navigation-aside-wrapper {
                     left: auto;
-                    right: #{$fuse-vertical-navigation-dense-width}px;
+                    right: var(--fuse-vertical-navigation-dense-width);
                 }
 
                 &.fuse-vertical-navigation-hover {
 
                     .fuse-vertical-navigation-aside-wrapper {
                         left: auto;
-                        right: #{$fuse-vertical-navigation-width}px;
+                        right: var(--fuse-vertical-navigation-width);
                     }
                 }
             }
@@ -69,9 +71,9 @@ fuse-vertical-navigation {
                     .fuse-vertical-navigation-item-wrapper {
 
                         .fuse-vertical-navigation-item {
-                            width: #{$fuse-vertical-navigation-width}px - 24px;
-                            min-width: #{$fuse-vertical-navigation-width}px - 24px;
-                            max-width: #{$fuse-vertical-navigation-width}px - 24px;
+                            width: calc(var(--fuse-vertical-navigation-dense-width) - 24px);
+                            min-width: calc(var(--fuse-vertical-navigation-dense-width) - 24px);
+                            max-width: calc(var(--fuse-vertical-navigation-dense-width) - 24px);
 
                             .fuse-vertical-navigation-item-arrow,
                             .fuse-vertical-navigation-item-badge,
@@ -142,20 +144,23 @@ fuse-vertical-navigation {
 
         /* Aside wrapper */
         .fuse-vertical-navigation-aside-wrapper {
-            left: #{$fuse-vertical-navigation-dense-width}px;
+            left: var(--fuse-vertical-navigation-dense-width);
         }
 
         /* Hover */
         &.fuse-vertical-navigation-hover {
 
             .fuse-vertical-navigation-wrapper {
-                width: #{$fuse-vertical-navigation-width}px;
+                width: var(--fuse-vertical-navigation-width);
 
                 .fuse-vertical-navigation-content {
 
                     .fuse-vertical-navigation-item-wrapper {
 
                         .fuse-vertical-navigation-item {
+                            width: calc(var(--fuse-vertical-navigation-width) - 24px);
+                            min-width: calc(var(--fuse-vertical-navigation-width) - 24px);
+                            max-width: calc(var(--fuse-vertical-navigation-width) - 24px);
 
                             .fuse-vertical-navigation-item-arrow,
                             .fuse-vertical-navigation-item-badge,
@@ -170,7 +175,7 @@ fuse-vertical-navigation {
             }
 
             .fuse-vertical-navigation-aside-wrapper {
-                left: #{$fuse-vertical-navigation-width}px;
+                left: var(--fuse-vertical-navigation-width);
             }
         }
     }

src/@fuse/components/navigation/vertical/styles/appearances/thin.scss

@@ -1,19 +1,21 @@
 /* Variables */
-$fuse-vertical-navigation-thin-width: 80;
+:root {
+    --fuse-vertical-navigation-thin-width: 80px;
+}
 
 fuse-vertical-navigation {
 
     /* Thin appearance overrides */
     &.fuse-vertical-navigation-appearance-thin {
-        width: #{$fuse-vertical-navigation-thin-width}px;
-        min-width: #{$fuse-vertical-navigation-thin-width}px;
-        max-width: #{$fuse-vertical-navigation-thin-width}px;
+        width: var(--fuse-vertical-navigation-thin-width);
+        min-width: var(--fuse-vertical-navigation-thin-width);
+        max-width: var(--fuse-vertical-navigation-thin-width);
 
         /* Left positioned */
         &.fuse-vertical-navigation-position-left {
 
             &.fuse-vertical-navigation-mode-side {
-                margin-left: -#{$fuse-vertical-navigation-thin-width}px;
+                margin-left: calc(var(--fuse-vertical-navigation-thin-width) * -1);
             }
 
             &.fuse-vertical-navigation-opened {
@@ -25,7 +27,7 @@ fuse-vertical-navigation {
         &.fuse-vertical-navigation-position-right {
 
             &.fuse-vertical-navigation-mode-side {
-                margin-right: -#{$fuse-vertical-navigation-thin-width}px;
+                margin-right: calc(var(--fuse-vertical-navigation-thin-width) * -1);
             }
 
             &.fuse-vertical-navigation-opened {
@@ -34,7 +36,7 @@ fuse-vertical-navigation {
 
             .fuse-vertical-navigation-aside-wrapper {
                 left: auto;
-                right: #{$fuse-vertical-navigation-thin-width}px;
+                right: var(--fuse-vertical-navigation-thin-width);
             }
         }
 
@@ -91,7 +93,7 @@ fuse-vertical-navigation {
 
         /* Aside wrapper */
         .fuse-vertical-navigation-aside-wrapper {
-            left: #{$fuse-vertical-navigation-thin-width}px;
+            left: var(--fuse-vertical-navigation-thin-width);
         }
     }
 }

src/@fuse/components/navigation/vertical/vertical.component.html

@@ -24,46 +24,52 @@
             <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
                 <!-- Aside -->
-                <fuse-vertical-navigation-aside-item
-                    *ngIf="item.type === 'aside'"
-                    [item]="item"
-                    [name]="name"
-                    [activeItemId]="activeAsideItemId"
-                    [autoCollapse]="autoCollapse"
-                    [skipChildren]="true"
-                    (click)="toggleAside(item)"></fuse-vertical-navigation-aside-item>
+                <ng-container *ngIf="item.type === 'aside'">
+                    <fuse-vertical-navigation-aside-item
+                        [item]="item"
+                        [name]="name"
+                        [activeItemId]="activeAsideItemId"
+                        [autoCollapse]="autoCollapse"
+                        [skipChildren]="true"
+                        (click)="toggleAside(item)"></fuse-vertical-navigation-aside-item>
+                </ng-container>
 
                 <!-- Basic -->
-                <fuse-vertical-navigation-basic-item
-                    *ngIf="item.type === 'basic'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-basic-item>
+                <ng-container *ngIf="item.type === 'basic'">
+                    <fuse-vertical-navigation-basic-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-basic-item>
+                </ng-container>
 
                 <!-- Collapsable -->
-                <fuse-vertical-navigation-collapsable-item
-                    *ngIf="item.type === 'collapsable'"
-                    [item]="item"
-                    [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                <ng-container *ngIf="item.type === 'collapsable'">
+                    <fuse-vertical-navigation-collapsable-item
+                        [item]="item"
+                        [name]="name"
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                </ng-container>
 
                 <!-- Divider -->
-                <fuse-vertical-navigation-divider-item
-                    *ngIf="item.type === 'divider'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-divider-item>
+                <ng-container *ngIf="item.type === 'divider'">
+                    <fuse-vertical-navigation-divider-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-divider-item>
+                </ng-container>
 
                 <!-- Group -->
-                <fuse-vertical-navigation-group-item
-                    *ngIf="item.type === 'group'"
-                    [item]="item"
-                    [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-group-item>
+                <ng-container *ngIf="item.type === 'group'">
+                    <fuse-vertical-navigation-group-item
+                        [item]="item"
+                        [name]="name"
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-group-item>
+                </ng-container>
 
                 <!-- Spacer -->
-                <fuse-vertical-navigation-spacer-item
-                    *ngIf="item.type === 'spacer'"
-                    [item]="item"
-                    [name]="name"></fuse-vertical-navigation-spacer-item>
+                <ng-container *ngIf="item.type === 'spacer'">
+                    <fuse-vertical-navigation-spacer-item
+                        [item]="item"
+                        [name]="name"></fuse-vertical-navigation-spacer-item>
+                </ng-container>
 
             </ng-container>
 
@@ -84,31 +90,33 @@
 </div>
 
 <!-- Aside -->
-<div
-    class="fuse-vertical-navigation-aside-wrapper"
-    *ngIf="activeAsideItemId"
-    fuseScrollbar
-    [fuseScrollbarOptions]="{wheelPropagation: false, suppressScrollX: true}"
-    [@fadeInLeft]="position === 'left'"
-    [@fadeInRight]="position === 'right'"
-    [@fadeOutLeft]="position === 'left'"
-    [@fadeOutRight]="position === 'right'">
+<ng-container *ngIf="activeAsideItemId">
+    <div
+        class="fuse-vertical-navigation-aside-wrapper"
+        fuseScrollbar
+        [fuseScrollbarOptions]="{wheelPropagation: false, suppressScrollX: true}"
+        [@fadeInLeft]="position === 'left'"
+        [@fadeInRight]="position === 'right'"
+        [@fadeOutLeft]="position === 'left'"
+        [@fadeOutRight]="position === 'right'">
 
-    <!-- Items -->
-    <ng-container *ngFor="let item of navigation; trackBy: trackByFn">
+        <!-- Items -->
+        <ng-container *ngFor="let item of navigation; trackBy: trackByFn">
 
-        <!-- Skip the hidden items -->
-        <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
+            <!-- Skip the hidden items -->
+            <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
-            <!-- Aside -->
-            <fuse-vertical-navigation-aside-item
-                *ngIf="item.type === 'aside' && item.id === activeAsideItemId"
-                [item]="item"
-                [name]="name"
-                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-aside-item>
+                <!-- Aside -->
+                <ng-container *ngIf="item.type === 'aside' && item.id === activeAsideItemId">
+                    <fuse-vertical-navigation-aside-item
+                        [item]="item"
+                        [name]="name"
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-aside-item>
+                </ng-container>
+
+            </ng-container>
 
         </ng-container>
 
-    </ng-container>
-
-</div>
+    </div>
+</ng-container>

src/@fuse/components/navigation/vertical/vertical.component.ts

@@ -2,8 +2,7 @@ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, E
 import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
 import { NavigationEnd, Router } from '@angular/router';
 import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay';
-import { merge, ReplaySubject, Subject, Subscription } from 'rxjs';
-import { delay, filter, takeUntil } from 'rxjs/operators';
+import { delay, filter, merge, ReplaySubject, Subject, Subscription, takeUntil } from 'rxjs';
 import { fuseAnimations } from '@fuse/animations';
 import { FuseNavigationItem, FuseVerticalNavigationAppearance, FuseVerticalNavigationMode, FuseVerticalNavigationPosition } from '@fuse/components/navigation/navigation.types';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
@@ -374,11 +373,15 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
      */
     ngOnDestroy(): void
     {
+        // Forcefully close the navigation and aside in case they are opened
+        this.close();
+        this.closeAside();
+
         // Deregister the navigation component from the registry
         this._fuseNavigationService.deregisterComponent(this.name);
 
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/directives/scroll-reset/scroll-reset.directive.ts

@@ -1,7 +1,6 @@
 import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
-import { Subject } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, Subject, takeUntil } from 'rxjs';
 
 @Directive({
     selector: '[fuseScrollReset]',
@@ -47,7 +46,7 @@ export class FuseScrollResetDirective implements OnInit, OnDestroy
     ngOnDestroy(): void
     {
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 }

src/@fuse/directives/scrollbar/scrollbar.directive.ts

@@ -2,8 +2,7 @@ import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChang
 import { Router } from '@angular/router';
 import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
 import { Platform } from '@angular/cdk/platform';
-import { fromEvent, Subject } from 'rxjs';
-import { debounceTime, takeUntil } from 'rxjs/operators';
+import { debounceTime, fromEvent, Subject, takeUntil } from 'rxjs';
 import PerfectScrollbar from 'perfect-scrollbar';
 import { merge } from 'lodash-es';
 import { ScrollbarGeometry, ScrollbarPosition } from '@fuse/directives/scrollbar/scrollbar.types';
@@ -138,7 +137,7 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
         this._destroy();
 
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 

src/@fuse/fuse.module.ts

@@ -1,18 +1,30 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
+import { MATERIAL_SANITY_CHECKS } from '@angular/material/core';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
+import { FuseConfirmationModule } from '@fuse/services/confirmation';
+import { FuseLoadingModule } from '@fuse/services/loading';
 import { FuseMediaWatcherModule } from '@fuse/services/media-watcher/media-watcher.module';
 import { FuseSplashScreenModule } from '@fuse/services/splash-screen/splash-screen.module';
-import { FuseTailwindConfigModule } from '@fuse/services/tailwind/tailwind.module';
 import { FuseUtilsModule } from '@fuse/services/utils/utils.module';
 
 @NgModule({
     imports  : [
+        FuseConfirmationModule,
+        FuseLoadingModule,
         FuseMediaWatcherModule,
         FuseSplashScreenModule,
-        FuseTailwindConfigModule,
         FuseUtilsModule
     ],
     providers: [
+        {
+            // Disable 'theme' sanity check
+            provide : MATERIAL_SANITY_CHECKS,
+            useValue: {
+                doctype: true,
+                theme  : false,
+                version: true
+            }
+        },
         {
             // Use the 'fill' appearance on Angular Material form fields by default
             provide : MAT_FORM_FIELD_DEFAULT_OPTIONS,

src/@fuse/lib/mock-api/mock-api.interceptor.ts

@@ -1,7 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
-import { Observable, of, throwError } from 'rxjs';
-import { delay, switchMap } from 'rxjs/operators';
+import { delay, Observable, of, switchMap, throwError } from 'rxjs';
 import { FUSE_MOCK_API_DEFAULT_DELAY } from '@fuse/lib/mock-api/mock-api.constants';
 import { FuseMockApiService } from '@fuse/lib/mock-api/mock-api.service';
 

src/@fuse/lib/mock-api/mock-api.request-handler.ts

@@ -1,6 +1,5 @@
 import { HttpRequest } from '@angular/common/http';
-import { Observable, of, throwError } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { Observable, of, take, throwError } from 'rxjs';
 import { FuseMockApiReplyCallback } from '@fuse/lib/mock-api/mock-api.types';
 
 export class FuseMockApiHandler

src/@fuse/lib/mock-api/mock-api.service.ts

@@ -9,11 +9,14 @@ import { FuseMockApiMethods } from '@fuse/lib/mock-api/mock-api.types';
 export class FuseMockApiService
 {
     private _handlers: { [key: string]: Map<string, FuseMockApiHandler> } = {
-        'delete': new Map<string, FuseMockApiHandler>(),
-        'get'   : new Map<string, FuseMockApiHandler>(),
-        'patch' : new Map<string, FuseMockApiHandler>(),
-        'post'  : new Map<string, FuseMockApiHandler>(),
-        'put'   : new Map<string, FuseMockApiHandler>()
+        'get'    : new Map<string, FuseMockApiHandler>(),
+        'post'   : new Map<string, FuseMockApiHandler>(),
+        'patch'  : new Map<string, FuseMockApiHandler>(),
+        'delete' : new Map<string, FuseMockApiHandler>(),
+        'put'    : new Map<string, FuseMockApiHandler>(),
+        'head'   : new Map<string, FuseMockApiHandler>(),
+        'jsonp'  : new Map<string, FuseMockApiHandler>(),
+        'options': new Map<string, FuseMockApiHandler>()
     };
 
     /**
@@ -86,18 +89,7 @@ export class FuseMockApiService
     }
 
     /**
-     * Register a DELETE request handler
-     *
-     * @param url - URL address of the mocked API endpoint
-     * @param delay - Delay of the response in milliseconds
-     */
-    onDelete(url: string, delay?: number): FuseMockApiHandler
-    {
-        return this._registerHandler('delete', url, delay);
-    }
-
-    /**
-     * Register a GET request handler
+     * Register GET request handler
      *
      * @param url - URL address of the mocked API endpoint
      * @param delay - Delay of the response in milliseconds
@@ -108,18 +100,7 @@ export class FuseMockApiService
     }
 
     /**
-     * Register a PATCH request handler
-     *
-     * @param url - URL address of the mocked API endpoint
-     * @param delay - Delay of the response in milliseconds
-     */
-    onPatch(url: string, delay?: number): FuseMockApiHandler
-    {
-        return this._registerHandler('patch', url, delay);
-    }
-
-    /**
-     * Register a POST request handler
+     * Register POST request handler
      *
      * @param url - URL address of the mocked API endpoint
      * @param delay - Delay of the response in milliseconds
@@ -130,7 +111,29 @@ export class FuseMockApiService
     }
 
     /**
-     * Register a PUT request handler
+     * Register PATCH request handler
+     *
+     * @param url - URL address of the mocked API endpoint
+     * @param delay - Delay of the response in milliseconds
+     */
+    onPatch(url: string, delay?: number): FuseMockApiHandler
+    {
+        return this._registerHandler('patch', url, delay);
+    }
+
+    /**
+     * Register DELETE request handler
+     *
+     * @param url - URL address of the mocked API endpoint
+     * @param delay - Delay of the response in milliseconds
+     */
+    onDelete(url: string, delay?: number): FuseMockApiHandler
+    {
+        return this._registerHandler('delete', url, delay);
+    }
+
+    /**
+     * Register PUT request handler
      *
      * @param url - URL address of the mocked API endpoint
      * @param delay - Delay of the response in milliseconds
@@ -140,6 +143,39 @@ export class FuseMockApiService
         return this._registerHandler('put', url, delay);
     }
 
+    /**
+     * Register HEAD request handler
+     *
+     * @param url - URL address of the mocked API endpoint
+     * @param delay - Delay of the response in milliseconds
+     */
+    onHead(url: string, delay?: number): FuseMockApiHandler
+    {
+        return this._registerHandler('head', url, delay);
+    }
+
+    /**
+     * Register JSONP request handler
+     *
+     * @param url - URL address of the mocked API endpoint
+     * @param delay - Delay of the response in milliseconds
+     */
+    onJsonp(url: string, delay?: number): FuseMockApiHandler
+    {
+        return this._registerHandler('jsonp', url, delay);
+    }
+
+    /**
+     * Register OPTIONS request handler
+     *
+     * @param url - URL address of the mocked API endpoint
+     * @param delay - Delay of the response in milliseconds
+     */
+    onOptions(url: string, delay?: number): FuseMockApiHandler
+    {
+        return this._registerHandler('options', url, delay);
+    }
+
     // -----------------------------------------------------------------------------------------------------
     // @ Private methods
     // -----------------------------------------------------------------------------------------------------

src/@fuse/lib/mock-api/mock-api.types.ts

@@ -8,6 +8,9 @@ export type FuseMockApiReplyCallback =
 export type FuseMockApiMethods =
     | 'get'
     | 'post'
-    | 'put'
     | 'patch'
-    | 'delete';
+    | 'delete'
+    | 'put'
+    | 'head'
+    | 'jsonp'
+    | 'options';

src/@fuse/services/confirmation/confirmation.module.ts

@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { FuseConfirmationService } from '@fuse/services/confirmation/confirmation.service';
+import { FuseConfirmationDialogComponent } from '@fuse/services/confirmation/dialog/dialog.component';
+import { CommonModule } from '@angular/common';
+
+@NgModule({
+    declarations: [
+        FuseConfirmationDialogComponent
+    ],
+    imports     : [
+        MatButtonModule,
+        MatDialogModule,
+        MatIconModule,
+        CommonModule
+    ],
+    providers   : [
+        FuseConfirmationService
+    ]
+})
+export class FuseConfirmationModule
+{
+    /**
+     * Constructor
+     */
+    constructor(private _fuseConfirmationService: FuseConfirmationService)
+    {
+    }
+}

src/@fuse/services/confirmation/confirmation.service.ts

@@ -0,0 +1,58 @@
+import { Injectable } from '@angular/core';
+import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { merge } from 'lodash-es';
+import { FuseConfirmationDialogComponent } from '@fuse/services/confirmation/dialog/dialog.component';
+import { FuseConfirmationConfig } from '@fuse/services/confirmation/confirmation.types';
+
+@Injectable()
+export class FuseConfirmationService
+{
+    private _defaultConfig: FuseConfirmationConfig = {
+        title      : 'Confirm action',
+        message    : 'Are you sure you want to confirm this action?',
+        icon       : {
+            show : true,
+            name : 'heroicons_outline:exclamation',
+            color: 'warn'
+        },
+        actions    : {
+            confirm: {
+                show : true,
+                label: 'Confirm',
+                color: 'warn'
+            },
+            cancel : {
+                show : true,
+                label: 'Cancel'
+            }
+        },
+        dismissible: false
+    };
+
+    /**
+     * Constructor
+     */
+    constructor(
+        private _matDialog: MatDialog
+    )
+    {
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Public methods
+    // -----------------------------------------------------------------------------------------------------
+
+    open(config: FuseConfirmationConfig = {}): MatDialogRef<FuseConfirmationDialogComponent>
+    {
+        // Merge the user config with the default config
+        const userConfig = merge({}, this._defaultConfig, config);
+
+        // Open the dialog
+        return this._matDialog.open(FuseConfirmationDialogComponent, {
+            autoFocus   : false,
+            disableClose: !userConfig.dismissible,
+            data        : userConfig,
+            panelClass  : 'fuse-confirmation-dialog-panel'
+        });
+    }
+}

src/@fuse/services/confirmation/confirmation.types.ts

@@ -0,0 +1,22 @@
+export interface FuseConfirmationConfig
+{
+    title?: string;
+    message?: string;
+    icon?: {
+        show?: boolean;
+        name?: string;
+        color?: 'primary' | 'accent' | 'warn' | 'basic' | 'info' | 'success' | 'warning' | 'error';
+    };
+    actions?: {
+        confirm?: {
+            show?: boolean;
+            label?: string;
+            color?: 'primary' | 'accent' | 'warn';
+        };
+        cancel?: {
+            show?: boolean;
+            label?: string;
+        };
+    };
+    dismissible?: boolean;
+}

src/@fuse/services/confirmation/dialog/dialog.component.html

@@ -0,0 +1,85 @@
+<div class="relative flex flex-col w-full h-full">
+
+    <!-- Dismiss button -->
+    <ng-container *ngIf="data.dismissible">
+        <div class="absolute top-0 right-0 pt-4 pr-4">
+            <button
+                mat-icon-button
+                [matDialogClose]="undefined">
+                <mat-icon
+                    class="text-secondary"
+                    [svgIcon]="'heroicons_outline:x'"></mat-icon>
+            </button>
+        </div>
+    </ng-container>
+
+    <!-- Content -->
+    <div class="flex flex-col sm:flex-row flex-auto items-center sm:items-start p-8 pb-6 sm:pb-8">
+
+        <!-- Icon -->
+        <ng-container *ngIf="data.icon.show">
+            <div
+                class="flex flex-0 items-center justify-center w-10 h-10 sm:mr-4 rounded-full"
+                [ngClass]="{'text-primary-600 bg-primary-100 dark:text-primary-50 dark:bg-primary-600': data.icon.color === 'primary',
+                            'text-accent-600 bg-accent-100 dark:text-accent-50 dark:bg-accent-600': data.icon.color === 'accent',
+                            'text-warn-600 bg-warn-100 dark:text-warn-50 dark:bg-warn-600': data.icon.color === 'warn',
+                            'text-gray-600 bg-gray-100 dark:text-gray-50 dark:bg-gray-600': data.icon.color === 'basic',
+                            'text-blue-600 bg-blue-100 dark:text-blue-50 dark:bg-blue-600': data.icon.color === 'info',
+                            'text-green-500 bg-green-100 dark:text-green-50 dark:bg-green-500': data.icon.color === 'success',
+                            'text-amber-500 bg-amber-100 dark:text-amber-50 dark:bg-amber-500': data.icon.color === 'warning',
+                            'text-red-600 bg-red-100 dark:text-red-50 dark:bg-red-600': data.icon.color === 'error'
+                            }">
+                <mat-icon
+                    class="text-current"
+                    [svgIcon]="data.icon.name"></mat-icon>
+            </div>
+        </ng-container>
+
+        <ng-container *ngIf="data.title || data.message">
+            <div class="flex flex-col items-center sm:items-start mt-4 sm:mt-0 sm:pr-8 space-y-1 text-center sm:text-left">
+
+                <!-- Title -->
+                <ng-container *ngIf="data.title">
+                    <div
+                        class="text-xl leading-6 font-medium"
+                        [innerHTML]="data.title"></div>
+                </ng-container>
+
+                <!-- Message -->
+                <ng-container *ngIf="data.message">
+                    <div
+                        class="text-secondary"
+                        [innerHTML]="data.message"></div>
+                </ng-container>
+            </div>
+        </ng-container>
+
+    </div>
+
+    <!-- Actions -->
+    <ng-container *ngIf="data.actions.confirm.show || data.actions.cancel.show">
+        <div class="flex items-center justify-center sm:justify-end px-6 py-4 space-x-3 bg-gray-50 dark:bg-black dark:bg-opacity-10">
+
+            <!-- Cancel -->
+            <ng-container *ngIf="data.actions.cancel.show">
+                <button
+                    mat-stroked-button
+                    [matDialogClose]="'cancelled'">
+                    {{data.actions.cancel.label}}
+                </button>
+            </ng-container>
+
+            <!-- Confirm -->
+            <ng-container *ngIf="data.actions.confirm.show">
+                <button
+                    mat-flat-button
+                    [color]="data.actions.confirm.color"
+                    [matDialogClose]="'confirmed'">
+                    {{data.actions.confirm.label}}
+                </button>
+            </ng-container>
+
+        </div>
+    </ng-container>
+
+</div>

src/@fuse/services/confirmation/dialog/dialog.component.ts

@@ -0,0 +1,52 @@
+import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { FuseConfirmationConfig } from '@fuse/services/confirmation/confirmation.types';
+
+@Component({
+    selector     : 'fuse-confirmation-dialog',
+    templateUrl  : './dialog.component.html',
+    styles       : [
+        /* language=SCSS */
+        `
+            .fuse-confirmation-dialog-panel {
+                @screen md {
+                    @apply w-128;
+                }
+
+                .mat-dialog-container {
+                    padding: 0 !important;
+                }
+            }
+        `
+    ],
+    encapsulation: ViewEncapsulation.None
+})
+export class FuseConfirmationDialogComponent implements OnInit
+{
+    /**
+     * Constructor
+     */
+    constructor(
+        @Inject(MAT_DIALOG_DATA) public data: FuseConfirmationConfig,
+        public matDialogRef: MatDialogRef<FuseConfirmationDialogComponent>
+    )
+    {
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Lifecycle hooks
+    // -----------------------------------------------------------------------------------------------------
+
+    /**
+     * On init
+     */
+    ngOnInit(): void
+    {
+
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Public methods
+    // -----------------------------------------------------------------------------------------------------
+
+}

src/@fuse/services/confirmation/index.ts

@@ -0,0 +1 @@
+export * from '@fuse/services/confirmation/public-api';

src/@fuse/services/confirmation/public-api.ts

@@ -0,0 +1,3 @@
+export * from '@fuse/services/confirmation/confirmation.module';
+export * from '@fuse/services/confirmation/confirmation.service';
+export * from '@fuse/services/confirmation/confirmation.types';

src/@fuse/services/loading/index.ts

@@ -0,0 +1 @@
+export * from '@fuse/services/loading/public-api';

src/@fuse/services/loading/loading.interceptor.ts

@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
+import { finalize, Observable } from 'rxjs';
+import { FuseLoadingService } from '@fuse/services/loading/loading.service';
+
+@Injectable()
+export class FuseLoadingInterceptor implements HttpInterceptor
+{
+    handleRequestsAutomatically: boolean;
+
+    /**
+     * Constructor
+     */
+    constructor(
+        private _fuseLoadingService: FuseLoadingService
+    )
+    {
+        // Subscribe to the auto
+        this._fuseLoadingService.auto$
+            .subscribe((value) => {
+                this.handleRequestsAutomatically = value;
+            });
+    }
+
+    /**
+     * Intercept
+     *
+     * @param req
+     * @param next
+     */
+    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>
+    {
+        // If the Auto mode is turned off, do nothing
+        if ( !this.handleRequestsAutomatically )
+        {
+            return next.handle(req);
+        }
+
+        // Set the loading status to true
+        this._fuseLoadingService._setLoadingStatus(true, req.url);
+
+        return next.handle(req).pipe(
+            finalize(() => {
+                // Set the status to false if there are any errors or the request is completed
+                this._fuseLoadingService._setLoadingStatus(false, req.url);
+            }));
+    }
+}

src/@fuse/services/loading/loading.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { FuseLoadingInterceptor } from '@fuse/services/loading/loading.interceptor';
+
+@NgModule({
+    providers: [
+        {
+            provide : HTTP_INTERCEPTORS,
+            useClass: FuseLoadingInterceptor,
+            multi   : true
+        }
+    ]
+})
+export class FuseLoadingModule
+{
+}

src/@fuse/services/loading/loading.service.ts

@@ -0,0 +1,146 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class FuseLoadingService
+{
+    private _auto$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+    private _mode$: BehaviorSubject<'determinate' | 'indeterminate'> = new BehaviorSubject<'determinate' | 'indeterminate'>('indeterminate');
+    private _progress$: BehaviorSubject<number | null> = new BehaviorSubject<number | null>(0);
+    private _show$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+    private _urlMap: Map<string, boolean> = new Map<string, boolean>();
+
+    /**
+     * Constructor
+     */
+    constructor(private _httpClient: HttpClient)
+    {
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Accessors
+    // -----------------------------------------------------------------------------------------------------
+
+    /**
+     * Getter for auto mode
+     */
+    get auto$(): Observable<boolean>
+    {
+        return this._auto$.asObservable();
+    }
+
+    /**
+     * Getter for mode
+     */
+    get mode$(): Observable<'determinate' | 'indeterminate'>
+    {
+        return this._mode$.asObservable();
+    }
+
+    /**
+     * Getter for progress
+     */
+    get progress$(): Observable<number>
+    {
+        return this._progress$.asObservable();
+    }
+
+    /**
+     * Getter for show
+     */
+    get show$(): Observable<boolean>
+    {
+        return this._show$.asObservable();
+    }
+
+    // -----------------------------------------------------------------------------------------------------
+    // @ Public methods
+    // -----------------------------------------------------------------------------------------------------
+
+    /**
+     * Show the loading bar
+     */
+    show(): void
+    {
+        this._show$.next(true);
+    }
+
+    /**
+     * Hide the loading bar
+     */
+    hide(): void
+    {
+        this._show$.next(false);
+    }
+
+    /**
+     * Set the auto mode
+     *
+     * @param value
+     */
+    setAutoMode(value: boolean): void
+    {
+        this._auto$.next(value);
+    }
+
+    /**
+     * Set the mode
+     *
+     * @param value
+     */
+    setMode(value: 'determinate' | 'indeterminate'): void
+    {
+        this._mode$.next(value);
+    }
+
+    /**
+     * Set the progress of the bar manually
+     *
+     * @param value
+     */
+    setProgress(value: number): void
+    {
+        if ( value < 0 || value > 100 )
+        {
+            console.error('Progress value must be between 0 and 100!');
+            return;
+        }
+
+        this._progress$.next(value);
+    }
+
+    /**
+     * Sets the loading status on the given url
+     *
+     * @param status
+     * @param url
+     */
+    _setLoadingStatus(status: boolean, url: string): void
+    {
+        // Return if the url was not provided
+        if ( !url )
+        {
+            console.error('The request URL must be provided!');
+            return;
+        }
+
+        if ( status === true )
+        {
+            this._urlMap.set(url, status);
+            this._show$.next(true);
+        }
+        else if ( status === false && this._urlMap.has(url) )
+        {
+            this._urlMap.delete(url);
+        }
+
+        // Only set the status to 'false' if all outgoing requests are completed
+        if ( this._urlMap.size === 0 )
+        {
+            this._show$.next(false);
+        }
+    }
+}

src/@fuse/services/loading/public-api.ts

@@ -0,0 +1,2 @@
+export * from '@fuse/services/loading/loading.service';
+export * from '@fuse/services/loading/loading.module';

src/@fuse/services/media-watcher/media-watcher.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout';
-import { Observable, ReplaySubject } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { FuseTailwindService } from '@fuse/services/tailwind/tailwind.service';
+import { map, Observable, ReplaySubject, switchMap } from 'rxjs';
+import { fromPairs } from 'lodash-es';
+import { FuseConfigService } from '@fuse/services/config';
 
 @Injectable()
 export class FuseMediaWatcherService
@@ -14,11 +14,12 @@ export class FuseMediaWatcherService
      */
     constructor(
         private _breakpointObserver: BreakpointObserver,
-        private _fuseTailwindConfigService: FuseTailwindService
+        private _fuseConfigService: FuseConfigService
     )
     {
-        this._fuseTailwindConfigService.tailwindConfig$.pipe(
-            switchMap(config => this._breakpointObserver.observe(Object.values(config.breakpoints)).pipe(
+        this._fuseConfigService.config$.pipe(
+            map(config => fromPairs(Object.entries(config.screens).map(([alias, screen]) => ([alias, `(min-width: ${screen})`])))),
+            switchMap(screens => this._breakpointObserver.observe(Object.values(screens)).pipe(
                 map((state) => {
 
                     // Prepare the observable values and set their defaults
@@ -30,7 +31,7 @@ export class FuseMediaWatcherService
                     for ( const [query] of matchingBreakpoints )
                     {
                         // Find the alias of the matching query
-                        const matchingAlias = Object.entries(config.breakpoints).find(([alias, q]) => q === query)[0];
+                        const matchingAlias = Object.entries(screens).find(([alias, q]) => q === query)[0];
 
                         // Add the matching query to the observable values
                         if ( matchingAlias )

src/@fuse/services/splash-screen/splash-screen.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { NavigationEnd, Router } from '@angular/router';
-import { filter, take } from 'rxjs/operators';
+import { filter, take } from 'rxjs';
 
 @Injectable()
 export class FuseSplashScreenService

src/@fuse/services/tailwind/index.ts

@@ -1 +0,0 @@
-export * from '@fuse/services/tailwind/public-api';

src/@fuse/services/tailwind/public-api.ts

@@ -1,2 +0,0 @@
-export * from '@fuse/services/tailwind/tailwind.module';
-export * from '@fuse/services/tailwind/tailwind.service';

src/@fuse/services/tailwind/tailwind.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FuseTailwindService } from '@fuse/services/tailwind/tailwind.service';
-
-@NgModule({
-    providers: [
-        FuseTailwindService
-    ]
-})
-export class FuseTailwindConfigModule
-{
-    /**
-     * Constructor
-     */
-    constructor(private _fuseTailwindConfigService: FuseTailwindService)
-    {
-    }
-}

src/@fuse/services/tailwind/tailwind.service.ts

@@ -1,58 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable, ReplaySubject } from 'rxjs';
-import { fromPairs, map } from 'lodash-es';
-import * as extractedTailwindConfigStyle from '@fuse/styles/core/tailwind-config.scss';
-
-@Injectable()
-export class FuseTailwindService
-{
-    private _tailwindConfig: ReplaySubject<any> = new ReplaySubject<any>(1);
-
-    /**
-     * Constructor
-     */
-    constructor()
-    {
-        // Prepare the config object
-        const config: any = {};
-
-        // Extract the style from the class
-        const regexpForClass = /\.fuse-tailwind-extracted-config\s\{([\s\S]*)\}/g;
-        const style = regexpForClass.exec(extractedTailwindConfigStyle.default)[1].trim();
-
-        // Extract the rules
-        const regexp = /(--[\s\S]*?):'([\s\S]*?)';/g;
-        let rules = regexp.exec(style);
-
-        // Add to the config
-        while ( rules !== null )
-        {
-            const configGroup = /--([\s\S]*?)-/g.exec(rules[1])[1];
-            if ( !config[configGroup] )
-            {
-                config[configGroup] = {};
-            }
-
-            config[configGroup][rules[1].replace(/(--[\s\S]*?-)/g, '')] = rules[2];
-            rules = regexp.exec(style);
-        }
-
-        // Parse the themes objects
-        config.themes = fromPairs(map(config.themes, (value, key) => [key, JSON.parse(value)]));
-
-        // Execute the observable with the config
-        this._tailwindConfig.next(config);
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Accessors
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Getter for _tailwindConfig
-     */
-    get tailwindConfig$(): Observable<any>
-    {
-        return this._tailwindConfig.asObservable();
-    }
-}

src/@fuse/styles/core/tailwind-config.scss

@@ -1,6 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------- */
-/* @ Any configuration we need from Tailwind's config file will be extracted here so we can import this
-/* @ file from "config.ts" to access the extracted configuration from TypeScript
-/* ----------------------------------------------------------------------------------------------------- */
-@variants fuse-tailwind-extracted-config {
-}

src/@fuse/styles/main.scss

@@ -1,13 +1,9 @@
-/* 1. Core */
-@import 'core/tailwind-config';
-
-/* 2. Components */
+/* 1. Components */
 @import 'components/example-viewer';
 @import 'components/input';
 
-/* 3. Overrides */
+/* 2. Overrides */
 @import 'overrides/angular-material';
-@import 'overrides/fullcalendar';
 @import 'overrides/highlightjs';
 @import 'overrides/perfect-scrollbar';
 @import 'overrides/quill';

src/@fuse/styles/overrides/angular-material.scss

@@ -136,11 +136,8 @@
 .mat-flat-button,
 .mat-raised-button,
 .mat-stroked-button {
-
-    .fuse-mat-rounded & {
-        padding: 0 20px;
-        border-radius: 9999px;
-    }
+    padding: 0 20px !important;
+    border-radius: 9999px !important;
 }
 
 /* Target all buttons */
@@ -334,6 +331,8 @@
 /*  @ Button Toggle
 /* ----------------------------------------------------------------------------------------------------- */
 .mat-button-toggle-group {
+    border: none !important;
+    @apply space-x-1;
 
     &.mat-button-toggle-group-appearance-standard {
 
@@ -341,36 +340,27 @@
             background-clip: padding-box;
         }
     }
-}
 
-/* Rounded design */
-.fuse-mat-rounded {
-
-    .mat-button-toggle-group {
+    .mat-button-toggle {
+        border-radius: 9999px;
+        overflow: hidden;
         border: none !important;
-        @apply space-x-1;
+        font-weight: 500;
 
-        .mat-button-toggle {
-            border-radius: 9999px;
-            overflow: hidden;
-            border: none !important;
-            font-weight: 500;
-
-            &.mat-button-toggle-checked {
-
-                .mat-button-toggle-label-content {
-                    @apply text-default #{'!important'};
-                }
-            }
+        &.mat-button-toggle-checked {
 
             .mat-button-toggle-label-content {
-                padding: 0 20px;
-                @apply text-secondary;
+                @apply text-default #{'!important'};
             }
+        }
 
-            .mat-ripple {
-                border-radius: 9999px;
-            }
+        .mat-button-toggle-label-content {
+            padding: 0 20px;
+            @apply text-secondary;
+        }
+
+        .mat-ripple {
+            border-radius: 9999px;
         }
     }
 }
@@ -444,7 +434,7 @@
 
             /* Border color */
             .mat-form-field-flex {
-                @apply border-warn #{'!important'};
+                @apply border-warn dark:border-warn #{'!important'};
             }
         }
     }
@@ -456,7 +446,7 @@
 
             /* Background color */
             .mat-form-field-flex {
-                @apply bg-card #{'!important'};
+                @apply bg-card dark:bg-card #{'!important'};
             }
         }
     }
@@ -468,7 +458,7 @@
 
             /* Border color */
             .mat-form-field-flex {
-                @apply border-primary #{'!important'};
+                @apply border-primary dark:border-primary #{'!important'};
             }
         }
     }
@@ -1329,62 +1319,55 @@
             opacity: 0 !important;
         }
     }
+
+    .mat-tab-header {
+        border-bottom: none !important;
+
+        .mat-tab-label-container {
+            padding: 0 24px;
+
+            .mat-tab-list {
+
+                .mat-tab-labels {
+
+                    .mat-tab-label {
+                        min-width: 0 !important;
+                        height: 40px !important;
+                        padding: 0 20px !important;
+                        border-radius: 9999px !important;
+                        @apply text-secondary;
+
+                        &.mat-tab-label-active {
+                            @apply bg-gray-700 bg-opacity-10 dark:bg-gray-50 dark:bg-opacity-10 #{'!important'};
+                            @apply text-default #{'!important'};
+                        }
+
+                        + .mat-tab-label {
+                            margin-left: 4px;
+                        }
+
+                        .mat-tab-label-content {
+                            line-height: 20px;
+                        }
+                    }
+                }
+
+                .mat-ink-bar {
+                    display: none !important;
+                }
+            }
+        }
+    }
+
+    .mat-tab-body-content {
+        padding: 24px;
+    }
 }
 
 .mat-tab-label {
     opacity: 1 !important;
 }
 
-/* Rounded design */
-.fuse-mat-rounded {
-
-    .mat-tab-group {
-
-        .mat-tab-header {
-            border-bottom: none !important;
-
-            .mat-tab-label-container {
-                padding: 0 24px;
-
-                .mat-tab-list {
-
-                    .mat-tab-labels {
-
-                        .mat-tab-label {
-                            min-width: 0 !important;
-                            height: 40px !important;
-                            padding: 0 20px !important;
-                            border-radius: 9999px !important;
-                            @apply text-secondary;
-
-                            &.mat-tab-label-active {
-                                @apply bg-gray-700 bg-opacity-10 dark:bg-gray-50 dark:bg-opacity-10 #{'!important'};
-                                @apply text-default #{'!important'};
-                            }
-
-                            + .mat-tab-label {
-                                margin-left: 4px;
-                            }
-
-                            .mat-tab-label-content {
-                                line-height: 20px;
-                            }
-                        }
-                    }
-
-                    .mat-ink-bar {
-                        display: none !important;
-                    }
-                }
-            }
-        }
-
-        .mat-tab-body-content {
-            padding: 24px;
-        }
-    }
-}
-
 /* ----------------------------------------------------------------------------------------------------- */
 /*  @ Textarea
 /* ----------------------------------------------------------------------------------------------------- */

src/@fuse/styles/overrides/fullcalendar.scss

@@ -1,680 +0,0 @@
-/* ----------------------------------------------------------------------------------------------------- */
-/*  @ FullCalendar overrides
-/* ----------------------------------------------------------------------------------------------------- */
-.fc {
-
-    .fc-view-container {
-
-        /* Day Grid - Month view */
-        .fc-view.fc-dayGridMonth-view {
-
-            .fc-head {
-
-                > tr > .fc-head-container {
-                    border: none;
-
-                    .fc-row {
-
-                        .fc-day-header {
-                            border-color: var(--fuse-divider);
-
-                            span {
-                                display: flex;
-                                align-items: center;
-                                justify-content: center;
-                                padding-top: 8px;
-                                font-size: 12px;
-                                font-weight: 500;
-                                text-transform: uppercase;
-                                @apply text-secondary;
-                            }
-                        }
-                    }
-                }
-            }
-
-            .fc-body {
-
-                > tr > .fc-widget-content {
-                    border: none;
-
-                    .fc-day-grid {
-
-                        .fc-week {
-
-                            .fc-bg {
-
-                                .fc-day {
-                                    border-color: var(--fuse-divider);
-
-                                    &.fc-today {
-                                        background: none;
-                                    }
-                                }
-                            }
-
-                            .fc-content-skeleton {
-
-                                .fc-day-top {
-                                    text-align: center;
-
-                                    &.fc-other-month {
-                                        opacity: 1;
-
-                                        .fc-day-number {
-                                            @apply text-hint;
-                                        }
-                                    }
-
-                                    &.fc-today {
-
-                                        .fc-day-number {
-                                            @apply bg-primary text-on-primary;
-                                        }
-                                    }
-
-                                    .fc-day-number {
-                                        display: inline-flex;
-                                        align-items: center;
-                                        justify-content: center;
-                                        width: 22px;
-                                        height: 21px;
-                                        margin: 4px 0;
-                                        font-size: 12px;
-                                        border-radius: 50%;
-                                        float: none;
-                                    }
-                                }
-
-                                .fc-event-container {
-
-                                    .fc-day-grid-event {
-                                        display: flex;
-                                        align-items: center;
-                                        height: 22px;
-                                        min-height: 22px;
-                                        max-height: 22px;
-                                        margin: 0 6px 4px 6px;
-                                        padding: 0 5px;
-                                        font-size: 12px;
-                                        border-radius: 4px;
-                                        border: none;
-                                        cursor: pointer;
-
-                                        @screen sm {
-                                            padding: 0 8px;
-                                        }
-                                    }
-                                }
-
-                                .fc-more {
-                                    padding: 0 3px;
-                                    font-size: 12px;
-                                    font-weight: 500;
-                                    white-space: nowrap;
-                                    @apply text-secondary;
-
-                                    @screen sm {
-                                        padding: 0 6px;
-                                    }
-                                }
-                            }
-
-                            .fc-highlight-skeleton {
-
-                                .fc-highlight {
-                                    position: relative;
-                                    opacity: 1;
-                                    @apply bg-gray-100;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            .fc-popover {
-                @apply bg-card;
-
-                &.fc-more-popover {
-                    border: none;
-                    border-radius: 4px;
-                    @apply shadow-2xl;
-
-                    .fc-header {
-                        height: 32px;
-                        min-height: 32px;
-                        max-height: 32px;
-                        padding: 0 8px;
-                        @apply bg-hover;
-
-                        .fc-title {
-                            margin: 0;
-                            padding: 0;
-                            font-size: 12px;
-                        }
-                    }
-
-                    .fc-body {
-                        max-height: 160px;
-                        overflow: hidden auto;
-
-                        .fc-event-container {
-                            padding: 8px;
-
-                            .fc-day-grid-event {
-                                display: flex;
-                                align-items: center;
-                                height: 22px;
-                                min-height: 22px;
-                                max-height: 22px;
-                                margin: 0 0 6px 0;
-                                padding: 0 8px;
-                                font-size: 12px;
-                                line-height: 1;
-                                border-radius: 4px;
-                                border: none;
-                                cursor: pointer;
-
-                                &:last-child {
-                                    margin-bottom: 0;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /* Time Grid - Week view */
-        .fc-view.fc-timeGridWeek-view {
-
-            .fc-head {
-
-                > tr > .fc-head-container {
-                    border: none;
-
-                    .fc-row {
-
-                        .fc-axis {
-                            width: 48px !important;
-                            border-color: var(--fuse-divider);
-                        }
-
-                        .fc-day-header {
-                            border-color: var(--fuse-divider);
-
-                            span {
-                                display: flex;
-                                flex-direction: column;
-                                align-items: center;
-                                justify-content: center;
-                                width: 100%;
-                                @apply text-secondary;
-
-                                &.fc-weekday {
-                                    padding-top: 16px;
-                                    font-size: 12px;
-                                    letter-spacing: 0.055em;
-                                    text-transform: uppercase;
-                                    font-weight: 400;
-                                }
-
-                                &.fc-date {
-                                    padding-bottom: 12px;
-                                    font-size: 26px;
-                                    font-weight: 300;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            .fc-body {
-
-                > tr > .fc-widget-content {
-                    border: none;
-
-                    .fc-day-grid {
-
-                        .fc-row {
-                            min-height: 0;
-
-                            .fc-bg {
-
-                                .fc-axis {
-                                    width: 48px !important;
-                                    border-color: var(--fuse-divider);
-                                }
-
-                                .fc-day {
-                                    border-color: var(--fuse-divider);
-
-                                    &.fc-today {
-                                        background: none;
-                                    }
-                                }
-                            }
-
-                            .fc-content-skeleton {
-                                padding-bottom: 0;
-
-                                .fc-axis {
-                                    width: 48px !important;
-                                }
-
-                                .fc-event-container {
-
-                                    .fc-day-grid-event {
-                                        display: flex;
-                                        align-items: center;
-                                        height: 22px;
-                                        min-height: 22px;
-                                        max-height: 22px;
-                                        margin: 0 6px 6px 6px;
-                                        padding: 0 8px;
-                                        font-size: 12px;
-                                        line-height: 1;
-                                        border-radius: 4px;
-                                        border: none;
-                                        cursor: pointer;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    .fc-divider {
-                        border: none;
-                        background: var(--fuse-divider);
-                    }
-
-                    .fc-time-grid {
-
-                        .fc-bg {
-
-                            .fc-axis {
-                                border: none;
-                                width: 48px !important;
-
-                                + .fc-day {
-                                    border: none;
-                                }
-                            }
-
-                            .fc-day {
-                                border-color: var(--fuse-divider);
-
-                                &.fc-today {
-                                    background: none;
-                                }
-                            }
-                        }
-
-                        .fc-slats {
-
-                            .fc-axis {
-                                width: 48px !important;
-                                height: 48px;
-                                text-align: center;
-
-                                span {
-                                    font-size: 12px;
-                                    width: 48px;
-                                    min-width: 48px;
-                                }
-                            }
-
-                            .fc-time {
-                                border-color: var(--fuse-divider);
-                            }
-
-                            .fc-widget-content {
-                                border-color: var(--fuse-divider);
-                            }
-                        }
-
-                        .fc-content-skeleton {
-
-                            .fc-axis {
-                                width: 48px !important;
-                            }
-
-                            .fc-event-container {
-                                margin: 0 12px 0 0;
-
-                                .fc-time-grid-event {
-                                    display: flex;
-                                    padding: 8px;
-                                    border-radius: 4px;
-                                    border: none;
-                                    cursor: pointer;
-
-                                    .fc-time,
-                                    .fc-title {
-                                        font-size: 12px;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /* Time Grid - Day view */
-        .fc-view.fc-timeGridDay-view {
-
-            .fc-head {
-
-                > tr > .fc-head-container {
-                    border: none;
-
-                    .fc-row {
-
-                        .fc-axis {
-                            width: 48px !important;
-                            border-color: var(--fuse-divider);
-                        }
-
-                        .fc-day-header {
-                            border-color: var(--fuse-divider);
-
-                            span {
-                                display: flex;
-                                flex-direction: column;
-                                align-items: center;
-                                justify-content: center;
-                                width: 100%;
-                                @apply text-secondary;
-
-                                &.fc-weekday {
-                                    padding-top: 16px;
-                                    font-size: 12px;
-                                    letter-spacing: 0.055em;
-                                    text-transform: uppercase;
-                                    font-weight: 400;
-                                }
-
-                                &.fc-date {
-                                    padding-bottom: 12px;
-                                    font-size: 26px;
-                                    font-weight: 300;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            .fc-body {
-
-                > tr > .fc-widget-content {
-                    border: none;
-
-                    .fc-day-grid {
-
-                        .fc-bg {
-
-                            .fc-axis {
-                                border-color: var(--fuse-divider);
-                            }
-
-                            .fc-day {
-                                border-color: var(--fuse-divider);
-
-                                &.fc-today {
-                                    background: none;
-                                }
-                            }
-                        }
-
-                        .fc-row {
-                            min-height: 0;
-
-                            .fc-bg {
-
-                                .fc-axis {
-                                    width: 48px !important;
-                                }
-                            }
-
-                            .fc-content-skeleton {
-                                padding-bottom: 0;
-
-                                .fc-axis {
-                                    width: 48px !important;
-                                }
-
-                                .fc-event-container {
-
-                                    .fc-day-grid-event {
-                                        display: flex;
-                                        align-items: center;
-                                        height: 22px;
-                                        min-height: 22px;
-                                        max-height: 22px;
-                                        margin: 0 6px 6px 6px;
-                                        padding: 0 8px;
-                                        font-size: 12px;
-                                        line-height: 1;
-                                        border-radius: 4px;
-                                        border: none;
-                                        cursor: pointer;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    .fc-divider {
-                        border: none;
-                        border-color: var(--fuse-divider);
-                    }
-
-                    .fc-time-grid {
-
-                        .fc-bg {
-
-                            .fc-day {
-                                border-color: var(--fuse-divider);
-
-                                &.fc-today {
-                                    background: none;
-                                }
-                            }
-
-                            .fc-axis {
-                                border: none;
-                                width: 48px !important;
-
-                                + .fc-day {
-                                    border: none;
-                                }
-                            }
-                        }
-
-                        .fc-slats {
-
-                            .fc-axis {
-                                width: 48px !important;
-                                height: 48px;
-                                text-align: center;
-
-                                span {
-                                    font-size: 12px;
-                                    width: 48px;
-                                    min-width: 48px;
-                                }
-                            }
-
-                            .fc-time {
-                                border-color: var(--fuse-divider);
-                            }
-
-                            .fc-widget-content {
-                                border-color: var(--fuse-divider);
-                            }
-                        }
-
-                        .fc-content-skeleton {
-
-                            .fc-axis {
-                                width: 48px !important;
-                            }
-
-                            .fc-event-container {
-                                margin: 0 12px 0 0;
-
-                                .fc-time-grid-event {
-                                    display: flex;
-                                    padding: 8px;
-                                    border-radius: 4px;
-                                    border: none;
-                                    cursor: pointer;
-
-                                    .fc-time,
-                                    .fc-title {
-                                        font-size: 12px;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /* List - Year view */
-        .fc-view.fc-listYear-view {
-            border: none;
-
-            .fc-list-table {
-
-                .fc-list-heading {
-                    display: none;
-                }
-
-                .fc-list-item {
-                    display: flex;
-                    cursor: pointer;
-
-                    &:hover {
-
-                        td {
-                            @apply bg-hover;
-                        }
-                    }
-
-                    td {
-                        display: flex;
-                        align-items: center;
-                        width: auto;
-                        height: 48px;
-                        min-height: 48px;
-                        padding: 0 8px;
-                        border-width: 0 0 1px 0;
-                        border-color: var(--fuse-divider);
-
-                        &.fc-list-item-date {
-                            order: 1;
-                            padding-left: 16px;
-                            width: 100px;
-                            min-width: 100px;
-                            max-width: 100px;
-
-                            @screen sm {
-                                width: 120px;
-                                min-width: 120px;
-                                max-width: 120px;
-                            }
-
-                            > span {
-                                display: flex;
-                                align-items: baseline;
-
-                                span {
-
-                                    &:first-child {
-                                        display: flex;
-                                        justify-content: center;
-                                        padding-right: 2px;
-                                        width: 32px;
-                                        min-width: 32px;
-                                        max-width: 32px;
-                                        font-size: 18px;
-
-                                        @screen sm {
-                                            padding-right: 8px;
-                                        }
-
-                                        + span {
-                                            display: flex;
-                                            font-size: 11px;
-                                            font-weight: 500;
-                                            letter-spacing: 0.055em;
-                                            text-transform: uppercase;
-                                            @apply text-secondary;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        &.fc-list-item-time {
-                            flex: 0 0 auto;
-                            order: 3;
-                            width: 120px;
-                            min-width: 120px;
-                            max-width: 120px;
-
-                            @screen sm {
-                                width: 160px;
-                                min-width: 160px;
-                                max-width: 160px;
-                            }
-                        }
-
-                        &.fc-list-item-marker {
-                            flex: 0 0 auto;
-                            order: 2;
-
-                            .fc-event-dot {
-                                width: 12px;
-                                height: 12px;
-                                border-radius: 50%;
-                            }
-                        }
-
-                        &.fc-list-item-title {
-                            flex: 1 1 auto;
-                            order: 4;
-                            padding-right: 24px;
-                            font-weight: 500;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /* Day grid event - Dragging */
-    .fc-day-grid-event {
-
-        &.fc-dragging,
-        &.fc-resizing {
-            display: flex;
-            align-items: center;
-            height: 22px;
-            min-height: 22px;
-            max-height: 22px;
-            margin: 0 6px 4px 6px;
-            padding: 0 8px;
-            font-size: 12px;
-            line-height: 1;
-            border-radius: 4px;
-            border: none;
-        }
-    }
-}

src/@fuse/styles/overrides/quill.scss

@@ -4,11 +4,12 @@
 .ql-toolbar {
     border-radius: 6px 6px 0 0;
     padding: 0 !important;
-    @apply bg-gray-100 border-gray-300;
+    @apply bg-gray-100;
+    @apply border-gray-300 border-opacity-100 #{'!important'};
 
     .dark & {
         background-color: rgba(0, 0, 0, 0.05);
-        @apply border-gray-500;
+        @apply border-gray-500 #{'!important'};
     }
 
     .ql-formats {
@@ -81,26 +82,22 @@
 .ql-container {
     overflow: hidden;
     border-radius: 0 0 6px 6px;
-    @apply border-gray-300 shadow-sm;
+    @apply border-gray-300 border-opacity-100 shadow-sm #{'!important'};
 
     .dark & {
-        @apply border-gray-500;
+        @apply border-gray-500 #{'!important'};
     }
 
     .ql-editor {
         min-height: 160px;
         max-height: 160px;
         height: 160px;
-        @apply bg-gray-50;
+        @apply bg-card;
 
         .dark & {
             background-color: rgba(0, 0, 0, 0.05);
         }
 
-        &:focus {
-            @apply bg-card;
-        }
-
         &.ql-blank::before {
             @apply text-hint;
         }

src/@fuse/styles/themes.scss

@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 @use "sass:map";
 
 /* Include the core Angular Material styles */
@@ -18,81 +18,6 @@
     )
 ));
 
-/* Prepare the Background and Foreground maps */
-$background-light: (
-    status-bar: #CBD5E1, /* blueGray.300 */
-    app-bar: #FFFFFF,
-    background: #F1F5F9, /* blueGray.100 */
-    hover: rgba(148, 163, 184, 0.12), /* blueGray.400 + opacity */
-    card: #FFFFFF,
-    dialog: #FFFFFF,
-    disabled-button: rgba(148, 163, 184, 0.38), /* blueGray.400 + opacity */
-    raised-button: #FFFFFF,
-    focused-button: #64748B, /* blueGray.500 */
-    selected-button: #E2E8F0, /* blueGray.200 */
-    selected-disabled-button: #E2E8F0, /* blueGray.200 */
-    disabled-button-toggle: #CBD5E1, /* blueGray.300 */
-    unselected-chip: #E2E8F0, /* blueGray.200 */
-    disabled-list-option: #CBD5E1, /* blueGray.300 */
-    tooltip: #1E293B /* blueGray.800 */
-);
-
-$background-dark: (
-    status-bar: #0F172A, /* blueGray.900 */
-    app-bar: #0F172A, /* blueGray.900 */
-    background: #0F172A, /* blueGray.900 */
-    hover: rgba(255, 255, 255, 0.05),
-    card: #1E293B, /* blueGray.800 */
-    dialog: #1E293B, /* blueGray.800 */
-    disabled-button: rgba(15, 23, 42, 0.38), /* blueGray.900 + opacity */
-    raised-button: #0F172A, /* blueGray.900 */
-    focused-button: #E2E8F0, /* blueGray.200 */
-    selected-button: rgba(255, 255, 255, 0.05),
-    selected-disabled-button: #1E293B, /* blueGray.800 */
-    disabled-button-toggle: #0F172A, /* blueGray.900 */
-    unselected-chip: #475569, /* blueGray.600 */
-    disabled-list-option: #E2E8F0, /* blueGray.200 */
-    tooltip: #64748B /* blueGray.500 */
-);
-
-$foreground-light: (
-    base: #000000,
-    divider: #E2E8F0, /* blueGray.200 */
-    dividers: #E2E8F0, /* blueGray.200 */
-    disabled: #94A3B8, /* blueGray.400 */
-    disabled-button: #94A3B8, /* blueGray.400 */
-    disabled-text: #94A3B8, /* blueGray.400 */
-    elevation: #000000,
-    hint-text: #94A3B8, /* blueGray.400 */
-    secondary-text: #64748B, /* blueGray.500 */
-    icon: #64748B, /* blueGray.500 */
-    icons: #64748B, /* blueGray.500 */
-    mat-icon: #64748B, /* blueGray.500 */
-    text: #1E293B, /* blueGray.800 */
-    slider-min: #1E293B, /* blueGray.800 */
-    slider-off: #CBD5E1, /* blueGray.300 */
-    slider-off-active: #94A3B8 /* blueGray.400 */
-);
-
-$foreground-dark: (
-    base: #FFFFFF,
-    divider: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
-    dividers: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
-    disabled: #475569, /* blueGray.600 */
-    disabled-button: #1E293B, /* blueGray.800 */
-    disabled-text: #475569, /* blueGray.600 */
-    elevation: #000000,
-    hint-text: #64748B, /* blueGray.500 */
-    secondary-text: #94A3B8, /* blueGray.400 */
-    icon: #F1F5F9, /* blueGray.100 */
-    icons: #F1F5F9, /* blueGray.100 */
-    mat-icon: #94A3B8, /* blueGray.400 */
-    text: #FFFFFF,
-    slider-min: #FFFFFF,
-    slider-off: #64748B, /* blueGray.500 */
-    slider-off-active: #94A3B8 /* blueGray.400 */
-);
-
 /* Generate Primary, Accent and Warn palettes */
 $palettes: ();
 @each $name in (primary, accent, warn) {
@@ -145,8 +70,41 @@ body .light {
             accent: map.get(map.get($base-light-theme, color), accent),
             warn: map.get(map.get($base-light-theme, color), warn),
             is-dark: map.get(map.get($base-light-theme, color), is-dark),
-            foreground: $foreground-light,
-            background: $background-light
+            foreground: (
+                base: #000000,
+                divider: #E2E8F0, /* slate.200 */
+                dividers: #E2E8F0, /* slate.200 */
+                disabled: #94A3B8, /* slate.400 */
+                disabled-button: #94A3B8, /* slate.400 */
+                disabled-text: #94A3B8, /* slate.400 */
+                elevation: #000000,
+                hint-text: #94A3B8, /* slate.400 */
+                secondary-text: #64748B, /* slate.500 */
+                icon: #64748B, /* slate.500 */
+                icons: #64748B, /* slate.500 */
+                mat-icon: #64748B, /* slate.500 */
+                text: #1E293B, /* slate.800 */
+                slider-min: #1E293B, /* slate.800 */
+                slider-off: #CBD5E1, /* slate.300 */
+                slider-off-active: #94A3B8 /* slate.400 */
+            ),
+            background: (
+                status-bar: #CBD5E1, /* slate.300 */
+                app-bar: #FFFFFF,
+                background: #F1F5F9, /* slate.100 */
+                hover: rgba(148, 163, 184, 0.12), /* slate.400 + opacity */
+                card: #FFFFFF,
+                dialog: #FFFFFF,
+                disabled-button: rgba(148, 163, 184, 0.38), /* slate.400 + opacity */
+                raised-button: #FFFFFF,
+                focused-button: #64748B, /* slate.500 */
+                selected-button: #E2E8F0, /* slate.200 */
+                selected-disabled-button: #E2E8F0, /* slate.200 */
+                disabled-button-toggle: #CBD5E1, /* slate.300 */
+                unselected-chip: #E2E8F0, /* slate.200 */
+                disabled-list-option: #CBD5E1, /* slate.300 */
+                tooltip: #1E293B /* slate.800 */
+            )
         )
     );
 
@@ -166,8 +124,41 @@ body .dark {
             accent: map.get(map.get($base-dark-theme, color), accent),
             warn: map.get(map.get($base-dark-theme, color), warn),
             is-dark: map.get(map.get($base-dark-theme, color), is-dark),
-            foreground: $foreground-dark,
-            background: $background-dark
+            foreground: (
+                base: #FFFFFF,
+                divider: rgba(241, 245, 249, 0.12), /* slate.100 + opacity */
+                dividers: rgba(241, 245, 249, 0.12), /* slate.100 + opacity */
+                disabled: #475569, /* slate.600 */
+                disabled-button: #1E293B, /* slate.800 */
+                disabled-text: #475569, /* slate.600 */
+                elevation: #000000,
+                hint-text: #64748B, /* slate.500 */
+                secondary-text: #94A3B8, /* slate.400 */
+                icon: #F1F5F9, /* slate.100 */
+                icons: #F1F5F9, /* slate.100 */
+                mat-icon: #94A3B8, /* slate.400 */
+                text: #FFFFFF,
+                slider-min: #FFFFFF,
+                slider-off: #64748B, /* slate.500 */
+                slider-off-active: #94A3B8 /* slate.400 */
+            ),
+            background: (
+                status-bar: #0F172A, /* slate.900 */
+                app-bar: #0F172A, /* slate.900 */
+                background: #0F172A, /* slate.900 */
+                hover: rgba(255, 255, 255, 0.05),
+                card: #1E293B, /* slate.800 */
+                dialog: #1E293B, /* slate.800 */
+                disabled-button: rgba(15, 23, 42, 0.38), /* slate.900 + opacity */
+                raised-button: #0F172A, /* slate.900 */
+                focused-button: #E2E8F0, /* slate.200 */
+                selected-button: rgba(255, 255, 255, 0.05),
+                selected-disabled-button: #1E293B, /* slate.800 */
+                disabled-button-toggle: #0F172A, /* slate.900 */
+                unselected-chip: #475569, /* slate.600 */
+                disabled-list-option: #E2E8F0, /* slate.200 */
+                tooltip: #64748B /* slate.500 */
+            )
         )
     );
 

src/@fuse/tailwind/plugins/extract-config.js

@@ -1,38 +0,0 @@
-const plugin = require('tailwindcss/plugin');
-const buildMediaQuery = require('tailwindcss/lib/util/buildMediaQuery').default;
-
-const extractConfig = plugin(({
-    addVariant,
-    theme
-}) =>
-{
-    addVariant('fuse-tailwind-extracted-config', ({container}) =>
-    {
-        // Prepare the extracted config variable
-        let extractedConfig = '';
-
-        // Breakpoints
-        Object.entries(theme('screens')).forEach(([key, value]) =>
-        {
-            extractedConfig = `${extractedConfig} --breakpoints-${key}:'${buildMediaQuery(value)}';`;
-        });
-
-        // Themes
-        (theme('fuse.themes')).forEach((value) =>
-        {
-            Object.entries(value).forEach(([key, value]) =>
-            {
-                extractedConfig = `${extractedConfig} --themes-${key}:'${JSON.stringify(value)}';`;
-            });
-        });
-
-        // Append the extracted config
-        container.append(`
-            .fuse-tailwind-extracted-config {
-                ${extractedConfig}
-            }
-        `);
-    });
-});
-
-module.exports = extractConfig;

src/@fuse/tailwind/plugins/icon-size.js

@@ -1,17 +1,14 @@
 const plugin = require('tailwindcss/plugin');
 
-const iconSize = plugin(({
-        addUtilities,
-        theme,
-        e,
-        variants
+module.exports = plugin(
+    ({
+        matchUtilities,
+        theme
     }) =>
     {
-        const values = theme('iconSize');
-
-        addUtilities(
-            Object.entries(values).map(([key, value]) => ({
-                [`.${e(`icon-size-${key}`)}`]: {
+        matchUtilities(
+            {
+                'icon-size': (value) => ({
                     width     : value,
                     height    : value,
                     minWidth  : value,
@@ -22,13 +19,14 @@ const iconSize = plugin(({
                         width : value,
                         height: value
                     }
-                }
-            })),
-            variants('iconSize')
-        );
+                })
+            },
+            {
+                values: theme('iconSize')
+            });
     },
     {
-        theme   : {
+        theme: {
             iconSize: {
                 3  : '0.75rem',
                 3.5: '0.875rem',
@@ -47,10 +45,6 @@ const iconSize = plugin(({
                 22 : '5.5rem',
                 24 : '6rem'
             }
-        },
-        variants: {
-            iconSize: ['responsive']
         }
-    });
-
-module.exports = iconSize;
+    }
+);

src/@fuse/tailwind/plugins/theming.js

@@ -102,7 +102,7 @@ const theming = plugin.withOptions((options) => ({
         // @ Map variable colors
         // -----------------------------------------------------------------------------------------------------
         const mapVariableColors = _.fromPairs(_.map(options.themes, (theme, themeName) => [
-            themeName === 'default' ? 'body' : `body.theme-${e(themeName)}`,
+            themeName === 'default' ? 'body, .theme-default' : `.theme-${e(themeName)}`,
             _.fromPairs(_.flatten(_.map(flattenColorPalette(_.fromPairs(_.flatten(_.map(normalizeTheme(theme), (palette, paletteName) => [
                     [
                         e(paletteName),
@@ -185,47 +185,46 @@ const theming = plugin.withOptions((options) => ({
                             light: {
                                 'bg-app-bar'   : '#FFFFFF',
                                 'bg-card'      : '#FFFFFF',
-                                'bg-default'   : colors.blueGray[100],
+                                'bg-default'   : colors.slate[100],
                                 'bg-dialog'    : '#FFFFFF',
-                                'bg-hover'     : chroma(colors.blueGray[400]).alpha(0.12).css(),
-                                'bg-status-bar': colors.blueGray[300]
+                                'bg-hover'     : chroma(colors.slate[400]).alpha(0.12).css(),
+                                'bg-status-bar': colors.slate[300]
                             },
                             dark : {
-                                'bg-app-bar'   : colors.blueGray[900],
-                                'bg-card'      : colors.blueGray[800],
-                                'bg-default'   : colors.blueGray[900],
-                                'bg-dialog'    : colors.blueGray[800],
+                                'bg-app-bar'   : colors.slate[900],
+                                'bg-card'      : colors.slate[800],
+                                'bg-default'   : colors.slate[900],
+                                'bg-dialog'    : colors.slate[800],
                                 'bg-hover'     : 'rgba(255, 255, 255, 0.05)',
-                                'bg-status-bar': colors.blueGray[900]
+                                'bg-status-bar': colors.slate[900]
                             }
                         },
                         foreground: {
                             light: {
-                                'text-default'  : colors.blueGray[800],
-                                'text-secondary': colors.blueGray[500],
-                                'text-hint'     : colors.blueGray[400],
-                                'text-disabled' : colors.blueGray[400],
-                                'border'        : colors.blueGray[200],
-                                'divider'       : colors.blueGray[200],
-                                'icon'          : colors.blueGray[500],
-                                'mat-icon'      : colors.blueGray[500]
+                                'text-default'  : colors.slate[800],
+                                'text-secondary': colors.slate[500],
+                                'text-hint'     : colors.slate[400],
+                                'text-disabled' : colors.slate[400],
+                                'border'        : colors.slate[200],
+                                'divider'       : colors.slate[200],
+                                'icon'          : colors.slate[500],
+                                'mat-icon'      : colors.slate[500]
                             },
                             dark : {
                                 'text-default'  : '#FFFFFF',
-                                'text-secondary': colors.blueGray[400],
-                                'text-hint'     : colors.blueGray[500],
-                                'text-disabled' : colors.blueGray[600],
-                                'border'        : chroma(colors.blueGray[100]).alpha(0.12).css(),
-                                'divider'       : chroma(colors.blueGray[100]).alpha(0.12).css(),
-                                'icon'          : colors.blueGray[400],
-                                'mat-icon'      : colors.blueGray[400]
+                                'text-secondary': colors.slate[400],
+                                'text-hint'     : colors.slate[500],
+                                'text-disabled' : colors.slate[600],
+                                'border'        : chroma(colors.slate[100]).alpha(0.12).css(),
+                                'divider'       : chroma(colors.slate[100]).alpha(0.12).css(),
+                                'icon'          : colors.slate[400],
+                                'mat-icon'      : colors.slate[400]
                             }
                         }
                     },
                     themes     : generateThemesObject(options.themes)
                 }
-            },
-            variants: {}
+            }
         };
     }
 );

src/@fuse/tailwind/plugins/utilities.js

@@ -1,6 +1,6 @@
 const plugin = require('tailwindcss/plugin');
 
-const utilities = plugin(({
+module.exports = plugin(({
     addComponents
 }) =>
 {
@@ -54,9 +54,6 @@ const utilities = plugin(({
                 '--tw-ring-opacity': '1 !important',
                 '--tw-ring-color'  : 'rgba(var(--fuse-bg-card-rgb), var(--tw-ring-opacity)) !important'
             }
-        },
-        {
-            variants: ['dark', 'responsive', 'group-hover', 'hover']
         }
     );
 
@@ -65,11 +62,6 @@ const utilities = plugin(({
             '.bg-hover': {
                 backgroundColor: 'var(--fuse-bg-hover) !important'
             }
-        },
-        {
-            variants: ['dark', 'group-hover', 'hover']
         }
     );
 });
-
-module.exports = utilities;

src/@fuse/version/fuse-version.ts

@@ -1,3 +1,3 @@
 import { Version } from '@fuse/version/version';
 
-export const FUSE_VERSION = new Version('13.0.3').full;
+export const FUSE_VERSION = new Version('14.2.0').full;

src/app/app.component.scss

@@ -3,4 +3,4 @@
     flex: 1 1 auto;
     width: 100%;
     height: 100%;
-}
+}

src/app/app.module.ts

@@ -14,8 +14,8 @@ import { AppComponent } from 'app/app.component';
 import { appRoutes } from 'app/app.routing';
 
 const routerConfig: ExtraOptions = {
-    scrollPositionRestoration: 'enabled',
-    preloadingStrategy       : PreloadAllModules
+    preloadingStrategy       : PreloadAllModules,
+    scrollPositionRestoration: 'enabled'
 };
 
 @NgModule({

src/app/app.resolvers.ts

@@ -1,9 +1,12 @@
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { forkJoin, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { InitialData } from 'app/app.types';
+import { MessagesService } from 'app/layout/common/messages/messages.service';
+import { NavigationService } from 'app/core/navigation/navigation.service';
+import { NotificationsService } from 'app/layout/common/notifications/notifications.service';
+import { QuickChatService } from 'app/layout/common/quick-chat/quick-chat.service';
+import { ShortcutsService } from 'app/layout/common/shortcuts/shortcuts.service';
+import { UserService } from 'app/core/user/user.service';
 
 @Injectable({
     providedIn: 'root'
@@ -13,7 +16,14 @@ export class InitialDataResolver implements Resolve<any>
     /**
      * Constructor
      */
-    constructor(private _httpClient: HttpClient)
+    constructor(
+        private _messagesService: MessagesService,
+        private _navigationService: NavigationService,
+        private _notificationsService: NotificationsService,
+        private _quickChatService: QuickChatService,
+        private _shortcutsService: ShortcutsService,
+        private _userService: UserService
+    )
     {
     }
 
@@ -27,29 +37,16 @@ export class InitialDataResolver implements Resolve<any>
      * @param route
      * @param state
      */
-    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<InitialData>
+    resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any>
     {
         // Fork join multiple API endpoint calls to wait all of them to finish
         return forkJoin([
-            this._httpClient.get<any>('api/common/messages'),
-            this._httpClient.get<any>('api/common/navigation'),
-            this._httpClient.get<any>('api/common/notifications'),
-            this._httpClient.get<any>('api/common/shortcuts'),
-            this._httpClient.get<any>('api/common/user')
-        ]).pipe(
-            map(([messages, navigation, notifications, shortcuts, user]) => ({
-                    messages,
-                    navigation: {
-                        compact   : navigation.compact,
-                        default   : navigation.default,
-                        futuristic: navigation.futuristic,
-                        horizontal: navigation.horizontal
-                    },
-                    notifications,
-                    shortcuts,
-                    user
-                })
-            )
-        );
+            this._navigationService.get(),
+            this._messagesService.getAll(),
+            this._notificationsService.getAll(),
+            this._quickChatService.getChats(),
+            this._shortcutsService.getAll(),
+            this._userService.get()
+        ]);
     }
 }

src/app/app.routing.ts

@@ -5,7 +5,8 @@ import { LayoutComponent } from 'app/layout/layout.component';
 import { InitialDataResolver } from 'app/app.resolvers';
 
 // @formatter:off
-// tslint:disable:max-line-length
+/* eslint-disable max-len */
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 export const appRoutes: Route[] = [
 
     // Redirect empty path to '/example'

src/app/app.types.ts

@@ -1,19 +0,0 @@
-import { FuseNavigationItem } from '@fuse/components/navigation';
-import { Message } from 'app/layout/common/messages/messages.types';
-import { Notification } from 'app/layout/common/notifications/notifications.types';
-import { Shortcut } from 'app/layout/common/shortcuts/shortcuts.types';
-import { User } from 'app/core/user/user.model';
-
-export interface InitialData
-{
-    messages: Message[];
-    navigation: {
-        compact: FuseNavigationItem[];
-        default: FuseNavigationItem[];
-        futuristic: FuseNavigationItem[];
-        horizontal: FuseNavigationItem[];
-    };
-    notifications: Notification[];
-    shortcuts: Shortcut[];
-    user: User;
-}

src/app/core/auth/auth.interceptor.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { catchError, Observable, throwError } from 'rxjs';
 import { AuthService } from 'app/core/auth/auth.service';
 import { AuthUtils } from 'app/core/auth/auth.utils';
 

src/app/core/auth/auth.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Observable, of, throwError } from 'rxjs';
-import { catchError, switchMap } from 'rxjs/operators';
+import { catchError, Observable, of, switchMap, throwError } from 'rxjs';
 import { AuthUtils } from 'app/core/auth/auth.utils';
 import { UserService } from 'app/core/user/user.service';
 

src/app/core/auth/guards/auth.guard.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, CanLoad, Route, Router, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
-import { Observable, of } from 'rxjs';
+import { Observable, of, switchMap } from 'rxjs';
 import { AuthService } from 'app/core/auth/auth.service';
-import { switchMap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root'

src/app/core/auth/guards/noAuth.guard.ts

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, CanLoad, Route, Router, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
-import { Observable, of } from 'rxjs';
+import { Observable, of, switchMap } from 'rxjs';
 import { AuthService } from 'app/core/auth/auth.service';
-import { switchMap } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root'

src/app/core/config/app.config.ts

@@ -2,7 +2,9 @@ import { Layout } from 'app/layout/layout.types';
 
 // Types
 export type Scheme = 'auto' | 'dark' | 'light';
-export type Theme = 'default' | string;
+export type Screens = { [key: string]: string };
+export type Theme = 'theme-default' | string;
+export type Themes = { id: string; name: string }[];
 
 /**
  * AppConfig interface. Update this interface to strictly type your config
@@ -12,7 +14,9 @@ export interface AppConfig
 {
     layout: Layout;
     scheme: Scheme;
+    screens: Screens;
     theme: Theme;
+    themes: Themes;
 }
 
 /**
@@ -22,9 +26,46 @@ export interface AppConfig
  * If you need to store global configuration for your app, you can use this
  * object to set the defaults. To access, update and reset the config, use
  * FuseConfigService and its methods.
+ *
+ * "Screens" are carried over to the BreakpointObserver for accessing them within
+ * components, and they are required.
+ *
+ * "Themes" are required for Tailwind to generate themes.
  */
 export const appConfig: AppConfig = {
-    layout: 'classy',
-    scheme: 'light',
-    theme : 'default'
+    layout : 'classy',
+    scheme : 'light',
+    screens: {
+        sm: '600px',
+        md: '960px',
+        lg: '1280px',
+        xl: '1440px'
+    },
+    theme  : 'theme-default',
+    themes : [
+        {
+            id  : 'theme-default',
+            name: 'Default'
+        },
+        {
+            id  : 'theme-brand',
+            name: 'Brand'
+        },
+        {
+            id  : 'theme-teal',
+            name: 'Teal'
+        },
+        {
+            id  : 'theme-rose',
+            name: 'Rose'
+        },
+        {
+            id  : 'theme-purple',
+            name: 'Purple'
+        },
+        {
+            id  : 'theme-amber',
+            name: 'Amber'
+        }
+    ]
 };