diff --git a/package-lock.json b/package-lock.json index 4f064684..01bbde9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1612,9 +1612,9 @@ "dev": true }, "@es-joy/jsdoccomment": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.4.4.tgz", - "integrity": "sha512-ua4qDt9dQb4qt5OI38eCZcQZYE5Bq3P0GzgvDARdT8Lt0mAUpxKTPy8JGGqEvF77tG1irKDZ3WreeezEa3P43w==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.6.0.tgz", + "integrity": "sha512-zT1EtysKMITJ7vE4RvOJqitxk/Str6It8hq+fykxkwLuTyzgak+TnVuVSIyovT/qrEz3i46ypCSXgNtIDYwNOg==", "dev": true, "requires": { "comment-parser": "^1.1.5", @@ -2192,19 +2192,76 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz", - "integrity": "sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.24.0.tgz", + "integrity": "sha512-qbCgkPM7DWTsYQGjx9RTuQGswi+bEt0isqDBeo+CKV0953zqI0Tp7CZ7Fi9ipgFA6mcQqF4NOVNwS/f2r6xShw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.23.0", - "@typescript-eslint/scope-manager": "4.23.0", + "@typescript-eslint/experimental-utils": "4.24.0", + "@typescript-eslint/scope-manager": "4.24.0", "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", "lodash": "^4.17.15", "regexpp": "^3.0.0", "semver": "^7.3.2", "tsutils": "^3.17.1" + }, + "dependencies": { + "@typescript-eslint/experimental-utils": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.24.0.tgz", + "integrity": "sha512-IwTT2VNDKH1h8RZseMH4CcYBz6lTvRoOLDuuqNZZoThvfHEhOiZPQCow+5El3PtyxJ1iDr6UXZwYtE3yZQjhcw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/scope-manager": "4.24.0", + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/typescript-estree": "4.24.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.24.0.tgz", + "integrity": "sha512-9+WYJGDnuC9VtYLqBhcSuM7du75fyCS/ypC8c5g7Sdw7pGL4NDTbeH38eJPfzIydCHZDoOgjloxSAA3+4l/zsA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/visitor-keys": "4.24.0" + } + }, + "@typescript-eslint/types": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.24.0.tgz", + "integrity": "sha512-tkZUBgDQKdvfs8L47LaqxojKDE+mIUmOzdz7r+u+U54l3GDkTpEbQ1Jp3cNqqAU9vMUCBA1fitsIhm7yN0vx9Q==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.24.0.tgz", + "integrity": "sha512-kBDitL/by/HK7g8CYLT7aKpAwlR8doshfWz8d71j97n5kUa5caHWvY0RvEUEanL/EqBJoANev8Xc/mQ6LLwXGA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/visitor-keys": "4.24.0", + "debug": "^4.1.1", + "globby": "^11.0.1", + "is-glob": "^4.0.1", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.24.0.tgz", + "integrity": "sha512-4ox1sjmGHIxjEDBnMCtWFFhErXtKA1Ec0sBpuz0fqf3P+g3JFGyTxxbF06byw0FRsPnnbq44cKivH7Ks1/0s6g==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "eslint-visitor-keys": "^2.0.0" + } + } } }, "@typescript-eslint/experimental-utils": { @@ -2222,15 +2279,58 @@ } }, "@typescript-eslint/parser": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz", - "integrity": "sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.24.0.tgz", + "integrity": "sha512-dj1ZIh/4QKeECLb2f/QjRwMmDArcwc2WorWPRlB8UNTZlY1KpTVsbX7e3ZZdphfRw29aTFUSNuGB8w9X5sS97w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.23.0", - "@typescript-eslint/types": "4.23.0", - "@typescript-eslint/typescript-estree": "4.23.0", + "@typescript-eslint/scope-manager": "4.24.0", + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/typescript-estree": "4.24.0", "debug": "^4.1.1" + }, + "dependencies": { + "@typescript-eslint/scope-manager": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.24.0.tgz", + "integrity": "sha512-9+WYJGDnuC9VtYLqBhcSuM7du75fyCS/ypC8c5g7Sdw7pGL4NDTbeH38eJPfzIydCHZDoOgjloxSAA3+4l/zsA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/visitor-keys": "4.24.0" + } + }, + "@typescript-eslint/types": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.24.0.tgz", + "integrity": "sha512-tkZUBgDQKdvfs8L47LaqxojKDE+mIUmOzdz7r+u+U54l3GDkTpEbQ1Jp3cNqqAU9vMUCBA1fitsIhm7yN0vx9Q==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.24.0.tgz", + "integrity": "sha512-kBDitL/by/HK7g8CYLT7aKpAwlR8doshfWz8d71j97n5kUa5caHWvY0RvEUEanL/EqBJoANev8Xc/mQ6LLwXGA==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "@typescript-eslint/visitor-keys": "4.24.0", + "debug": "^4.1.1", + "globby": "^11.0.1", + "is-glob": "^4.0.1", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.24.0.tgz", + "integrity": "sha512-4ox1sjmGHIxjEDBnMCtWFFhErXtKA1Ec0sBpuz0fqf3P+g3JFGyTxxbF06byw0FRsPnnbq44cKivH7Ks1/0s6g==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.24.0", + "eslint-visitor-keys": "^2.0.0" + } + } } }, "@typescript-eslint/scope-manager": { @@ -2627,9 +2727,9 @@ } }, "apexcharts": { - "version": "3.26.2", - "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.26.2.tgz", - "integrity": "sha512-CD7bad4ygwc9rs9vOQDDagUcoJ1mcc9BwNSiQB14l6jiZBCQKrXxnG4I1ZjJ2MIel/Y5GmsJFs8HTcZBqpe/Ew==", + "version": "3.26.3", + "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.26.3.tgz", + "integrity": "sha512-zbP7RBBV2CGffoVMIuTCUG64YbEUzV8IIT7iNVLMtY/OAVXTjPksDxSqKIniTvgJoscKe6sx4P56qDpBSU19VA==", "requires": { "svg.draggable.js": "^2.2.2", "svg.easing.js": "^2.0.0", @@ -3388,9 +3488,9 @@ "dev": true }, "chroma-js": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.1.tgz", - "integrity": "sha512-gYc5/Dooshun2OikK7oY/hYnoEiZ0dxqRpXosEdYRYm505vU5mRsHFqIW062C9nMtr32DVErP6mlxuepo2kNkw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.2.tgz", + "integrity": "sha512-ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ==", "dev": true, "requires": { "cross-env": "^6.0.3" @@ -5340,9 +5440,9 @@ } }, "eslint-plugin-import": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.0.tgz", - "integrity": "sha512-W5v1f7Cbam6BwbSSKtN6+yoUAms07ozbqAEhLOtf5erEqRv7w67PeZuAuBThaUkzdq2GfBx/5GBvxF+NWJshrQ==", + "version": "2.23.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.2.tgz", + "integrity": "sha512-LmNoRptHBxOP+nb0PIKz1y6OSzCJlB+0g0IGS3XV4KaKk2q4szqQ6s6F1utVf5ZRkxk/QOTjdxe7v4VjS99Bsg==", "dev": true, "requires": { "array-includes": "^3.1.3", @@ -5439,12 +5539,12 @@ } }, "eslint-plugin-jsdoc": { - "version": "34.2.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-34.2.2.tgz", - "integrity": "sha512-9JCeUUZ2MefGd/Pl3blx9/EDjCd7/Z2+fcVBuJdNdvSLApRqZ8CwjGjLHf5s4uVikqF968A0CfnID0WK9B/H/w==", + "version": "34.8.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-34.8.2.tgz", + "integrity": "sha512-UOU9A40Cl806JMtla2vF+RM6sNqfLPbhLv9FZqhcC7+LmChD3DVaWqM7ADxpF0kMyZNWe1QKUnqGnXaA3NTn+w==", "dev": true, "requires": { - "@es-joy/jsdoccomment": "^0.4.4", + "@es-joy/jsdoccomment": "^0.6.0", "comment-parser": "1.1.5", "debug": "^4.3.1", "esquery": "^1.4.0", @@ -8271,9 +8371,9 @@ } }, "marked": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.3.tgz", - "integrity": "sha512-5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA==" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/marked/-/marked-2.0.4.tgz", + "integrity": "sha512-MIL0xKRDQM3DE7dJr/wa6JV0EmK9yZ3cwuTc2bu66FNm/tmEMm9cJCgJZpt9R+K1T+pB2iBNV55wvnwSd345zg==" }, "mdn-data": { "version": "2.0.14", @@ -8708,9 +8808,9 @@ "dev": true }, "ng-apexcharts": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.5.9.tgz", - "integrity": "sha512-ZRsU9meBvXNPG1vhEolCJGRrhfR7Nnj37E6H5CHfWpUEAw9/89U5TK+yDD+myPhT0ubQbRb6fZJoG74dEebXYA==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/ng-apexcharts/-/ng-apexcharts-1.5.10.tgz", + "integrity": "sha512-NcAQZnzG4Knf9QG8PP20B9lx+rLm1ynoKIP3tMDsv272VAMaN0Yn01B50WR7yI3ouWufuH4qOPB8lqjjyqbJJg==", "requires": { "tslib": "^1.10.0" }, @@ -8723,16 +8823,16 @@ } }, "ngx-markdown": { - "version": "11.1.3", - "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-11.1.3.tgz", - "integrity": "sha512-z32q8l76ubrcP62L03mdvrizwueLBHV10LkT8MEDnFcjmY+8J1PytxFJ9EBTJpvc+CaPolgAoi7felN2XJZTSg==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/ngx-markdown/-/ngx-markdown-12.0.0.tgz", + "integrity": "sha512-U8EeHNGVxdjn9QDsPZy6h05I39QRiBV7a5n95NDBP1nACRos31sPzVa3+NMLs0Z6HzFpnHuIR4759uveRn7KBg==", "requires": { "@types/marked": "^2.0.0", - "emoji-toolkit": "^6.0.1", + "emoji-toolkit": "^6.5.0", "katex": "^0.13.0", "marked": "^2.0.0", "prismjs": "^1.23.0", - "tslib": "^2.0.0" + "tslib": "^2.1.0" } }, "ngx-quill": { @@ -9665,22 +9765,14 @@ "dev": true }, "postcss": { - "version": "8.2.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.15.tgz", - "integrity": "sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.0.tgz", + "integrity": "sha512-+ogXpdAjWGa+fdYY5BQ96V/6tAo+TdSSIMP5huJBIygdWwKtVoB5JWZ7yUd4xZ8r+8Kvvx4nyg/PQ071H4UtcQ==", "dev": true, "requires": { "colorette": "^1.2.2", "nanoid": "^3.1.23", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } + "source-map-js": "^0.6.2" } }, "postcss-attribute-case-insensitive": { @@ -13252,9 +13344,9 @@ } }, "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz", + "integrity": "sha512-NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g==", "dev": true }, "spdy": { diff --git a/package.json b/package.json index f14b725f..79978d78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fuse/demo", - "version": "13.0.0", + "version": "13.0.1", "license": "https://themeforest.net/licenses/standard", "private": true, "scripts": { @@ -32,13 +32,13 @@ "@fullcalendar/rrule": "4.4.2", "@fullcalendar/timegrid": "4.4.2", "@ngneat/transloco": "2.20.1", - "apexcharts": "3.26.2", + "apexcharts": "3.26.3", "crypto-js": "3.3.0", "highlight.js": "10.7.2", "lodash-es": "4.17.21", "moment": "2.29.1", - "ng-apexcharts": "1.5.9", - "ngx-markdown": "11.1.3", + "ng-apexcharts": "1.5.10", + "ngx-markdown": "12.0.0", "ngx-quill": "14.0.0", "perfect-scrollbar": "1.5.1", "quill": "1.3.7", @@ -68,13 +68,13 @@ "@types/lodash": "4.14.169", "@types/lodash-es": "4.17.4", "@types/node": "12.20.13", - "@typescript-eslint/eslint-plugin": "4.23.0", - "@typescript-eslint/parser": "4.23.0", + "@typescript-eslint/eslint-plugin": "4.24.0", + "@typescript-eslint/parser": "4.24.0", "autoprefixer": "10.2.5", - "chroma-js": "2.1.1", + "chroma-js": "2.1.2", "eslint": "7.26.0", - "eslint-plugin-import": "2.23.0", - "eslint-plugin-jsdoc": "34.2.2", + "eslint-plugin-import": "2.23.2", + "eslint-plugin-jsdoc": "34.8.2", "eslint-plugin-prefer-arrow": "1.2.3", "jasmine-core": "3.7.1", "jasmine-spec-reporter": "5.0.2", @@ -84,7 +84,7 @@ "karma-jasmine": "4.0.1", "karma-jasmine-html-reporter": "1.6.0", "lodash": "4.17.21", - "postcss": "8.2.15", + "postcss": "8.3.0", "protractor": "7.0.0", "tailwindcss": "2.1.2", "typescript": "4.2.4" diff --git a/src/@fuse/animations/index.ts b/src/@fuse/animations/index.ts index 7e1a213e..e3669783 100644 --- a/src/@fuse/animations/index.ts +++ b/src/@fuse/animations/index.ts @@ -1 +1 @@ -export * from './public-api'; +export * from '@fuse/animations/public-api'; diff --git a/src/@fuse/animations/public-api.ts b/src/@fuse/animations/public-api.ts index 60d4ee81..3e7cd5a5 100644 --- a/src/@fuse/animations/public-api.ts +++ b/src/@fuse/animations/public-api.ts @@ -1,8 +1,8 @@ -import { expandCollapse } from './expand-collapse'; -import { fadeIn, fadeInBottom, fadeInLeft, fadeInRight, fadeInTop, fadeOut, fadeOutBottom, fadeOutLeft, fadeOutRight, fadeOutTop } from './fade'; -import { shake } from './shake'; -import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from './slide'; -import { zoomIn, zoomOut } from './zoom'; +import { expandCollapse } from '@fuse/animations/expand-collapse'; +import { fadeIn, fadeInBottom, fadeInLeft, fadeInRight, fadeInTop, fadeOut, fadeOutBottom, fadeOutLeft, fadeOutRight, fadeOutTop } from '@fuse/animations/fade'; +import { shake } from '@fuse/animations/shake'; +import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from '@fuse/animations/slide'; +import { zoomIn, zoomOut } from '@fuse/animations/zoom'; export const fuseAnimations = [ expandCollapse, diff --git a/src/@fuse/components/date-range/date-range.component.ts b/src/@fuse/components/date-range/date-range.component.ts index 2794df7c..9fd99cb9 100644 --- a/src/@fuse/components/date-range/date-range.component.ts +++ b/src/@fuse/components/date-range/date-range.component.ts @@ -61,9 +61,9 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD private _viewContainerRef: ViewContainerRef ) { - this._onChange = () => { + this._onChange = (): void => { }; - this._onTouched = () => { + this._onTouched = (): void => { }; this.dateFormat = 'DD/MM/YYYY'; this.timeFormat = '12'; @@ -361,7 +361,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD this._unsubscribeAll.complete(); // @ TODO: Workaround until "angular/issues/20007" resolved - this.writeValue = () => { + this.writeValue = (): void => { }; } diff --git a/src/@fuse/components/masonry/index.ts b/src/@fuse/components/masonry/index.ts index ac978a78..b2f1a036 100644 --- a/src/@fuse/components/masonry/index.ts +++ b/src/@fuse/components/masonry/index.ts @@ -1 +1 @@ -export * from '@fuse/components/card/public-api'; +export * from '@fuse/components/masonry/public-api'; diff --git a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.html b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.html index 1d136ccf..73ca799b 100644 --- a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.html +++ b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.html @@ -11,7 +11,7 @@ [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}" [routerLink]="[item.link]" [routerLinkActive]="'fuse-horizontal-navigation-item-active'" - [routerLinkActiveOptions]="item.isActiveMatchOptions"> + [routerLinkActiveOptions]="isActiveMatchOptions"> @@ -39,7 +39,7 @@ [ngClass]="{'fuse-horizontal-navigation-item-active-forced': item.active}" [routerLink]="[item.link]" [routerLinkActive]="'fuse-horizontal-navigation-item-active'" - [routerLinkActiveOptions]="item.isActiveMatchOptions" + [routerLinkActiveOptions]="isActiveMatchOptions" (click)="item.function(item)"> diff --git a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts index e32f5819..f20224ac 100644 --- a/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/basic/basic.component.ts @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { IsActiveMatchOptions } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { FuseHorizontalNavigationComponent } from '@fuse/components/navigation/horizontal/horizontal.component'; @@ -17,6 +18,7 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes @Input() item: FuseNavigationItem; @Input() name: string; + isActiveMatchOptions: IsActiveMatchOptions; private _fuseHorizontalNavigationComponent: FuseHorizontalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); @@ -29,6 +31,11 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes 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,16 +47,20 @@ export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDes */ ngOnInit(): void { - // If the item doesn't have "isActiveMatchOptions", - // set it using the equivalent form of "item.exactMatch" - if ( !this.item.isActiveMatchOptions ) - { - this.item.isActiveMatchOptions = this.item.exactMatch ? this._fuseUtilsService.exactMatchOptions : this._fuseUtilsService.subsetMatchOptions; - } + // 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) diff --git a/src/@fuse/components/navigation/vertical/components/basic/basic.component.html b/src/@fuse/components/navigation/vertical/components/basic/basic.component.html index 7b255875..7eea495e 100644 --- a/src/@fuse/components/navigation/vertical/components/basic/basic.component.html +++ b/src/@fuse/components/navigation/vertical/components/basic/basic.component.html @@ -11,7 +11,7 @@ [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}" [routerLink]="[item.link]" [routerLinkActive]="'fuse-vertical-navigation-item-active'" - [routerLinkActiveOptions]="item.isActiveMatchOptions"> + [routerLinkActiveOptions]="isActiveMatchOptions"> @@ -39,7 +39,7 @@ [ngClass]="{'fuse-vertical-navigation-item-active-forced': item.active}" [routerLink]="[item.link]" [routerLinkActive]="'fuse-vertical-navigation-item-active'" - [routerLinkActiveOptions]="item.isActiveMatchOptions" + [routerLinkActiveOptions]="isActiveMatchOptions" (click)="item.function(item)"> diff --git a/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts b/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts index 556e8d5e..b3a20aa4 100644 --- a/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts +++ b/src/@fuse/components/navigation/vertical/components/basic/basic.component.ts @@ -1,4 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { IsActiveMatchOptions } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component'; @@ -17,6 +18,7 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr @Input() item: FuseNavigationItem; @Input() name: string; + isActiveMatchOptions: IsActiveMatchOptions; private _fuseVerticalNavigationComponent: FuseVerticalNavigationComponent; private _unsubscribeAll: Subject = new Subject(); @@ -29,6 +31,11 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr 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,16 +47,20 @@ export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestr */ ngOnInit(): void { - // If the item doesn't have "isActiveMatchOptions", - // set it using the equivalent form of "item.exactMatch" - if ( !this.item.isActiveMatchOptions ) - { - this.item.isActiveMatchOptions = this.item.exactMatch ? this._fuseUtilsService.exactMatchOptions : this._fuseUtilsService.subsetMatchOptions; - } + // 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) diff --git a/src/@fuse/directives/scrollbar/scrollbar.directive.ts b/src/@fuse/directives/scrollbar/scrollbar.directive.ts index 6644fd15..d4854f29 100644 --- a/src/@fuse/directives/scrollbar/scrollbar.directive.ts +++ b/src/@fuse/directives/scrollbar/scrollbar.directive.ts @@ -389,7 +389,7 @@ 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)); diff --git a/src/@fuse/services/tailwind/index.ts b/src/@fuse/services/tailwind/index.ts index b2dad0cb..2efe083b 100644 --- a/src/@fuse/services/tailwind/index.ts +++ b/src/@fuse/services/tailwind/index.ts @@ -1 +1 @@ -export * from '@fuse/services/media-watcher/public-api'; +export * from '@fuse/services/tailwind/public-api'; diff --git a/src/@fuse/services/tailwind/public-api.ts b/src/@fuse/services/tailwind/public-api.ts index fd5905d7..3eeb3757 100644 --- a/src/@fuse/services/tailwind/public-api.ts +++ b/src/@fuse/services/tailwind/public-api.ts @@ -1,2 +1,2 @@ -export * from '@fuse/services/media-watcher/media-watcher.module'; -export * from '@fuse/services/media-watcher/media-watcher.service'; +export * from '@fuse/services/tailwind/tailwind.module'; +export * from '@fuse/services/tailwind/tailwind.service'; diff --git a/src/@fuse/services/utils/index.ts b/src/@fuse/services/utils/index.ts index 0563cafe..a507e7ff 100644 --- a/src/@fuse/services/utils/index.ts +++ b/src/@fuse/services/utils/index.ts @@ -1 +1 @@ -export * from '@fuse/services/config/public-api'; +export * from '@fuse/services/utils/public-api'; diff --git a/src/@fuse/validators/index.ts b/src/@fuse/validators/index.ts index 7e1a213e..5e4748d3 100644 --- a/src/@fuse/validators/index.ts +++ b/src/@fuse/validators/index.ts @@ -1 +1 @@ -export * from './public-api'; +export * from '@fuse/validators/public-api'; diff --git a/src/@fuse/validators/public-api.ts b/src/@fuse/validators/public-api.ts index 011b41e0..fc16900a 100644 --- a/src/@fuse/validators/public-api.ts +++ b/src/@fuse/validators/public-api.ts @@ -1 +1 @@ -export * from './validators'; +export * from '@fuse/validators/validators'; diff --git a/src/@fuse/version/fuse-version.ts b/src/@fuse/version/fuse-version.ts index 284b2a2b..15f63ba1 100644 --- a/src/@fuse/version/fuse-version.ts +++ b/src/@fuse/version/fuse-version.ts @@ -1,3 +1,3 @@ import { Version } from '@fuse/version/version'; -export const FUSE_VERSION = new Version('13.0.0').full; +export const FUSE_VERSION = new Version('13.0.1').full; diff --git a/src/app/layout/common/language/language.component.html b/src/app/layout/common/language/language.component.html index cbb1a54a..c8907850 100644 --- a/src/app/layout/common/language/language.component.html +++ b/src/app/layout/common/language/language.component.html @@ -9,7 +9,7 @@ - +