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

Increased version number

.browserslistrc

@@ -1,17 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-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.

.eslintrc.json

@@ -16,8 +16,7 @@
             ],
             "parserOptions": {
                 "project": [
-                    "tsconfig.json",
+                    "tsconfig.json"
-                    "e2e/tsconfig.json"
                 ],
                 "createDefaultProgram": true
             },
@@ -44,6 +43,7 @@
                     }
                 ],
                 "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-function-return-type": "error",
                 "@typescript-eslint/explicit-member-accessibility": [
                     "off",
                     {

.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
+20

CREDITS

@@ -2,6 +2,9 @@
 // @ 3rd party credits
 // -----------------------------------------------------------------------------------------------------
 
+// Flags
+https://github.com/Yummygum/flagpack-core
+
 // Icons
 Material - https://material.io/tools/icons
 Feather - https://feathericons.com/

README.md

@@ -4,7 +4,7 @@ This project was generated with [Angular CLI](https://github.com/angular/angular
 
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 
@@ -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

@@ -20,7 +20,9 @@
                         "outputPath": "dist/fuse",
                         "index": "src/index.html",
                         "main": "src/main.ts",
-                        "polyfills": "src/polyfills.ts",
+                        "polyfills": [
+                            "zone.js"
+                        ],
                         "tsConfig": "tsconfig.app.json",
                         "inlineStyleLanguage": "scss",
                         "allowedCommonJsDependencies": [
@@ -28,7 +30,9 @@
                             "highlight.js",
                             "crypto-js/enc-utf8",
                             "crypto-js/hmac-sha256",
-                            "crypto-js/enc-base64"
+                            "crypto-js/enc-base64",
+                            "flat",
+                            "quill"
                         ],
                         "assets": [
                             "src/favicon-16x16.png",
@@ -60,19 +64,13 @@
                             "budgets": [
                                 {
                                     "type": "initial",
-                                    "maximumWarning": "5mb",
+                                    "maximumWarning": "3mb",
-                                    "maximumError": "8mb"
+                                    "maximumError": "5mb"
                                 },
                                 {
                                     "type": "anyComponentStyle",
-                                    "maximumWarning": "100kb",
+                                    "maximumWarning": "75kb",
-                                    "maximumError": "150kb"
+                                    "maximumError": "90kb"
-                                }
-                            ],
-                            "fileReplacements": [
-                                {
-                                    "replace": "src/environments/environment.ts",
-                                    "with": "src/environments/environment.prod.ts"
                                 }
                             ],
                             "outputHashing": "all"
@@ -92,10 +90,10 @@
                     "builder": "@angular-devkit/build-angular:dev-server",
                     "configurations": {
                         "production": {
-                            "browserTarget": "fuse:build:production"
+                          "buildTarget": "fuse:build:production"
                         },
                         "development": {
-                            "browserTarget": "fuse:build:development"
+                          "buildTarget": "fuse:build:development"
                         }
                     },
                     "defaultConfiguration": "development"
@@ -103,16 +101,17 @@
                 "extract-i18n": {
                     "builder": "@angular-devkit/build-angular:extract-i18n",
                     "options": {
-                        "browserTarget": "fuse:build"
+                      "buildTarget": "fuse:build"
                     }
                 },
                 "test": {
                     "builder": "@angular-devkit/build-angular:karma",
                     "options": {
-                        "main": "src/test.ts",
+                        "polyfills": [
-                        "polyfills": "src/polyfills.ts",
+                            "zone.js",
+                            "zone.js/testing"
+                        ],
                         "tsConfig": "tsconfig.spec.json",
-                        "karmaConfig": "karma.conf.js",
                         "inlineStyleLanguage": "scss",
                         "assets": [
                             "src/favicon-16x16.png",
@@ -120,37 +119,12 @@
                             "src/assets"
                         ],
                         "styles": [
-                            "src/styles.scss"
+                            "src/styles/styles.scss"
                         ],
                         "scripts": []
                     }
-                },
-                "lint": {
-                    "builder": "@angular-eslint/builder:lint",
-                    "options": {
-                        "lintFilePatterns": [
-                            "src/**/*.ts",
-                            "src/**/*.html"
-                        ]
-                    }
-                },
-                "e2e": {
-                    "builder": "@angular-devkit/build-angular:protractor",
-                    "options": {
-                        "protractorConfig": "e2e/protractor.conf.js",
-                        "devServerTarget": "fuse:serve"
-                    },
-                    "configurations": {
-                        "production": {
-                            "devServerTarget": "fuse:serve:production"
-                        }
-                    }
                 }
             }
         }
-    },
-    "defaultProject": "fuse",
-    "cli": {
-        "defaultCollection": "@angular-eslint/schematics"
     }
 }

karma.conf.js

@@ -1,45 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config)
-{
-    config.set({
-        basePath           : '',
-        frameworks         : ['jasmine', '@angular-devkit/build-angular'],
-        plugins            : [
-            require('karma-jasmine'),
-            require('karma-chrome-launcher'),
-            require('karma-jasmine-html-reporter'),
-            require('karma-coverage'),
-            require('@angular-devkit/build-angular/plugins/karma')
-        ],
-        client             : {
-            jasmine     : {
-                // you can add configuration options for Jasmine here
-                // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
-                // for example, you can disable the random execution with `random: false`
-                // or set a specific seed with `seed: 4321`
-            },
-            clearContext: false // leave Jasmine Spec Runner output visible in browser
-        },
-        jasmineHtmlReporter: {
-            suppressAll: true // removes the duplicated traces
-        },
-        coverageReporter   : {
-            dir      : require('path').join(__dirname, './coverage/angular12'),
-            subdir   : '.',
-            reporters: [
-                {type: 'html'},
-                {type: 'text-summary'}
-            ]
-        },
-        reporters          : ['progress', 'kjhtml'],
-        port               : 9876,
-        colors             : true,
-        logLevel           : config.LOG_INFO,
-        autoWatch          : true,
-        browsers           : ['Chrome'],
-        singleRun          : false,
-        restartOnFileChange: true
-    });
-};

package.json

@@ -1,91 +1,66 @@
 {
-    "name": "@fuse/demo",
+    "name": "fuse-angular",
-    "version": "13.0.0",
+    "version": "19.0.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",
-        "test": "ng test",
+        "watch": "ng build --watch --configuration development",
-        "lint": "ng lint",
+        "test": "ng test"
-        "e2e": "ng e2e"
     },
     "dependencies": {
-        "@angular/animations": "12.0.0",
+        "@angular/animations": "17.0.3",
-        "@angular/cdk": "12.0.0",
+        "@angular/cdk": "17.0.1",
-        "@angular/common": "12.0.0",
+        "@angular/common": "17.0.3",
-        "@angular/compiler": "12.0.0",
+        "@angular/compiler": "17.0.3",
-        "@angular/core": "12.0.0",
+        "@angular/core": "17.0.3",
-        "@angular/forms": "12.0.0",
+        "@angular/forms": "17.0.3",
-        "@angular/material": "12.0.0",
+        "@angular/material": "17.0.1",
-        "@angular/material-moment-adapter": "12.0.0",
+        "@angular/material-luxon-adapter": "17.0.1",
-        "@angular/platform-browser": "12.0.0",
+        "@angular/platform-browser": "17.0.3",
-        "@angular/platform-browser-dynamic": "12.0.0",
+        "@angular/platform-browser-dynamic": "17.0.3",
-        "@angular/router": "12.0.0",
+        "@angular/router": "17.0.3",
-        "@fullcalendar/angular": "4.4.5-beta",
+        "@ngneat/transloco": "6.0.0",
-        "@fullcalendar/core": "4.4.2",
+        "apexcharts": "3.44.0",
-        "@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",
-        "apexcharts": "3.26.2",
         "crypto-js": "3.3.0",
-        "highlight.js": "10.7.2",
+        "highlight.js": "11.9.0",
         "lodash-es": "4.17.21",
-        "moment": "2.29.1",
+        "luxon": "3.4.4",
-        "ng-apexcharts": "1.5.9",
+        "ng-apexcharts": "1.8.0",
-        "ngx-markdown": "11.1.3",
+        "ngx-quill": "24.0.2",
-        "ngx-quill": "14.0.0",
+        "perfect-scrollbar": "1.5.5",
-        "perfect-scrollbar": "1.5.1",
         "quill": "1.3.7",
-        "rrule": "2.6.8",
+        "rxjs": "7.8.1",
-        "rxjs": "6.6.7",
+        "tslib": "2.6.2",
-        "tslib": "2.2.0",
+        "zone.js": "0.14.2"
-        "web-animations-js": "2.3.2",
-        "zone.js": "0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "12.0.0",
+        "@angular-devkit/build-angular": "17.0.1",
-        "@angular-eslint/builder": "12.0.0",
+        "@angular/cli": "17.0.1",
-        "@angular-eslint/eslint-plugin": "12.0.0",
+        "@angular/compiler-cli": "17.0.3",
-        "@angular-eslint/eslint-plugin-template": "12.0.0",
+        "@tailwindcss/typography": "0.5.10",
-        "@angular-eslint/schematics": "12.0.0",
+        "@types/chroma-js": "2.4.3",
-        "@angular-eslint/template-parser": "12.0.0",
-        "@angular/cli": "12.0.0",
-        "@angular/compiler-cli": "12.0.0",
-        "@angular/language-service": "12.0.0",
-        "@tailwindcss/aspect-ratio": "0.2.0",
-        "@tailwindcss/line-clamp": "0.2.0",
-        "@tailwindcss/typography": "0.4.0",
-        "@types/chroma-js": "2.1.3",
         "@types/crypto-js": "3.1.47",
         "@types/highlight.js": "10.1.0",
-        "@types/jasmine": "3.6.11",
+        "@types/jasmine": "5.1.2",
-        "@types/lodash": "4.14.169",
+        "@types/lodash": "4.14.201",
-        "@types/lodash-es": "4.17.4",
+        "@types/lodash-es": "4.17.11",
-        "@types/node": "12.20.13",
+        "@types/luxon": "3.3.4",
-        "@typescript-eslint/eslint-plugin": "4.23.0",
+        "autoprefixer": "10.4.16",
-        "@typescript-eslint/parser": "4.23.0",
+        "chroma-js": "2.4.2",
-        "autoprefixer": "10.2.5",
+        "jasmine-core": "5.1.1",
-        "chroma-js": "2.1.1",
+        "karma": "6.4.2",
-        "eslint": "7.26.0",
+        "karma-chrome-launcher": "3.2.0",
-        "eslint-plugin-import": "2.23.0",
+        "karma-coverage": "2.2.1",
-        "eslint-plugin-jsdoc": "34.2.2",
+        "karma-jasmine": "5.1.0",
-        "eslint-plugin-prefer-arrow": "1.2.3",
+        "karma-jasmine-html-reporter": "2.0.0",
-        "jasmine-core": "3.7.1",
-        "jasmine-spec-reporter": "5.0.2",
-        "karma": "6.3.2",
-        "karma-chrome-launcher": "3.1.0",
-        "karma-coverage": "2.0.3",
-        "karma-jasmine": "4.0.1",
-        "karma-jasmine-html-reporter": "1.6.0",
         "lodash": "4.17.21",
-        "postcss": "8.2.15",
+        "postcss": "8.4.31",
-        "protractor": "7.0.0",
+        "tailwindcss": "3.3.5",
-        "tailwindcss": "2.1.2",
+        "typescript": "5.2.2"
-        "typescript": "4.2.4"
     }
 }

src/@fuse/animations/expand-collapse.ts

@@ -8,12 +8,12 @@ const expandCollapse = trigger('expandCollapse',
     [
         state('void, collapsed',
             style({
-                height: '0'
+                height: '0',
-            })
+            }),
         ),
 
         state('*, expanded',
-            style('*')
+            style('*'),
         ),
 
         // Prevent the transition if the state is false
@@ -24,11 +24,11 @@ const expandCollapse = trigger('expandCollapse',
             animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 export { expandCollapse };

src/@fuse/animations/fade.ts

@@ -8,14 +8,14 @@ const fadeIn = trigger('fadeIn',
     [
         state('void',
             style({
-                opacity: 0
+                opacity: 0,
-            })
+            }),
         ),
 
         state('*',
             style({
-                opacity: 1
+                opacity: 1,
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -25,11 +25,11 @@ const fadeIn = trigger('fadeIn',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -40,15 +40,15 @@ const fadeInTop = trigger('fadeInTop',
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(0, -100%, 0)'
+                transform: 'translate3d(0, -100%, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -58,11 +58,11 @@ const fadeInTop = trigger('fadeInTop',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -73,15 +73,15 @@ const fadeInBottom = trigger('fadeInBottom',
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(0, 100%, 0)'
+                transform: 'translate3d(0, 100%, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -91,11 +91,11 @@ const fadeInBottom = trigger('fadeInBottom',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -106,15 +106,15 @@ const fadeInLeft = trigger('fadeInLeft',
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(-100%, 0, 0)'
+                transform: 'translate3d(-100%, 0, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -124,11 +124,11 @@ const fadeInLeft = trigger('fadeInLeft',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -139,15 +139,15 @@ const fadeInRight = trigger('fadeInRight',
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(100%, 0, 0)'
+                transform: 'translate3d(100%, 0, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -157,11 +157,11 @@ const fadeInRight = trigger('fadeInRight',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -171,14 +171,14 @@ const fadeOut = trigger('fadeOut',
     [
         state('*',
             style({
-                opacity: 1
+                opacity: 1,
-            })
+            }),
         ),
 
         state('void',
             style({
-                opacity: 0
+                opacity: 0,
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -188,11 +188,11 @@ const fadeOut = trigger('fadeOut',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -203,15 +203,15 @@ const fadeOutTop = trigger('fadeOutTop',
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(0, -100%, 0)'
+                transform: 'translate3d(0, -100%, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -221,11 +221,11 @@ const fadeOutTop = trigger('fadeOutTop',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -236,15 +236,15 @@ const fadeOutBottom = trigger('fadeOutBottom',
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(0, 100%, 0)'
+                transform: 'translate3d(0, 100%, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -254,11 +254,11 @@ const fadeOutBottom = trigger('fadeOutBottom',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -269,15 +269,15 @@ const fadeOutLeft = trigger('fadeOutLeft',
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(-100%, 0, 0)'
+                transform: 'translate3d(-100%, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -287,11 +287,11 @@ const fadeOutLeft = trigger('fadeOutLeft',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -302,15 +302,15 @@ const fadeOutRight = trigger('fadeOutRight',
         state('*',
             style({
                 opacity  : 1,
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
                 opacity  : 0,
-                transform: 'translate3d(100%, 0, 0)'
+                transform: 'translate3d(100%, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -320,11 +320,11 @@ const fadeOutRight = trigger('fadeOutRight',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 export { fadeIn, fadeInTop, fadeInBottom, fadeInLeft, fadeInRight, fadeOut, fadeOutTop, fadeOutBottom, fadeOutLeft, fadeOutRight };

src/@fuse/animations/index.ts

@@ -1 +1 @@
-export * from './public-api';
+export * from '@fuse/animations/public-api';

src/@fuse/animations/public-api.ts

@@ -1,8 +1,8 @@
-import { expandCollapse } from './expand-collapse';
+import { expandCollapse } from '@fuse/animations/expand-collapse';
-import { fadeIn, fadeInBottom, fadeInLeft, fadeInRight, fadeInTop, fadeOut, fadeOutBottom, fadeOutLeft, fadeOutRight, fadeOutTop } from './fade';
+import { fadeIn, fadeInBottom, fadeInLeft, fadeInRight, fadeInTop, fadeOut, fadeOutBottom, fadeOutLeft, fadeOutRight, fadeOutTop } from '@fuse/animations/fade';
-import { shake } from './shake';
+import { shake } from '@fuse/animations/shake';
-import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from './slide';
+import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from '@fuse/animations/slide';
-import { zoomIn, zoomOut } from './zoom';
+import { zoomIn, zoomOut } from '@fuse/animations/zoom';
 
 export const fuseAnimations = [
     expandCollapse,
@@ -11,5 +11,5 @@ export const fuseAnimations = [
     shake,
     slideInTop, slideInBottom, slideInLeft, slideInRight,
     slideOutTop, slideOutBottom, slideOutLeft, slideOutRight,
-    zoomIn, zoomOut
+    zoomIn, zoomOut,
 ];

src/@fuse/animations/shake.ts

@@ -16,58 +16,58 @@ const shake = trigger('shake',
                     keyframes([
                         style({
                             transform: 'translate3d(0, 0, 0)',
-                            offset   : 0
+                            offset   : 0,
                         }),
                         style({
                             transform: 'translate3d(-10px, 0, 0)',
-                            offset   : 0.1
+                            offset   : 0.1,
                         }),
                         style({
                             transform: 'translate3d(10px, 0, 0)',
-                            offset   : 0.2
+                            offset   : 0.2,
                         }),
                         style({
                             transform: 'translate3d(-10px, 0, 0)',
-                            offset   : 0.3
+                            offset   : 0.3,
                         }),
                         style({
                             transform: 'translate3d(10px, 0, 0)',
-                            offset   : 0.4
+                            offset   : 0.4,
                         }),
                         style({
                             transform: 'translate3d(-10px, 0, 0)',
-                            offset   : 0.5
+                            offset   : 0.5,
                         }),
                         style({
                             transform: 'translate3d(10px, 0, 0)',
-                            offset   : 0.6
+                            offset   : 0.6,
                         }),
                         style({
                             transform: 'translate3d(-10px, 0, 0)',
-                            offset   : 0.7
+                            offset   : 0.7,
                         }),
                         style({
                             transform: 'translate3d(10px, 0, 0)',
-                            offset   : 0.8
+                            offset   : 0.8,
                         }),
                         style({
                             transform: 'translate3d(-10px, 0, 0)',
-                            offset   : 0.9
+                            offset   : 0.9,
                         }),
                         style({
                             transform: 'translate3d(0, 0, 0)',
-                            offset   : 1
+                            offset   : 1,
-                        })
+                        }),
-                    ])
+                    ]),
-                )
+                ),
             ],
             {
                 params: {
-                    timings: '0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955)'
+                    timings: '0.8s cubic-bezier(0.455, 0.03, 0.515, 0.955)',
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 export { shake };

src/@fuse/animations/slide.ts

@@ -8,14 +8,14 @@ const slideInTop = trigger('slideInTop',
     [
         state('void',
             style({
-                transform: 'translate3d(0, -100%, 0)'
+                transform: 'translate3d(0, -100%, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -25,11 +25,11 @@ const slideInTop = trigger('slideInTop',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -39,14 +39,14 @@ const slideInBottom = trigger('slideInBottom',
     [
         state('void',
             style({
-                transform: 'translate3d(0, 100%, 0)'
+                transform: 'translate3d(0, 100%, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -56,11 +56,11 @@ const slideInBottom = trigger('slideInBottom',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -70,14 +70,14 @@ const slideInLeft = trigger('slideInLeft',
     [
         state('void',
             style({
-                transform: 'translate3d(-100%, 0, 0)'
+                transform: 'translate3d(-100%, 0, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -87,11 +87,11 @@ const slideInLeft = trigger('slideInLeft',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -101,14 +101,14 @@ const slideInRight = trigger('slideInRight',
     [
         state('void',
             style({
-                transform: 'translate3d(100%, 0, 0)'
+                transform: 'translate3d(100%, 0, 0)',
-            })
+            }),
         ),
 
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -118,11 +118,11 @@ const slideInRight = trigger('slideInRight',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -132,14 +132,14 @@ const slideOutTop = trigger('slideOutTop',
     [
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
-                transform: 'translate3d(0, -100%, 0)'
+                transform: 'translate3d(0, -100%, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -149,11 +149,11 @@ const slideOutTop = trigger('slideOutTop',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -163,14 +163,14 @@ const slideOutBottom = trigger('slideOutBottom',
     [
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
-                transform: 'translate3d(0, 100%, 0)'
+                transform: 'translate3d(0, 100%, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -180,11 +180,11 @@ const slideOutBottom = trigger('slideOutBottom',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -194,14 +194,14 @@ const slideOutLeft = trigger('slideOutLeft',
     [
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
-                transform: 'translate3d(-100%, 0, 0)'
+                transform: 'translate3d(-100%, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -211,11 +211,11 @@ const slideOutLeft = trigger('slideOutLeft',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -225,14 +225,14 @@ const slideOutRight = trigger('slideOutRight',
     [
         state('*',
             style({
-                transform: 'translate3d(0, 0, 0)'
+                transform: 'translate3d(0, 0, 0)',
-            })
+            }),
         ),
 
         state('void',
             style({
-                transform: 'translate3d(100%, 0, 0)'
+                transform: 'translate3d(100%, 0, 0)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -242,11 +242,11 @@ const slideOutRight = trigger('slideOutRight',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 export { slideInTop, slideInBottom, slideInLeft, slideInRight, slideOutTop, slideOutBottom, slideOutLeft, slideOutRight };

src/@fuse/animations/zoom.ts

@@ -10,15 +10,15 @@ const zoomIn = trigger('zoomIn',
         state('void',
             style({
                 opacity  : 0,
-                transform: 'scale(0.5)'
+                transform: 'scale(0.5)',
-            })
+            }),
         ),
 
         state('*',
             style({
                 opacity  : 1,
-                transform: 'scale(1)'
+                transform: 'scale(1)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -28,11 +28,11 @@ const zoomIn = trigger('zoomIn',
         transition('void => *', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
+                    timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 // -----------------------------------------------------------------------------------------------------
@@ -44,15 +44,15 @@ const zoomOut = trigger('zoomOut',
         state('*',
             style({
                 opacity  : 1,
-                transform: 'scale(1)'
+                transform: 'scale(1)',
-            })
+            }),
         ),
 
         state('void',
             style({
                 opacity  : 0,
-                transform: 'scale(0.5)'
+                transform: 'scale(0.5)',
-            })
+            }),
         ),
 
         // Prevent the transition if the state is false
@@ -62,11 +62,11 @@ const zoomOut = trigger('zoomOut',
         transition('* => void', animate('{{timings}}'),
             {
                 params: {
-                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
+                    timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`,
-                }
+                },
-            }
+            },
-        )
+        ),
-    ]
+    ],
 );
 
 export { zoomIn, zoomOut };

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

@@ -48,7 +48,7 @@
 
             <mat-icon
                 *ngIf="type === 'warning'"
-                [svgIcon]="'heroicons_solid:exclamation'"></mat-icon>
+                [svgIcon]="'heroicons_solid:exclamation-triangle'"></mat-icon>
 
             <mat-icon
                 *ngIf="type === 'error'"
@@ -76,7 +76,7 @@
         class="fuse-alert-dismiss-button"
         mat-icon-button
         (click)="dismiss()">
-        <mat-icon [svgIcon]="'heroicons_solid:x'"></mat-icon>
+        <mat-icon [svgIcon]="'heroicons_solid:x-mark'"></mat-icon>
     </button>
 
 </div>

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

@@ -1,11 +1,13 @@
-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 { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
+import { NgIf } from '@angular/common';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
 import { fuseAnimations } from '@fuse/animations';
-import { FuseAlertAppearance, FuseAlertType } from '@fuse/components/alert/alert.types';
 import { FuseAlertService } from '@fuse/components/alert/alert.service';
+import { FuseAlertAppearance, FuseAlertType } from '@fuse/components/alert/alert.types';
 import { FuseUtilsService } from '@fuse/services/utils/utils.service';
+import { filter, Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-alert',
@@ -14,7 +16,9 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
     encapsulation  : ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
     animations     : fuseAnimations,
-    exportAs       : 'fuseAlert'
+    exportAs       : 'fuseAlert',
+    standalone     : true,
+    imports        : [NgIf, MatIconModule, MatButtonModule],
 })
 export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
 {
@@ -40,7 +44,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
         private _fuseAlertService: FuseAlertService,
-        private _fuseUtilsService: FuseUtilsService
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
     }
@@ -54,6 +58,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
      */
     @HostBinding('class') get classList(): any
     {
+        /* eslint-disable @typescript-eslint/naming-convention */
         return {
             'fuse-alert-appearance-border' : this.appearance === 'border',
             'fuse-alert-appearance-fill'   : this.appearance === 'fill',
@@ -69,8 +74,9 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
             'fuse-alert-type-info'         : this.type === 'info',
             'fuse-alert-type-success'      : this.type === 'success',
             'fuse-alert-type-warning'      : this.type === 'warning',
-            'fuse-alert-type-error'        : this.type === 'error'
+            'fuse-alert-type-error'        : this.type === 'error',
         };
+        /* eslint-enable @typescript-eslint/naming-convention */
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -118,10 +124,10 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
         this._fuseAlertService.onDismiss
             .pipe(
                 filter(name => this.name === name),
-                takeUntil(this._unsubscribeAll)
+                takeUntil(this._unsubscribeAll),
             )
-            .subscribe(() => {
+            .subscribe(() =>
-
+            {
                 // Dismiss the alert
                 this.dismiss();
             });
@@ -130,10 +136,10 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
         this._fuseAlertService.onShow
             .pipe(
                 filter(name => this.name === name),
-                takeUntil(this._unsubscribeAll)
+                takeUntil(this._unsubscribeAll),
             )
-            .subscribe(() => {
+            .subscribe(() =>
-
+            {
                 // Show the alert
                 this.show();
             });
@@ -145,7 +151,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/alert/alert.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
-import { FuseAlertComponent } from '@fuse/components/alert/alert.component';
-
-@NgModule({
-    declarations: [
-        FuseAlertComponent
-    ],
-    imports     : [
-        CommonModule,
-        MatButtonModule,
-        MatIconModule
-    ],
-    exports     : [
-        FuseAlertComponent
-    ]
-})
-export class FuseAlertModule
-{
-}

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, ReplaySubject } from 'rxjs';
 
-@Injectable({
+@Injectable({providedIn: 'root'})
-    providedIn: 'root'
-})
 export class FuseAlertService
 {
     private readonly _onDismiss: ReplaySubject<string> = new ReplaySubject<string>(1);

src/@fuse/components/alert/public-api.ts

@@ -1,4 +1,3 @@
 export * from '@fuse/components/alert/alert.component';
-export * from '@fuse/components/alert/alert.module';
 export * from '@fuse/components/alert/alert.service';
 export * from '@fuse/components/alert/alert.types';

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

@@ -1,5 +1,6 @@
-import { Component, HostBinding, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
+import { NgIf } from '@angular/common';
+import { Component, HostBinding, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { fuseAnimations } from '@fuse/animations';
 import { FuseCardFace } from '@fuse/components/card/card.types';
 
@@ -9,7 +10,9 @@ import { FuseCardFace } from '@fuse/components/card/card.types';
     styleUrls    : ['./card.component.scss'],
     encapsulation: ViewEncapsulation.None,
     animations   : fuseAnimations,
-    exportAs     : 'fuseCard'
+    exportAs     : 'fuseCard',
+    standalone   : true,
+    imports      : [NgIf],
 })
 export class FuseCardComponent implements OnChanges
 {
@@ -38,12 +41,14 @@ export class FuseCardComponent implements OnChanges
      */
     @HostBinding('class') get classList(): any
     {
+        /* eslint-disable @typescript-eslint/naming-convention */
         return {
             'fuse-card-expanded'  : this.expanded,
             'fuse-card-face-back' : this.flippable && this.face === 'back',
             'fuse-card-face-front': this.flippable && this.face === 'front',
-            'fuse-card-flippable' : this.flippable
+            'fuse-card-flippable' : this.flippable,
         };
+        /* eslint-enable @typescript-eslint/naming-convention */
     }
 
     // -----------------------------------------------------------------------------------------------------

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

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FuseCardComponent } from '@fuse/components/card/card.component';
-
-@NgModule({
-    declarations: [
-        FuseCardComponent
-    ],
-    imports     : [
-        CommonModule
-    ],
-    exports     : [
-        FuseCardComponent
-    ]
-})
-export class FuseCardModule
-{
-}

src/@fuse/components/card/public-api.ts

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

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 = () => {
-        };
-        this._onTouched = () => {
-        };
-        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 = () => {
-        };
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ 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;
+    width: var(--fuse-drawer-width);
-    min-width: #{$fuse-drawer-width}px;
+    min-width: var(--fuse-drawer-width);
-    max-width: #{$fuse-drawer-width}px;
+    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

@@ -1,16 +1,17 @@
-import { Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, Renderer2, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
-import { FuseDrawerMode, FuseDrawerPosition } from '@fuse/components/drawer/drawer.types';
-import { FuseDrawerService } from '@fuse/components/drawer/drawer.service';
-import { FuseUtilsService } from '@fuse/services/utils/utils.service';
 import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
+import { Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, Renderer2, SimpleChanges, ViewEncapsulation } from '@angular/core';
+import { FuseDrawerService } from '@fuse/components/drawer/drawer.service';
+import { FuseDrawerMode, FuseDrawerPosition } from '@fuse/components/drawer/drawer.types';
+import { FuseUtilsService } from '@fuse/services/utils/utils.service';
 
 @Component({
     selector     : 'fuse-drawer',
     templateUrl  : './drawer.component.html',
     styleUrls    : ['./drawer.component.scss'],
     encapsulation: ViewEncapsulation.None,
-    exportAs     : 'fuseDrawer'
+    exportAs     : 'fuseDrawer',
+    standalone   : true,
 })
 export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
 {
@@ -32,6 +33,7 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
     @Output() readonly positionChanged: EventEmitter<FuseDrawerPosition> = new EventEmitter<FuseDrawerPosition>();
 
     private _animationsEnabled: boolean = false;
+    private readonly _handleOverlayClick: any;
     private _hovered: boolean = false;
     private _overlay: HTMLElement;
     private _player: AnimationPlayer;
@@ -44,9 +46,13 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
         private _elementRef: ElementRef,
         private _renderer2: Renderer2,
         private _fuseDrawerService: FuseDrawerService,
-        private _fuseUtilsService: FuseUtilsService
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
+        this._handleOverlayClick = (): void =>
+        {
+            this.close();
+        };
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -58,14 +64,16 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
      */
     @HostBinding('class') get classList(): any
     {
+        /* eslint-disable @typescript-eslint/naming-convention */
         return {
             'fuse-drawer-animations-enabled'         : this._animationsEnabled,
             'fuse-drawer-fixed'                      : this.fixed,
             'fuse-drawer-hover'                      : this._hovered,
             [`fuse-drawer-mode-${this.mode}`]        : true,
             'fuse-drawer-opened'                     : this.opened,
-            [`fuse-drawer-position-${this.position}`]: true
+            [`fuse-drawer-position-${this.position}`]: true,
         };
+        /* eslint-enable @typescript-eslint/naming-convention */
     }
 
     /**
@@ -74,7 +82,7 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
     @HostBinding('style') get styleList(): any
     {
         return {
-            'visibility': this.opened ? 'visible' : 'hidden'
+            'visibility': this.opened ? 'visible' : 'hidden',
         };
     }
 
@@ -167,7 +175,8 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
             // Enable the animations after a delay
             // The delay must be bigger than the current transition-duration
             // to make sure nothing will be animated while the mode is changing
-            setTimeout(() => {
+            setTimeout(() =>
+            {
                 this._enableAnimations();
             }, 500);
         }
@@ -211,6 +220,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);
     }
@@ -312,12 +327,6 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
         // Create the backdrop element
         this._overlay = this._renderer2.createElement('div');
 
-        // Return if overlay couldn't be create for some reason
-        if ( !this._overlay )
-        {
-            return;
-        }
-
         // Add a class to the backdrop element
         this._overlay.classList.add('fuse-drawer-overlay');
 
@@ -336,18 +345,17 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
         // Append the backdrop to the parent of the drawer
         this._renderer2.appendChild(this._elementRef.nativeElement.parentElement, this._overlay);
 
-        // Create the enter animation and attach it to the player
+        // Create enter animation and attach it to the player
         this._player = this._animationBuilder.build([
-            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1}))
+            style({opacity: 0}),
+            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1})),
         ]).create(this._overlay);
 
         // Play the animation
         this._player.play();
 
         // Add an event listener to the overlay
-        this._overlay.addEventListener('click', () => {
+        this._overlay.addEventListener('click', this._handleOverlayClick);
-            this.close();
-        });
     }
 
     /**
@@ -364,19 +372,22 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
 
         // Create the leave animation and attach it to the player
         this._player = this._animationBuilder.build([
-            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0}))
+            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0})),
         ]).create(this._overlay);
 
         // Play the animation
         this._player.play();
 
         // Once the animation is done...
-        this._player.onDone(() => {
+        this._player.onDone(() =>
-
+        {
-            // If the backdrop still exists...
+            // If the overlay still exists...
             if ( this._overlay )
             {
-                // Remove the backdrop
+                // Remove the event listener
+                this._overlay.removeEventListener('click', this._handleOverlayClick);
+
+                // Remove the overlay
                 this._overlay.parentNode.removeChild(this._overlay);
                 this._overlay = null;
             }

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

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FuseDrawerComponent } from '@fuse/components/drawer/drawer.component';
-
-@NgModule({
-    declarations: [
-        FuseDrawerComponent
-    ],
-    imports     : [
-        CommonModule
-    ],
-    exports     : [
-        FuseDrawerComponent
-    ]
-})
-export class FuseDrawerModule
-{
-}

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
 import { FuseDrawerComponent } from '@fuse/components/drawer/drawer.component';
 
-@Injectable({
+@Injectable({providedIn: 'root'})
-    providedIn: 'root'
-})
 export class FuseDrawerService
 {
     private _componentRegistry: Map<string, FuseDrawerComponent> = new Map<string, FuseDrawerComponent>();

src/@fuse/components/drawer/public-api.ts

@@ -1,4 +1,3 @@
 export * from '@fuse/components/drawer/drawer.component';
-export * from '@fuse/components/drawer/drawer.module';
 export * from '@fuse/components/drawer/drawer.service';
 export * from '@fuse/components/drawer/drawer.types';

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-pointing-out'"></mat-icon>
+</ng-template>

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

@@ -1,5 +1,8 @@
-import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewEncapsulation } from '@angular/core';
+import { DOCUMENT, NgTemplateOutlet } from '@angular/common';
-import { DOCUMENT } from '@angular/common';
+import { ChangeDetectionStrategy, Component, Inject, Input, OnInit, TemplateRef, ViewEncapsulation } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
 import { FSDocument, FSDocumentElement } from '@fuse/components/fullscreen/fullscreen.types';
 
 @Component({
@@ -7,10 +10,14 @@ import { FSDocument, FSDocumentElement } from '@fuse/components/fullscreen/fulls
     templateUrl    : './fullscreen.component.html',
     encapsulation  : ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    exportAs       : 'fuseFullscreen'
+    exportAs       : 'fuseFullscreen',
+    standalone     : true,
+    imports        : [MatButtonModule, MatTooltipModule, NgTemplateOutlet, MatIconModule],
 })
 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

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-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';
-
-@NgModule({
-    declarations: [
-        FuseFullscreenComponent
-    ],
-    imports     : [
-        MatButtonModule,
-        MatIconModule,
-        MatTooltipModule
-    ],
-    exports     : [
-        FuseFullscreenComponent
-    ]
-})
-export class FuseFullscreenModule
-{
-}

src/@fuse/components/fullscreen/public-api.ts

@@ -1,3 +1,2 @@
 export * from '@fuse/components/fullscreen/fullscreen.component';
-export * from '@fuse/components/fullscreen/fullscreen.module';
 export * from '@fuse/components/fullscreen/fullscreen.types';

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

@@ -1,3 +1,4 @@
+import { NgClass } from '@angular/common';
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EmbeddedViewRef, Input, OnChanges, Renderer2, SecurityContext, SimpleChanges, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { FuseHighlightService } from '@fuse/components/highlight/highlight.service';
@@ -8,7 +9,9 @@ import { FuseHighlightService } from '@fuse/components/highlight/highlight.servi
     styleUrls      : ['./highlight.component.scss'],
     encapsulation  : ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    exportAs       : 'fuseHighlight'
+    exportAs       : 'fuseHighlight',
+    standalone     : true,
+    imports        : [NgClass],
 })
 export class FuseHighlightComponent implements OnChanges, AfterViewInit
 {
@@ -28,7 +31,7 @@ export class FuseHighlightComponent implements OnChanges, AfterViewInit
         private _elementRef: ElementRef,
         private _renderer2: Renderer2,
         private _fuseHighlightService: FuseHighlightService,
-        private _viewContainerRef: ViewContainerRef
+        private _viewContainerRef: ViewContainerRef,
     )
     {
     }
@@ -123,7 +126,7 @@ export class FuseHighlightComponent implements OnChanges, AfterViewInit
         // Render and insert the template
         this._viewRef = this._viewContainerRef.createEmbeddedView(this.templateRef, {
             highlightedCode: this.highlightedCode,
-            lang           : this.lang
+            lang           : this.lang,
         });
 
         // Detect the changes

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

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FuseHighlightComponent } from '@fuse/components/highlight/highlight.component';
-
-@NgModule({
-    declarations: [
-        FuseHighlightComponent
-    ],
-    imports     : [
-        CommonModule
-    ],
-    exports     : [
-        FuseHighlightComponent
-    ]
-})
-export class FuseHighlightModule
-{
-}

src/@fuse/components/highlight/highlight.service.ts

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import * as hljs from 'highlight.js';
+import hljs from 'highlight.js';
 
-@Injectable({
+@Injectable({providedIn: 'root'})
-    providedIn: 'root'
-})
 export class FuseHighlightService
 {
     /**
@@ -61,19 +59,19 @@ export class FuseHighlightService
 
         // Iterate through the lines
         lines.filter(line => line.length)
-             .forEach((line, index) => {
+            .forEach((line, index) =>
+            {
+                // Always get the indentation of the first line so we can
+                // have something to compare with
+                if ( index === 0 )
+                {
+                    indentation = line.search(/\S|$/);
+                    return;
+                }
 
-                 // Always get the indentation of the first line so we can
+                // Look at all the remaining lines to figure out the smallest indentation.
-                 // have something to compare with
+                indentation = Math.min(line.search(/\S|$/), indentation);
-                 if ( index === 0 )
+            });
-                 {
-                     indentation = line.search(/\S|$/);
-                     return;
-                 }
-
-                 // Look at all the remaining lines to figure out the smallest indentation.
-                 indentation = Math.min(line.search(/\S|$/), indentation);
-             });
 
         // Iterate through the lines one more time, remove the extra
         // indentation, join them together and return it

src/@fuse/components/highlight/public-api.ts

@@ -1,3 +1,2 @@
 export * from '@fuse/components/highlight/highlight.component';
-export * from '@fuse/components/highlight/highlight.module';
 export * from '@fuse/components/highlight/highlight.service';

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,89 @@
+import { coerceBooleanProperty } from '@angular/cdk/coercion';
+import { NgIf } from '@angular/common';
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { FuseLoadingService } from '@fuse/services/loading';
+import { Subject, takeUntil } from 'rxjs';
+
+@Component({
+    selector     : 'fuse-loading-bar',
+    templateUrl  : './loading-bar.component.html',
+    styleUrls    : ['./loading-bar.component.scss'],
+    encapsulation: ViewEncapsulation.None,
+    exportAs     : 'fuseLoadingBar',
+    standalone   : true,
+    imports      : [NgIf, MatProgressBarModule],
+})
+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/public-api.ts

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

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

@@ -1 +1 @@
-export * from '@fuse/components/card/public-api';
+export * from '@fuse/components/masonry/public-api';

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

@@ -1,3 +1,4 @@
+import { NgTemplateOutlet } from '@angular/common';
 import { AfterViewInit, Component, Input, OnChanges, SimpleChanges, TemplateRef, ViewEncapsulation } from '@angular/core';
 import { fuseAnimations } from '@fuse/animations';
 import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
@@ -5,10 +6,11 @@ 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'
+    exportAs     : 'fuseMasonry',
+    standalone   : true,
+    imports      : [NgTemplateOutlet],
 })
 export class FuseMasonryComponent implements OnChanges, AfterViewInit
 {

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

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FuseMasonryComponent } from '@fuse/components/masonry/masonry.component';
-
-@NgModule({
-    declarations: [
-        FuseMasonryComponent
-    ],
-    imports     : [
-        CommonModule
-    ],
-    exports     : [
-        FuseMasonryComponent
-    ]
-})
-export class FuseMasonryModule
-{
-}

src/@fuse/components/masonry/public-api.ts

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

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

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

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

@@ -1,21 +1,28 @@
+import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
+import { MatIconModule } from '@angular/material/icon';
-import { takeUntil } from 'rxjs/operators';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { IsActiveMatchOptions, RouterLink, RouterLinkActive } from '@angular/router';
 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';
+import { FuseUtilsService } from '@fuse/services/utils/utils.service';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-horizontal-navigation-basic-item',
     templateUrl    : './basic.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass, NgIf, RouterLink, RouterLinkActive, MatTooltipModule, NgTemplateOutlet, MatMenuModule, MatIconModule],
 })
 export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDestroy
 {
     @Input() item: FuseNavigationItem;
     @Input() name: string;
 
+    isActiveMatchOptions: IsActiveMatchOptions;
     private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent;
     private _unsubscribeAll: Subject<any> = new Subject<any>();
 
@@ -24,9 +31,15 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
+        // Set the equivalent of {exact: false} as default for active match options.
+        // We are not assigning the item.isActiveMatchOptions directly to the
+        // [routerLinkActiveOptions] because if it's "undefined" initially, the router
+        // will throw an error and stop working.
+        this.isActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions;
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -38,14 +51,25 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes
      */
     ngOnInit(): void
     {
+        // Set the "isActiveMatchOptions" either from item's
+        // "isActiveMatchOptions" or the equivalent form of
+        // item's "exactMatch" option
+        this.isActiveMatchOptions =
+            this.item.isActiveMatchOptions ?? this.item.exactMatch
+                ? this._fuseUtilsService.exactMatchOptions
+                : this._fuseUtilsService.subsetMatchOptions;
+
         // Get the parent navigation component
         this._fuseHorizontalNavigationComponent = this._fuseNavigationService.getComponent(this.name);
 
+        // Mark for check
+        this._changeDetectorRef.markForCheck();
+
         // Subscribe to onRefreshed on the navigation component
         this._fuseHorizontalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -57,7 +81,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
+<ng-container *ngIf="!child">
-    *ngIf="!child"
+    <div
-    [ngClass]="{'fuse-horizontal-navigation-menu-active': trigger.menuOpen,
+        [ngClass]="{'fuse-horizontal-navigation-menu-active': trigger.menuOpen,
                  'fuse-horizontal-navigation-menu-active-forced': item.active}"
-    [matMenuTriggerFor]="matMenu"
+        [matMenuTriggerFor]="matMenu"
-    (onMenuOpen)="triggerChangeDetection()"
+        (onMenuOpen)="triggerChangeDetection()"
-    (onMenuClose)="triggerChangeDetection()"
+        (onMenuClose)="triggerChangeDetection()"
-    #trigger="matMenuTrigger">
+        #trigger="matMenuTrigger">
-    <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
+        <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
-</div>
+    </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
+            <ng-container *ngIf="item.type === 'basic'">
-                class="fuse-horizontal-navigation-menu-item"
+                <div
-                *ngIf="item.type === 'basic'"
+                    class="fuse-horizontal-navigation-menu-item"
-                [disabled]="item.disabled"
+                    [disabled]="item.disabled"
-                mat-menu-item>
+                    mat-menu-item>
-                <fuse-horizontal-navigation-basic-item
+                    <fuse-horizontal-navigation-basic-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-horizontal-navigation-basic-item>
+                        [name]="name"></fuse-horizontal-navigation-basic-item>
-            </div>
+                </div>
+            </ng-container>
 
             <!-- Branch: aside, collapsable, group -->
-            <div
+            <ng-container *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'">
-                class="fuse-horizontal-navigation-menu-item"
+                <div
-                *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'"
+                    class="fuse-horizontal-navigation-menu-item"
-                [disabled]="item.disabled"
+                    [disabled]="item.disabled"
-                [matMenuTriggerFor]="branch.matMenu"
+                    [matMenuTriggerFor]="branch.matMenu"
-                mat-menu-item>
+                    mat-menu-item>
-                <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
+                    <ng-container *ngTemplateOutlet="itemTemplate; context: {$implicit: item}"></ng-container>
-                <fuse-horizontal-navigation-branch-item
+                    <fuse-horizontal-navigation-branch-item
-                    [child]="true"
+                        [child]="true"
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"
+                        [name]="name"
-                    #branch></fuse-horizontal-navigation-branch-item>
+                        #branch></fuse-horizontal-navigation-branch-item>
-            </div>
+                </div>
+            </ng-container>
 
             <!-- Divider -->
-            <div
+            <ng-container *ngIf="item.type === 'divider'">
-                class="fuse-horizontal-navigation-menu-item"
+                <div
-                *ngIf="item.type === 'divider'"
+                    class="fuse-horizontal-navigation-menu-item"
-                mat-menu-item>
+                    mat-menu-item>
-                <fuse-horizontal-navigation-divider-item
+                    <fuse-horizontal-navigation-divider-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-horizontal-navigation-divider-item>
+                        [name]="name"></fuse-horizontal-navigation-divider-item>
-            </div>
+                </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
+            <ng-container *ngIf="item.icon">
-                class="fuse-horizontal-navigation-item-icon"
+                <mat-icon
-                [ngClass]="item.classes?.icon"
+                    class="fuse-horizontal-navigation-item-icon"
-                *ngIf="item.icon"
+                    [ngClass]="item.classes?.icon"
-                [svgIcon]="item.icon"></mat-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
+                <ng-container *ngIf="item.subtitle">
-                    class="fuse-horizontal-navigation-item-subtitle text-hint"
+                    <div class="fuse-horizontal-navigation-item-subtitle text-hint">
-                    *ngIf="item.subtitle">
+                        <span [ngClass]="item.classes?.subtitle">
-                    <span [ngClass]="item.classes?.subtitle">
+                            {{item.subtitle}}
-                        {{item.subtitle}}
+                        </span>
-                    </span>
+                    </div>
-                </div>
+                </ng-container>
             </div>
 
             <!-- Badge -->
-            <div
+            <ng-container *ngIf="item.badge">
-                class="fuse-horizontal-navigation-item-badge"
+                <div class="fuse-horizontal-navigation-item-badge">
-                *ngIf="item.badge">
+                    <div
-                <div
+                        class="fuse-horizontal-navigation-item-badge-content"
-                    class="fuse-horizontal-navigation-item-badge-content"
+                        [ngClass]="item.badge.classes">
-                    [ngClass]="item.badge.classes">
+                        {{item.badge.title}}
-                    {{item.badge.title}}
+                    </div>
                 </div>
-            </div>
+            </ng-container>
         </div>
     </div>
 

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

@@ -1,17 +1,22 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { MatMenu } from '@angular/material/menu';
+import { NgClass, NgFor, NgIf, NgTemplateOutlet } from '@angular/common';
-import { Subject } from 'rxjs';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { takeUntil } from 'rxjs/operators';
+import { MatIconModule } from '@angular/material/icon';
+import { MatMenu, MatMenuModule } from '@angular/material/menu';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { FuseHorizontalNavigationBasicItemComponent } from '@fuse/components/navigation/horizontal/components/basic/basic.component';
+import { FuseHorizontalNavigationDividerItemComponent } from '@fuse/components/navigation/horizontal/components/divider/divider.component';
 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';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-horizontal-navigation-branch-item',
     templateUrl    : './branch.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgIf, NgClass, MatMenuModule, NgTemplateOutlet, NgFor, FuseHorizontalNavigationBasicItemComponent, forwardRef(() => FuseHorizontalNavigationBranchItemComponent), FuseHorizontalNavigationDividerItemComponent, MatTooltipModule, MatIconModule],
 })
 export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDestroy
 {
@@ -32,7 +37,7 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -51,9 +56,9 @@ export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDe
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseHorizontalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -65,7 +70,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 +86,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,15 +1,16 @@
+import { NgClass } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
 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';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-horizontal-navigation-divider-item',
     templateUrl    : './divider.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass],
 })
 export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnDestroy
 {
@@ -24,7 +25,7 @@ export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnD
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -43,9 +44,9 @@ export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnD
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseHorizontalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -57,7 +58,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,15 +1,16 @@
+import { NgClass } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } 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';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-horizontal-navigation-spacer-item',
     templateUrl    : './spacer.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass],
 })
 export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDestroy
 {
@@ -24,7 +25,7 @@ export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDe
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -43,9 +44,9 @@ export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDe
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseHorizontalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -57,7 +58,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
+            <ng-container *ngIf="item.type === 'basic'">
-                class="fuse-horizontal-navigation-menu-item"
+                <fuse-horizontal-navigation-basic-item
-                *ngIf="item.type === 'basic'"
+                    class="fuse-horizontal-navigation-menu-item"
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-horizontal-navigation-basic-item>
+                    [name]="name"></fuse-horizontal-navigation-basic-item>
+            </ng-container>
 
             <!-- Branch: aside, collapsable, group -->
-            <fuse-horizontal-navigation-branch-item
+            <ng-container *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'">
-                class="fuse-horizontal-navigation-menu-item"
+                <fuse-horizontal-navigation-branch-item
-                *ngIf="item.type === 'aside' || item.type === 'collapsable' || item.type === 'group'"
+                    class="fuse-horizontal-navigation-menu-item"
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-horizontal-navigation-branch-item>
+                    [name]="name"></fuse-horizontal-navigation-branch-item>
+            </ng-container>
 
             <!-- Spacer -->
-            <fuse-horizontal-navigation-spacer-item
+            <ng-container *ngIf="item.type === 'spacer'">
-                class="fuse-horizontal-navigation-menu-item"
+                <fuse-horizontal-navigation-spacer-item
-                *ngIf="item.type === 'spacer'"
+                    class="fuse-horizontal-navigation-menu-item"
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-horizontal-navigation-spacer-item>
+                    [name]="name"></fuse-horizontal-navigation-spacer-item>
+            </ng-container>
 
         </ng-container>
 

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

@@ -1,9 +1,13 @@
+import { NgFor, NgIf } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
-import { ReplaySubject, Subject } from 'rxjs';
 import { fuseAnimations } from '@fuse/animations';
-import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
+import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
 import { FuseUtilsService } from '@fuse/services/utils/utils.service';
+import { ReplaySubject, Subject } from 'rxjs';
+import { FuseHorizontalNavigationBasicItemComponent } from './components/basic/basic.component';
+import { FuseHorizontalNavigationBranchItemComponent } from './components/branch/branch.component';
+import { FuseHorizontalNavigationSpacerItemComponent } from './components/spacer/spacer.component';
 
 @Component({
     selector       : 'fuse-horizontal-navigation',
@@ -12,7 +16,9 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
     animations     : fuseAnimations,
     encapsulation  : ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    exportAs       : 'fuseHorizontalNavigation'
+    exportAs       : 'fuseHorizontalNavigation',
+    standalone     : true,
+    imports        : [NgFor, NgIf, FuseHorizontalNavigationBasicItemComponent, FuseHorizontalNavigationBranchItemComponent, FuseHorizontalNavigationSpacerItemComponent],
 })
 export class FuseHorizontalNavigationComponent implements OnChanges, OnInit, OnDestroy
 {
@@ -28,7 +34,7 @@ export class FuseHorizontalNavigationComponent implements OnChanges, OnInit, OnD
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
         private _fuseNavigationService: FuseNavigationService,
-        private _fuseUtilsService: FuseUtilsService
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
     }
@@ -76,7 +82,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.module.ts

@@ -1,55 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import { MatButtonModule } from '@angular/material/button';
-import { MatDividerModule } from '@angular/material/divider';
-import { MatIconModule } from '@angular/material/icon';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { FuseScrollbarModule } from '@fuse/directives/scrollbar/public-api';
-import { FuseHorizontalNavigationBasicItemComponent } from '@fuse/components/navigation/horizontal/components/basic/basic.component';
-import { FuseHorizontalNavigationBranchItemComponent } from '@fuse/components/navigation/horizontal/components/branch/branch.component';
-import { FuseHorizontalNavigationDividerItemComponent } from '@fuse/components/navigation/horizontal/components/divider/divider.component';
-import { FuseHorizontalNavigationSpacerItemComponent } from '@fuse/components/navigation/horizontal/components/spacer/spacer.component';
-import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component';
-import { FuseVerticalNavigationAsideItemComponent } from '@fuse/components/navigation/vertical/components/aside/aside.component';
-import { FuseVerticalNavigationBasicItemComponent } from '@fuse/components/navigation/vertical/components/basic/basic.component';
-import { FuseVerticalNavigationCollapsableItemComponent } from '@fuse/components/navigation/vertical/components/collapsable/collapsable.component';
-import { FuseVerticalNavigationDividerItemComponent } from '@fuse/components/navigation/vertical/components/divider/divider.component';
-import { FuseVerticalNavigationGroupItemComponent } from '@fuse/components/navigation/vertical/components/group/group.component';
-import { FuseVerticalNavigationSpacerItemComponent } from '@fuse/components/navigation/vertical/components/spacer/spacer.component';
-import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
-
-@NgModule({
-    declarations: [
-        FuseHorizontalNavigationBasicItemComponent,
-        FuseHorizontalNavigationBranchItemComponent,
-        FuseHorizontalNavigationDividerItemComponent,
-        FuseHorizontalNavigationSpacerItemComponent,
-        FuseHorizontalNavigationComponent,
-        FuseVerticalNavigationAsideItemComponent,
-        FuseVerticalNavigationBasicItemComponent,
-        FuseVerticalNavigationCollapsableItemComponent,
-        FuseVerticalNavigationDividerItemComponent,
-        FuseVerticalNavigationGroupItemComponent,
-        FuseVerticalNavigationSpacerItemComponent,
-        FuseVerticalNavigationComponent
-    ],
-    imports     : [
-        CommonModule,
-        RouterModule,
-        MatButtonModule,
-        MatDividerModule,
-        MatIconModule,
-        MatMenuModule,
-        MatTooltipModule,
-        FuseScrollbarModule
-    ],
-    exports     : [
-        FuseHorizontalNavigationComponent,
-        FuseVerticalNavigationComponent
-    ]
-})
-export class FuseNavigationModule
-{
-}

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
 
-@Injectable({
+@Injectable({providedIn: 'root'})
-    providedIn: 'root'
-})
 export class FuseNavigationService
 {
     private _componentRegistry: Map<string, any> = new Map<string, any>();
@@ -46,7 +44,7 @@ export class FuseNavigationService
      *
      * @param name
      */
-    getComponent(name: string): any
+    getComponent<T>(name: string): T
     {
         return this._componentRegistry.get(name);
     }
@@ -160,7 +158,7 @@ export class FuseNavigationService
     getItemParent(
         id: string,
         navigation: FuseNavigationItem[],
-        parent: FuseNavigationItem[] | FuseNavigationItem
+        parent: FuseNavigationItem[] | FuseNavigationItem,
     ): FuseNavigationItem[] | FuseNavigationItem | null
     {
         for ( const item of navigation )

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

@@ -1,3 +1,5 @@
+import { IsActiveMatchOptions, Params, QueryParamsHandling } from '@angular/router';
+
 export interface FuseNavigationItem
 {
     id?: string;
@@ -13,9 +15,21 @@ export interface FuseNavigationItem
     hidden?: (item: FuseNavigationItem) => boolean;
     active?: boolean;
     disabled?: boolean;
+    tooltip?: string;
     link?: string;
+    fragment?: string;
+    preserveFragment?: boolean;
+    queryParams?: Params | null;
+    queryParamsHandling?: QueryParamsHandling | null;
     externalLink?: boolean;
+    target?:
+        | '_blank'
+        | '_self'
+        | '_parent'
+        | '_top'
+        | string;
     exactMatch?: boolean;
+    isActiveMatchOptions?: IsActiveMatchOptions;
     function?: (item: FuseNavigationItem) => void;
     classes?: {
         title?: string;

src/@fuse/components/navigation/public-api.ts

@@ -1,5 +1,4 @@
 export * from '@fuse/components/navigation/horizontal/horizontal.component';
 export * from '@fuse/components/navigation/vertical/vertical.component';
-export * from '@fuse/components/navigation/navigation.module';
 export * from '@fuse/components/navigation/navigation.service';
 export * from '@fuse/components/navigation/navigation.types';

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
+        <ng-container *ngIf="item.icon">
-            class="fuse-vertical-navigation-item-icon"
+            <mat-icon
-            [ngClass]="item.classes?.icon"
+                class="fuse-vertical-navigation-item-icon"
-            *ngIf="item.icon"
+                [ngClass]="item.classes?.icon"
-            [svgIcon]="item.icon"></mat-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
+            <ng-container *ngIf="item.subtitle">
-                class="fuse-vertical-navigation-item-subtitle"
+                <div class="fuse-vertical-navigation-item-subtitle">
-                *ngIf="item.subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
-                    {{item.subtitle}}
+                    </span>
-                </span>
+                </div>
-            </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
+        <ng-container *ngIf="item.badge">
-            class="fuse-vertical-navigation-item-badge"
+            <div class="fuse-vertical-navigation-item-badge">
-            *ngIf="item.badge">
+                <div
-            <div
+                    class="fuse-vertical-navigation-item-badge-content"
-                class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
-                [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
-                {{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
+                <ng-container *ngIf="item.type === 'basic'">
-                    *ngIf="item.type === 'basic'"
+                    <fuse-vertical-navigation-basic-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-basic-item>
+                        [name]="name"></fuse-vertical-navigation-basic-item>
+                </ng-container>
 
                 <!-- Collapsable -->
-                <fuse-vertical-navigation-collapsable-item
+                <ng-container *ngIf="item.type === 'collapsable'">
-                    *ngIf="item.type === 'collapsable'"
+                    <fuse-vertical-navigation-collapsable-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"
+                        [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                </ng-container>
 
                 <!-- Divider -->
-                <fuse-vertical-navigation-divider-item
+                <ng-container *ngIf="item.type === 'divider'">
-                    *ngIf="item.type === 'divider'"
+                    <fuse-vertical-navigation-divider-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-divider-item>
+                        [name]="name"></fuse-vertical-navigation-divider-item>
+                </ng-container>
 
                 <!-- Group -->
-                <fuse-vertical-navigation-group-item
+                <ng-container *ngIf="item.type === 'group'">
-                    *ngIf="item.type === 'group'"
+                    <fuse-vertical-navigation-group-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-group-item>
+                        [name]="name"></fuse-vertical-navigation-group-item>
+                </ng-container>
 
                 <!-- Spacer -->
-                <fuse-vertical-navigation-spacer-item
+                <ng-container *ngIf="item.type === 'spacer'">
-                    *ngIf="item.type === 'spacer'"
+                    <fuse-vertical-navigation-spacer-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-spacer-item>
+                        [name]="name"></fuse-vertical-navigation-spacer-item>
+                </ng-container>
 
             </ng-container>
 

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

@@ -1,17 +1,25 @@
-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 { NgClass, NgFor, NgIf } from '@angular/common';
-import { filter, takeUntil } from 'rxjs/operators';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { NavigationEnd, Router } from '@angular/router';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
+import { FuseVerticalNavigationBasicItemComponent } from '@fuse/components/navigation/vertical/components/basic/basic.component';
+import { FuseVerticalNavigationCollapsableItemComponent } from '@fuse/components/navigation/vertical/components/collapsable/collapsable.component';
+import { FuseVerticalNavigationDividerItemComponent } from '@fuse/components/navigation/vertical/components/divider/divider.component';
+import { FuseVerticalNavigationGroupItemComponent } from '@fuse/components/navigation/vertical/components/group/group.component';
+import { FuseVerticalNavigationSpacerItemComponent } from '@fuse/components/navigation/vertical/components/spacer/spacer.component';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { filter, Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-aside-item',
     templateUrl    : './aside.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass, MatTooltipModule, NgIf, MatIconModule, NgFor, FuseVerticalNavigationBasicItemComponent, FuseVerticalNavigationCollapsableItemComponent, FuseVerticalNavigationDividerItemComponent, FuseVerticalNavigationGroupItemComponent, FuseVerticalNavigationSpacerItemComponent],
 })
 export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnInit, OnDestroy
 {
@@ -36,7 +44,7 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
         private _router: Router,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -72,10 +80,10 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
         this._router.events
             .pipe(
                 filter((event): event is NavigationEnd => event instanceof NavigationEnd),
-                takeUntil(this._unsubscribeAll)
+                takeUntil(this._unsubscribeAll),
             )
-            .subscribe((event: NavigationEnd) => {
+            .subscribe((event: NavigationEnd) =>
-
+            {
                 // Mark if active
                 this._markIfActive(event.urlAfterRedirects);
             });
@@ -85,9 +93,9 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -99,7 +107,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,92 @@
     [ngClass]="item.classes?.wrapper">
 
     <!-- Item with an internal link -->
-    <a
+    <ng-container *ngIf="item.link && !item.externalLink && !item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <a
-        *ngIf="item.link && !item.externalLink && !item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
+            [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-vertical-navigation-item-active'"
+            [fragment]="item.fragment ?? null"
-        [routerLinkActiveOptions]="{exact: item.exactMatch || false}">
+            [preserveFragment]="item.preserveFragment ?? false"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [queryParams]="item.queryParams ?? null"
-    </a>
+            [queryParamsHandling]="item.queryParamsHandling ?? null"
+            [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
+    <ng-container *ngIf="item.link && item.externalLink && !item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <a
-        *ngIf="item.link && item.externalLink && !item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [href]="item.link">
+            [href]="item.link"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [target]="item.target || '_self'"
-    </a>
+            [matTooltip]="item.tooltip || ''">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a function -->
-    <div
+    <ng-container *ngIf="!item.link && item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <div
-        *ngIf="!item.link && item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        (click)="item.function(item)">
+            [matTooltip]="item.tooltip || ''"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            (click)="item.function(item)">
-    </div>
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item with an internal link and function -->
-    <a
+    <ng-container *ngIf="item.link && !item.externalLink && item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <a
-        *ngIf="item.link && !item.externalLink && item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        [routerLink]="[item.link]"
+            [routerLink]="[item.link]"
-        [routerLinkActive]="'fuse-vertical-navigation-item-active'"
+            [fragment]="item.fragment ?? null"
-        [routerLinkActiveOptions]="{exact: item.exactMatch || false}"
+            [preserveFragment]="item.preserveFragment ?? false"
-        (click)="item.function(item)">
+            [queryParams]="item.queryParams ?? null"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [queryParamsHandling]="item.queryParamsHandling ?? null"
-    </a>
+            [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
+    <ng-container *ngIf="item.link && item.externalLink && item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <a
-        *ngIf="item.link && item.externalLink && item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [href]="item.link"
+            [href]="item.link"
-        (click)="item.function(item)">
+            [target]="item.target || '_self'"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [matTooltip]="item.tooltip || ''"
-    </a>
+            (click)="item.function(item)">
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </a>
+    </ng-container>
 
     <!-- Item with a no link and no function -->
-    <div
+    <ng-container *ngIf="!item.link && !item.function && !item.disabled">
-        class="fuse-vertical-navigation-item"
+        <div
-        *ngIf="!item.link && !item.function && !item.disabled"
+            class="fuse-vertical-navigation-item"
-        [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}">
+            [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [matTooltip]="item.tooltip || ''">
-    </div>
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
     <!-- Item is disabled -->
-    <div
+    <ng-container *ngIf="item.disabled">
-        class="fuse-vertical-navigation-item fuse-vertical-navigation-item-disabled"
+        <div
-        *ngIf="item.disabled">
+            class="fuse-vertical-navigation-item fuse-vertical-navigation-item-disabled"
-        <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+            [matTooltip]="item.tooltip || ''">
-    </div>
+            <ng-container *ngTemplateOutlet="itemTemplate"></ng-container>
+        </div>
+    </ng-container>
 
 </div>
 
@@ -74,11 +98,12 @@
 <ng-template #itemTemplate>
 
     <!-- Icon -->
-    <mat-icon
+    <ng-container *ngIf="item.icon">
-        class="fuse-vertical-navigation-item-icon"
+        <mat-icon
-        [ngClass]="item.classes?.icon"
+            class="fuse-vertical-navigation-item-icon"
-        *ngIf="item.icon"
+            [ngClass]="item.classes?.icon"
-        [svgIcon]="item.icon"></mat-icon>
+            [svgIcon]="item.icon"></mat-icon>
+    </ng-container>
 
     <!-- Title & Subtitle -->
     <div class="fuse-vertical-navigation-item-title-wrapper">
@@ -87,24 +112,24 @@
                 {{item.title}}
             </span>
         </div>
-        <div
+        <ng-container *ngIf="item.subtitle">
-            class="fuse-vertical-navigation-item-subtitle"
+            <div class="fuse-vertical-navigation-item-subtitle">
-            *ngIf="item.subtitle">
+                <span [ngClass]="item.classes?.subtitle">
-            <span [ngClass]="item.classes?.subtitle">
+                    {{item.subtitle}}
-                {{item.subtitle}}
+                </span>
-            </span>
+            </div>
-        </div>
+        </ng-container>
     </div>
 
     <!-- Badge -->
-    <div
+    <ng-container *ngIf="item.badge">
-        class="fuse-vertical-navigation-item-badge"
+        <div class="fuse-vertical-navigation-item-badge">
-        *ngIf="item.badge">
+            <div
-        <div
+                class="fuse-vertical-navigation-item-badge-content"
-            class="fuse-vertical-navigation-item-badge-content"
+                [ngClass]="item.badge.classes">
-            [ngClass]="item.badge.classes">
+                {{item.badge.title}}
-            {{item.badge.title}}
+            </div>
         </div>
-    </div>
+    </ng-container>
 
 </ng-template>

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

@@ -1,22 +1,27 @@
+import { NgClass, NgIf, NgTemplateOutlet } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
+import { MatIconModule } from '@angular/material/icon';
-import { takeUntil } from 'rxjs/operators';
+import { MatTooltipModule } from '@angular/material/tooltip';
-import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { IsActiveMatchOptions, RouterLink, RouterLinkActive } from '@angular/router';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
 import { FuseUtilsService } from '@fuse/services/utils/utils.service';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-basic-item',
     templateUrl    : './basic.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass, NgIf, RouterLink, RouterLinkActive, MatTooltipModule, NgTemplateOutlet, MatIconModule],
 })
 export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestroy
 {
     @Input() item: FuseNavigationItem;
     @Input() name: string;
 
+    isActiveMatchOptions: IsActiveMatchOptions;
     private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent;
     private _unsubscribeAll: Subject<any> = new Subject<any>();
 
@@ -26,9 +31,14 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
         private _fuseNavigationService: FuseNavigationService,
-        private _fuseUtilsService: FuseUtilsService
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
+        // Set the equivalent of {exact: false} as default for active match options.
+        // We are not assigning the item.isActiveMatchOptions directly to the
+        // [routerLinkActiveOptions] because if it's "undefined" initially, the router
+        // will throw an error and stop working.
+        this.isActiveMatchOptions = this._fuseUtilsService.subsetMatchOptions;
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -40,14 +50,25 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr
      */
     ngOnInit(): void
     {
+        // Set the "isActiveMatchOptions" either from item's
+        // "isActiveMatchOptions" or the equivalent form of
+        // item's "exactMatch" option
+        this.isActiveMatchOptions =
+            this.item.isActiveMatchOptions ?? this.item.exactMatch
+                ? this._fuseUtilsService.exactMatchOptions
+                : this._fuseUtilsService.subsetMatchOptions;
+
         // Get the parent navigation component
         this._fuseVerticalNavigationComponent = this._fuseNavigationService.getComponent(this.name);
 
+        // Mark for check
+        this._changeDetectorRef.markForCheck();
+
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -59,7 +80,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
+        <ng-container *ngIf="item.icon">
-            class="fuse-vertical-navigation-item-icon"
+            <mat-icon
-            [ngClass]="item.classes?.icon"
+                class="fuse-vertical-navigation-item-icon"
-            *ngIf="item.icon"
+                [ngClass]="item.classes?.icon"
-            [svgIcon]="item.icon"></mat-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
+            <ng-container *ngIf="item.subtitle">
-                class="fuse-vertical-navigation-item-subtitle"
+                <div class="fuse-vertical-navigation-item-subtitle">
-                *ngIf="item.subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
-                    {{item.subtitle}}
+                    </span>
-                </span>
+                </div>
-            </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
+        <ng-container *ngIf="item.badge">
-            class="fuse-vertical-navigation-item-badge"
+            <div class="fuse-vertical-navigation-item-badge">
-            *ngIf="item.badge">
+                <div
-            <div
+                    class="fuse-vertical-navigation-item-badge-content"
-                class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
-                [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
-                {{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
+            <ng-container *ngIf="item.type === 'basic'">
-                *ngIf="item.type === 'basic'"
+                <fuse-vertical-navigation-basic-item
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-vertical-navigation-basic-item>
+                    [name]="name"></fuse-vertical-navigation-basic-item>
+            </ng-container>
 
             <!-- Collapsable -->
-            <fuse-vertical-navigation-collapsable-item
+            <ng-container *ngIf="item.type === 'collapsable'">
-                *ngIf="item.type === 'collapsable'"
+                <fuse-vertical-navigation-collapsable-item
-                [item]="item"
+                    [item]="item"
-                [name]="name"
+                    [name]="name"
-                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+            </ng-container>
 
             <!-- Divider -->
-            <fuse-vertical-navigation-divider-item
+            <ng-container *ngIf="item.type === 'divider'">
-                *ngIf="item.type === 'divider'"
+                <fuse-vertical-navigation-divider-item
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-vertical-navigation-divider-item>
+                    [name]="name"></fuse-vertical-navigation-divider-item>
+            </ng-container>
 
             <!-- Group -->
-            <fuse-vertical-navigation-group-item
+            <ng-container *ngIf="item.type === 'group'">
-                *ngIf="item.type === 'group'"
+                <fuse-vertical-navigation-group-item
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-vertical-navigation-group-item>
+                    [name]="name"></fuse-vertical-navigation-group-item>
+            </ng-container>
 
             <!-- Spacer -->
-            <fuse-vertical-navigation-spacer-item
+            <ng-container *ngIf="item.type === 'spacer'">
-                *ngIf="item.type === 'spacer'"
+                <fuse-vertical-navigation-spacer-item
-                [item]="item"
+                    [item]="item"
-                [name]="name"></fuse-vertical-navigation-spacer-item>
+                    [name]="name"></fuse-vertical-navigation-spacer-item>
+            </ng-container>
 
         </ng-container>
 

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

@@ -1,19 +1,26 @@
-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 { NgClass, NgFor, NgIf } from '@angular/common';
-import { filter, takeUntil } from 'rxjs/operators';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, HostBinding, Input, OnDestroy, OnInit } from '@angular/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { NavigationEnd, Router } from '@angular/router';
 import { fuseAnimations } from '@fuse/animations';
-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';
+import { FuseVerticalNavigationBasicItemComponent } from '@fuse/components/navigation/vertical/components/basic/basic.component';
+import { FuseVerticalNavigationDividerItemComponent } from '@fuse/components/navigation/vertical/components/divider/divider.component';
+import { FuseVerticalNavigationGroupItemComponent } from '@fuse/components/navigation/vertical/components/group/group.component';
+import { FuseVerticalNavigationSpacerItemComponent } from '@fuse/components/navigation/vertical/components/spacer/spacer.component';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { filter, Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-collapsable-item',
     templateUrl    : './collapsable.component.html',
-    styles         : [],
     animations     : fuseAnimations,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    standalone     : true,
+    imports        : [NgClass, MatTooltipModule, NgIf, MatIconModule, NgFor, FuseVerticalNavigationBasicItemComponent, forwardRef(() => FuseVerticalNavigationCollapsableItemComponent), FuseVerticalNavigationDividerItemComponent, FuseVerticalNavigationGroupItemComponent, FuseVerticalNavigationSpacerItemComponent],
 })
 export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, OnDestroy
 {
@@ -36,7 +43,7 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
         private _router: Router,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -50,10 +57,12 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
      */
     @HostBinding('class') get classList(): any
     {
+        /* eslint-disable @typescript-eslint/naming-convention */
         return {
             'fuse-vertical-navigation-item-collapsed': this.isCollapsed,
-            'fuse-vertical-navigation-item-expanded' : this.isExpanded
+            'fuse-vertical-navigation-item-expanded' : this.isExpanded,
         };
+        /* eslint-enable @typescript-eslint/naming-convention */
     }
 
     // -----------------------------------------------------------------------------------------------------
@@ -86,8 +95,8 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
         // Listen for the onCollapsableItemCollapsed from the service
         this._fuseVerticalNavigationComponent.onCollapsableItemCollapsed
             .pipe(takeUntil(this._unsubscribeAll))
-            .subscribe((collapsedItem) => {
+            .subscribe((collapsedItem) =>
-
+            {
                 // Check if the collapsed item is null
                 if ( collapsedItem === null )
                 {
@@ -106,8 +115,8 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
         {
             this._fuseVerticalNavigationComponent.onCollapsableItemExpanded
                 .pipe(takeUntil(this._unsubscribeAll))
-                .subscribe((expandedItem) => {
+                .subscribe((expandedItem) =>
-
+                {
                     // Check if the expanded item is null
                     if ( expandedItem === null )
                     {
@@ -141,10 +150,10 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
         this._router.events
             .pipe(
                 filter((event): event is NavigationEnd => event instanceof NavigationEnd),
-                takeUntil(this._unsubscribeAll)
+                takeUntil(this._unsubscribeAll),
             )
-            .subscribe((event: NavigationEnd) => {
+            .subscribe((event: NavigationEnd) =>
-
+            {
                 // If the item has a children that has a matching url with the current url, expand...
                 if ( this._hasActiveChild(this.item, event.urlAfterRedirects) )
                 {
@@ -163,9 +172,9 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -177,7 +186,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,15 +1,16 @@
+import { NgClass } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Subject } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
-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';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-divider-item',
     templateUrl    : './divider.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass],
 })
 export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDestroy
 {
@@ -24,7 +25,7 @@ export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDes
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -43,9 +44,9 @@ export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDes
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -57,7 +58,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
+        <ng-container *ngIf="item.icon">
-            class="fuse-vertical-navigation-item-icon"
+            <mat-icon
-            [ngClass]="item.classes?.icon"
+                class="fuse-vertical-navigation-item-icon"
-            *ngIf="item.icon"
+                [ngClass]="item.classes?.icon"
-            [svgIcon]="item.icon"></mat-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
+            <ng-container *ngIf="item.subtitle">
-                class="fuse-vertical-navigation-item-subtitle"
+                <div class="fuse-vertical-navigation-item-subtitle">
-                *ngIf="item.subtitle">
+                    <span [ngClass]="item.classes?.subtitle">
-                <span [ngClass]="item.classes?.subtitle">
+                        {{item.subtitle}}
-                    {{item.subtitle}}
+                    </span>
-                </span>
+                </div>
-            </div>
+            </ng-container>
         </div>
 
         <!-- Badge -->
-        <div
+        <ng-container *ngIf="item.badge">
-            class="fuse-vertical-navigation-item-badge"
+            <div class="fuse-vertical-navigation-item-badge">
-            *ngIf="item.badge">
+                <div
-            <div
+                    class="fuse-vertical-navigation-item-badge-content"
-                class="fuse-vertical-navigation-item-badge-content"
+                    [ngClass]="item.badge.classes">
-                [ngClass]="item.badge.classes">
+                    {{item.badge.title}}
-                {{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
+        <ng-container *ngIf="item.type === 'basic'">
-            *ngIf="item.type === 'basic'"
+            <fuse-vertical-navigation-basic-item
-            [item]="item"
+                [item]="item"
-            [name]="name"></fuse-vertical-navigation-basic-item>
+                [name]="name"></fuse-vertical-navigation-basic-item>
+        </ng-container>
 
         <!-- Collapsable -->
-        <fuse-vertical-navigation-collapsable-item
+        <ng-container *ngIf="item.type === 'collapsable'">
-            *ngIf="item.type === 'collapsable'"
+            <fuse-vertical-navigation-collapsable-item
-            [item]="item"
+                [item]="item"
-            [name]="name"
+                [name]="name"
-            [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+        </ng-container>
 
         <!-- Divider -->
-        <fuse-vertical-navigation-divider-item
+        <ng-container *ngIf="item.type === 'divider'">
-            *ngIf="item.type === 'divider'"
+            <fuse-vertical-navigation-divider-item
-            [item]="item"
+                [item]="item"
-            [name]="name"></fuse-vertical-navigation-divider-item>
+                [name]="name"></fuse-vertical-navigation-divider-item>
+        </ng-container>
 
         <!-- Group -->
-        <fuse-vertical-navigation-group-item
+        <ng-container *ngIf="item.type === 'group'">
-            *ngIf="item.type === 'group'"
+            <fuse-vertical-navigation-group-item
-            [item]="item"
+                [item]="item"
-            [name]="name"></fuse-vertical-navigation-group-item>
+                [name]="name"></fuse-vertical-navigation-group-item>
+        </ng-container>
 
         <!-- Spacer -->
-        <fuse-vertical-navigation-spacer-item
+        <ng-container *ngIf="item.type === 'spacer'">
-            *ngIf="item.type === 'spacer'"
+            <fuse-vertical-navigation-spacer-item
-            [item]="item"
+                [item]="item"
-            [name]="name"></fuse-vertical-navigation-spacer-item>
+                [name]="name"></fuse-vertical-navigation-spacer-item>
+        </ng-container>
 
     </ng-container>
 

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

@@ -1,16 +1,22 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { Subject } from 'rxjs';
+import { NgClass, NgFor, NgIf } from '@angular/common';
-import { takeUntil } from 'rxjs/operators';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core';
-import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { MatIconModule } from '@angular/material/icon';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
 import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
+import { FuseVerticalNavigationBasicItemComponent } from '@fuse/components/navigation/vertical/components/basic/basic.component';
+import { FuseVerticalNavigationCollapsableItemComponent } from '@fuse/components/navigation/vertical/components/collapsable/collapsable.component';
+import { FuseVerticalNavigationDividerItemComponent } from '@fuse/components/navigation/vertical/components/divider/divider.component';
+import { FuseVerticalNavigationSpacerItemComponent } from '@fuse/components/navigation/vertical/components/spacer/spacer.component';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-group-item',
     templateUrl    : './group.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass, NgIf, MatIconModule, NgFor, FuseVerticalNavigationBasicItemComponent, FuseVerticalNavigationCollapsableItemComponent, FuseVerticalNavigationDividerItemComponent, forwardRef(() => FuseVerticalNavigationGroupItemComponent), FuseVerticalNavigationSpacerItemComponent],
 })
 export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestroy
 {
@@ -30,7 +36,7 @@ export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestr
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -49,9 +55,9 @@ export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestr
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -63,7 +69,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,15 +1,16 @@
+import { NgClass } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { takeUntil } from 'rxjs/operators';
-import { Subject } 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';
+import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
+import { Subject, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation-spacer-item',
     templateUrl    : './spacer.component.html',
-    styles         : [],
+    changeDetection: ChangeDetectionStrategy.OnPush,
-    changeDetection: ChangeDetectionStrategy.OnPush
+    standalone     : true,
+    imports        : [NgClass],
 })
 export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDestroy
 {
@@ -24,7 +25,7 @@ export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDest
      */
     constructor(
         private _changeDetectorRef: ChangeDetectorRef,
-        private _fuseNavigationService: FuseNavigationService
+        private _fuseNavigationService: FuseNavigationService,
     )
     {
     }
@@ -43,9 +44,9 @@ export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDest
 
         // Subscribe to onRefreshed on the navigation component
         this._fuseVerticalNavigationComponent.onRefreshed.pipe(
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Mark for check
             this._changeDetectorRef.markForCheck();
         });
@@ -57,7 +58,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;
+        width: var(--fuse-vertical-navigation-compact-width);
-        min-width: #{$fuse-vertical-navigation-compact-width}px;
+        min-width: var(--fuse-vertical-navigation-compact-width);
-        max-width: #{$fuse-vertical-navigation-compact-width}px;
+        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;
+    width: var(--fuse-vertical-navigation-width);
-    min-width: #{$fuse-vertical-navigation-width}px;
+    min-width: var(--fuse-vertical-navigation-width);
-    max-width: #{$fuse-vertical-navigation-width}px;
+    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;
+        left: var(--fuse-vertical-navigation-width);
-        width: #{$fuse-vertical-navigation-width}px;
+        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);
         }
     }
 
@@ -336,6 +338,10 @@ fuse-vertical-navigation {
 
         > .fuse-vertical-navigation-item-children {
 
+            > *:first-child {
+                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;
+:root {
-$fuse-vertical-navigation-dense-width: 80;
+    --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;
+            width: var(--fuse-vertical-navigation-dense-width);
-            min-width: #{$fuse-vertical-navigation-dense-width}px;
+            min-width: var(--fuse-vertical-navigation-dense-width);
-            max-width: #{$fuse-vertical-navigation-dense-width}px;
+            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;
+                            width: calc(var(--fuse-vertical-navigation-dense-width) - 24px);
-                            min-width: #{$fuse-vertical-navigation-width}px - 24px;
+                            min-width: calc(var(--fuse-vertical-navigation-dense-width) - 24px);
-                            max-width: #{$fuse-vertical-navigation-width}px - 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;
+        width: var(--fuse-vertical-navigation-thin-width);
-        min-width: #{$fuse-vertical-navigation-thin-width}px;
+        min-width: var(--fuse-vertical-navigation-thin-width);
-        max-width: #{$fuse-vertical-navigation-thin-width}px;
+        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
+                <ng-container *ngIf="item.type === 'aside'">
-                    *ngIf="item.type === 'aside'"
+                    <fuse-vertical-navigation-aside-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"
+                        [name]="name"
-                    [activeItemId]="activeAsideItemId"
+                        [activeItemId]="activeAsideItemId"
-                    [autoCollapse]="autoCollapse"
+                        [autoCollapse]="autoCollapse"
-                    [skipChildren]="true"
+                        [skipChildren]="true"
-                    (click)="toggleAside(item)"></fuse-vertical-navigation-aside-item>
+                        (click)="toggleAside(item)"></fuse-vertical-navigation-aside-item>
+                </ng-container>
 
                 <!-- Basic -->
-                <fuse-vertical-navigation-basic-item
+                <ng-container *ngIf="item.type === 'basic'">
-                    *ngIf="item.type === 'basic'"
+                    <fuse-vertical-navigation-basic-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-basic-item>
+                        [name]="name"></fuse-vertical-navigation-basic-item>
+                </ng-container>
 
                 <!-- Collapsable -->
-                <fuse-vertical-navigation-collapsable-item
+                <ng-container *ngIf="item.type === 'collapsable'">
-                    *ngIf="item.type === 'collapsable'"
+                    <fuse-vertical-navigation-collapsable-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"
+                        [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-collapsable-item>
+                </ng-container>
 
                 <!-- Divider -->
-                <fuse-vertical-navigation-divider-item
+                <ng-container *ngIf="item.type === 'divider'">
-                    *ngIf="item.type === 'divider'"
+                    <fuse-vertical-navigation-divider-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-divider-item>
+                        [name]="name"></fuse-vertical-navigation-divider-item>
+                </ng-container>
 
                 <!-- Group -->
-                <fuse-vertical-navigation-group-item
+                <ng-container *ngIf="item.type === 'group'">
-                    *ngIf="item.type === 'group'"
+                    <fuse-vertical-navigation-group-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"
+                        [name]="name"
-                    [autoCollapse]="autoCollapse"></fuse-vertical-navigation-group-item>
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-group-item>
+                </ng-container>
 
                 <!-- Spacer -->
-                <fuse-vertical-navigation-spacer-item
+                <ng-container *ngIf="item.type === 'spacer'">
-                    *ngIf="item.type === 'spacer'"
+                    <fuse-vertical-navigation-spacer-item
-                    [item]="item"
+                        [item]="item"
-                    [name]="name"></fuse-vertical-navigation-spacer-item>
+                        [name]="name"></fuse-vertical-navigation-spacer-item>
+                </ng-container>
 
             </ng-container>
 
@@ -84,31 +90,33 @@
 </div>
 
 <!-- Aside -->
-<div
+<ng-container *ngIf="activeAsideItemId">
-    class="fuse-vertical-navigation-aside-wrapper"
+    <div
-    *ngIf="activeAsideItemId"
+        class="fuse-vertical-navigation-aside-wrapper"
-    fuseScrollbar
+        fuseScrollbar
-    [fuseScrollbarOptions]="{wheelPropagation: false, suppressScrollX: true}"
+        [fuseScrollbarOptions]="{wheelPropagation: false, suppressScrollX: true}"
-    [@fadeInLeft]="position === 'left'"
+        [@fadeInLeft]="position === 'left'"
-    [@fadeInRight]="position === 'right'"
+        [@fadeInRight]="position === 'right'"
-    [@fadeOutLeft]="position === 'left'"
+        [@fadeOutLeft]="position === 'left'"
-    [@fadeOutRight]="position === 'right'">
+        [@fadeOutRight]="position === 'right'">
 
-    <!-- Items -->
+        <!-- Items -->
-    <ng-container *ngFor="let item of navigation; trackBy: trackByFn">
+        <ng-container *ngFor="let item of navigation; trackBy: trackByFn">
 
-        <!-- Skip the hidden items -->
+            <!-- Skip the hidden items -->
-        <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
+            <ng-container *ngIf="(item.hidden && !item.hidden(item)) || !item.hidden">
 
-            <!-- Aside -->
+                <!-- Aside -->
-            <fuse-vertical-navigation-aside-item
+                <ng-container *ngIf="item.type === 'aside' && item.id === activeAsideItemId">
-                *ngIf="item.type === 'aside' && item.id === activeAsideItemId"
+                    <fuse-vertical-navigation-aside-item
-                [item]="item"
+                        [item]="item"
-                [name]="name"
+                        [name]="name"
-                [autoCollapse]="autoCollapse"></fuse-vertical-navigation-aside-item>
+                        [autoCollapse]="autoCollapse"></fuse-vertical-navigation-aside-item>
+                </ng-container>
+
+            </ng-container>
 
         </ng-container>
 
-    </ng-container>
+    </div>
-
+</ng-container>
-</div>

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

@@ -1,4 +1,4 @@
-@import 'styles/appearances/default';
+@use 'styles/appearances/default';
-@import 'styles/appearances/compact';
+@use 'styles/appearances/compact';
-@import 'styles/appearances/dense';
+@use 'styles/appearances/dense';
-@import 'styles/appearances/thin';
+@use 'styles/appearances/thin';

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

@@ -1,15 +1,21 @@
-import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, QueryList, Renderer2, SimpleChanges, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core';
 import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
-import { NavigationEnd, Router } from '@angular/router';
+import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay';
-import { merge, ReplaySubject, Subject, Subscription } from 'rxjs';
+import { DOCUMENT, NgFor, NgIf } from '@angular/common';
-import { delay, filter, takeUntil } from 'rxjs/operators';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, HostBinding, HostListener, Inject, Input, OnChanges, OnDestroy, OnInit, Output, QueryList, Renderer2, SimpleChanges, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
 import { fuseAnimations } from '@fuse/animations';
-import { FuseNavigationItem, FuseVerticalNavigationAppearance, FuseVerticalNavigationMode, FuseVerticalNavigationPosition } from '@fuse/components/navigation/navigation.types';
 import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
+import { FuseNavigationItem, FuseVerticalNavigationAppearance, FuseVerticalNavigationMode, FuseVerticalNavigationPosition } from '@fuse/components/navigation/navigation.types';
+import { FuseVerticalNavigationAsideItemComponent } from '@fuse/components/navigation/vertical/components/aside/aside.component';
+import { FuseVerticalNavigationBasicItemComponent } from '@fuse/components/navigation/vertical/components/basic/basic.component';
+import { FuseVerticalNavigationCollapsableItemComponent } from '@fuse/components/navigation/vertical/components/collapsable/collapsable.component';
+import { FuseVerticalNavigationDividerItemComponent } from '@fuse/components/navigation/vertical/components/divider/divider.component';
+import { FuseVerticalNavigationGroupItemComponent } from '@fuse/components/navigation/vertical/components/group/group.component';
+import { FuseVerticalNavigationSpacerItemComponent } from '@fuse/components/navigation/vertical/components/spacer/spacer.component';
 import { FuseScrollbarDirective } from '@fuse/directives/scrollbar/scrollbar.directive';
 import { FuseUtilsService } from '@fuse/services/utils/utils.service';
-import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
+import { delay, filter, merge, ReplaySubject, Subject, Subscription, takeUntil } from 'rxjs';
 
 @Component({
     selector       : 'fuse-vertical-navigation',
@@ -18,7 +24,9 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
     animations     : fuseAnimations,
     encapsulation  : ViewEncapsulation.None,
     changeDetection: ChangeDetectionStrategy.OnPush,
-    exportAs       : 'fuseVerticalNavigation'
+    exportAs       : 'fuseVerticalNavigation',
+    standalone     : true,
+    imports        : [FuseScrollbarDirective, NgFor, NgIf, FuseVerticalNavigationAsideItemComponent, FuseVerticalNavigationBasicItemComponent, FuseVerticalNavigationCollapsableItemComponent, FuseVerticalNavigationDividerItemComponent, FuseVerticalNavigationGroupItemComponent, FuseVerticalNavigationSpacerItemComponent],
 })
 export class FuseVerticalNavigationComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy
 {
@@ -52,6 +60,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
     private readonly _handleAsideOverlayClick: any;
     private readonly _handleOverlayClick: any;
     private _hovered: boolean = false;
+    private _mutationObserver: MutationObserver;
     private _overlay: HTMLElement;
     private _player: AnimationPlayer;
     private _scrollStrategy: ScrollStrategy = this._scrollStrategyOptions.block();
@@ -65,18 +74,21 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
     constructor(
         private _animationBuilder: AnimationBuilder,
         private _changeDetectorRef: ChangeDetectorRef,
+        @Inject(DOCUMENT) private _document: Document,
         private _elementRef: ElementRef,
         private _renderer2: Renderer2,
         private _router: Router,
         private _scrollStrategyOptions: ScrollStrategyOptions,
         private _fuseNavigationService: FuseNavigationService,
-        private _fuseUtilsService: FuseUtilsService
+        private _fuseUtilsService: FuseUtilsService,
     )
     {
-        this._handleAsideOverlayClick = () => {
+        this._handleAsideOverlayClick = (): void =>
+        {
             this.closeAside();
         };
-        this._handleOverlayClick = () => {
+        this._handleOverlayClick = (): void =>
+        {
             this.close();
         };
     }
@@ -90,6 +102,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
      */
     @HostBinding('class') get classList(): any
     {
+        /* eslint-disable @typescript-eslint/naming-convention */
         return {
             'fuse-vertical-navigation-animations-enabled'             : this._animationsEnabled,
             [`fuse-vertical-navigation-appearance-${this.appearance}`]: true,
@@ -99,8 +112,9 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
             'fuse-vertical-navigation-mode-side'                      : this.mode === 'side',
             'fuse-vertical-navigation-opened'                         : this.opened,
             'fuse-vertical-navigation-position-left'                  : this.position === 'left',
-            'fuse-vertical-navigation-position-right'                 : this.position === 'right'
+            'fuse-vertical-navigation-position-right'                 : this.position === 'right',
         };
+        /* eslint-enable @typescript-eslint/naming-convention */
     }
 
     /**
@@ -109,7 +123,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
     @HostBinding('style') get styleList(): any
     {
         return {
-            'visibility': this.opened ? 'visible' : 'hidden'
+            'visibility': this.opened ? 'visible' : 'hidden',
         };
     }
 
@@ -138,16 +152,17 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
         this._fuseScrollbarDirectivesSubscription =
             merge(
                 this.onCollapsableItemCollapsed,
-                this.onCollapsableItemExpanded
+                this.onCollapsableItemExpanded,
             )
                 .pipe(
                     takeUntil(this._unsubscribeAll),
-                    delay(250)
+                    delay(250),
                 )
-                .subscribe(() => {
+                .subscribe(() =>
-
+                {
                     // Loop through the scrollbars and update them
-                    fuseScrollbarDirectives.forEach((fuseScrollbarDirective) => {
+                    fuseScrollbarDirectives.forEach((fuseScrollbarDirective) =>
+                    {
                         fuseScrollbarDirective.update();
                     });
                 });
@@ -249,7 +264,8 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
             // Enable the animations after a delay
             // The delay must be bigger than the current transition-duration
             // to make sure nothing will be animated while the mode changing
-            setTimeout(() => {
+            setTimeout(() =>
+            {
                 this._enableAnimations();
             }, 500);
         }
@@ -304,10 +320,10 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
         this._router.events
             .pipe(
                 filter(event => event instanceof NavigationEnd),
-                takeUntil(this._unsubscribeAll)
+                takeUntil(this._unsubscribeAll),
             )
-            .subscribe(() => {
+            .subscribe(() =>
-
+            {
                 // If the mode is 'over' and the navigation is opened...
                 if ( this.mode === 'over' && this.opened )
                 {
@@ -329,8 +345,38 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
      */
     ngAfterViewInit(): void
     {
-        setTimeout(() => {
+        // Fix for Firefox.
+        //
+        // Because 'position: sticky' doesn't work correctly inside a 'position: fixed' parent,
+        // adding the '.cdk-global-scrollblock' to the html element breaks the navigation's position.
+        // This fixes the problem by reading the 'top' value from the html element and adding it as a
+        // 'marginTop' to the navigation itself.
+        this._mutationObserver = new MutationObserver((mutations) =>
+        {
+            mutations.forEach((mutation) =>
+            {
+                const mutationTarget = mutation.target as HTMLElement;
+                if ( mutation.attributeName === 'class' )
+                {
+                    if ( mutationTarget.classList.contains('cdk-global-scrollblock') )
+                    {
+                        const top = parseInt(mutationTarget.style.top, 10);
+                        this._renderer2.setStyle(this._elementRef.nativeElement, 'margin-top', `${Math.abs(top)}px`);
+                    }
+                    else
+                    {
+                        this._renderer2.setStyle(this._elementRef.nativeElement, 'margin-top', null);
+                    }
+                }
+            });
+        });
+        this._mutationObserver.observe(this._document.documentElement, {
+            attributes     : true,
+            attributeFilter: ['class'],
+        });
 
+        setTimeout(() =>
+        {
             // Return if 'navigation content' element does not exist
             if ( !this._navigationContentEl )
             {
@@ -354,8 +400,8 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
             else
             {
                 // Go through all the scrollbar directives
-                this._fuseScrollbarDirectives.forEach((fuseScrollbarDirective) => {
+                this._fuseScrollbarDirectives.forEach((fuseScrollbarDirective) =>
-
+                {
                     // Skip if not enabled
                     if ( !fuseScrollbarDirective.isEnabled() )
                     {
@@ -374,11 +420,18 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
      */
     ngOnDestroy(): void
     {
+        // Disconnect the mutation observer
+        this._mutationObserver.disconnect();
+
+        // 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();
     }
 
@@ -585,7 +638,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
 
         // Create the enter animation and attach it to the player
         this._player = this._animationBuilder.build([
-            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1}))
+            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1})),
         ]).create(this._overlay);
 
         // Play the animation
@@ -609,15 +662,15 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
 
         // Create the leave animation and attach it to the player
         this._player = this._animationBuilder.build([
-            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0}))
+            animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0})),
         ]).create(this._overlay);
 
         // Play the animation
         this._player.play();
 
         // Once the animation is done...
-        this._player.onDone(() => {
+        this._player.onDone(() =>
-
+        {
             // If the overlay still exists...
             if ( this._overlay )
             {
@@ -660,7 +713,7 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
         this._player =
             this._animationBuilder
                 .build([
-                    animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1}))
+                    animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 1})),
                 ]).create(this._asideOverlay);
 
         // Play the animation
@@ -686,15 +739,15 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
         this._player =
             this._animationBuilder
                 .build([
-                    animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0}))
+                    animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({opacity: 0})),
                 ]).create(this._asideOverlay);
 
         // Play the animation
         this._player.play();
 
         // Once the animation is done...
-        this._player.onDone(() => {
+        this._player.onDone(() =>
-
+        {
             // If the aside overlay still exists...
             if ( this._asideOverlay )
             {

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

@@ -1,114 +0,0 @@
-import { ChangeDetectorRef, Directive, ElementRef, HostBinding, HostListener, Input, NgZone, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { Subject } from 'rxjs';
-
-@Directive({
-    selector: 'textarea[fuseAutogrow]',
-    exportAs: 'fuseAutogrow'
-})
-export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy
-{
-    // eslint-disable-next-line @angular-eslint/no-input-rename
-    @Input('fuseAutogrowVerticalPadding') padding: number = 8;
-    @HostBinding('rows') private _rows: number = 1;
-
-    private _height: string = 'auto';
-    private _unsubscribeAll: Subject<any> = new Subject<any>();
-
-    /**
-     * Constructor
-     */
-    constructor(
-        private _elementRef: ElementRef,
-        private _changeDetectorRef: ChangeDetectorRef,
-        private _ngZone: NgZone
-    )
-    {
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Accessors
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Host binding for component inline styles
-     */
-    @HostBinding('style') get styleList(): any
-    {
-        return {
-            'height'  : this._height,
-            'overflow': 'hidden',
-            'resize'  : 'none'
-        };
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Decorated methods
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * Resize on 'input' and 'ngModelChange' events
-     *
-     * @private
-     */
-    @HostListener('input')
-    @HostListener('ngModelChange')
-    private _resize(): void
-    {
-        // This doesn't need to trigger Angular's change detection by itself
-        this._ngZone.runOutsideAngular(() => {
-
-            setTimeout(() => {
-
-                // Set the height to 'auto' so we can correctly read the scrollHeight
-                this._height = 'auto';
-
-                // Detect the changes so the height is applied
-                this._changeDetectorRef.detectChanges();
-
-                // Get the scrollHeight and subtract the vertical padding
-                this._height = `${this._elementRef.nativeElement.scrollHeight - this.padding}px`;
-
-                // Detect the changes one more time to apply the final height
-                this._changeDetectorRef.detectChanges();
-            });
-        });
-    }
-
-    // -----------------------------------------------------------------------------------------------------
-    // @ Lifecycle hooks
-    // -----------------------------------------------------------------------------------------------------
-
-    /**
-     * On changes
-     *
-     * @param changes
-     */
-    ngOnChanges(changes: SimpleChanges): void
-    {
-        // Padding
-        if ( 'fuseAutogrowVerticalPadding' in changes )
-        {
-            // Resize
-            this._resize();
-        }
-    }
-
-    /**
-     * On init
-     */
-    ngOnInit(): void
-    {
-        // Resize for the first time
-        this._resize();
-    }
-
-    /**
-     * On destroy
-     */
-    ngOnDestroy(): void
-    {
-        // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
-        this._unsubscribeAll.complete();
-    }
-}

src/@fuse/directives/autogrow/autogrow.module.ts

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FuseAutogrowDirective } from '@fuse/directives/autogrow/autogrow.directive';
-
-@NgModule({
-    declarations: [
-        FuseAutogrowDirective
-    ],
-    exports     : [
-        FuseAutogrowDirective
-    ]
-})
-export class FuseAutogrowModule
-{
-}

src/@fuse/directives/autogrow/index.ts

@@ -1 +0,0 @@
-export * from '@fuse/directives/autogrow/public-api';

src/@fuse/directives/autogrow/public-api.ts

@@ -1,2 +0,0 @@
-export * from '@fuse/directives/autogrow/autogrow.directive';
-export * from '@fuse/directives/autogrow/autogrow.module';

src/@fuse/directives/scroll-reset/public-api.ts

@@ -1,2 +1 @@
 export * from '@fuse/directives/scroll-reset/scroll-reset.directive';
-export * from '@fuse/directives/scroll-reset/scroll-reset.module';

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

@@ -1,11 +1,11 @@
 import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
-import { Subject } from 'rxjs';
+import { filter, Subject, takeUntil } from 'rxjs';
-import { filter, takeUntil } from 'rxjs/operators';
 
 @Directive({
-    selector: '[fuseScrollReset]',
+    selector  : '[fuseScrollReset]',
-    exportAs: 'fuseScrollReset'
+    exportAs  : 'fuseScrollReset',
+    standalone: true,
 })
 export class FuseScrollResetDirective implements OnInit, OnDestroy
 {
@@ -16,7 +16,7 @@ export class FuseScrollResetDirective implements OnInit, OnDestroy
      */
     constructor(
         private _elementRef: ElementRef,
-        private _router: Router
+        private _router: Router,
     )
     {
     }
@@ -33,9 +33,9 @@ export class FuseScrollResetDirective implements OnInit, OnDestroy
         // Subscribe to NavigationEnd event
         this._router.events.pipe(
             filter(event => event instanceof NavigationEnd),
-            takeUntil(this._unsubscribeAll)
+            takeUntil(this._unsubscribeAll),
-        ).subscribe(() => {
+        ).subscribe(() =>
-
+        {
             // Reset the element's scroll position to the top
             this._elementRef.nativeElement.scrollTop = 0;
         });
@@ -47,7 +47,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/scroll-reset/scroll-reset.module.ts

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FuseScrollResetDirective } from '@fuse/directives/scroll-reset/scroll-reset.directive';
-
-@NgModule({
-    declarations: [
-        FuseScrollResetDirective
-    ],
-    exports     : [
-        FuseScrollResetDirective
-    ]
-})
-export class FuseScrollResetModule
-{
-}

src/@fuse/directives/scrollbar/public-api.ts

@@ -1,2 +1 @@
 export * from '@fuse/directives/scrollbar/scrollbar.directive';
-export * from '@fuse/directives/scrollbar/scrollbar.module';

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

@@ -1,19 +1,19 @@
-import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { Router } from '@angular/router';
 import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
 import { Platform } from '@angular/cdk/platform';
-import { fromEvent, Subject } from 'rxjs';
+import { Directive, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-import { debounceTime, takeUntil } from 'rxjs/operators';
+import { Router } from '@angular/router';
-import PerfectScrollbar from 'perfect-scrollbar';
-import { merge } from 'lodash-es';
 import { ScrollbarGeometry, ScrollbarPosition } from '@fuse/directives/scrollbar/scrollbar.types';
+import { merge } from 'lodash-es';
+import PerfectScrollbar from 'perfect-scrollbar';
+import { debounceTime, fromEvent, Subject, takeUntil } from 'rxjs';
 
 /**
  * Wrapper directive for the Perfect Scrollbar: https://github.com/mdbootstrap/perfect-scrollbar
  */
 @Directive({
-    selector: '[fuseScrollbar]',
+    selector  : '[fuseScrollbar]',
-    exportAs: 'fuseScrollbar'
+    exportAs  : 'fuseScrollbar',
+    standalone: true,
 })
 export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
 {
@@ -35,7 +35,7 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
     constructor(
         private _elementRef: ElementRef,
         private _platform: Platform,
-        private _router: Router
+        private _router: Router,
     )
     {
     }
@@ -102,11 +102,13 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
             }
 
             // Destroy and re-init the PerfectScrollbar to update its options
-            setTimeout(() => {
+            setTimeout(() =>
+            {
                 this._destroy();
             });
 
-            setTimeout(() => {
+            setTimeout(() =>
+            {
                 this._init();
             });
         }
@@ -121,10 +123,10 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
         fromEvent(window, 'resize')
             .pipe(
                 takeUntil(this._unsubscribeAll),
-                debounceTime(150)
+                debounceTime(150),
             )
-            .subscribe(() => {
+            .subscribe(() =>
-
+            {
                 // Update the PerfectScrollbar
                 this.update();
             });
@@ -138,7 +140,7 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
         this._destroy();
 
         // Unsubscribe from all subscriptions
-        this._unsubscribeAll.next();
+        this._unsubscribeAll.next(null);
         this._unsubscribeAll.complete();
     }
 
@@ -204,14 +206,14 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
         {
             scrollbarPosition = new ScrollbarPosition(
                 this._ps.reach.x || 0,
-                this._ps.reach.y || 0
+                this._ps.reach.y || 0,
             );
         }
         else
         {
             scrollbarPosition = new ScrollbarPosition(
                 this._elementRef.nativeElement.scrollLeft,
-                this._elementRef.nativeElement.scrollTop
+                this._elementRef.nativeElement.scrollTop,
             );
         }
 
@@ -389,7 +391,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
 
             const cosParameter = (oldValue - value) / 2;
 
-            const step = (newTimestamp: number) => {
+            const step = (newTimestamp: number): void =>
+            {
                 scrollCount += Math.PI / (speed / (newTimestamp - oldTimestamp));
                 newValue = Math.round(value + cosParameter + cosParameter * Math.cos(scrollCount));
 

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

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { FuseScrollbarDirective } from '@fuse/directives/scrollbar/scrollbar.directive';
-
-@NgModule({
-    declarations: [
-        FuseScrollbarDirective
-    ],
-    exports     : [
-        FuseScrollbarDirective
-    ]
-})
-export class FuseScrollbarModule
-{
-}

src/@fuse/fuse.module.ts

@@ -1,37 +0,0 @@
-import { NgModule, Optional, SkipSelf } from '@angular/core';
-import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
-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  : [
-        FuseMediaWatcherModule,
-        FuseSplashScreenModule,
-        FuseTailwindConfigModule,
-        FuseUtilsModule
-    ],
-    providers: [
-        {
-            // Use the 'fill' appearance on Angular Material form fields by default
-            provide : MAT_FORM_FIELD_DEFAULT_OPTIONS,
-            useValue: {
-                appearance: 'fill'
-            }
-        }
-    ]
-})
-export class FuseModule
-{
-    /**
-     * Constructor
-     */
-    constructor(@Optional() @SkipSelf() parentModule?: FuseModule)
-    {
-        if ( parentModule )
-        {
-            throw new Error('FuseModule has already been loaded. Import this module in the AppModule only!');
-        }
-    }
-}

src/@fuse/fuse.provider.ts

@@ -0,0 +1,108 @@
+import { provideHttpClient, withInterceptors } from '@angular/common/http';
+import { APP_INITIALIZER, ENVIRONMENT_INITIALIZER, EnvironmentProviders, importProvidersFrom, inject, Provider } from '@angular/core';
+import { MATERIAL_SANITY_CHECKS } from '@angular/material/core';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
+import { FUSE_MOCK_API_DEFAULT_DELAY, mockApiInterceptor } from '@fuse/lib/mock-api';
+import { FuseConfig } from '@fuse/services/config';
+import { FUSE_CONFIG } from '@fuse/services/config/config.constants';
+import { FuseConfirmationService } from '@fuse/services/confirmation';
+import { fuseLoadingInterceptor, FuseLoadingService } from '@fuse/services/loading';
+import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
+import { FusePlatformService } from '@fuse/services/platform';
+import { FuseSplashScreenService } from '@fuse/services/splash-screen';
+import { FuseUtilsService } from '@fuse/services/utils';
+
+export type FuseProviderConfig = {
+    mockApi?: {
+        delay?: number;
+        services?: any[];
+    },
+    fuse?: FuseConfig
+}
+
+/**
+ * Fuse provider
+ */
+export const provideFuse = (config: FuseProviderConfig): Array<Provider | EnvironmentProviders> =>
+{
+    // Base providers
+    const providers: Array<Provider | EnvironmentProviders> = [
+        {
+            // 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,
+            useValue: {
+                appearance: 'fill',
+            },
+        },
+        {
+            provide : FUSE_MOCK_API_DEFAULT_DELAY,
+            useValue: config?.mockApi?.delay ?? 0,
+        },
+        {
+            provide : FUSE_CONFIG,
+            useValue: config?.fuse ?? {},
+        },
+
+        importProvidersFrom(MatDialogModule),
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FuseConfirmationService),
+            multi   : true,
+        },
+
+        provideHttpClient(withInterceptors([fuseLoadingInterceptor])),
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FuseLoadingService),
+            multi   : true,
+        },
+
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FuseMediaWatcherService),
+            multi   : true,
+        },
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FusePlatformService),
+            multi   : true,
+        },
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FuseSplashScreenService),
+            multi   : true,
+        },
+        {
+            provide : ENVIRONMENT_INITIALIZER,
+            useValue: () => inject(FuseUtilsService),
+            multi   : true,
+        },
+    ];
+
+    // Mock Api services
+    if ( config?.mockApi?.services )
+    {
+        providers.push(
+            provideHttpClient(withInterceptors([mockApiInterceptor])),
+            {
+                provide   : APP_INITIALIZER,
+                deps      : [...config.mockApi.services],
+                useFactory: () => (): any => null,
+                multi     : true,
+            },
+        );
+    }
+
+    // Return the providers
+    return providers;
+};

src/@fuse/index.ts

@@ -1 +1 @@
-export * from './fuse.module';
+export * from './fuse.provider';

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

@@ -1,97 +1,77 @@
-import { Inject, Injectable } from '@angular/core';
+import { HttpErrorResponse, HttpEvent, HttpHandlerFn, HttpRequest, HttpResponse } from '@angular/common/http';
-import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
+import { inject } from '@angular/core';
-import { Observable, of, throwError } from 'rxjs';
-import { delay, switchMap } from 'rxjs/operators';
 import { FUSE_MOCK_API_DEFAULT_DELAY } from '@fuse/lib/mock-api/mock-api.constants';
 import { FuseMockApiService } from '@fuse/lib/mock-api/mock-api.service';
+import { delay, Observable, of, switchMap, throwError } from 'rxjs';
 
-@Injectable({
+export const mockApiInterceptor = (request: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> =>
-    providedIn: 'root'
-})
-export class FuseMockApiInterceptor implements HttpInterceptor
 {
-    /**
+    const defaultDelay = inject(FUSE_MOCK_API_DEFAULT_DELAY);
-     * Constructor
+    const fuseMockApiService = inject(FuseMockApiService);
-     */
+
-    constructor(
+    // Try to get the request handler
-        @Inject(FUSE_MOCK_API_DEFAULT_DELAY) private _defaultDelay: number,
+    const {
-        private _fuseMockApiService: FuseMockApiService
+        handler,
-    )
+        urlParams,
+    } = fuseMockApiService.findHandler(request.method.toUpperCase(), request.url);
+
+    // Pass through if the request handler does not exist
+    if ( !handler )
     {
+        return next(request);
     }
 
-    /**
+    // Set the intercepted request on the handler
-     * Intercept
+    handler.request = request;
-     *
-     * @param request
-     * @param next
-     */
-    intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>
-    {
-        // Try to get the request handler
-        const {
-                  handler,
-                  urlParams
-              } = this._fuseMockApiService.findHandler(request.method.toUpperCase(), request.url);
 
-        // Pass through if the request handler does not exist
+    // Set the url params on the handler
-        if ( !handler )
+    handler.urlParams = urlParams;
+
+    // Subscribe to the response function observable
+    return handler.response.pipe(
+        delay(handler.delay ?? defaultDelay ?? 0),
+        switchMap((response) =>
         {
-            return next.handle(request);
+            // If there is no response data,
-        }
+            // throw an error response
-
+            if ( !response )
-        // Set the intercepted request on the handler
+            {
-        handler.request = request;
-
-        // Set the url params on the handler
-        handler.urlParams = urlParams;
-
-        // Subscribe to the response function observable
-        return handler.response.pipe(
-            delay(handler.delay ?? this._defaultDelay ?? 0),
-            switchMap((response) => {
-
-                // If there is no response mock-api,
-                // throw an error response
-                if ( !response )
-                {
-                    response = new HttpErrorResponse({
-                        error     : 'NOT FOUND',
-                        status    : 404,
-                        statusText: 'NOT FOUND'
-                    });
-
-                    return throwError(response);
-                }
-
-                // Parse the response mock-api
-                const data = {
-                    status: response[0],
-                    body  : response[1]
-                };
-
-                // If the status code is in between 200 and 300,
-                // return a success response
-                if ( data.status >= 200 && data.status < 300 )
-                {
-                    response = new HttpResponse({
-                        body      : data.body,
-                        status    : data.status,
-                        statusText: 'OK'
-                    });
-
-                    return of(response);
-                }
-
-                // For other status codes,
-                // throw an error response
                 response = new HttpErrorResponse({
-                    error     : data.body.error,
+                    error     : 'NOT FOUND',
-                    status    : data.status,
+                    status    : 404,
-                    statusText: 'ERROR'
+                    statusText: 'NOT FOUND',
                 });
 
                 return throwError(response);
-            }));
+            }
-    }
+
-}
+            // Parse the response data
+            const data = {
+                status: response[0],
+                body  : response[1],
+            };
+
+            // If the status code is in between 200 and 300,
+            // return a success response
+            if ( data.status >= 200 && data.status < 300 )
+            {
+                response = new HttpResponse({
+                    body      : data.body,
+                    status    : data.status,
+                    statusText: 'OK',
+                });
+
+                return of(response);
+            }
+
+            // For other status codes,
+            // throw an error response
+            response = new HttpErrorResponse({
+                error     : data.body.error,
+                status    : data.status,
+                statusText: 'ERROR',
+            });
+
+            return throwError(response);
+        }));
+};

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

@@ -1,42 +0,0 @@
-import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { FUSE_MOCK_API_DEFAULT_DELAY } from '@fuse/lib/mock-api/mock-api.constants';
-import { FuseMockApiInterceptor } from '@fuse/lib/mock-api/mock-api.interceptor';
-
-@NgModule({
-    providers: [
-        {
-            provide : HTTP_INTERCEPTORS,
-            useClass: FuseMockApiInterceptor,
-            multi   : true
-        }
-    ]
-})
-export class FuseMockApiModule
-{
-    /**
-     * FuseMockApi module default configuration.
-     *
-     * @param mockApiServices - Array of services that register mock API handlers
-     * @param config - Configuration options
-     * @param config.delay - Default delay value in milliseconds to apply all responses
-     */
-    static forRoot(mockApiServices: any[], config?: { delay?: number }): ModuleWithProviders<FuseMockApiModule>
-    {
-        return {
-            ngModule : FuseMockApiModule,
-            providers: [
-                {
-                    provide   : APP_INITIALIZER,
-                    deps      : [...mockApiServices],
-                    useFactory: () => () => null,
-                    multi     : true
-                },
-                {
-                    provide : FUSE_MOCK_API_DEFAULT_DELAY,
-                    useValue: config?.delay ?? 0
-                }
-            ]
-        };
-    }
-}

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

@@ -1,7 +1,6 @@
 import { HttpRequest } from '@angular/common/http';
-import { Observable, of, throwError } from 'rxjs';
-import { take } from 'rxjs/operators';
 import { FuseMockApiReplyCallback } from '@fuse/lib/mock-api/mock-api.types';
+import { Observable, of, take, throwError } from 'rxjs';
 
 export class FuseMockApiHandler
 {
@@ -18,7 +17,7 @@ export class FuseMockApiHandler
      */
     constructor(
         public url: string,
-        public delay?: number
+        public delay?: number,
     )
     {
     }
@@ -56,7 +55,7 @@ export class FuseMockApiHandler
         // Execute the reply callback
         const replyResult = this._reply({
             request  : this.request,
-            urlParams: this.urlParams
+            urlParams: this.urlParams,
         });
 
         // If the result of the reply callback is an observable...